Menu
▾
▴
canorus-commit — Canorus Subversion Commit Mailing List
This list is closed, nobody may subscribe to it.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(34) |
Sep
(63) |
Oct
(3) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
|
Jun
(3) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
(8) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(36) |
May
|
Jun
|
Jul
|
Aug
(12) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(12) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(2) |
Jun
(48) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2019 |
Jan
(7) |
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <its...@us...> - 2016-04-10 08:50:19
|
Revision: 1447
http://sourceforge.net/p/canorus/code/1447
Author: itsgeorg
Date: 2016-04-10 08:50:16 +0000 (Sun, 10 Apr 2016)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
trunk/src/export/midiexport.cpp
Modified: trunk/src/export/midiexport.cpp
===================================================================
--- trunk/src/export/midiexport.cpp 2016-04-10 06:08:54 UTC (rev 1446)
+++ trunk/src/export/midiexport.cpp 2016-04-10 08:50:16 UTC (rev 1447)
@@ -333,7 +333,6 @@
controlTrackChunk.append( trackEnd());
setChunkLength( &controlTrackChunk );
streamQByteArray( controlTrackChunk );
- //for (int i=0;i<controlTrackChunk.length();i++) out().device()->putChar(controlTrackChunk[i]);
// trackChunk is already filled with midi data,
// let's add chunk header, in reverse, ...
@@ -354,7 +353,7 @@
void CAMidiExport::streamQByteArray( QByteArray x )
{
- for (int i=0;i<x.length();i++) // here we pass binary data through QTextStream
+ for (int i=0;i<x.size();i++) // here we pass binary data through QTextStream
out().device()->putChar(x[i]);
return; // when no debugging
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-10 06:08:57
|
Revision: 1446
http://sourceforge.net/p/canorus/code/1446
Author: matevz
Date: 2016-04-10 06:08:54 +0000 (Sun, 10 Apr 2016)
Log Message:
-----------
Migrated English user's guide to sphinx.
Modified Paths:
--------------
trunk/doc/usersguide2/source/en/index.rst
Added Paths:
-----------
trunk/doc/usersguide2/_static/default.css
trunk/doc/usersguide2/_templates/layout.html
trunk/doc/usersguide2/images/
trunk/doc/usersguide2/images/arrow.svg
trunk/doc/usersguide2/images/blah.png
trunk/doc/usersguide2/images/canorus.png
trunk/doc/usersguide2/images/fileprintpreview.png
trunk/doc/usersguide2/images/insertplayable.svg
trunk/doc/usersguide2/images/mainwin.en.png
trunk/doc/usersguide2/images/play.svg
trunk/doc/usersguide2/images/staffnew.svg
trunk/doc/usersguide2/images/voicenew.svg
trunk/doc/usersguide2/source/en/introduction.rst
trunk/doc/usersguide2/source/en/quickstart.rst
Added: trunk/doc/usersguide2/_static/default.css
===================================================================
--- trunk/doc/usersguide2/_static/default.css (rev 0)
+++ trunk/doc/usersguide2/_static/default.css 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,508 @@
+/**
+ * Alternate Sphinx design
+ * Originally created by Armin Ronacher for Werkzeug, adapted by Georg Brandl.
+ */
+
+body {
+ font-family: "Times New Roman", Times, serif;
+ font-size: 14px;
+ letter-spacing: -0.01em;
+ line-height: 150%;
+ text-align: center;
+ /*background-color: #AFC1C4; */
+ background-color: #FFFFF0;
+ color: black;
+ padding: 0;
+ border: 1px solid #aaa;
+
+ margin: 0px 80px 0px 80px;
+ min-width: 740px;
+}
+
+a {
+ color: #CA7900;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #2491CF;
+}
+
+pre {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+ font-size: 0.95em;
+ letter-spacing: 0.015em;
+ padding: 0.5em;
+ border: 1px solid #ccc;
+ background-color: #f8f8f8;
+}
+
+td.linenos pre {
+ padding: 0.5em 0;
+ border: 0;
+ background-color: transparent;
+ color: #aaa;
+}
+
+table.highlighttable {
+ margin-left: 0.5em;
+}
+
+table.highlighttable td {
+ padding: 0 0.5em 0 0.5em;
+}
+
+cite, code, tt {
+ font-family: 'Consolas', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+ font-size: 0.95em;
+ letter-spacing: 0.01em;
+}
+
+hr {
+ border: 1px solid #abc;
+ margin: 2em;
+}
+
+tt {
+ background-color: #f2f2f2;
+ border-bottom: 1px solid #ddd;
+ color: #333;
+}
+
+tt.descname {
+ background-color: transparent;
+ font-weight: bold;
+ font-size: 1.2em;
+ border: 0;
+}
+
+tt.descclassname {
+ background-color: transparent;
+ border: 0;
+}
+
+tt.xref {
+ background-color: transparent;
+ font-weight: bold;
+ border: 0;
+}
+
+a tt {
+ background-color: transparent;
+ font-weight: bold;
+ border: 0;
+ color: #CA7900;
+}
+
+a tt:hover {
+ color: #2491CF;
+}
+
+dl {
+ margin-bottom: 15px;
+}
+
+dd p {
+ margin-top: 0px;
+}
+
+dd ul, dd table {
+ margin-bottom: 10px;
+}
+
+dd {
+ margin-top: 3px;
+ margin-bottom: 10px;
+ margin-left: 30px;
+}
+
+.refcount {
+ color: #060;
+}
+
+dt:target,
+.highlight {
+ background-color: #fbe54e;
+}
+
+dl.class, dl.function {
+ border-top: 2px solid #888;
+}
+
+dl.method, dl.attribute {
+ border-top: 1px solid #aaa;
+}
+
+dl.glossary dt {
+ font-weight: bold;
+ font-size: 1.1em;
+}
+
+pre {
+ line-height: 120%;
+}
+
+pre a {
+ color: inherit;
+ text-decoration: underline;
+}
+
+.first {
+ margin-top: 0 !important;
+}
+
+div.document {
+ background-color: white;
+ text-align: left;
+ background-image: url(contents.png);
+ background-repeat: repeat-x;
+}
+
+/*
+div.documentwrapper {
+ width: 100%;
+}
+*/
+
+div.clearer {
+ clear: both;
+}
+
+div.related h3 {
+ display: none;
+}
+
+div.related ul {
+ background-image: url(navigation.png);
+ height: 2em;
+ list-style: none;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ margin: 0;
+ padding-left: 10px;
+}
+
+div.related ul li {
+ margin: 0;
+ padding: 0;
+ height: 2em;
+ float: left;
+}
+
+div.related ul li.right {
+ float: right;
+ margin-right: 5px;
+}
+
+div.related ul li a {
+ margin: 0;
+ padding: 0 5px 0 5px;
+ line-height: 1.75em;
+ color: #EE9816;
+}
+
+div.related ul li a:hover {
+ color: #3CA8E7;
+}
+
+div.body {
+ margin: 0;
+ padding: 0.5em 20px 20px 20px;
+}
+
+div.bodywrapper {
+ margin: 0 0 0 0;
+ border-right: 1px solid #ccc;
+}
+
+div.body a {
+ text-decoration: underline;
+}
+
+div.sphinxsidebar {
+ margin: 0;
+ padding: 0.5em 15px 15px 0;
+ width: 210px;
+ float: right;
+ text-align: left;
+/* margin-left: -100%; */
+}
+
+div.sphinxsidebar h4, div.sphinxsidebar h3 {
+ margin: 1em 0 0.5em 0;
+ font-size: 0.9em;
+ padding: 0.1em 0 0.1em 0.5em;
+ color: white;
+ border: 1px solid #86989B;
+ background-color: #AFC1C4;
+}
+
+div.sphinxsidebar ul {
+ padding-left: 1.5em;
+ margin-top: 7px;
+ list-style: none;
+ padding: 0;
+ line-height: 130%;
+}
+
+div.sphinxsidebar ul ul {
+ list-style: square;
+ margin-left: 20px;
+}
+
+p {
+ margin: 0.8em 0 0.5em 0;
+}
+
+p.rubric {
+ font-weight: bold;
+}
+
+h1 {
+ margin: 0;
+ padding: 0.7em 0 0.3em 0;
+ font-size: 1.5em;
+ color: black;
+}
+
+h2 {
+ margin: 1.3em 0 0.2em 0;
+ font-size: 1.35em;
+ padding: 0;
+}
+
+h3 {
+ margin: 1em 0 -0.3em 0;
+ font-size: 1.2em;
+}
+
+h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+ color: black!important;
+}
+
+h1 a.anchor, h2 a.anchor, h3 a.anchor, h4 a.anchor, h5 a.anchor, h6 a.anchor {
+ display: none;
+ margin: 0 0 0 0.3em;
+ padding: 0 0.2em 0 0.2em;
+ color: #aaa!important;
+}
+
+h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor,
+h5:hover a.anchor, h6:hover a.anchor {
+ display: inline;
+}
+
+h1 a.anchor:hover, h2 a.anchor:hover, h3 a.anchor:hover, h4 a.anchor:hover,
+h5 a.anchor:hover, h6 a.anchor:hover {
+ color: #777;
+ background-color: #eee;
+}
+
+table {
+ border-collapse: collapse;
+ margin: 0 -0.5em 0 -0.5em;
+}
+
+table td, table th {
+ padding: 0.2em 0.5em 0.2em 0.5em;
+}
+
+div.footer {
+ background-color: #E3EFF1;
+ color: #86989B;
+ padding: 3px 8px 3px 0;
+ clear: both;
+ font-size: 0.8em;
+ text-align: right;
+}
+
+div.footer a {
+ color: #86989B;
+ text-decoration: underline;
+}
+
+div.pagination {
+ margin-top: 2em;
+ padding-top: 0.5em;
+ border-top: 1px solid black;
+ text-align: center;
+}
+
+div.sphinxsidebar ul.toc {
+ margin: 1em 0 1em 0;
+ padding: 0 0 0 0.5em;
+ list-style: none;
+}
+
+div.sphinxsidebar ul.toc li {
+ margin: 0.5em 0 0.5em 0;
+ font-size: 0.9em;
+ line-height: 130%;
+}
+
+div.sphinxsidebar ul.toc li p {
+ margin: 0;
+ padding: 0;
+}
+
+div.sphinxsidebar ul.toc ul {
+ margin: 0.2em 0 0.2em 0;
+ padding: 0 0 0 1.8em;
+}
+
+div.sphinxsidebar ul.toc ul li {
+ padding: 0;
+}
+
+div.admonition, div.warning {
+ font-size: 0.9em;
+ margin: 1em 0 0 0;
+ border: 1px solid #86989B;
+ background-color: #f7f7f7;
+}
+
+div.admonition p, div.warning p {
+ margin: 0.5em 1em 0.5em 1em;
+ padding: 0;
+}
+
+div.admonition pre, div.warning pre {
+ margin: 0.4em 1em 0.4em 1em;
+}
+
+div.admonition p.admonition-title,
+div.warning p.admonition-title {
+ margin: 0;
+ padding: 0.1em 0 0.1em 0.5em;
+ color: white;
+ border-bottom: 1px solid #86989B;
+ font-weight: bold;
+ background-color: #AFC1C4;
+}
+
+div.warning {
+ border: 1px solid #940000;
+}
+
+div.warning p.admonition-title {
+ background-color: #CF0000;
+ border-bottom-color: #940000;
+}
+
+div.admonition ul, div.admonition ol,
+div.warning ul, div.warning ol {
+ margin: 0.1em 0.5em 0.5em 3em;
+ padding: 0;
+}
+
+div.versioninfo {
+ margin: 1em 0 0 0;
+ border: 1px solid #ccc;
+ background-color: #DDEAF0;
+ padding: 8px;
+ line-height: 1.3em;
+ font-size: 0.9em;
+}
+
+
+a.headerlink {
+ color: #c60f0f!important;
+ font-size: 1em;
+ margin-left: 6px;
+ padding: 0 4px 0 4px;
+ text-decoration: none!important;
+ visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+ visibility: hidden;
+}
+
+a.headerlink:hover {
+ background-color: #ccc;
+ color: white!important;
+}
+
+table.indextable td {
+ text-align: left;
+ vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+ height: 10px;
+}
+
+table.indextable tr.cap {
+ margin-top: 10px;
+ background-color: #f2f2f2;
+}
+
+img.toggler {
+ margin-right: 3px;
+ margin-top: 3px;
+ cursor: pointer;
+}
+
+img.inheritance {
+ border: 0px
+}
+
+form.pfform {
+ margin: 10px 0 20px 0;
+}
+
+table.contentstable {
+ width: 90%;
+}
+
+table.contentstable p.biglink {
+ line-height: 150%;
+}
+
+a.biglink {
+ font-size: 1.3em;
+}
+
+span.linkdescr {
+ font-style: italic;
+ padding-top: 5px;
+ font-size: 90%;
+}
+
+ul.search {
+ margin: 10px 0 0 20px;
+ padding: 0;
+}
+
+ul.search li {
+ padding: 5px 0 5px 20px;
+ background-image: url(file.png);
+ background-repeat: no-repeat;
+ background-position: 0 7px;
+}
+
+ul.search li a {
+ font-weight: bold;
+}
+
+ul.search li div.context {
+ color: #888;
+ margin: 2px 0 0 30px;
+ text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+ font-weight: bold;
+}
+
Added: trunk/doc/usersguide2/_templates/layout.html
===================================================================
--- trunk/doc/usersguide2/_templates/layout.html (rev 0)
+++ trunk/doc/usersguide2/_templates/layout.html 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,16 @@
+{% extends "!layout.html" %}
+
+
+{% block rootrellink %}
+ <li><a href="{{ pathto('index') }}">home</a>| </li>
+{% endblock %}
+
+
+{% block relbar1 %}
+
+{{ super() }}
+{% endblock %}
+
+{# put the sidebar before the body #}
+{% block sidebar1 %}{% endblock %}
+{% block sidebar2 %}{% endblock %}
Added: trunk/doc/usersguide2/images/arrow.svg
===================================================================
--- trunk/doc/usersguide2/images/arrow.svg (rev 0)
+++ trunk/doc/usersguide2/images/arrow.svg 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg2220"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ version="1.0"
+ sodipodi:docname="arrow.svg"
+ sodipodi:docbase="/home/matevz/canorus/artwork/icons"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
+ <defs
+ id="defs2222" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.959798"
+ inkscape:cx="148.83343"
+ inkscape:cy="35.638468"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="128px"
+ height="128px"
+ inkscape:window-width="1600"
+ inkscape:window-height="1126"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata2225">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.48974562px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 38.597288,7.7471713 L 38.582175,100.01719 L 60.388668,78.210695 L 86.122871,122.78365 L 98.490389,114.44574 L 73.316013,71.29283 L 102.32422,71.29283 L 38.597288,7.7471713 z "
+ id="path2228"
+ sodipodi:nodetypes="cccccccc" />
+ </g>
+</svg>
Added: trunk/doc/usersguide2/images/blah.png
===================================================================
Added: trunk/doc/usersguide2/images/canorus.png
===================================================================
(Binary files differ)
Index: trunk/doc/usersguide2/images/canorus.png
===================================================================
--- trunk/doc/usersguide2/images/canorus.png 2016-04-09 22:57:50 UTC (rev 1445)
+++ trunk/doc/usersguide2/images/canorus.png 2016-04-10 06:08:54 UTC (rev 1446)
Property changes on: trunk/doc/usersguide2/images/canorus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/doc/usersguide2/images/fileprintpreview.png
===================================================================
(Binary files differ)
Index: trunk/doc/usersguide2/images/fileprintpreview.png
===================================================================
--- trunk/doc/usersguide2/images/fileprintpreview.png 2016-04-09 22:57:50 UTC (rev 1445)
+++ trunk/doc/usersguide2/images/fileprintpreview.png 2016-04-10 06:08:54 UTC (rev 1446)
Property changes on: trunk/doc/usersguide2/images/fileprintpreview.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/doc/usersguide2/images/insertplayable.svg
===================================================================
--- trunk/doc/usersguide2/images/insertplayable.svg (rev 0)
+++ trunk/doc/usersguide2/images/insertplayable.svg 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ sodipodi:modified="true"
+ version="1.0">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient9389">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop9391" />
+ <stop
+ style="stop-color:#646464;stop-opacity:1;"
+ offset="1"
+ id="stop9393" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9389"
+ id="linearGradient9395"
+ x1="-26.241436"
+ y1="-153.48067"
+ x2="300"
+ y2="-153.48067"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient36148">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop36150" />
+ <stop
+ style="stop-color:#646464;stop-opacity:1;"
+ offset="1"
+ id="stop36152" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient36148"
+ id="linearGradient36154"
+ x1="54.073642"
+ y1="922.13912"
+ x2="108.13371"
+ y2="922.13912"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4366167,0,0,0.4366167,-3.2808296,-359.04494)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9389"
+ id="linearGradient2423"
+ gradientUnits="userSpaceOnUse"
+ x1="-26.241436"
+ y1="-153.48067"
+ x2="300"
+ y2="-153.48067" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient36148"
+ id="linearGradient2435"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4366167,0,0,0.4366167,-3.2808296,-359.04494)"
+ x1="54.073642"
+ y1="922.13912"
+ x2="108.13371"
+ y2="922.13912" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9389"
+ id="linearGradient2437"
+ gradientUnits="userSpaceOnUse"
+ x1="-26.241436"
+ y1="-153.48067"
+ x2="300"
+ y2="-153.48067" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9389"
+ id="linearGradient2439"
+ gradientUnits="userSpaceOnUse"
+ x1="-26.241436"
+ y1="-153.48067"
+ x2="300"
+ y2="-153.48067" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.49497475"
+ inkscape:cx="106.98601"
+ inkscape:cy="-17.653473"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="128px"
+ height="128px"
+ inkscape:window-width="1053"
+ inkscape:window-height="707"
+ inkscape:window-x="153"
+ inkscape:window-y="287" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ id="path4344"
+ d="M 1.9087978,43.965549 L 126.66263,43.965549"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798"
+ d="M 1.9087978,56.781857 L 126.66263,56.781857"
+ id="path4346" />
+ <path
+ id="path4348"
+ d="M 1.9087978,69.598171 L 126.66263,69.598171"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798"
+ d="M 1.9087978,82.414479 L 126.66263,82.414479"
+ id="path4350" />
+ <path
+ id="path4352"
+ d="M 1.9087978,95.230791 L 126.66263,95.230791"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.9087978,42.197782 L 126.66263,42.197782"
+ id="path2352" />
+ <path
+ id="path2356"
+ d="M 1.9087978,55.01409 L 126.66263,55.01409"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.9087978,67.830404 L 126.66263,67.830404"
+ id="path2358" />
+ <path
+ id="path2360"
+ d="M 1.9087978,80.646712 L 126.66263,80.646712"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.9087978,93.463021 L 126.66263,93.463021"
+ id="path2362" />
+ <g
+ id="g2431"
+ transform="matrix(1.0794841,0,0,1.0794841,-0.5443739,-7.0709978)">
+ <path
+ style="fill:#000000;fill-opacity:0.39215686"
+ sodipodi:nodetypes="cscccccccccccssc"
+ id="path36146"
+ d="M 42.99059,8.9954788 C 42.558362,9.1107018 42.403214,9.3827578 42.210964,9.5814928 C 41.983106,9.8170388 41.843664,10.430677 41.849668,10.758336 L 41.849668,62.137879 C 41.533635,61.429215 41.012019,60.844847 39.706797,60.423172 C 38.415281,60.064417 36.424593,59.828146 34.989578,59.971614 C 29.751758,60.545599 24.3598,64.271271 22.135522,68.791616 C 21.418012,70.29834 21.143743,71.370732 21.07199,72.733967 C 21.00024,74.958267 21.8621,76.961814 23.584125,78.253361 C 24.158131,78.755601 25.453691,79.340012 26.24295,79.555264 C 32.270032,81.349013 40.575965,77.180908 43.589506,71.010331 C 44.307016,69.575312 44.599619,68.504566 44.671377,67.141252 L 44.634701,10.242378 C 44.640853,9.9076018 44.50472,9.5806318 44.267965,9.3438768 C 44.03121,9.1071348 43.72257,8.9893268 43.387802,8.9954788 C 43.336605,8.9962338 43.098815,8.9755738 42.99059,8.9954788 z " />
+ <path
+ style="fill:url(#linearGradient2435);fill-opacity:1"
+ sodipodi:nodetypes="cscccccccccccssc"
+ id="path34228"
+ d="M 42.251364,8.0911328 C 41.819135,8.2063548 41.663988,8.4784118 41.471736,8.6771458 C 41.243879,8.9126918 41.104437,9.5263298 41.11044,9.8539898 L 41.11044,61.233532 C 40.794409,60.524869 40.272792,59.940501 38.967571,59.518825 C 37.676054,59.16007 35.685367,58.9238 34.250349,59.067268 C 29.01253,59.641252 23.620574,63.366924 21.396294,67.887269 C 20.678785,69.393994 20.404515,70.466385 20.332764,71.829638 C 20.261013,74.053929 21.122873,76.057475 22.844897,77.349027 C 23.418904,77.85125 24.714463,78.435648 25.503724,78.6509 C 31.530803,80.444653 39.836738,76.276579 42.850279,70.105984 C 43.567789,68.670965 43.860392,67.60022 43.93215,66.236906 L 43.895474,9.3380308 C 43.901626,9.0032548 43.765494,8.6762858 43.528738,8.4395308 C 43.291982,8.2027878 42.983342,8.0849798 42.648576,8.0911328 C 42.597378,8.0918878 42.359587,8.0712268 42.251364,8.0911328 z " />
+ </g>
+ <g
+ id="g2425"
+ transform="matrix(1.1686772,0,0,1.1686772,-6.3399709,-14.328306)">
+ <g
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/matevz/apps/canorus/branches/matevz/src/fonts/r16.png"
+ style="fill:#000000;fill-opacity:0.39215686;stroke:none;stroke-opacity:0.39215686"
+ id="g7639"
+ transform="matrix(7.8180666e-2,0,0,-7.8180666e-2,76.556536,76.676372)">
+ <path
+ style="fill:#000000;fill-opacity:0.39215686;stroke:none;stroke-opacity:0.39215686"
+ id="path7641"
+ d="M 110,203 C 125,207 140,205 154,198 C 167,191 177,181 182,167 C 183,163 185,154 187,145 C 192,121 195,116 203,111 C 210,108 215,108 220,111 C 229,116 250,140 262,159 C 269,170 270,171 275,173 C 280,175 285,175 291,173 C 295,171 300,165 300,163 C 299,162 260,13 212,-169 C 150,-405 124,-501 123,-502 C 116,-507 102,-512 93,-512 C 83,-512 69,-507 62,-502 C 60,-500 63,-490 110,-338 C 138,-249 160,-176 160,-175 C 160,-175 153,-177 146,-180 C 129,-185 110,-190 94,-193 C 75,-196 48,-196 37,-193 C 13,-187 -8,-171 -18,-151 C -25,-139 -27,-131 -26,-116 C -26,-105 -26,-103 -23,-95 C -19,-83 -15,-76 -6,-67 C 5,-56 17,-49 33,-46 C 64,-40 94,-56 104,-83 C 105,-87 107,-96 109,-105 C 114,-129 117,-134 125,-139 C 136,-143 142,-141 155,-129 C 164,-119 174,-106 183,-91 C 188,-84 190,-78 194,-66 C 203,-39 238,74 238,75 C 237,75 231,73 222,70 C 188,59 166,55 141,55 C 119,55 113,56 97,64 C 75,74 61,91 54,113 C 52,119 52,123 52,134 C 52,145 52,147 55,155 C 59,167 63,174 72,183 C 83,194 95,201 110,203 z " />
+ </g>
+ <g
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/matevz/apps/canorus/branches/matevz/src/fonts/r16.png"
+ style="fill:url(#linearGradient2437);fill-opacity:1"
+ id="g6755"
+ transform="matrix(7.8180666e-2,0,0,-7.8180666e-2,75.632361,75.567408)">
+ <path
+ style="fill:url(#linearGradient2439);fill-opacity:1"
+ id="path6757"
+ d="M 110,203 C 125,207 140,205 154,198 C 167,191 177,181 182,167 C 183,163 185,154 187,145 C 192,121 195,116 203,111 C 210,108 215,108 220,111 C 229,116 250,140 262,159 C 269,170 270,171 275,173 C 280,175 285,175 291,173 C 295,171 300,165 300,163 C 299,162 260,13 212,-169 C 150,-405 124,-501 123,-502 C 116,-507 102,-512 93,-512 C 83,-512 69,-507 62,-502 C 60,-500 63,-490 110,-338 C 138,-249 160,-176 160,-175 C 160,-175 153,-177 146,-180 C 129,-185 110,-190 94,-193 C 75,-196 48,-196 37,-193 C 13,-187 -8,-171 -18,-151 C -25,-139 -27,-131 -26,-116 C -26,-105 -26,-103 -23,-95 C -19,-83 -15,-76 -6,-67 C 5,-56 17,-49 33,-46 C 64,-40 94,-56 104,-83 C 105,-87 107,-96 109,-105 C 114,-129 117,-134 125,-139 C 136,-143 142,-141 155,-129 C 164,-119 174,-106 183,-91 C 188,-84 190,-78 194,-66 C 203,-39 238,74 238,75 C 237,75 231,73 222,70 C 188,59 166,55 141,55 C 119,55 113,56 97,64 C 75,74 61,91 54,113 C 52,119 52,123 52,134 C 52,145 52,147 55,155 C 59,167 63,174 72,183 C 83,194 95,201 110,203 z " />
+ </g>
+ </g>
+ <rect
+ style="opacity:1;fill:none;fill-opacity:0.39215686;fill-rule:nonzero;stroke:none;stroke-width:1.99100006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect6764"
+ width="59.07143"
+ height="59.07143"
+ x="57.071426"
+ y="58.642849"
+ inkscape:export-filename="/home/matevz/apps/canorus/branches/matevz/src/fonts/r16.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ </g>
+</svg>
Added: trunk/doc/usersguide2/images/mainwin.en.png
===================================================================
(Binary files differ)
Index: trunk/doc/usersguide2/images/mainwin.en.png
===================================================================
--- trunk/doc/usersguide2/images/mainwin.en.png 2016-04-09 22:57:50 UTC (rev 1445)
+++ trunk/doc/usersguide2/images/mainwin.en.png 2016-04-10 06:08:54 UTC (rev 1446)
Property changes on: trunk/doc/usersguide2/images/mainwin.en.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/doc/usersguide2/images/play.svg
===================================================================
--- trunk/doc/usersguide2/images/play.svg (rev 0)
+++ trunk/doc/usersguide2/images/play.svg 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg2493"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="start.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2495">
+ <linearGradient
+ id="linearGradient3665">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3667" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3669" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3201">
+ <stop
+ style="stop-color:#00ff00;stop-opacity:1;"
+ offset="0"
+ id="stop3203" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="1"
+ id="stop3205" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3201"
+ id="linearGradient3217"
+ x1="155"
+ y1="160.51891"
+ x2="155"
+ y2="244.20544"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-131.4086,-137.43511)" />
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2501" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3665"
+ id="linearGradient3671"
+ x1="51.42857"
+ y1="430.93362"
+ x2="51.42857"
+ y2="330.93362"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(17.162829,-316.00655)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3665"
+ id="linearGradient3677"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(17.162829,-316.00655)"
+ x1="1.42857"
+ y1="330.93362"
+ x2="1.42857"
+ y2="430.93362" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3665"
+ id="linearGradient3683"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(17.162829,-316.00655)"
+ x1="1.42857"
+ y1="330.93362"
+ x2="1.42857"
+ y2="430.93362" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3201"
+ id="linearGradient3685"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-131.4086,-137.43511)"
+ x1="155"
+ y1="160.51891"
+ x2="155"
+ y2="244.20544" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="95.520416"
+ inkscape:cy="61.439606"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1600"
+ inkscape:window-height="1140"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata2498">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g3679"
+ transform="matrix(1.1414214,0,0,1.1414214,-14.291688,-10.109142)">
+ <path
+ inkscape:export-ydpi="14.4"
+ inkscape:export-xdpi="14.4"
+ inkscape:export-filename="/home/panzi/video/old-video/still/my-deviantart/svg/play-16x16.png"
+ id="path2385"
+ d="M 18.591399,14.927066 L 118.5914,64.927066 L 18.591399,114.92707 L 18.591399,14.927066 z"
+ style="fill:url(#linearGradient3683);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:export-ydpi="14.4"
+ inkscape:export-xdpi="14.4"
+ inkscape:export-filename="/home/panzi/video/old-video/still/my-deviantart/svg/play-16x16.png"
+ id="path3209"
+ d="M 23.591399,23.083796 L 107.27795,64.927066 L 23.591399,106.77034 L 23.591399,23.083796 z"
+ style="fill:url(#linearGradient3685);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ </g>
+</svg>
Added: trunk/doc/usersguide2/images/staffnew.svg
===================================================================
--- trunk/doc/usersguide2/images/staffnew.svg (rev 0)
+++ trunk/doc/usersguide2/images/staffnew.svg 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ version="1.0"
+ sodipodi:docname="insertplayable.svg"
+ sodipodi:docbase="/home/matevz/canorus/artwork/icons/scalable"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient9389">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop9391" />
+ <stop
+ style="stop-color:#646464;stop-opacity:1;"
+ offset="1"
+ id="stop9393" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9389"
+ id="linearGradient9395"
+ x1="-26.241436"
+ y1="-153.48067"
+ x2="300"
+ y2="-153.48067"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient36148">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop36150" />
+ <stop
+ style="stop-color:#646464;stop-opacity:1;"
+ offset="1"
+ id="stop36152" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient36148"
+ id="linearGradient36154"
+ x1="54.073642"
+ y1="922.13912"
+ x2="108.13371"
+ y2="922.13912"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4366167,0,0,0.4366167,-3.2808296,-359.04494)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9389"
+ id="linearGradient2423"
+ gradientUnits="userSpaceOnUse"
+ x1="-26.241436"
+ y1="-153.48067"
+ x2="300"
+ y2="-153.48067" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9389"
+ id="linearGradient2437"
+ gradientUnits="userSpaceOnUse"
+ x1="-26.241436"
+ y1="-153.48067"
+ x2="300"
+ y2="-153.48067" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4"
+ inkscape:cx="62.695937"
+ inkscape:cy="39.432719"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="128px"
+ height="128px"
+ inkscape:window-width="1053"
+ inkscape:window-height="707"
+ inkscape:window-x="153"
+ inkscape:window-y="287" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ id="path4344"
+ d="M 1.9087978,43.965549 L 126.66263,43.965549"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798"
+ d="M 1.9087978,56.781857 L 126.66263,56.781857"
+ id="path4346" />
+ <path
+ id="path4348"
+ d="M 1.9087978,69.598171 L 126.66263,69.598171"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798"
+ d="M 1.9087978,82.414479 L 126.66263,82.414479"
+ id="path4350" />
+ <path
+ id="path4352"
+ d="M 1.9087978,95.230791 L 126.66263,95.230791"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.9087978,42.197782 L 126.66263,42.197782"
+ id="path2352" />
+ <path
+ id="path2356"
+ d="M 1.9087978,55.01409 L 126.66263,55.01409"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.9087978,67.830404 L 126.66263,67.830404"
+ id="path2358" />
+ <path
+ id="path2360"
+ d="M 1.9087978,80.646712 L 126.66263,80.646712"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.9087978,93.463021 L 126.66263,93.463021"
+ id="path2362" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:0.39215686;fill-rule:nonzero;stroke:none;stroke-width:1.99100006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect6764"
+ width="59.07143"
+ height="59.07143"
+ x="57.071426"
+ y="58.642849"
+ inkscape:export-filename="/home/matevz/apps/canorus/branches/matevz/src/fonts/r16.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90" />
+ <path
+ sodipodi:type="star"
+ style="opacity:1;fill:#ffff71;fill-opacity:1;fill-rule:nonzero;stroke:#ff7000;stroke-width:6.05999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path8759"
+ sodipodi:sides="7"
+ sodipodi:cx="14.285714"
+ sodipodi:cy="24.428572"
+ sodipodi:r1="32.625347"
+ sodipodi:r2="17.401892"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.0195953"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 14.285715,57.053919 L 6.735316,40.107134 L -11.221809,44.770144 L -2.6798759,28.300857 L -17.521648,17.16875 L 0.6803676,13.578669 L 0.13010576,-4.96585 L 14.285715,7.02668 L 28.441321,-4.9658508 L 27.891061,13.57867 L 46.093076,17.168748 L 31.251304,28.300857 L 39.793238,44.770142 L 21.836112,40.107135 L 14.285715,57.053919 z "
+ transform="matrix(1,0,0,-1,22.142857,61.901178)" />
+ </g>
+</svg>
Added: trunk/doc/usersguide2/images/voicenew.svg
===================================================================
--- trunk/doc/usersguide2/images/voicenew.svg (rev 0)
+++ trunk/doc/usersguide2/images/voicenew.svg 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg2342"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ version="1.0"
+ sodipodi:docbase="/home/matevz/canorus/artwork/icons"
+ sodipodi:docname="voiceproperties.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
+ <defs
+ id="defs2344">
+ <filter
+ inkscape:collect="always"
+ id="filter4340">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="2.309203"
+ id="feGaussianBlur4342" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8"
+ inkscape:cx="158.27789"
+ inkscape:cy="1.5155603"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ height="128px"
+ width="128px"
+ inkscape:window-width="1600"
+ inkscape:window-height="1126"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata2347">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ id="path4344"
+ d="M 1.7677669,45.506689 L 126.5216,45.506689"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798"
+ d="M 1.7677669,58.322997 L 126.5216,58.322997"
+ id="path4346" />
+ <path
+ id="path4348"
+ d="M 1.7677669,71.139311 L 126.5216,71.139311"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798"
+ d="M 1.7677669,83.955619 L 126.5216,83.955619"
+ id="path4350" />
+ <path
+ id="path4352"
+ d="M 1.7677669,96.771929 L 126.5216,96.771929"
+ style="fill:#cccccc;fill-opacity:0.75;fill-rule:evenodd;stroke:#707071;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.74688798" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.7677669,43.738922 L 126.5216,43.738922"
+ id="path2352" />
+ <path
+ id="path2356"
+ d="M 1.7677669,56.55523 L 126.5216,56.55523"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.7677669,69.371544 L 126.5216,69.371544"
+ id="path2358" />
+ <path
+ id="path2360"
+ d="M 1.7677669,82.187852 L 126.5216,82.187852"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 1.7677669,95.004162 L 126.5216,95.004162"
+ id="path2362" />
+ <path
+ style="opacity:1;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ff0000;stroke-width:13.45085144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:80.70510621, 26.90170207;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4340)"
+ d="M 5.8735559,101.92339 C 5.8735559,101.92339 19.24914,79.85076 64.893423,48.154712 C 119.28731,10.382812 123.95345,65.395246 123.95345,65.395246"
+ id="path3337"
+ transform="matrix(0.9326317,0,0,1.0060544,3.4780313,-1.8450105)"
+ sodipodi:nodetypes="csc" />
+ <path
+ sodipodi:type="star"
+ style="opacity:1;fill:#ffff71;fill-opacity:1;fill-rule:nonzero;stroke:#ff7000;stroke-width:6.05999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path8759"
+ sodipodi:sides="7"
+ sodipodi:cx="14.285714"
+ sodipodi:cy="24.428572"
+ sodipodi:r1="32.625347"
+ sodipodi:r2="17.401892"
+ sodipodi:arg1="1.5707963"
+ sodipodi:arg2="2.0195953"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 14.285715,57.053919 L 6.735316,40.107134 L -11.221809,44.770144 L -2.6798759,28.300857 L -17.521648,17.16875 L 0.6803676,13.578669 L 0.13010576,-4.96585 L 14.285715,7.02668 L 28.441321,-4.9658508 L 27.891061,13.57867 L 46.093076,17.168748 L 31.251304,28.300857 L 39.793238,44.770142 L 21.836112,40.107135 L 14.285715,57.053919 z "
+ transform="matrix(1,0,0,-1,22.857143,62.445211)" />
+ </g>
+</svg>
Modified: trunk/doc/usersguide2/source/en/index.rst
===================================================================
--- trunk/doc/usersguide2/source/en/index.rst 2016-04-09 22:57:50 UTC (rev 1445)
+++ trunk/doc/usersguide2/source/en/index.rst 2016-04-10 06:08:54 UTC (rev 1446)
@@ -3,20 +3,13 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-Welcome to Canorus User's Guide's documentation!
-================================================
+.. image:: ../../images/canorus.png
+ :height: 100px
+ :align: center
-Contents:
-
-{*.. toctree::
+.. toctree::
:maxdepth: 2
-*}
+
+ introduction.rst
+ quickstart.rst
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
Added: trunk/doc/usersguide2/source/en/introduction.rst
===================================================================
--- trunk/doc/usersguide2/source/en/introduction.rst (rev 0)
+++ trunk/doc/usersguide2/source/en/introduction.rst 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,5 @@
+Introduction
+============
+
+Welcome to Canorus v0.7, a free cross-platform music score editor.
+Visit our website at \url{http://www.canorus.org}.
Added: trunk/doc/usersguide2/source/en/quickstart.rst
===================================================================
--- trunk/doc/usersguide2/source/en/quickstart.rst (rev 0)
+++ trunk/doc/usersguide2/source/en/quickstart.rst 2016-04-10 06:08:54 UTC (rev 1446)
@@ -0,0 +1,108 @@
+Quickstart
+==========
+
+Main window
+-----------
+
+The first thing you'll notice when starting the application is the
+main window. It should look something like this:
+
+.. image:: ../../images/mainwin.en.png
+
+The main window consists of a menu at the top, insert toolbar on the
+left, general and music properties on the top and a tabbed score view.
+
+Each document can have one or more sheets - a sheet is represented
+as a tab (similar to spreadsheet applications). Multiple sheets can
+be used for different score parts, transpositions, variations or just
+as a temporary place to write your ideas down.
+
+
+Inserting notes
+---------------
+
+To add notes and rests to your score, click on the staff, select the
+voice at the top and the click the ``Insert playable`` icon |INSERT_PLAYABLE|
+in the left toolbar. The toolbar on the top now shows you the note/rest
+length, visibility, tuplets etc.
+
+.. |INSERT_PLAYABLE| image:: ../../images/insertplayable.svg
+ :height: 20px
+
+To add a note to a score, click on the staff using the left mouse
+button. To add a rest, use the right mouse button. For raising/lowering
+a note for half a step, use +/- keys. To fix the just added note,
+use up/down keys. To toggle a dotted note, use the . key.
+
+
+Inserting other music elements
+------------------------------
+
+To insert clefs, key signatures, time signatures, barlines and other
+music elements, use the buttons located in the left toolbar, set their
+properties at the top and click on the score. The left toolbar shows
+you the elements you can add to the currently selected context.
+
+For slurs, first select two or more notes and add a slur.
+
+A special keyboard shortcut b manually inserts a single barline at
+the current location (eg. for pickup measures).
+
+Editing elements
+----------------
+
+If you want to change any music elements properties once they were
+already inserted, you have to be in the default Edit mode by hitting
+Esc or the arrow icon in the left toolbar |ARROW|.
+
+When selecting one or more elements, their properties appear in the
+toolbar at the top.
+
+.. |ARROW| image:: ../../images/arrow.svg
+ :height: 20px
+
+New staff, voice, lyrics
+------------------------
+
+To insert a new staff, click on the ``Insert context`` dropdown
+icon in the left toolbar |STAFF_NEW| select a context (staff, lyrics or
+function marks) and click on the score.
+
+.. |STAFF_NEW| image:: ../../images/staffnew.svg
+ :height: 20px
+
+To insert a new voice, select a staff and click on the ``New voice``
+icon |VOICE_NEW|.
+
+.. |VOICE_NEW| image:: ../../images/voicenew.svg
+ :height: 20px
+
+Playback
+--------
+
+To play the music you inserted from the current selection hit the
+spacebar key or click on the green playback icon |PLAY|.
+
+.. |PLAY| image:: ../../images/play.svg
+ :height: 20px
+
+To stop the playback, click on the icon again.
+
+Printing
+--------
+
+Canorus uses LilyPond application for printing.
+
+Unfortunately, LilyPond is not bundled with Canorus. The first step
+is to install LilyPond - visit http://www.lilypond.org and
+download it. You can also use your distribution package manager to
+install it on Linux.
+
+For print preview, you should have a working PDF viewer installed
+on your system. Use File->Print preview |PRINT_PREVIEW|.
+
+.. |PRINT_PREVIEW| image:: ../../images/fileprintpreview.png
+ :height: 20px
+
+You can print the document directly using the File->Print or you can
+print it indirectly from your PDF viewer application (preferred).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-09 22:57:52
|
Revision: 1445
http://sourceforge.net/p/canorus/code/1445
Author: matevz
Date: 2016-04-09 22:57:50 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
Added initial sphinx stubs for the User's Guide.
Added Paths:
-----------
trunk/doc/usersguide2/
trunk/doc/usersguide2/Makefile
trunk/doc/usersguide2/_static/
trunk/doc/usersguide2/_templates/
trunk/doc/usersguide2/build/
trunk/doc/usersguide2/source/
trunk/doc/usersguide2/source/en/
trunk/doc/usersguide2/source/en/conf.py
trunk/doc/usersguide2/source/en/index.rst
Added: trunk/doc/usersguide2/Makefile
===================================================================
--- trunk/doc/usersguide2/Makefile (rev 0)
+++ trunk/doc/usersguide2/Makefile 2016-04-09 22:57:50 UTC (rev 1445)
@@ -0,0 +1,11 @@
+languages = en
+SPHINX_BUILD_COMMAND = sphinx-build
+RM_COMMAND = rm -rf
+
+all: singlehtml
+
+singlehtml: ; $(foreach l,$(languages),( $(SPHINX_BUILD_COMMAND) -b singlehtml source/$(l) build/$(l) ) &&) :
+
+clean: clean-singlehtml
+
+clean-singlehtml: ; $(foreach l,$(languages),( $(RM_COMMAND) build/$(l) ) &&) :
Added: trunk/doc/usersguide2/source/en/conf.py
===================================================================
--- trunk/doc/usersguide2/source/en/conf.py (rev 0)
+++ trunk/doc/usersguide2/source/en/conf.py 2016-04-09 22:57:50 UTC (rev 1445)
@@ -0,0 +1,259 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Canorus User's Guide documentation build configuration file, created by
+# sphinx-quickstart on Sun Apr 10 00:33:52 2016.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['../../_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Canorus User\'s Guide'
+copyright = '2016, Matevž Jekovec'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.7.3rc1'
+# The full version, including alpha/beta/rc tags.
+release = '0.7.3rc1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['../../_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'CanorusUsersGuidedoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+# author, documentclass [howto, manual, or own class]).
+latex_documents = [
+ ('index', 'CanorusUsersGuide.tex', 'Canorus User\'s Guide Documentation',
+ 'Matevž Jekovec', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ ('index', 'canorususersguide', 'Canorus User\'s Guide Documentation',
+ ['Matevž Jekovec'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+# dir menu entry, description, category)
+texinfo_documents = [
+ ('index', 'CanorusUsersGuide', 'Canorus User\'s Guide Documentation',
+ 'Matevž Jekovec', 'CanorusUsersGuide', 'One line description of project.',
+ 'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
Added: trunk/doc/usersguide2/source/en/index.rst
===================================================================
--- trunk/doc/usersguide2/source/en/index.rst (rev 0)
+++ trunk/doc/usersguide2/source/en/index.rst 2016-04-09 22:57:50 UTC (rev 1445)
@@ -0,0 +1,22 @@
+.. Canorus User's Guide documentation master file, created by
+ sphinx-quickstart on Sun Apr 10 00:33:52 2016.
+ You can adapt this file completely to your liking, but it should at least
+ contain the root `toctree` directive.
+
+Welcome to Canorus User's Guide's documentation!
+================================================
+
+Contents:
+
+{*.. toctree::
+ :maxdepth: 2
+*}
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2016-04-09 12:43:28
|
Revision: 1444
http://sourceforge.net/p/canorus/code/1444
Author: suamor
Date: 2016-04-09 12:43:26 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
Add more swig version check
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2016-04-09 12:39:43 UTC (rev 1443)
+++ trunk/src/CMakeLists.txt 2016-04-09 12:43:26 UTC (rev 1444)
@@ -29,14 +29,22 @@
# Scripting detection #
#######################
# The following lines detect scripting environments (SWIG, Ruby, Python etc.)
-FIND_PACKAGE(SWIG QUIET)
+FIND_PACKAGE(SWIG 3.0.3 QUIET)
+MESSAGE("Swig version ${SWIG_VERSION}")
IF(SWIG_FOUND AND NOT NO_SWIG)
SET(USE_SWIG True)
MESSAGE("SWIG found, using scripting extensions.")
ELSE(SWIG_FOUND AND NOT NO_SWIG)
- MESSAGE("SWIG version >=3 *not* found, disabling SWIG!")
- SET(NO_RUBY True)
- SET(NO_PYTHON True)
+ # Try again with version 2
+ FIND_PACKAGE(SWIG 2.0.12 QUIET)
+ IF(SWIG_FOUND AND NOT NO_SWIG)
+ SET(USE_SWIG True)
+ MESSAGE("SWIG found, using scripting extensions.")
+ ELSE(SWIG_FOUND AND NOT NO_SWIG)
+ MESSAGE("SWIG version >=2.0.12 or >= 3.0.3 *not* found, version is ${SWIG_VERSION}, disabling SWIG!")
+ SET(NO_RUBY True)
+ SET(NO_PYTHON True)
+ ENDIF(SWIG_FOUND AND NOT NO_SWIG)
ENDIF(SWIG_FOUND AND NOT NO_SWIG)
FIND_PACKAGE(Ruby) #Setup RUBY_INCLUDE_PATH and RUBY_LIBRARIES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2016-04-09 12:39:46
|
Revision: 1443
http://sourceforge.net/p/canorus/code/1443
Author: suamor
Date: 2016-04-09 12:39:43 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
Update of Tools, Instructions
Modified Paths:
--------------
trunk/README
Modified: trunk/README
===================================================================
--- trunk/README 2016-04-08 23:36:24 UTC (rev 1442)
+++ trunk/README 2016-04-09 12:39:43 UTC (rev 1443)
@@ -12,19 +12,26 @@
Build dependencies:
===================
-The latest version of Qt4, Swig and CMake is prefered.
+The latest version of Qt5, Swig and CMake is preferred.
+Canorus supports the current "LTS" version 5.6.0
-- Qt development package >=4.4 (http://www.qt-project.org)
-- Swig >=2 (http://www.swig.org). Swig 3.x is not officially supported, but might work
-- g++ >=4, make (http://gcc.gnu.org, http://www.mingw.org)
-- cmake >=2.6.2 (http://www.cmake.org). CMake 3.x is not supported (does not work on SuSE)
+- Qt development package >=5.3 (http://www.qt-project.org)
+- Swig >=2.0.12 (http://www.swig.org). Swig >= 3.0.3 is working too.
+ (cmake does not support parallel installations of swig)
+- g++ >=4.8, make (http://gcc.gnu.org, http://www.mingw.org)
+- cmake >=2.8 (http://www.cmake.org). CMake 3.x is not supported (does not work on SuSE)
- Python development package >=3.0 (http://www.python.org)
-- (optional) Lyx, tex4ht (user's guide)
+- (optional) Lyx, tex4ht (user's guide)
-Qt5 Build (Experimental, not tested with Qt 5.4.x)
-- Qt development package 5.3.2 (http://www.qt-project.org)
-- Swig, g++, cmake, python, lyx as above
-- copy the CMakeListQt5.txt files (main folder and src) to CMakeList.txt
+Qt5 Build (tested up to version 5.6.0)
+- Get Qt development package 5.6.0 (http://www.qt.io)
+- Get Swig, g++, cmake, python, lyx as specified above
+ (make sure to remove Swig 2.0 before using Swig 3.0)
+- Run cmake with prefix to the Qt installation path (f.e. "/opt/Qt")
+ $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64 .
+ (the prefix option can be skipped on most Linux distributions)
+- Ignore the warning about the missing ruby package
+- make -j4 (for dual-core use -j2 switch)
Runtime dependencies:
=====================
@@ -36,7 +43,7 @@
============
1. (Optional) Compile User's guide:
$ cd doc/usersguide
- $ make
+ $ make (use -j4 / -j2 for faster build)
You need latex and other tools installed (see doc/Readme-doc.txt for details).
You can skip this step, but the User's guide won't be launched using
Help->User's Guide action then.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-08 23:36:26
|
Revision: 1442
http://sourceforge.net/p/canorus/code/1442
Author: matevz
Date: 2016-04-08 23:36:24 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Fixed showing selection area, if a user had a shaky hand.
Modified Paths:
--------------
trunk/src/ui/mainwin.cpp
trunk/src/widgets/scoreview.cpp
trunk/src/widgets/scoreview.h
Modified: trunk/src/ui/mainwin.cpp
===================================================================
--- trunk/src/ui/mainwin.cpp 2016-04-08 21:54:49 UTC (rev 1441)
+++ trunk/src/ui/mainwin.cpp 2016-04-08 23:36:24 UTC (rev 1442)
@@ -1936,7 +1936,7 @@
c->repaint();
}
} else
- if (e->buttons()==Qt::LeftButton) {
+ if (e->buttons()==Qt::LeftButton && c->mouseDragActivated()) {
// multiple selection
c->clearSelectionRegionList();
int x=c->lastMousePressCoords().x(), y=c->lastMousePressCoords().y(),
@@ -2002,7 +2002,7 @@
CACanorus::rebuildUI(document(), c->sheet());
}
- if ( mode() != InsertMode && c->lastMousePressCoords()!=coords ) { // area was selected
+ if ( mode() != InsertMode && c->mouseDragActivated() ) { // area was selected
c->clearSelectionRegionList();
if (e->modifiers()==Qt::NoModifier)
Modified: trunk/src/widgets/scoreview.cpp
===================================================================
--- trunk/src/widgets/scoreview.cpp 2016-04-08 21:54:49 UTC (rev 1441)
+++ trunk/src/widgets/scoreview.cpp 2016-04-08 23:36:24 UTC (rev 1442)
@@ -52,6 +52,7 @@
const int CAScoreView::BOTTOM_EXTRA_SPACE = 30; // Gives some space after the music so you're able to insert new contexts below the last context
const int CAScoreView::RULER_HEIGHT = 15;
const int CAScoreView::ANIMATION_STEPS = 7;
+const int CAScoreView::SELECTION_REGION_THRESHOLD = 10;
/*!
\class CATextEdit
@@ -1316,6 +1317,16 @@
}
/*!
+ Calculates the distance between the start of the mouse drag and the current position
+ in world coordinates and returns true, if it is larger than SELECTION_REGION_THRESHOLD.
+
+ @return True, if the selection region should be activated; False otherwise.
+ */
+bool CAScoreView::mouseDragActivated() {
+ return qMax(qAbs(_xCursor-_lastMousePressCoords.x()), qAbs(_yCursor-_lastMousePressCoords.y()))*_zoom >= SELECTION_REGION_THRESHOLD;
+}
+
+/*!
Processes the wheelEvent().
A new signal is emitted: CAWheelEvent(), which usually gets processed by the parent class then.
*/
Modified: trunk/src/widgets/scoreview.h
===================================================================
--- trunk/src/widgets/scoreview.h 2016-04-08 21:54:49 UTC (rev 1441)
+++ trunk/src/widgets/scoreview.h 2016-04-08 23:36:24 UTC (rev 1442)
@@ -118,6 +118,7 @@
inline void removeSelectionRegion(QRect r) { _selectionRegionList.removeAll(r); }
inline void clearSelectionRegionList() { _selectionRegionList.clear(); }
inline CADrawable::CADirection resizeDirection() { return _resizeDirection; }
+ bool mouseDragActivated();
/////////////////////////////////////////////////////////////////////
// Music elements and contexts query, space calculation and access //
@@ -338,7 +339,10 @@
// Selection regions
QList<QRect> _selectionRegionList;
void drawSelectionRegion( QPainter *p, CADrawSettings s );
-
+public:
+ static const int SELECTION_REGION_THRESHOLD; // Threshold in px for mouse move until the selection region is activated
+
+private:
////////////////
// Appearance //
////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-08 21:54:52
|
Revision: 1441
http://sourceforge.net/p/canorus/code/1441
Author: matevz
Date: 2016-04-08 21:54:49 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Fixed missing uiSelectMode in CAActionStorage.
Modified Paths:
--------------
trunk/src/ui/actionstorage.cpp
Modified: trunk/src/ui/actionstorage.cpp
===================================================================
--- trunk/src/ui/actionstorage.cpp 2016-04-08 21:36:45 UTC (rev 1440)
+++ trunk/src/ui/actionstorage.cpp 2016-04-08 21:54:49 UTC (rev 1441)
@@ -84,7 +84,6 @@
storeAction(mainWin.uiInsertPlayable);
storeAction(mainWin.uiInsertFM);
storeAction(mainWin.uiInsertClef);
- storeAction(mainWin.uiSelectMode);
storeAction(mainWin.uiRemoveVoice);
storeAction(mainWin.uiVoiceProperties);
storeAction(mainWin.uiAccsVisible);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-08 21:36:47
|
Revision: 1440
http://sourceforge.net/p/canorus/code/1440
Author: matevz
Date: 2016-04-08 21:36:45 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Unified Edit mode with Select mode. Default mode now is Edit mode.
Modified Paths:
--------------
trunk/src/ui/mainwin.cpp
trunk/src/ui/mainwin.h
trunk/src/ui/mainwin.ui
Added Paths:
-----------
trunk/src/ui/images/general/redarrow.svg
Removed Paths:
-------------
trunk/src/ui/images/general/editmode.svg
Deleted: trunk/src/ui/images/general/editmode.svg
===================================================================
--- trunk/src/ui/images/general/editmode.svg 2016-04-08 21:10:42 UTC (rev 1439)
+++ trunk/src/ui/images/general/editmode.svg 2016-04-08 21:36:45 UTC (rev 1440)
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="128"
- height="128"
- id="svg2220"
- sodipodi:version="0.32"
- inkscape:version="0.45"
- version="1.0"
- sodipodi:docname="editmode.svg"
- sodipodi:docbase="/home/matevz/canorus/trunk/src/ui/images"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true">
- <defs
- id="defs2222" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="3.959798"
- inkscape:cx="111.53027"
- inkscape:cy="31.355358"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="128px"
- height="128px"
- inkscape:window-width="1600"
- inkscape:window-height="1171"
- inkscape:window-x="0"
- inkscape:window-y="0" />
- <metadata
- id="metadata2225">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.48974562px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 37.347288,120.46222 L 37.332175,28.192202 L 59.138668,49.998697 L 84.872871,5.4257427 L 97.240389,13.763652 L 72.066013,56.916562 L 101.07422,56.916562 L 37.347288,120.46222 z "
- id="path2228"
- sodipodi:nodetypes="cccccccc" />
- </g>
-</svg>
Copied: trunk/src/ui/images/general/redarrow.svg (from rev 1439, trunk/src/ui/images/general/editmode.svg)
===================================================================
--- trunk/src/ui/images/general/redarrow.svg (rev 0)
+++ trunk/src/ui/images/general/redarrow.svg 2016-04-08 21:36:45 UTC (rev 1440)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="128"
+ height="128"
+ id="svg2220"
+ sodipodi:version="0.32"
+ inkscape:version="0.45"
+ version="1.0"
+ sodipodi:docname="editmode.svg"
+ sodipodi:docbase="/home/matevz/canorus/trunk/src/ui/images"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
+ <defs
+ id="defs2222" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="3.959798"
+ inkscape:cx="111.53027"
+ inkscape:cy="31.355358"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="128px"
+ height="128px"
+ inkscape:window-width="1600"
+ inkscape:window-height="1171"
+ inkscape:window-x="0"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata2225">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.48974562px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 37.347288,120.46222 L 37.332175,28.192202 L 59.138668,49.998697 L 84.872871,5.4257427 L 97.240389,13.763652 L 72.066013,56.916562 L 101.07422,56.916562 L 37.347288,120.46222 z "
+ id="path2228"
+ sodipodi:nodetypes="cccccccc" />
+ </g>
+</svg>
Modified: trunk/src/ui/mainwin.cpp
===================================================================
--- trunk/src/ui/mainwin.cpp 2016-04-08 21:10:42 UTC (rev 1439)
+++ trunk/src/ui/mainwin.cpp 2016-04-08 21:36:45 UTC (rev 1440)
@@ -626,7 +626,6 @@
uiStandardToolBar->updateGeometry();
// Insert Toolbar
- uiInsertToolBar->addAction( uiSelectMode );
uiInsertToolBar->addAction( uiEditMode );
uiInsertToolBar->addSeparator();
uiContextType->setDefaultAction( uiInsertToolBar->addWidget( uiContextType ) );
@@ -815,7 +814,6 @@
// Mutual exclusive groups
uiInsertGroup = new QActionGroup( this );
- uiInsertGroup->addAction( uiSelectMode );
uiInsertGroup->addAction( uiEditMode );
uiInsertGroup->addAction( uiNewContext );
uiInsertGroup->addAction( uiContextType->defaultAction() );
@@ -873,7 +871,7 @@
}
setDocument(new CADocument());
- setMode(SelectMode);
+ setMode(EditMode);
uiCloseDocument->setEnabled(true);
CACanorus::undo()->createUndoStack( document() );
restartTimeEditedTime();
@@ -911,7 +909,7 @@
currentScoreView()->selectContext( document()->sheetList()[0]->contextList()[0] );
}
- setMode(SelectMode);
+ setMode(EditMode);
}
/*!
@@ -992,7 +990,7 @@
delete _midiRecorderView;
}
- uiSelectMode->trigger(); // select mode
+ uiEditMode->trigger(); // select mode
}
/*!
@@ -1456,22 +1454,19 @@
}
void CAMainWin::on_uiContextType_toggled(bool checked, int buttonId) {
- if (checked)
+ if (checked) {
+ musElementFactory()->setMusElementType( CAMusElement::Undefined );
setMode( InsertMode );
+ }
}
-void CAMainWin::on_uiSelectMode_toggled(bool checked) {
- if (checked)
- setMode( SelectMode );
-}
-
void CAMainWin::on_uiEditMode_toggled(bool checked) {
if (checked)
setMode( EditMode );
}
/*!
- Allows to set the current mode from priviledged (ui/ctl) objects
+ Allows to set the current mode from privileged (ui/ctl) objects
*/
void CAMainWin::setMode(CAMode mode, const QString &oModeHash) {
int iAllowed = _modeHash[oModeHash];
@@ -1487,24 +1482,6 @@
_mode = mode;
switch (mode) {
- case SelectMode: {
- for (int i=0; i<_viewList.size(); i++) {
- if ( _viewList[i]->viewType()==CAView::ScoreView ) {
- CAScoreView *v = static_cast<CAScoreView*>(_viewList[i]);
- if ( !v->playing())
- v->unsetBorder();
-
- v->setShadowNoteVisible(false);
- if ( v->textEditVisible())
- v->removeTextEdit();
- }
- }
-
- musElementFactory()->setMusElementType( CAMusElement::Undefined );
- uiVoiceNum->setRealValue( 0 );
-
- break;
- }
case InsertMode: {
QPen p;
p.setColor(Qt::blue);
@@ -1519,7 +1496,7 @@
}
if ( currentScoreView() ) {
- currentScoreView()->setShadowNoteVisible((musElementFactory()->musElementType() == CAMusElement::Note) ? true : false); /// \todo Set other mouse cursors
+ currentScoreView()->setShadowNoteVisible(musElementFactory()->musElementType() == CAMusElement::Note); /// \todo Set other mouse cursors
currentScoreView()->repaint();
}
@@ -1534,22 +1511,27 @@
if (_viewList[i]->viewType()==CAView::ScoreView) {
CAScoreView *sv = static_cast<CAScoreView*>(_viewList[i]);
if (!sv->playing())
- (sv->setBorder(p));
+ (sv->unsetBorder());
sv->setShadowNoteVisible(false);
sv->repaint();
}
}
- if (currentScoreView() && currentScoreView()->selection().size()) {
- CAMusElement *elt = currentScoreView()->selection().front()->musElement();
- if ( elt->musElementType()==CAMusElement::Syllable ||
- ((elt->musElementType()==CAMusElement::Mark && (static_cast<CAMark*>(elt)->markType()==CAMark::Text)) || static_cast<CAMark*>(elt)->markType()==CAMark::BookMark)
- ) {
- currentScoreView()->createTextEdit(currentScoreView()->selection().front());
+ if (currentScoreView()) {
+ if (currentScoreView()->selection().size()) {
+ CAMusElement *elt = currentScoreView()->selection().front()->musElement();
+ if ( elt->musElementType()==CAMusElement::Syllable ||
+ ((elt->musElementType()==CAMusElement::Mark && (static_cast<CAMark*>(elt)->markType()==CAMark::Text)) || static_cast<CAMark*>(elt)->markType()==CAMark::BookMark)
+ ) {
+ currentScoreView()->createTextEdit(currentScoreView()->selection().front());
+ } else {
+ currentScoreView()->removeTextEdit();
+ }
} else {
- currentScoreView()->removeTextEdit();
+ musElementFactory()->setMusElementType( CAMusElement::Undefined );
}
+ uiVoiceNum->setRealValue( 0 );
}
}
case ReadOnlyMode:
@@ -1743,11 +1725,9 @@
}
switch ( mode() ) {
- case SelectMode:
case EditMode: {
v->clearSelectionRegionList();
-
if ( v->selection().size() ) {
CADrawableMusElement *dElt = v->selection().front();
CAMusElement *elt = dElt->musElement();
@@ -1851,7 +1831,7 @@
uiVoiceNum->setMax( 1 );
uiVoiceNum->setRealValue( 0 );
}
- uiSelectMode->toggle();
+ uiEditMode->toggle();
v->repaint();
break;
} else
@@ -1916,22 +1896,6 @@
CAScoreView *c = static_cast<CAScoreView*>(sender());
c->setMouseTracking(false); // disable mouse move events until we finish with drawing
- if ( mode() == SelectMode && c->resizeDirection()!=CADrawable::Undefined ) {
- int time = c->coordsToTime(coords.x());
- time -= (time % CAPlayableLength::musicLengthToTimeLength(CAPlayableLength::Sixteenth)); // round timelength to eighth notes length
- if ( c->resizeDirection()==CADrawable::Right && (time > c->selection().at(0)->musElement()->timeStart()) ) {
- c->selection().at(0)->musElement()->setTimeLength( time - c->selection().at(0)->musElement()->timeStart() );
- c->selection().at(0)->setWidth( c->timeToCoords(time) - c->selection().at(0)->xPos() );
- c->repaint();
- } else
- if ( c->resizeDirection()==CADrawable::Left && (time < c->selection().at(0)->musElement()->timeEnd()) ) {
- c->selection().at(0)->musElement()->setTimeLength( c->selection().at(0)->musElement()->timeEnd() - time );
- c->selection().at(0)->musElement()->setTimeStart( time );
- c->selection().at(0)->setXPos( c->timeToCoords(time) );
- c->selection().at(0)->setWidth( c->timeToCoords(c->selection().at(0)->musElement()->timeEnd()) - c->timeToCoords(time) );
- c->repaint();
- }
- } else
if ( (mode() == InsertMode && musElementFactory()->musElementType() == CAMusElement::Note) ) {
CADrawableStaff *s;
if (c->currentContext()?(c->currentContext()->drawableContextType() == CADrawableContext::DrawableStaff):0)
@@ -1954,27 +1918,47 @@
c->updateHelpers();
c->repaint();
} else
- if ( mode()!=InsertMode && e->buttons()==Qt::LeftButton ) { // multiple selection
- c->clearSelectionRegionList();
- int x=c->lastMousePressCoords().x(), y=c->lastMousePressCoords().y(),
- w=coords.x()-c->lastMousePressCoords().x(), h=coords.y()-c->lastMousePressCoords().y();
- if (w<0) { x+=w; w*=(-1); } // user selected from right to left
- if (h<0) { y+=h; h*=(-1); } // user selected from bottom to top
- QRect selectionRect( x, y, w, h );
+ if ( mode()!=InsertMode ) {
+ if (c->resizeDirection()!=CADrawable::Undefined) {
+ // resize element
+ int time = c->coordsToTime(coords.x());
+ time -= (time % CAPlayableLength::musicLengthToTimeLength(CAPlayableLength::Sixteenth)); // round timelength to eighth notes length
+ if ( c->resizeDirection()==CADrawable::Right && (time > c->selection().at(0)->musElement()->timeStart()) ) {
+ c->selection().at(0)->musElement()->setTimeLength( time - c->selection().at(0)->musElement()->timeStart() );
+ c->selection().at(0)->setWidth( c->timeToCoords(time) - c->selection().at(0)->xPos() );
+ c->repaint();
+ } else
+ if ( c->resizeDirection()==CADrawable::Left && (time < c->selection().at(0)->musElement()->timeEnd()) ) {
+ c->selection().at(0)->musElement()->setTimeLength( c->selection().at(0)->musElement()->timeEnd() - time );
+ c->selection().at(0)->musElement()->setTimeStart( time );
+ c->selection().at(0)->setXPos( c->timeToCoords(time) );
+ c->selection().at(0)->setWidth( c->timeToCoords(c->selection().at(0)->musElement()->timeEnd()) - c->timeToCoords(time) );
+ c->repaint();
+ }
+ } else
+ if (e->buttons()==Qt::LeftButton) {
+ // multiple selection
+ c->clearSelectionRegionList();
+ int x=c->lastMousePressCoords().x(), y=c->lastMousePressCoords().y(),
+ w=coords.x()-c->lastMousePressCoords().x(), h=coords.y()-c->lastMousePressCoords().y();
+ if (w<0) { x+=w; w*=(-1); } // user selected from right to left
+ if (h<0) { y+=h; h*=(-1); } // user selected from bottom to top
+ QRect selectionRect( x, y, w, h );
- QList<CADrawableContext*> dcList = c->findContextsInRegion( selectionRect );
- for (int i=0; i<dcList.size(); i++) {
- QList<CADrawableMusElement*> musEltList = dcList[i]->findInRange( selectionRect.x(), selectionRect.x() + selectionRect.width() );
- for (int j=0; j<musEltList.size(); j++)
- if (musEltList[j]->drawableMusElementType()==CADrawableMusElement::DrawableSlur)
- musEltList.removeAt(j--);
+ QList<CADrawableContext*> dcList = c->findContextsInRegion( selectionRect );
+ for (int i=0; i<dcList.size(); i++) {
+ QList<CADrawableMusElement*> musEltList = dcList[i]->findInRange( selectionRect.x(), selectionRect.x() + selectionRect.width() );
+ for (int j=0; j<musEltList.size(); j++)
+ if (musEltList[j]->drawableMusElementType()==CADrawableMusElement::DrawableSlur)
+ musEltList.removeAt(j--);
- if (musEltList.size()) {
- c->addSelectionRegion( QRect(musEltList.front()->xPos(), dcList[i]->yPos(),
- musEltList.back()->xPos()+musEltList.back()->width()-musEltList.front()->xPos(), dcList[i]->height()) );
+ if (musEltList.size()) {
+ c->addSelectionRegion( QRect(musEltList.front()->xPos(), dcList[i]->yPos(),
+ musEltList.back()->xPos()+musEltList.back()->width()-musEltList.front()->xPos(), dcList[i]->height()) );
+ }
}
+ c->repaint();
}
- c->repaint();
}
c->setMouseTracking(true); // re-enable mouse move events, we finished rendering
}
@@ -1986,7 +1970,7 @@
\sa CAScoreView::selectAllCurBar()
*/
void CAMainWin::scoreViewDoubleClick( QMouseEvent *e, const QPoint coords ) {
- if (mode() == SelectMode) {
+ if (mode() == EditMode) {
static_cast<CAScoreView*>(sender())->selectAllCurBar();
static_cast<CAScoreView*>(sender())->repaint();
}
@@ -1999,7 +1983,7 @@
\sa CAScoreView::selectAllCurContext()
*/
void CAMainWin::scoreViewTripleClick( QMouseEvent *e, const QPoint coords ) {
- if (mode() == SelectMode) {
+ if (mode() == EditMode) {
static_cast<CAScoreView*>(sender())->selectAllCurContext();
static_cast<CAScoreView*>(sender())->repaint();
}
@@ -2097,7 +2081,8 @@
// go to Insert mode (if in Select mode) before changing note length
if(e->key() >= Qt::Key_0 && e->key() <= Qt::Key_9 && e->key() != Qt::Key_3) {
- if (mode()!=EditMode && currentScoreView()->currentContext()) {
+ if (currentScoreView()->currentContext() && currentScoreView()->currentContext()->context()->contextType()==CAContext::Staff &&
+ v->selection().size()==0) {
uiInsertPlayable->setChecked(true);
}
}
@@ -2163,10 +2148,7 @@
}
case Qt::Key_Up: {
- if (mode() == SelectMode) { // select the upper music element
- v->selectUpMusElement();
- v->repaint();
- } else if ((mode() == InsertMode) || (mode() == EditMode)) {
+ if ((mode() == InsertMode) || (mode() == EditMode)) {
bool rebuild=false;
if (v->selection().size())
CACanorus::undo()->createUndoCommand( document(), tr("rise note", "undo") );
@@ -2201,10 +2183,7 @@
}
case Qt::Key_Down: {
- if (mode() == SelectMode) { // select the lower music element
- v->selectDownMusElement();
- v->repaint();
- } else if ((mode() == InsertMode) || (mode() == EditMode)) {
+ if ((mode() == InsertMode) || (mode() == EditMode)) {
//bool rebuild = false;
if (v->selection().size())
CACanorus::undo()->createUndoCommand( document(), tr("lower note", "undo") );
@@ -2392,12 +2371,11 @@
// Mode keys
case Qt::Key_Escape:
- if (mode()==SelectMode) {
+ if (mode()==EditMode) {
v->clearSelection();
v->setCurrentContext( 0 );
}
- uiVoiceNum->setRealValue( 0 );
- uiSelectMode->trigger();
+ uiEditMode->trigger();
break;
case Qt::Key_I:
uiInsertPlayable->trigger();
@@ -2472,8 +2450,8 @@
else
if( idx<0 )
idx = currentSheet()->voiceList().size() -1;
- //if ( idx >= 0 && idx < currentSheet()->voiceList().size() )
- setCurrentVoice( currentSheet()->voiceList()[idx] );
+
+ setCurrentVoice( currentSheet()->voiceList()[idx] );
}
break;
}
@@ -3107,7 +3085,7 @@
if ( doc->sheetList().size())
uiTabWidget->setCurrentIndex(0);
- setMode( SelectMode );
+ setMode( EditMode );
// select the first context automatically
if ( document() && document()->sheetList().size() && document()->sheetList()[0]->contextList().size() )
@@ -4391,7 +4369,7 @@
CANote::CAStemDirection direction = static_cast<CANote::CAStemDirection>(id);
if (mode()==InsertMode)
musElementFactory()->setNoteStemDirection( direction );
- else if (mode()==SelectMode || mode()==EditMode) {
+ else if (mode()==EditMode) {
CACanorus::undo()->createUndoCommand( document(), tr("change note stem direction", "undo") );
CAScoreView *v = currentScoreView();
bool changed=false;
@@ -4474,14 +4452,16 @@
*/
void CAMainWin::updateVoiceToolBar() {
CAContext *context = currentContext();
- if ( mode()==SelectMode && context && context->contextType() == CAContext::Staff ) {
+ if ( context && context->contextType() == CAContext::Staff && currentScoreView() &&
+ ((mode()==EditMode && currentScoreView()->selection().size()==0) ||
+ mode()==InsertMode) ) {
CAStaff *staff = static_cast<CAStaff*>(context);
uiNewVoice->setVisible(true);
uiNewVoice->setEnabled(true);
if (staff->voiceList().size()) {
uiVoiceNum->setMax(staff->voiceList().size());
int voiceNr = uiVoiceNum->getRealValue();
- if (voiceNr) {
+ if (currentVoice() && voiceNr) {
CAVoice *curVoice = (voiceNr<=staff->voiceList().size()?staff->voiceList()[voiceNr-1]:staff->voiceList()[0]);
uiVoiceName->setText(curVoice->name());
uiVoiceName->setEnabled(true);
@@ -4512,7 +4492,9 @@
*/
void CAMainWin::updateContextToolBar() {
CAContext *context = currentContext();
- if (mode()==SelectMode && context) {
+ if (mode()==EditMode &&
+ currentScoreView() && currentScoreView()->selection().size()==0 &&
+ context) {
if (!uiInsertPlayable->isChecked())
uiContextToolBar->show();
@@ -4546,8 +4528,9 @@
break;
}
uiContextName->setText(context->name());
- } else
+ } else {
uiContextToolBar->hide();
+ }
}
/*!
@@ -4556,102 +4539,97 @@
void CAMainWin::updateInsertToolBar() {
if ( currentSheet() ) {
uiNewContext->setVisible(true);
- if (mode()==EditMode) {
- uiInsertToolBar->show();
+ uiInsertToolBar->show();
+ CAContext *context = currentContext();
+ if (context) {
+ switch (context->contextType()) {
+ case CAContext::Staff:
+ // staff selected
+ uiInsertPlayable->setVisible(true);
+ uiSlurType->defaultAction()->setVisible(true); uiSlurType->defaultAction()->setEnabled(true);
+ //uiSlurType->setVisible(true); // \todo This is needed in order for actions to hide?! -Matevz
+ uiInsertClef->setVisible(true); // menu
+ uiInsertBarline->setVisible(true); // menu
+ uiClefType->defaultAction()->setVisible(true); uiClefType->defaultAction()->setEnabled(true);
+ uiTimeSigType->defaultAction()->setVisible(true); uiTimeSigType->defaultAction()->setEnabled(true);
+ uiInsertKeySig->setVisible(true);
+ uiMarkType->defaultAction()->setVisible(true); uiMarkType->defaultAction()->setEnabled(true);
+ uiArticulationType->defaultAction()->setVisible(true); uiArticulationType->defaultAction()->setEnabled(true);
+ uiInsertTimeSig->setVisible(true);
+ uiBarlineType->defaultAction()->setVisible(true); uiBarlineType->defaultAction()->setEnabled(true);
+ uiInsertFBM->setVisible(false);
+ uiInsertFM->setVisible(false);
+ uiInsertSyllable->setVisible(false);
+ break;
+ case CAContext::FunctionMarkContext:
+ // function mark context selected
+ uiInsertPlayable->setVisible(false);
+ uiSlurType->defaultAction()->setVisible(false);
+ uiInsertClef->setVisible(false); // menu
+ uiInsertBarline->setVisible(false); // menu
+ uiClefType->defaultAction()->setVisible(false);
+ uiTimeSigType->defaultAction()->setVisible(false);
+ uiInsertKeySig->setVisible(false);
+ uiMarkType->defaultAction()->setVisible(false);
+ uiArticulationType->defaultAction()->setVisible(false);
+ uiInsertTimeSig->setVisible(false);
+ uiBarlineType->defaultAction()->setVisible(false);
+ uiInsertFBM->setVisible(false);
+ uiInsertFM->setVisible(true);
+ uiInsertSyllable->setVisible(false);
+ break;
+ case CAContext::LyricsContext:
+ // lyrics context selected
+ uiInsertPlayable->setVisible(false);
+ uiSlurType->defaultAction()->setVisible(false);
+ uiInsertClef->setVisible(false); // menu
+ uiInsertBarline->setVisible(false); // menu
+ uiClefType->defaultAction()->setVisible(false);
+ uiTimeSigType->defaultAction()->setVisible(false);
+ uiInsertKeySig->setVisible(false);
+ uiMarkType->defaultAction()->setVisible(false);
+ uiArticulationType->defaultAction()->setVisible(false);
+ uiInsertTimeSig->setVisible(false);
+ uiBarlineType->defaultAction()->setVisible(false);
+ uiInsertFBM->setVisible(false);
+ uiInsertFM->setVisible(false);
+ uiInsertSyllable->setVisible(true);
+ break;
+ case CAContext::FiguredBassContext:
+ // lyrics context selected
+ uiInsertPlayable->setVisible(false);
+ uiSlurType->defaultAction()->setVisible(false);
+ uiInsertClef->setVisible(false); // menu
+ uiInsertBarline->setVisible(false); // menu
+ uiClefType->defaultAction()->setVisible(false);
+ uiTimeSigType->defaultAction()->setVisible(false);
+ uiInsertKeySig->setVisible(false);
+ uiMarkType->defaultAction()->setVisible(false);
+ uiArticulationType->defaultAction()->setVisible(false);
+ uiInsertTimeSig->setVisible(false);
+ uiBarlineType->defaultAction()->setVisible(false);
+ uiInsertFBM->setVisible(true);
+ uiInsertFM->setVisible(false);
+ uiInsertSyllable->setVisible(false);
+ break;
+ }
} else {
- uiInsertToolBar->show();
- CAContext *context = currentContext();
- if (context) {
- switch (context->contextType()) {
- case CAContext::Staff:
- // staff selected
- uiInsertPlayable->setVisible(true);
- uiSlurType->defaultAction()->setVisible(true); uiSlurType->defaultAction()->setEnabled(true);
- //uiSlurType->setVisible(true); // \todo This is needed in order for actions to hide?! -Matevz
- uiInsertClef->setVisible(true); // menu
- uiInsertBarline->setVisible(true); // menu
- uiClefType->defaultAction()->setVisible(true); uiClefType->defaultAction()->setEnabled(true);
- uiTimeSigType->defaultAction()->setVisible(true); uiTimeSigType->defaultAction()->setEnabled(true);
- uiInsertKeySig->setVisible(true);
- uiMarkType->defaultAction()->setVisible(true); uiMarkType->defaultAction()->setEnabled(true);
- uiArticulationType->defaultAction()->setVisible(true); uiArticulationType->defaultAction()->setEnabled(true);
- uiInsertTimeSig->setVisible(true);
- uiBarlineType->defaultAction()->setVisible(true); uiBarlineType->defaultAction()->setEnabled(true);
- uiInsertFBM->setVisible(false);
- uiInsertFM->setVisible(false);
- uiInsertSyllable->setVisible(false);
- break;
- case CAContext::FunctionMarkContext:
- // function mark context selected
- uiInsertPlayable->setVisible(false);
- uiSlurType->defaultAction()->setVisible(false);
- uiInsertClef->setVisible(false); // menu
- uiInsertBarline->setVisible(false); // menu
- uiClefType->defaultAction()->setVisible(false);
- uiTimeSigType->defaultAction()->setVisible(false);
- uiInsertKeySig->setVisible(false);
- uiMarkType->defaultAction()->setVisible(false);
- uiArticulationType->defaultAction()->setVisible(false);
- uiInsertTimeSig->setVisible(false);
- uiBarlineType->defaultAction()->setVisible(false);
- uiInsertFBM->setVisible(false);
- uiInsertFM->setVisible(true);
- uiInsertSyllable->setVisible(false);
- break;
- case CAContext::LyricsContext:
- // lyrics context selected
- uiInsertPlayable->setVisible(false);
- uiSlurType->defaultAction()->setVisible(false);
- uiInsertClef->setVisible(false); // menu
- uiInsertBarline->setVisible(false); // menu
- uiClefType->defaultAction()->setVisible(false);
- uiTimeSigType->defaultAction()->setVisible(false);
- uiInsertKeySig->setVisible(false);
- uiMarkType->defaultAction()->setVisible(false);
- uiArticulationType->defaultAction()->setVisible(false);
- uiInsertTimeSig->setVisible(false);
- uiBarlineType->defaultAction()->setVisible(false);
- uiInsertFBM->setVisible(false);
- uiInsertFM->setVisible(false);
- uiInsertSyllable->setVisible(true);
- break;
- case CAContext::FiguredBassContext:
- // lyrics context selected
- uiInsertPlayable->setVisible(false);
- uiSlurType->defaultAction()->setVisible(false);
- uiInsertClef->setVisible(false); // menu
- uiInsertBarline->setVisible(false); // menu
- uiClefType->defaultAction()->setVisible(false);
- uiTimeSigType->defaultAction()->setVisible(false);
- uiInsertKeySig->setVisible(false);
- uiMarkType->defaultAction()->setVisible(false);
- uiArticulationType->defaultAction()->setVisible(false);
- uiInsertTimeSig->setVisible(false);
- uiBarlineType->defaultAction()->setVisible(false);
- uiInsertFBM->setVisible(true);
- uiInsertFM->setVisible(false);
- uiInsertSyllable->setVisible(false);
- break;
- }
- } else {
- // no contexts selected
- uiInsertPlayable->setVisible(false);
- uiSlurType->defaultAction()->setVisible(false);
- uiInsertClef->setVisible(false); // menu
- uiInsertBarline->setVisible(false); // menu
- uiClefType->defaultAction()->setVisible(false);
- uiTimeSigType->defaultAction()->setVisible(false);
- uiInsertKeySig->setVisible(false);
- uiMarkType->defaultAction()->setVisible(false);
- uiArticulationType->defaultAction()->setVisible(false);
- uiInsertTimeSig->setVisible(false);
- uiBarlineType->defaultAction()->setVisible(false);
- uiInsertFBM->setVisible(false);
- uiInsertFM->setVisible(false);
- uiInsertSyllable->setVisible(false);
- }
+ // no contexts selected
+ uiInsertPlayable->setVisible(false);
+ uiSlurType->defaultAction()->setVisible(false);
+ uiInsertClef->setVisible(false); // menu
+ uiInsertBarline->setVisible(false); // menu
+ uiClefType->defaultAction()->setVisible(false);
+ uiTimeSigType->defaultAction()->setVisible(false);
+ uiInsertKeySig->setVisible(false);
+ uiMarkType->defaultAction()->setVisible(false);
+ uiArticulationType->defaultAction()->setVisible(false);
+ uiInsertTimeSig->setVisible(false);
+ uiBarlineType->defaultAction()->setVisible(false);
+ uiInsertFBM->setVisible(false);
+ uiInsertFM->setVisible(false);
+ uiInsertSyllable->setVisible(false);
}
-
} else {
uiInsertToolBar->hide();
uiNewContext->setVisible(false);
@@ -4713,7 +4691,6 @@
uiHiddenRest->setChecked(rest->restType()==CARest::Hidden);
}
uiPlayableToolBar->show();
- uiVoiceNum->setRealValue( playable->voice()->voiceNumber() );
} else {
uiPlayableToolBar->hide();
uiHiddenRest->setEnabled(false);
Modified: trunk/src/ui/mainwin.h
===================================================================
--- trunk/src/ui/mainwin.h 2016-04-08 21:10:42 UTC (rev 1439)
+++ trunk/src/ui/mainwin.h 2016-04-08 21:36:45 UTC (rev 1440)
@@ -76,7 +76,6 @@
NoDocumentMode,
ProgressMode,
InsertMode,
- SelectMode,
EditMode,
ReadOnlyMode
};
@@ -178,7 +177,6 @@
void on_uiDocumentProperties_triggered();
// Insert
- void on_uiSelectMode_toggled(bool);
void on_uiEditMode_toggled(bool);
void on_uiNewSheet_triggered();
void on_uiNewVoice_triggered();
@@ -424,7 +422,6 @@
// Insert toolbar
QToolBar *uiInsertToolBar;
QActionGroup *uiInsertGroup; // Group for mutual exclusive selection of music elements
- // QAction *uiSelectMode; // made by Qt Designer
// QAction *uiNewSheet; // made by Qt Designer
CAMenuToolButton *uiContextType;
Modified: trunk/src/ui/mainwin.ui
===================================================================
--- trunk/src/ui/mainwin.ui 2016-04-08 21:10:42 UTC (rev 1439)
+++ trunk/src/ui/mainwin.ui 2016-04-08 21:36:45 UTC (rev 1440)
@@ -795,21 +795,6 @@
<string>Clef...</string>
</property>
</action>
- <action name="uiSelectMode">
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>images:general/arrow.svg</normaloff>images:general/arrow.svg</iconset>
- </property>
- <property name="text">
- <string>Select mode</string>
- </property>
- </action>
<action name="uiRemoveVoice">
<property name="icon">
<iconset>
@@ -921,9 +906,12 @@
<property name="checkable">
<bool>true</bool>
</property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
<property name="icon">
<iconset>
- <normaloff>images:general/editmode.svg</normaloff>images:general/editmode.svg</iconset>
+ <normaloff>images:general/arrow.svg</normaloff>images:general/arrow.svg</iconset>
</property>
<property name="text">
<string>Edit mode</string>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2016-04-08 21:10:44
|
Revision: 1439
http://sourceforge.net/p/canorus/code/1439
Author: suamor
Date: 2016-04-08 21:10:42 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
- Build C++11
- Add several new files implementing keyboard shortcut settings (and delegating info from mainwin)
- Add some src code include path
- Remove "scripting" path as newer swig versions place it on parent folder (like 2.0.12)
- Small API changes for Settings
- Integate into mainwin (using mainwin actions to feed the settings)
- add some error checking code
Modified Paths:
--------------
trunk/src/CMakeLists.txt
trunk/src/core/settings.cpp
trunk/src/core/settings.h
trunk/src/ui/mainwin.cpp
trunk/src/ui/mainwin.h
trunk/src/ui/settingsdialog.cpp
trunk/src/ui/singleaction.cpp
trunk/src/ui/singleaction.h
trunk/src/widgets/actionseditor.cpp
trunk/src/widgets/actionseditor.h
Added Paths:
-----------
trunk/src/core/actiondelegate.cpp
trunk/src/core/actiondelegate.h
trunk/src/ui/actionstorage.cpp
trunk/src/ui/actionstorage.h
Removed Paths:
-------------
trunk/src/core/dynamickeyboard.cpp
trunk/src/core/dynamickeyboard.h
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/CMakeLists.txt 2016-04-08 21:10:42 UTC (rev 1439)
@@ -16,8 +16,8 @@
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fstack-protector-all -Wall -Werror -Wuninitialized -Wtype-limits -Wstack-protector")
SET(CMAKE_C_FLAGS_RELEASE "-O2")
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c++11")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c++11")
# Build universal binaries on Mac
IF(APPLE)
@@ -229,6 +229,7 @@
core/muselementfactory.cpp
core/transpose.cpp
core/notechecker.cpp
+ core/actiondelegate.cpp
)
SET(Canorus_Score_Srcs # Score representation
@@ -310,6 +311,7 @@
ui/propertiesdialog.cpp
ui/transposeview.cpp
ui/singleaction.cpp
+ ui/actionstorage.cpp
scoreui/keysignatureui.cpp
)
@@ -546,7 +548,12 @@
# Include paths and set up targets #
####################################
# This needs to be added in order for #include to work inside .cpp files - it adds src/ to include path
+#TARGET_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/core")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/ui")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/widgets")
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/import")
# These lines add the include paths of the Qt
# directory to the compiler include paths
@@ -570,9 +577,9 @@
IF(USE_RUBY)
INCLUDE_DIRECTORIES(${RUBY_INCLUDE_PATH})
- SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/scripting/canorusruby.i PROPERTIES CPLUSPLUS ON)
+ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/scripting/canorusruby.i PROPERTIES CPLUSPLUS ON)
- SET(CANORUS_RUBY_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/canorusrubyRUBY_wrap.cxx)
+ SET(CANORUS_RUBY_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/canorusrubyRUBY_wrap.cxx)
SET_SOURCE_FILES_PROPERTIES(${CANORUS_RUBY_WRAP_CXX} PROPERTIES GENERATED TRUE)
SWIG_ADD_MODULE(CanorusRuby ruby
@@ -587,7 +594,7 @@
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/scripting/canoruspython.i PROPERTIES CPLUSPLUS ON)
- SET(CANORUS_PYTHON_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/canoruspythonPYTHON_wrap.cxx)
+ SET(CANORUS_PYTHON_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/canoruspythonPYTHON_wrap.cxx)
SET_SOURCE_FILES_PROPERTIES(${CANORUS_PYTHON_WRAP_CXX} PROPERTIES GENERATED TRUE)
SWIG_ADD_MODULE(CanorusPython python # Warning! CMake renames CanorusPython automatically to _CanorusPython
Added: trunk/src/core/actiondelegate.cpp
===================================================================
--- trunk/src/core/actiondelegate.cpp (rev 0)
+++ trunk/src/core/actiondelegate.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -0,0 +1,86 @@
+/*!
+ Copyright (c) 2015, Reinhard Katzmann, Matevž Jekovec, Canorus development team
+ All Rights Reserved. See AUTHORS for a complete list of authors.
+
+ Licensed under the GNU GENERAL PUBLIC LICENSE. See COPYING for details.
+*/
+
+#include <QDebug>
+
+#include "ui/singleaction.h"
+#include "ui/mainwin.h"
+#include "actiondelegate.h"
+#include "canorus.h"
+#include "settings.h"
+
+CAActionDelegate::CAActionDelegate(CAMainWin *mainWin)
+{
+ _mainWin = mainWin;
+}
+
+// Add a single action to the list of actions from Settings (copy action parameters)
+void CAActionDelegate::addSingleAction(const QString &oCommandName, const QString &oDescription, const QAction &oAction)
+{
+ CASingleAction *pMainAction = new CASingleAction(_mainWin);
+ if( pMainAction ) {
+ //pMainAction->setAction( &oAction );
+ pMainAction->newAction();
+ pMainAction->fromQAction(oAction,*pMainAction);
+ pMainAction->setCommandName(oCommandName);
+ pMainAction->setDescription(oDescription);
+ pMainAction->setShortCutAsString( oAction.shortcut().toString() );
+ //pMainAction->setMidiKeySequence( oMidiKeySequence ); // ToDo
+ CACanorus::settings()->addSingleAction(*pMainAction);
+ }
+}
+
+// Update an action with the settings parameters of a single action (copy single action parameters)
+void CAActionDelegate::updateSingleAction(CASingleAction &oSource, QAction &oAction)
+{
+ oAction.setText(oSource.getCommandName());
+ oAction.setStatusTip(oSource.getDescription());
+ oAction.setShortcut(oSource.getAction()->shortcut());
+ //oAction->setMidiKeySequence( oSource.getMidiKeySequence ); // ToDo
+ oAction.setObjectName( oSource.getAction()->objectName() );
+ oAction.setActionGroup( oSource.getAction()->actionGroup() );
+ oAction.setAutoRepeat( oSource.getAction()->autoRepeat() );
+ oAction.setCheckable( oSource.getAction()->isCheckable() );
+ oAction.setChecked( oSource.getAction()->isChecked() );
+ oAction.setData( oSource.getAction()->data() );
+}
+
+// Add Actions from CAMainWin to the list of actions of the settings (initialization)
+void CAActionDelegate::addWinActions(QWidget &widget)
+{
+ // Hard coded description could be changed to Status Tip Text (if available)
+ //addSingleAction(_mainWin->uiQuit->text(),_mainWin->tr("Exit program"),*_mainWin->uiQuit);
+ QList<QAction *> actionList = widget.actions();
+ qWarning() << "Delegate: Adding " << actionList.size() << " actions ";
+ QAction *actionEntry;
+ foreach(actionEntry, actionList) {
+ qWarning("Adding new action %s to shortcut list of size %d", actionEntry->text().toLatin1().constData(),widget.actions().size());
+ addSingleAction( actionEntry->text(), actionEntry->toolTip(), *actionEntry);
+ }
+}
+
+// Remove all CAMainWin actions from the list of (single) actions in settings (exit program)
+void CAActionDelegate::removeMainWinActions()
+{
+ CASingleAction *poAction;
+ while( 0 != CACanorus::settings()->getActionList().isEmpty() ) {
+ poAction = CACanorus::settings()->getActionList().back();
+ if( poAction ) {
+ CACanorus::settings()->deleteSingleAction( poAction->getCommandName(), poAction );
+ delete poAction;
+ poAction = 0;
+ }
+ }
+}
+
+// Update all CAMainWin actions using the shortcuts (etc.) read from the settings
+void CAActionDelegate::updateMainWinActions()
+{
+ CASingleAction *poResAction;
+ CACanorus::settings()->getSingleAction(_mainWin->uiQuit->text(), poResAction);
+ updateSingleAction(*poResAction,*_mainWin->uiQuit);
+}
Added: trunk/src/core/actiondelegate.h
===================================================================
--- trunk/src/core/actiondelegate.h (rev 0)
+++ trunk/src/core/actiondelegate.h 2016-04-08 21:10:42 UTC (rev 1439)
@@ -0,0 +1,39 @@
+/*!
+ Copyright (c) 2015, Reinhard Katzmann, Matevž Jekovec, Canorus development team
+ All Rights Reserved. See AUTHORS for a complete list of authors.
+
+ Licensed under the GNU GENERAL PUBLIC LICENSE. See COPYING for details.
+*/
+
+#ifndef ACTIONDELEGATE_H_
+#define ACTIONDELEGATE_H_
+
+#include <QString>
+#include <QAction>
+
+// Helper methods to reduce code ballast in mainwin class
+// Keyboard (Midi) Shortcuts that can be changed dynamically
+
+class CAMainWin;
+class CASingleAction;
+
+class CAActionDelegate
+{
+public:
+ CAActionDelegate(CAMainWin *mainWin);
+
+ void addWinActions(QWidget &widget);
+ void removeMainWinActions();
+ void updateMainWinActions();
+
+protected:
+ void addSingleAction(const QString &oCommandName, const QString &oDescription, const QAction &oAction);
+ void updateSingleAction(CASingleAction &oSource, QAction &oAction);
+
+private:
+ CAMainWin *_mainWin;
+};
+
+#endif // ACTIONDELEGATE_H_
+
+
Deleted: trunk/src/core/dynamickeyboard.cpp
===================================================================
--- trunk/src/core/dynamickeyboard.cpp 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/core/dynamickeyboard.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -1,86 +0,0 @@
-/*!
- Copyright (c) 2015, Reinhard Katzmann, Matevž Jekovec, Canorus development team
- All Rights Reserved. See AUTHORS for a complete list of authors.
-
- Licensed under the GNU GENERAL PUBLIC LICENSE. See COPYING for details.
-*/
-
-#include "ui/singleaction.h"
-#include "ui/mainwin.h"
-#include "dynamickeyboard.h"
-#include "canorus.h"
-#include "settings.h"
-
-CAActionDelegate::CAActionDelegate(CAMainWin *mainWin)
-{
- _mainWin = mainWin;
-}
-
-// Add a single action to the list of actions from Settings (copy action parameters)
-void CAActionDelegate::addSingleAction(const QString &oCommandName, const QString &oDescription, QAction &oAction)
-{
- CASingleAction *pMainAction = new CASingleAction(_mainWin);
- if( pMainAction ) {
- pMainAction->setCommandName(oCommandName);
- pMainAction->setDescription(oDescription);
- pMainAction->setShortcut(oAction.shortcut());
- pMainAction->setShortCutAsString( oAction.shortcut().toString() );
- //pMainAction->setMidiKeySequence( oMidiKeySequence ); // ToDo
- pMainAction->setObjectName(oAction.objectName());
- pMainAction->setActionGroup( oAction.actionGroup() );
- pMainAction->setAutoRepeat( oAction.autoRepeat() );
- pMainAction->setCheckable( oAction.isCheckable() );
- pMainAction->setChecked( oAction.isChecked() );
- pMainAction->setData( oAction.data() );
- CACanorus::settings()->addSingleAction(*pMainAction);
- }
-}
-
-// Update an action with the settings parameters of a single action (copy single action parameters)
-void CAActionDelegate::updateSingleAction(CASingleAction &oSource, QAction &oAction)
-{
- oAction.setText(oSource.getCommandName());
- oAction.setStatusTip(oSource.getDescription());
- oAction.setShortcut(oSource.shortcut());
- //oAction->setMidiKeySequence( oSource.getMidiKeySequence ); // ToDo
- oAction.setObjectName( oSource.objectName() );
- oAction.setActionGroup( oSource.actionGroup() );
- oAction.setAutoRepeat( oSource.autoRepeat() );
- oAction.setCheckable( oSource.isCheckable() );
- oAction.setChecked( oSource.isChecked() );
- oAction.setData( oSource.data() );
-}
-
-// Add Actions from CAMainWin to the list of actions of the settings (initialization)
-void CAActionDelegate::addWinActions(QWidget &widget)
-{
- // Hard coded description could be changed to Status Tip Text (if available)
- //addSingleAction(_mainWin->uiQuit->text(),_mainWin->tr("Exit program"),*_mainWin->uiQuit);
- QList<QAction *> actionList = widget.actions();
- QAction *actionEntry;
- foreach(actionEntry, actionList) {
- addSingleAction( actionEntry->text(), actionEntry->toolTip(), *actionEntry);
- }
-}
-
-// Remove all CAMainWin actions from the list of (single) actions in settings (exit program)
-void CAActionDelegate::removeMainWinActions()
-{
- CASingleAction *poAction;
- while( 0 != CACanorus::settings()->getActionList().isEmpty() ) {
- poAction = CACanorus::settings()->getActionList().back();
- if( poAction ) {
- CACanorus::settings()->deleteSingleAction( poAction->getCommandName(), poAction );
- delete poAction;
- poAction = 0;
- }
- }
-}
-
-// Update all CAMainWin actions using the shortcuts (etc.) read from the settings
-void CAActionDelegate::updateMainWinActions()
-{
- CASingleAction *poResAction;
- CACanorus::settings()->getSingleAction(_mainWin->uiQuit->text(), poResAction);
- updateSingleAction(*poResAction,*_mainWin->uiQuit);
-}
Deleted: trunk/src/core/dynamickeyboard.h
===================================================================
--- trunk/src/core/dynamickeyboard.h 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/core/dynamickeyboard.h 2016-04-08 21:10:42 UTC (rev 1439)
@@ -1,39 +0,0 @@
-/*!
- Copyright (c) 2015, Reinhard Katzmann, Matevž Jekovec, Canorus development team
- All Rights Reserved. See AUTHORS for a complete list of authors.
-
- Licensed under the GNU GENERAL PUBLIC LICENSE. See COPYING for details.
-*/
-
-#ifndef DYNAMICKEYBOARD_H_
-#define DYNAMICKEYBOARD_H_
-
-#include <QString>
-#include <QAction>
-
-// Helper methods to reduce code ballast in mainwin class
-// Keyboard (Midi) Shortcuts that can be changed dynamically
-
-class CAMainWin;
-class CASingleAction;
-
-class CAActionDelegate
-{
-public:
- CAActionDelegate(CAMainWin *mainWin);
-
- void addWinActions(QWidget &widget);
- void removeMainWinActions();
- void updateMainWinActions();
-
-protected:
- void addSingleAction(const QString &oCommandName, const QString &oDescription, QAction &oAction);
- void updateSingleAction(CASingleAction &oSource, QAction &oAction);
-
-private:
- CAMainWin *_mainWin;
-};
-
-#endif // DYNAMICKEYBOARD_H_
-
-
Modified: trunk/src/core/settings.cpp
===================================================================
--- trunk/src/core/settings.cpp 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/core/settings.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -5,12 +5,16 @@
Licensed under the GNU GENERAL PUBLIC LICENSE. See COPYING for details.
*/
+#include <QDebug>
+
#include "core/settings.h"
#ifndef SWIGCPP
#include "canorus.h"
#endif
#include "interface/rtmididevice.h"
+//#define COPY_ACTIONLIST_ELEMS_MANUALLY 1
+
// Define default settings
const bool CASettings::DEFAULT_FINALE_LYRICS_BEHAVIOUR = false;
const bool CASettings::DEFAULT_SHADOW_NOTES_IN_OTHER_STAFFS = false;
@@ -355,22 +359,22 @@
Search one single action in the list of actions (-1: entry not found)
Returns an empty action element when the command was not found
*/
-int CASettings::getSingleAction(QString oCommandName, QAction *&poResAction)
+int CASettings::getSingleAction(const QString &oCommandName, QAction *&poResAction)
{
CASingleAction *poEntryAction;
for (int i=0; i < _oActionList.count(); i++) {
poEntryAction = _oActionList[i];
if( poEntryAction->getCommandName() == oCommandName )
{
- poResAction = poEntryAction;
+ poResAction = poEntryAction->getAction();
return i;
}
}
- poResAction = _poEmptyEntry;
+ poResAction = _poEmptyEntry->getAction();
return -1;
}
-int CASettings::getSingleAction(QString oCommandName, CASingleAction *&poResAction)
+int CASettings::getSingleAction(const QString &oCommandName, CASingleAction *&poResAction)
{
CASingleAction *poEntryAction;
for (int i=0; i < _oActionList.count(); i++) {
@@ -429,21 +433,26 @@
*/
void CASettings::addSingleAction(CASingleAction &oSingleAction)
{
+ qWarning() << "CASettings::addSingleAction" << endl;
+#ifdef COPY_ACTIONLIST_ELEMS_MANUALLY
CASingleAction *pActionEntry = new CASingleAction(0); // parent ?
pActionEntry->setCommandName( oSingleAction.getCommandName() );
pActionEntry->setDescription( oSingleAction.getDescription() );
pActionEntry->setShortCutAsString( oSingleAction.getShortCutAsString() );
pActionEntry->setMidiKeySequence( oSingleAction.getMidiKeySequence() );
- pActionEntry->setActionGroup( oSingleAction.actionGroup() );
- pActionEntry->setAutoRepeat( oSingleAction.autoRepeat() );
- pActionEntry->setCheckable( oSingleAction.isCheckable() );
- pActionEntry->setChecked( oSingleAction.isChecked() );
- pActionEntry->setData( oSingleAction.data() );
-#ifdef COPY_ACTIONLIST_ELEMS_MANUALLY
+ pActionEntry->newAction( oSingleAction.getAction()->parent() );
+ pActionEntry->getAction()->setObjectName( oSingleAction.getAction()->objectName() );
+ pActionEntry->getAction()->setActionGroup( oSingleAction.getAction()->actionGroup() );
+ pActionEntry->getAction()->setAutoRepeat( oSingleAction.getAction()->autoRepeat() );
+ pActionEntry->getAction()->setCheckable( oSingleAction.getAction()->isCheckable() );
+ pActionEntry->getAction()->setChecked( oSingleAction.getAction()->isChecked() );
+ pActionEntry->getAction()->setData( oSingleAction.getAction()->data() );
+ pActionEntry->setAction( oSingleAction.getAction() );
_oActionList.append( pActionEntry );
#else
_oActionList.append( &oSingleAction );
#endif
+ qWarning() << "New size is " << _oActionList.size() << endl;
}
/*!
@@ -451,9 +460,8 @@
Return 'true' when succesfull
Warning: The action itself is not deleted!
*/
-bool CASettings::deleteSingleAction(QString oCommand)
+bool CASettings::deleteSingleAction(QString oCommand, CASingleAction *&poResAction)
{
- CASingleAction *poResAction;
bool bRet = false;
int iPos = getSingleAction(oCommand, poResAction);
if( iPos >= 0 ) // Double entries should not be in the list
@@ -463,6 +471,7 @@
}
#ifdef COPY_ACTIONLIST_ELEMS_MANUALLY
delete poResAction;
+ poResAction = 0;
#endif
return bRet;
}
Modified: trunk/src/core/settings.h
===================================================================
--- trunk/src/core/settings.h 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/core/settings.h 2016-04-08 21:10:42 UTC (rev 1439)
@@ -143,21 +143,21 @@
inline void setLatestShortcutsDirectory( QDir d ) { _latestShortcutsDirectory = d; }
static const QDir DEFAULT_SHORTCUTS_DIRECTORY;
#ifndef SWIG
- int getSingleAction(QString oCommandName, QAction *&poResAction);
- int getSingleAction(QString oCommandName, CASingleAction *&poResAction);
+ int getSingleAction(const QString &oCommandName, QAction *&poResAction);
+ int getSingleAction(const QString &oCommandName, CASingleAction *&poResAction);
/*!
Re one single action in the list of actions
Does not check for the correct position in the list to be fast!
*/
- inline QAction &getSingleAction(int iPos, QList<QAction *> &oActionList) {
- QAction *poResAction = static_cast<QAction*> (oActionList[iPos]);
+ inline CASingleAction &getSingleAction(int iPos, QList<CASingleAction *> &oActionList) {
+ CASingleAction *poResAction = static_cast<CASingleAction*> (oActionList[iPos]);
return *poResAction; }
bool setSingleAction(QAction oSingleAction, int iPos);
inline const QList<CASingleAction*>& getActionList() { return _oActionList; }
void setActionList(QList<CASingleAction *> &oActionList);
- void addSingleAction(CASingleAction &oSingleAction);
- bool deleteSingleAction(QString oCommandName);
+ void addSingleAction(CASingleAction &oAction);
+ bool deleteSingleAction(QString oCommandName, CASingleAction *&poResAction);
#endif
private:
Added: trunk/src/ui/actionstorage.cpp
===================================================================
--- trunk/src/ui/actionstorage.cpp (rev 0)
+++ trunk/src/ui/actionstorage.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -0,0 +1,122 @@
+/*!
+ Copyright (c) 2015, Reinhard Katzmann, Matevž Jekovec, Canorus development team
+ All Rights Reserved. See AUTHORS for a complete list of authors.
+
+ Licensed under the GNU GENERAL PUBLIC LICENSE. See COPYING for details.
+*/
+
+#include <QDebug>
+
+#include "mainwin.h"
+#include "widgets/undotoolbutton.h"
+#include "actionstorage.h"
+#include "singleaction.h"
+#include "core/actiondelegate.h"
+
+CAActionStorage::CAActionStorage() :
+ _actionDelegate(0)
+{
+ _actionWidget.actions().clear();
+}
+
+CAActionStorage::~CAActionStorage()
+{
+ _actionWidget.actions().clear();
+ if( 0 != _actionDelegate )
+ delete _actionDelegate;
+ _actionDelegate = 0;
+}
+
+void CAActionStorage::storeActionsFromMainWindow(CAMainWin &mainWin)
+{
+ storeAction(mainWin.uiQuit);
+ storeAction(mainWin.uiNewDocument);
+ storeAction(mainWin.uiOpenDocument);
+ storeAction(mainWin.uiSaveDocument);
+ storeAction(mainWin.uiSaveDocumentAs);
+ storeAction(mainWin.uiCloseDocument);
+ storeAction(mainWin.uiImportDocument);
+ storeAction(mainWin.uiExportDocument);
+ storeAction(mainWin.uiPrintPreview);
+ storeAction(mainWin.uiPrint);
+ storeAction(mainWin.uiCopy);
+ storeAction(mainWin.uiCut);
+ storeAction(mainWin.uiPaste);
+ storeAction(mainWin.uiSelectAll);
+ storeAction(mainWin.uiInvertSelection);
+ storeAction(mainWin.uiZoomToWidth);
+ storeAction(mainWin.uiGotoBar);
+ storeAction(mainWin.uiShowStatusBar);
+ storeAction(mainWin.uiFullscreen);
+ storeAction(mainWin.uiInsertTimeSig);
+ storeAction(mainWin.uiInsertKeySig);
+ storeAction(mainWin.uiInsertBarline);
+ storeAction(mainWin.uiNoteCount);
+ storeAction(mainWin.uiSettings);
+ storeAction(mainWin.uiUsersGuide);
+ storeAction(mainWin.uiWhatsThis);
+ storeAction(mainWin.uiTipOfTheDay);
+ storeAction(mainWin.uiAboutCanorus);
+ storeAction(mainWin.uiAboutQt);
+ storeAction(mainWin.uiSplitHorizontally);
+ storeAction(mainWin.uiSplitVertically);
+ storeAction(mainWin.uiCloseCurrentView);
+ storeAction(mainWin.uiUnsplitAll);
+ storeAction(mainWin.uiNewView);
+ storeAction(mainWin.uiNewSheet);
+ storeAction(mainWin.uiNewContext);
+ storeAction(mainWin.uiPlayFromSelection);
+ storeAction(mainWin.uiAnimatedScroll);
+ storeAction(mainWin.uiLockScrollPlayback);
+ storeAction(mainWin.uiZoomToHeight);
+ storeAction(mainWin.uiZoomToFit);
+ storeAction(mainWin.uiZoomToSelection);
+ storeAction(mainWin.uiNewWindow);
+ storeAction(mainWin.uiCustomZoom);
+ storeAction(mainWin.uiScoreView);
+ storeAction(mainWin.uiLilyPondSource);
+ storeAction(mainWin.uiCanorusMLSource);
+ storeAction(mainWin.uiNewVoice);
+ storeAction(mainWin.uiDocumentProperties);
+ storeAction(mainWin.uiPrintDirectly);
+ storeAction(mainWin.uiExportToPdf);
+ storeAction(mainWin.uiNewDocumentWizard);
+ storeAction(mainWin.uiInsertPlayable);
+ storeAction(mainWin.uiInsertFM);
+ storeAction(mainWin.uiInsertClef);
+ storeAction(mainWin.uiSelectMode);
+ storeAction(mainWin.uiRemoveVoice);
+ storeAction(mainWin.uiVoiceProperties);
+ storeAction(mainWin.uiAccsVisible);
+ storeAction(mainWin.uiHiddenRest);
+ storeAction(mainWin.uiRemoveContext);
+ storeAction(mainWin.uiContextProperties);
+ storeAction(mainWin.uiRemoveSheet);
+ storeAction(mainWin.uiSheetProperties);
+ storeAction(mainWin.uiTranspose);
+ storeAction(mainWin.uiFMEllipse);
+ storeAction(mainWin.uiInsertSyllable);
+ storeAction(mainWin.uiEditMode);
+ storeAction(mainWin.uiInsertMark);
+ storeAction(mainWin.uiInsertArticulation);
+ storeAction(mainWin.actionRecent_documents);
+ storeAction(mainWin.uiMidiRecorder);
+ storeAction(mainWin.uiResourceView);
+ storeAction(mainWin.uiInsertFBM);
+ storeAction(mainWin.uiShowRuler);
+ storeAction(mainWin.uiUndo->defaultAction());
+ storeAction(mainWin.uiRedo->defaultAction());
+ _actionDelegate = new CAActionDelegate(&mainWin);
+}
+
+void CAActionStorage::storeAction(QAction *action)
+{
+ _actionWidget.addAction(action);
+ qWarning() << "Storage: Added new action, stored " << _actionWidget.actions().size();
+}
+
+void CAActionStorage::addWinActions()
+{
+ _actionDelegate->addWinActions(_actionWidget);
+ _actionDelegate->updateMainWinActions();
+}
Added: trunk/src/ui/actionstorage.h
===================================================================
--- trunk/src/ui/actionstorage.h (rev 0)
+++ trunk/src/ui/actionstorage.h 2016-04-08 21:10:42 UTC (rev 1439)
@@ -0,0 +1,37 @@
+/*!
+ Copyright (c) 2015, Reinhard Katzmann, Matevž Jekovec, Canorus development team
+ All Rights Reserved. See AUTHORS for a complete list of authors.
+
+ Licensed under the GNU GENERAL PUBLIC LICENSE. See COPYING for details.
+*/
+
+#ifndef ACTIONSTORAGE_H_
+#define ACTIONSTORAGE_H_
+
+#include <QString>
+#include <QAction>
+
+// Helper class to reduce code ballast in mainwin class
+// Action instances from childs in CAMainWin are stored here for access
+// their default keyboard information (like shortcut)
+
+class CAMainWin;
+class CAActionDelegate;
+class CASingleAction;
+
+class CAActionStorage
+{
+public:
+ CAActionStorage();
+ ~CAActionStorage();
+
+ void storeActionsFromMainWindow(CAMainWin &mainWin);
+ void storeAction(QAction *action);
+ void addWinActions();
+
+protected:
+ QWidget _actionWidget;
+ CAActionDelegate *_actionDelegate; // Requires parts of main win, so needs to be a member
+};
+
+#endif // ACTIONSTORAGE_H_
Modified: trunk/src/ui/mainwin.cpp
===================================================================
--- trunk/src/ui/mainwin.cpp 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/ui/mainwin.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -32,6 +32,7 @@
#include "ui/settingsdialog.h"
#include "ui/propertiesdialog.h"
#include "ui/transposeview.h"
+#include "ui/actionstorage.h"
#include "scoreui/keysignatureui.h"
@@ -158,6 +159,7 @@
// Create the GUI (actions, toolbars, menus etc.)
createCustomActions();
setupUi( this ); // initialize elements created by Qt Designer
+ actionStorage = new CAActionStorage(); // Shortcut System
setupCustomUi();
// Explicitly initialize this so it isn't true sometimes
@@ -849,6 +851,9 @@
uiFermataToolBar->hide();
uiRepeatMarkToolBar->hide();
uiFingeringToolBar->hide();
+
+ actionStorage->storeActionsFromMainWindow(*this);
+ actionStorage->addWinActions();
}
void CAMainWin::newDocument() {
Modified: trunk/src/ui/mainwin.h
===================================================================
--- trunk/src/ui/mainwin.h 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/ui/mainwin.h 2016-04-08 21:10:42 UTC (rev 1439)
@@ -61,12 +61,15 @@
class CAMidiRecorderView;
class CAKeybdInput;
class CAExport;
+class CAActionStorage;
class CAMainWin : public QMainWindow, private Ui::uiMainWindow
{
Q_OBJECT
friend class CAMainWinProgressCtl;
+ friend class CAActionDelegate;
+ friend class CAActionStorage;
public:
enum CAMode {
@@ -440,51 +443,52 @@
// QAction *uiNewSheet; // made by Qt Designer
QLineEdit *uiSheetName;
// QAction *uiRemoveSheet; // made by Qt Designer
- // QAction *uiSheetProperties; // made by Qt Designer
+ // QAction *uiSheetProperties; // made by Qt Designer
QToolBar *uiContextToolBar;
// CAContext
- QLineEdit *uiContextName;
- //QAction *uiRemoveContext; // made by Qt Designer
- //QAction *uiContextProperties; // made by Qt Designer
+ QLineEdit *uiContextName;
+ //QAction *uiRemoveContext; // made by Qt Designer
+ //QAction *uiContextProperties; // made by Qt Designer
// CAStaff
// CALyricsContext
- QSpinBox *uiStanzaNumber;
- QAction *uiStanzaNumberAction;
- QComboBox *uiAssociatedVoice;
- QAction *uiAssociatedVoiceAction;
+ QSpinBox *uiStanzaNumber;
+ QAction *uiStanzaNumberAction;
+ QComboBox *uiAssociatedVoice;
+ QAction *uiAssociatedVoiceAction;
// CAFunctionMarkContext
QToolBar *uiVoiceToolBar;
- // QAction *uiNewVoice; // made by Qt Designer
- CALCDNumber *uiVoiceNum;
- QLineEdit *uiVoiceName;
- QComboBox *uiVoiceInstrument;
- // QAction *uiRemoveVoice; // made by Qt Designer
- CAMenuToolButton *uiVoiceStemDirection;
- // QAction *uiVoiceProperties; // made by Qt Designer
+ // QAction *uiNewVoice; // made by Qt Designer
+ CALCDNumber *uiVoiceNum;
+ QLineEdit *uiVoiceName;
+ QComboBox *uiVoiceInstrument;
+ // QAction *uiRemoveVoice; // made by Qt Designer
+ CAMenuToolButton *uiVoiceStemDirection;
+ // QAction *uiVoiceProperties; // made by Qt Designer
QToolBar *uiPlayableToolBar; // note and rest properties are merged for the time being
// Note properties
- CAMenuToolButton *uiPlayableLength;
- CAMenuToolButton *uiNoteAccs;
- CAMenuToolButton *uiSlurType;
+ CAMenuToolButton *uiPlayableLength;
+ CAMenuToolButton *uiNoteAccs;
+ CAMenuToolButton *uiSlurType;
public: // Because CAKeyboardInput (input with midi keyboard) needs to operate these widgets to
// provide gui feedback, these, probably even more, should become public.
// Some clean interface would be appropriate.
- CAMenuToolButton *uiTupletType;
- QSpinBox *uiTupletNumber;
- QSpinBox *uiTupletActualNumber;
+ CAMenuToolButton *uiTupletType;
+ QSpinBox *uiTupletNumber;
+ QSpinBox *uiTupletActualNumber;
private:
- QAction *uiTupletNumberAction;
- QLabel *uiTupletInsteadOf;
- QAction *uiTupletInsteadOfAction;
- QAction *uiTupletActualNumberAction;
- // QAction *uiNoteAccsVisible; // made by Qt Designer
- CAMenuToolButton *uiNoteStemDirection;
+ QAction *uiTupletNumberAction;
+ QLabel *uiTupletInsteadOf;
+ QAction *uiTupletInsteadOfAction;
+ QAction *uiTupletActualNumberAction;
+ // QAction *uiNoteAccsVisible; // made by Qt Designer
+ CAMenuToolButton *uiNoteStemDirection;
+ CAActionStorage *actionStorage;
// Rest properties
// CAMenuToolButton *uiPlayableLength; // same as note properties
- // QLabel *uiPlayableDotted; // same as note properties
+ // QLabel *uiPlayableDotted; // same as note properties
// QAction *uiHiddenRest; // made by Qt Designer
CAKeySignatureUI *_poKeySignatureUI; // Key signature UI parts
Modified: trunk/src/ui/settingsdialog.cpp
===================================================================
--- trunk/src/ui/settingsdialog.cpp 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/ui/settingsdialog.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -191,18 +191,23 @@
void CASettingsDialog::buildActionsEditorPage()
{
- int i;
- QWidget oSingleActions; // all actions added here
+ //int i;
+ //QWidget oSingleActions; // all actions added here
const QList<CASingleAction *> &roSAList = CACanorus::settings()->getActionList();
+ if(roSAList.size() <= 0)
+ {
+ qWarning("List of Actions is empty!");
+ return;
+ }
_commandsEditor = new CAActionsEditor( 0 );
_commandsEditor->setObjectName(QString::fromUtf8("commandsEditor"));
commandsSettingsVBoxLayout->addWidget(_commandsEditor);
- // Read all elements from single action list (API requirement)
- for(i=0; i< roSAList.size(); ++i)
- oSingleActions.addAction( roSAList[i] );
- // Add all command actions (loading happens earlier in Canorus)
- _commandsEditor->addActions( &oSingleActions );
+ // Read all elements from single action list (API requirement)
+ //for(i=0; i< roSAList.size(); ++i)
+ // oSingleActions.addAction( roSAList[i]->getAction() );
+ // Add all command actions (loading happens earlier in Canorus)
+ _commandsEditor->addActions( roSAList );
}
void CASettingsDialog::buildPreviewSheet() {
Modified: trunk/src/ui/singleaction.cpp
===================================================================
--- trunk/src/ui/singleaction.cpp 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/ui/singleaction.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -9,15 +9,18 @@
#include "singleaction.h"
-
CASingleAction::CASingleAction( QObject *parent )
- : QAction( parent )
+ : _pAction(0)
{
_bMidiShortCutCombined = false;
}
CASingleAction::~CASingleAction()
{
+ if(m_localCreated) {
+ delete _pAction;
+ }
+ _pAction = 0;
}
void CASingleAction::setCommandName( QString oCommandName )
@@ -25,7 +28,9 @@
if( !oCommandName.isEmpty() )
{
_oCommandName = oCommandName;
- setText( oCommandName );
+ if(_pAction) {
+ _pAction->setText( oCommandName );
+ }
}
}
@@ -34,7 +39,9 @@
if( !oDescription.isEmpty() )
{
_oDescription = oDescription;
- setToolTip( oDescription );
+ if(_pAction) {
+ _pAction->setToolTip( oDescription );
+ }
}
}
@@ -43,8 +50,10 @@
if( !oShortCut.isEmpty() )
{
_oShortCut = oShortCut;
- QAction::setShortcut( oShortCut );
- _oSysShortCut = shortcut();
+ if(_pAction) {
+ _pAction->setShortcut( oShortCut );
+ }
+ //_oSysShortCut = shortcut();
}
}
@@ -63,3 +72,55 @@
}
}
}
+
+//void CASingleAction::setAction(QAction *pAction)
+//{
+// if(pAction == 0)
+// {
+// qWarning("Not overwriting action with Null-Pointer");
+// return;
+// }
+// _pAction = pAction;
+//}
+
+QAction *CASingleAction::newAction(QObject *parent)
+{
+ if(_pAction && m_localCreated) {
+ delete _pAction;
+ }
+ m_localCreated = true;
+ _pAction = new QAction(getCommandName(),parent);
+ _pAction->setText( getCommandName() );
+ _pAction->setShortcut( getShortCutAsString() );
+ _pAction->setToolTip( getDescription() );
+ return _pAction;
+}
+
+void CASingleAction::fromQAction(const QAction &action, CASingleAction &sAction)
+{
+ sAction.getAction()->setActionGroup(action.actionGroup());
+ sAction.getAction()->setAutoRepeat(action.autoRepeat());
+ sAction.getAction()->setCheckable(action.isCheckable());
+ sAction.getAction()->setChecked(action.isChecked());
+ sAction.getAction()->setData(action.data());
+ sAction.getAction()->setEnabled(action.isEnabled());
+ sAction.getAction()->setFont(action.font());
+ sAction.getAction()->setIcon(action.icon());
+ sAction.getAction()->setIconText(action.iconText());
+ sAction.getAction()->setIconVisibleInMenu(action.isIconVisibleInMenu());
+ sAction.getAction()->setMenu(action.menu());
+ sAction.getAction()->setMenuRole(action.menuRole());
+ sAction.getAction()->setObjectName(action.objectName());
+ sAction.getAction()->setParent(action.parent());
+ sAction.getAction()->setPriority(action.priority());
+ sAction.getAction()->setSeparator(action.isSeparator());
+ sAction.getAction()->setStatusTip(action.statusTip());
+ sAction.getAction()->setShortcut(action.shortcut());
+ sAction.getAction()->setShortcutContext(action.shortcutContext());
+ sAction.getAction()->setShortcuts(action.shortcuts());
+ sAction.getAction()->setStatusTip(action.statusTip());
+ sAction.getAction()->setText(action.text());
+ sAction.getAction()->setToolTip(action.toolTip());
+ sAction.getAction()->setVisible(action.isVisible());
+ sAction.getAction()->setWhatsThis(action.whatsThis());
+}
Modified: trunk/src/ui/singleaction.h
===================================================================
--- trunk/src/ui/singleaction.h 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/ui/singleaction.h 2016-04-08 21:10:42 UTC (rev 1439)
@@ -15,14 +15,12 @@
// One action based on QAction, Midi and QString. Contains all
// information (including description) for one control command
-class CASingleAction : public QAction
+class CASingleAction
{
- Q_OBJECT
-
public:
// Constructor / Desctructor
CASingleAction( QObject * );
- ~CASingleAction();
+ virtual ~CASingleAction();
// Getter methods for all single action parameters
inline QString getCommandName() { return _oCommandName; }
@@ -31,7 +29,7 @@
inline QString getMidiKeySequence() { return _oMidiKeySequence; }
inline bool getMidiShortCutCombined() { return _bMidiShortCutCombined; }
// Application-specific Getter (Refs, so no Setter required)
- inline QAction &getAction() { return (QAction &)*this; }
+ inline QAction *getAction() { return _pAction; }
inline QKeySequence &getSysShortCut() { return _oSysShortCut; }
inline QList<int> &getMidiKeyParameters() { return _oMidiKeyParameters; }
@@ -40,17 +38,23 @@
void setDescription( QString oDescription );
void setShortCutAsString( QString oShortCut );
void setMidiKeySequence( QString oMidiKeySequence, bool combined = false );
+ //void setAction(QAction *pAction);
+ QAction *newAction(QObject *parent = 0);
+ static void fromQAction(const QAction &action, CASingleAction &sAction);
+
protected:
// Action parameters to be stored / loaded via Settings Dialog
- QString _oCommandName;
- QString _oDescription;
- QString _oShortCut;
- QString _oMidiKeySequence;
- bool _bMidiShortCutCombined;
+ QString _oCommandName;
+ QString _oDescription;
+ QString _oShortCut;
+ QString _oMidiKeySequence;
+ bool _bMidiShortCutCombined;
+ QAction *_pAction;
// ShortCut, Midi Key Sequence for the application
QKeySequence _oSysShortCut;
QList<int> _oMidiKeyParameters;
+ bool m_localCreated = false;
};
#endif // _CASINGLEACTION_H_
Modified: trunk/src/widgets/actionseditor.cpp
===================================================================
--- trunk/src/widgets/actionseditor.cpp 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/widgets/actionseditor.cpp 2016-04-08 21:10:42 UTC (rev 1439)
@@ -30,6 +30,7 @@
#include <QRegExp>
#include <QApplication>
#include <QAction>
+#include <QDebug>
//#include "images.h"
#include "canorus.h"
@@ -177,31 +178,37 @@
}
bool CAActionsEditor::isEmpty() {
- return actionsList.isEmpty();
+ return m_actionsList.isEmpty();
}
void CAActionsEditor::clear() {
- actionsList.clear();
+ m_actionsList.clear();
}
-void CAActionsEditor::addActions(QWidget *widget) {
+void CAActionsEditor::addActions(const QList<CASingleAction *> &actionList) {
CASingleAction *action;
- QList<CASingleAction *> actions = widget->findChildren<CASingleAction *>();
- for (int n=0; n < actions.count(); n++) {
- action = static_cast<CASingleAction*> (actions[n]);
- if (!action->objectName().isEmpty() && !action->inherits("QWidgetAction"))
- actionsList.append(action);
+ // Issue: Actions not associated to objects anymore due to
+ // Step that converts QAction -> CASingleAction
+ //QList<CASingleAction *> actions = widget->findChildren<CASingleAction *>();
+ //qWarning() << "CAActionsEditor::addActions - size " << actions.size() << " orig size " << widget->actions().size() << endl;
+ //QList<QAction *> actions = widget->actions();
+ for (int n=0; n < actionList.size(); n++) {
+ action = actionList[n];
+ //action->getAction()->setParent(this);
+ qWarning() << "CAActionsEditor::addActions - objectName " << action->getAction()->objectName() << " inherits " << action->getAction()->inherits("QWidgetAction") << endl;
+ if (!action->getAction()->objectName().isEmpty() && !action->getAction()->inherits("QWidgetAction"))
+ m_actionsList.append(action);
}
updateView();
}
void CAActionsEditor::updateView() {
- actionsTable->setRowCount( actionsList.count() );
+ actionsTable->setRowCount( m_actionsList.count() );
CASingleAction *action;
- QString accelText, midi_com, description;
+ QString accelText, midi_com, midi_scut, description;
//#if !USE_SHORTCUTGETTER
dont_validate = true;
@@ -209,8 +216,8 @@
//actionsTable->setSortingEnabled(false);
// @ToDo: Replace with our own list of Canorus actions
- for (int n=0; n < actionsList.count(); n++) {
- action = static_cast<CASingleAction*> (actionsList[n]);
+ for (int n=0; n < m_actionsList.count(); n++) {
+ action = m_actionsList[n];
//#if USE_MULTIPLE_SHORTCUTS
// accelText = shortcutsToString( action->shortcuts() );
@@ -219,11 +226,12 @@
//#endif
description = action->getDescription();
midi_com = action->getMidiKeySequence();
+ midi_scut = action->getMidiShortCutCombined();
QTableWidgetItem * i_conf = new QTableWidgetItem();
// Command column
- QTableWidgetItem * i_command = new QTableWidgetItem(action->text());
+ QTableWidgetItem * i_command = new QTableWidgetItem(action->getAction()->text());
// Context column
QTableWidgetItem * i_context = new QTableWidgetItem( description );
@@ -233,7 +241,10 @@
// Midi command
QTableWidgetItem * i_midi = new QTableWidgetItem(midi_com);
-
+
+ // Midi command
+ QTableWidgetItem * i_midiscut = new QTableWidgetItem(midi_com);
+
// Set flags
//#if !USE_SHORTCUTGETTER
// i_conf->setFlags(Qt::ItemIsEnabled);
@@ -253,7 +264,7 @@
actionsTable->setItem(n, COL_DESCRIPTION, i_context );
actionsTable->setItem(n, COL_SHORTCUT, i_shortcut );
actionsTable->setItem(n, COL_MIDI, i_midi );
- actionsTable->setItem(n, COL_MIDISCUT, i_midi );
+ actionsTable->setItem(n, COL_MIDISCUT, i_midiscut );
}
hasConflicts(); // Check for conflicts
@@ -272,8 +283,8 @@
void CAActionsEditor::applyChanges() {
qDebug("CAActionsEditor::applyChanges");
- for (int row = 0; row < (int)actionsList.size(); ++row) {
- CASingleAction *action = actionsList[row];
+ for (int row = 0; row < (int)m_actionsList.size(); ++row) {
+ CASingleAction *action = m_actionsList[row];
QTableWidgetItem *i = actionsTable->item(row, COL_SHORTCUT);
//#if USE_MULTIPLE_SHORTCUTS
@@ -406,13 +417,13 @@
bool conflict = false;
QString accelText;
- QTableWidgetItem *i;
+ QTableWidgetItem *i;
for (int n=0; n < actionsTable->rowCount(); n++) {
//i = actionsTable->item( n, COL_CONFLICTS );
- if (i) i->setIcon( QPixmap() );
+ i = actionsTable->item(n, iType );
+ if (i) i->setIcon( QPixmap() );
- i = actionsTable->item(n, iType );
if (i) {
accelText = i->text();
if (!accelText.isEmpty()) {
@@ -587,26 +598,29 @@
// Static functions
-void CAActionsEditor::saveToConfig(QObject *o, QSettings *set) {
+void CAActionsEditor::saveToConfig(QWidget *widget, QSettings *set) {
qDebug("ActionsEditor::saveToConfig");
set->beginGroup("actions");
CASingleAction *action;
- QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
+ // Issue: Actions not associated to objects anymore due to
+ // Step that converts QAction -> CASingleAction
+ //QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
QString accelText;
+ QList<QAction *> actions = widget->actions();
for (int n=0; n < actions.count(); n++) {
- action = static_cast<CASingleAction*> (actions[n]);
- if (!action->text().isEmpty() && !action->inherits("QWidgetAction")) {
+ action = reinterpret_cast<CASingleAction*> (actions[n]);
+ if (!action->getAction()->text().isEmpty() && !action->getAction()->inherits("QWidgetAction")) {
//#if USE_MULTIPLE_SHORTCUTS
// accelText = shortcutsToString(action->shortcuts());
//#else
accelText = action->getShortCutAsString();
//#endif
if( accelText.isEmpty() )
- set->setValue(action->text(), "none");
+ set->setValue(action->getAction()->text(), "none");
else
- set->setValue(action->text(), accelText);
+ set->setValue(action->getAction()->text(), accelText);
}
}
@@ -614,7 +628,7 @@
}
-void CAActionsEditor::loadFromConfig(QObject *o, QSettings *set) {
+void CAActionsEditor::loadFromConfig(QWidget *widget, QSettings *set) {
qDebug("ActionsEditor::loadFromConfig");
set->beginGroup("actions");
@@ -622,19 +636,22 @@
CASingleAction *action;
QString accelText;
- QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
+ // Issue: Actions not associated to objects anymore due to
+ // Step that converts QAction -> CASingleAction
+ //QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
//#if USE_MULTIPLE_SHORTCUTS
// QString current;
//#endif
- for (int n=0; n < actions.count(); n++) {
- action = static_cast<CASingleAction*> (actions[n]);
- if (!action->objectName().isEmpty() && !action->inherits("QWidgetAction")) {
+ QList<QAction *> actions = widget->actions();
+ for (int n=0; n < actions.count(); n++) {
+ action = reinterpret_cast<CASingleAction*> (actions[n]);
+ if (!action->getAction()->objectName().isEmpty() && !action->getAction()->inherits("QWidgetAction")) {
//#if USE_MULTIPLE_SHORTCUTS
// current = shortcutsToString(action->shortcuts());
// accelText = set->value(action->objectName(), current).toString();
// action->setShortcuts( stringToShortcuts( accelText ) );
//#else
- accelText = set->value(action->text(), action->getShortCutAsString()).toString();
+ accelText = set->value(action->getAction()->text(), action->getShortCutAsString()).toString();
if( accelText != "none" )
action->setShortCutAsString( QKeySequence(accelText).toString() );
//#endif
@@ -644,30 +661,36 @@
set->endGroup();
}
-CASingleAction * CAActionsEditor::findAction(QObject *o, const QString & name) {
+CASingleAction * CAActionsEditor::findAction(QWidget *widget, const QString & name) {
CASingleAction *action;
- QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
- for (int n=0; n < actions.count(); n++) {
- action = static_cast<CASingleAction*> (actions[n]);
- if (name == action->objectName()) return action;
+ // Issue: Actions not associated to objects anymore due to
+ // Step that converts QAction -> CASingleAction
+ //QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
+ QList<QAction *> actions = widget->actions();
+ for (int n=0; n < actions.count(); n++) {
+ action = reinterpret_cast<CASingleAction*> (actions[n]);
+ if (name == action->getAction()->objectName()) return action;
}
return 0;
}
-QStringList CAActionsEditor::actionsNames(QObject *o) {
+QStringList CAActionsEditor::actionsNames(QWidget *widget) {
QStringList l;
CASingleAction *action;
- QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
- for (int n=0; n < actions.count(); n++) {
- action = static_cast<CASingleAction*> (actions[n]);
+ // Issue: Actions not associated to objects anymore due to
+ // Step that converts QAction -> CASingleAction
+ //QList<CASingleAction *> actions = o->findChildren<CASingleAction *>();
+ QList<QAction *> actions = widget->actions();
+ for (int n=0; n < actions.count(); n++) {
+ action = reinterpret_cast<CASingleAction*> (actions[n]);
//qDebug("action name: '%s'", action->objectName().toUtf8().data());
//qDebug("action name: '%s'", action->text().toUtf8().data());
- if (!action->text().isEmpty())
- l.append( action->text() );
+ if (!action->getAction()->text().isEmpty())
+ l.append( action->getAction()->text() );
}
return l;
Modified: trunk/src/widgets/actionseditor.h
===================================================================
--- trunk/src/widgets/actionseditor.h 2016-04-08 15:45:41 UTC (rev 1438)
+++ trunk/src/widgets/actionseditor.h 2016-04-08 21:10:42 UTC (rev 1439)
@@ -53,14 +53,14 @@
bool isEmpty();
// See QWidget documentation
- void addActions(QWidget * widget);
+ void addActions(const QList<CASingleAction *> &actionList);
// Static functions
- static CASingleAction * findAction(QObject *o, const QString & name);
- static QStringList actionsNames(QObject *o);
+ static CASingleAction * findAction(QWidget *widget, const QString & name);
+ static QStringList actionsNames(QWidget *widget);
- static void saveToConfig(QObject *o, QSettings *set);
- static void loadFromConfig(QObject *o, QSettings *set);
+ static void saveToConfig(QWidget *widget, QSettings *set);
+ static void loadFromConfig(QWidget *widget, QSettings *set);
//#if USE_MULTIPLE_SHORTCUTS
// static QString shortcutsToString(QList <QKeySequence> shortcuts_list);
@@ -107,7 +107,7 @@
private:
QTableWidget *actionsTable;
- QList<CASingleAction *> actionsList;
+ QList<CASingleAction *> m_actionsList;
QPushButton *saveButton;
QPushButton *loadButton;
QString latest_dir;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-08 15:45:44
|
Revision: 1438
http://sourceforge.net/p/canorus/code/1438
Author: matevz
Date: 2016-04-08 15:45:41 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Fixed CanorusPython module linking with Qt5.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
trunk/src/core/settings.cpp
trunk/src/core/settings.h
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2016-04-08 12:17:16 UTC (rev 1437)
+++ trunk/src/CMakeLists.txt 2016-04-08 15:45:41 UTC (rev 1438)
@@ -172,6 +172,7 @@
interface/mididevice.h
interface/playback.h
core/midirecorder.h
+ core/settings.h
interface/pluginaction.h
)
@@ -571,14 +572,14 @@
INCLUDE_DIRECTORIES(${RUBY_INCLUDE_PATH})
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/scripting/canorusruby.i PROPERTIES CPLUSPLUS ON)
- SET(CANORUS_RUBY_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/scripting/canorusrubyRUBY_wrap.cxx)
+ SET(CANORUS_RUBY_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/canorusrubyRUBY_wrap.cxx)
SET_SOURCE_FILES_PROPERTIES(${CANORUS_RUBY_WRAP_CXX} PROPERTIES GENERATED TRUE)
SWIG_ADD_MODULE(CanorusRuby ruby
${Canorus_Swig_Srcs}
${CMAKE_CURRENT_SOURCE_DIR}/scripting/canorusruby.i
)
- SWIG_LINK_LIBRARIES(CanorusRuby ${RUBY_LIBRARY} ${QT_LIBRARIES})
+ SWIG_LINK_LIBRARIES(CanorusRuby ${RUBY_LIBRARY} Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Svg Qt5::Xml Qt5::Help Qt5::PrintSupport)
SET_TARGET_PROPERTIES( ${SWIG_MODULE_CanorusRuby_REAL_NAME} PROPERTIES COMPILE_FLAGS "-DSWIGCPP" )
ENDIF(USE_RUBY)
@@ -586,14 +587,14 @@
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/scripting/canoruspython.i PROPERTIES CPLUSPLUS ON)
- SET(CANORUS_PYTHON_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/scripting/canoruspythonPYTHON_wrap.cxx)
+ SET(CANORUS_PYTHON_WRAP_CXX ${CMAKE_CURRENT_SOURCE_DIR}/canoruspythonPYTHON_wrap.cxx)
SET_SOURCE_FILES_PROPERTIES(${CANORUS_PYTHON_WRAP_CXX} PROPERTIES GENERATED TRUE)
SWIG_ADD_MODULE(CanorusPython python # Warning! CMake renames CanorusPython automatically to _CanorusPython
${Canorus_Swig_Srcs}
${CMAKE_CURRENT_SOURCE_DIR}/scripting/canoruspython.i
)
- SWIG_LINK_LIBRARIES(CanorusPython ${PYTHON_LIBRARY} ${QT_LIBRARIES})
+ SWIG_LINK_LIBRARIES(CanorusPython ${PYTHON_LIBRARY} Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Svg Qt5::Xml Qt5::Help Qt5::PrintSupport)
SET_TARGET_PROPERTIES( ${SWIG_MODULE_CanorusPython_REAL_NAME} PROPERTIES COMPILE_FLAGS "-DSWIGCPP" )
ENDIF(USE_PYTHON)
@@ -638,7 +639,7 @@
# command. Never remove that line :-)
# Add ${QT_QTTEST_LIBRARY} below to add the Qt Test library as well
# Add ${POPPLERQT4_LIBRARY} ${POPPLER_LIBRARY} to reactivate poppler libraries
-TARGET_LINK_LIBRARIES(canorus Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Svg Qt5::Xml Qt5::Svg Qt5::Help Qt5::PrintSupport ${RUBY_LIBRARY} ${PYTHON_LIBRARY} z pthread )
+TARGET_LINK_LIBRARIES(canorus Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Svg Qt5::Xml Qt5::Help Qt5::PrintSupport ${RUBY_LIBRARY} ${PYTHON_LIBRARY} z pthread )
# Duma leads to a crash on libfontconfig with Ubuntu (10.04/12.04)
# duma )
Modified: trunk/src/core/settings.cpp
===================================================================
--- trunk/src/core/settings.cpp 2016-04-08 12:17:16 UTC (rev 1437)
+++ trunk/src/core/settings.cpp 2016-04-08 15:45:41 UTC (rev 1438)
@@ -96,7 +96,9 @@
void CASettings::initSettings()
{
+#ifndef SWIGCPP
_poEmptyEntry = new CASingleAction( this );
+#endif
}
CASettings::~CASettings() {
@@ -104,6 +106,8 @@
if( _poEmptyEntry )
delete _poEmptyEntry;
_poEmptyEntry = 0;
+
+#ifndef SWIGCPP
if( false == _oActionList.isEmpty() )
{
CASingleAction *poActionEntry;
@@ -114,6 +118,7 @@
}
_oActionList.clear();
}
+#endif
}
/*!
@@ -466,9 +471,7 @@
for ( int i=0; contains( QString("files/recentdocument") + QString::number(i) ); i++ )
CACanorus::addRecentDocument( value(QString("files/recentdocument") + QString::number(i)).toString() );
}
-#endif
-#ifndef SWIGCPP
void CASettings::writeRecentDocuments() {
for ( int i=0; contains( QString("files/recentdocument") + QString::number(i) ); i++ )
remove( QString("files/recentdocument") + QString::number(i) );
@@ -476,7 +479,7 @@
for ( int i=0; i<CACanorus::recentDocumentList().size(); i++ )
setValue( QString("files/recentdocument") + QString::number(i), CACanorus::recentDocumentList()[i] );
}
-#endif
+#endif // SWIGCPP
/*!
Returns the default settings path. This function is static and is used when no config
Modified: trunk/src/core/settings.h
===================================================================
--- trunk/src/core/settings.h 2016-04-08 12:17:16 UTC (rev 1437)
+++ trunk/src/core/settings.h 2016-04-08 15:45:41 UTC (rev 1438)
@@ -19,6 +19,9 @@
#include "core/typesetter.h"
class CASettings : public QSettings {
+#ifndef SWIG
+ Q_OBJECT
+#endif
public:
CASettings( QObject * parent = 0 );
CASettings( const QString & fileName, QObject * parent = 0 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <its...@us...> - 2016-04-08 12:17:19
|
Revision: 1437
http://sourceforge.net/p/canorus/code/1437
Author: itsgeorg
Date: 2016-04-08 12:17:16 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
About swig3 update, and typo fix.
Modified Paths:
--------------
trunk/README
Modified: trunk/README
===================================================================
--- trunk/README 2016-04-08 12:00:08 UTC (rev 1436)
+++ trunk/README 2016-04-08 12:17:16 UTC (rev 1437)
@@ -88,19 +88,19 @@
If you get the error "swig not found" then you have the problem
that FindSWIG.cmake does not match your system configuration. On
-my system swig files are in /usr/share/swig2.x.y, so I needed to
-create a link to it from swig2.x:
+my system swig files are in /usr/share/swig3.x.y, so I needed to
+create a link to it from swig3.x:
- $ ln -s /usr/share/swig2.x.y /usr/share/swig2.x
+ $ ln -s /usr/share/swig3.x.y /usr/share/swig3.x
-Replace 2.x.y with the real version f.e. 2.0.4.
+Replace 3.x.y with the real version f.e. 3.0.8.
-------------------------------------------------------------------------------
If you get the following error:
"libpython.a: undefined reference to openpty"
your system requires the util library to be included to the
-Canorus link libaries. To do this edit src/CMakeFile.txt file
+Canorus link libaries. To do this edit src/CMakeLists.txt file
and search for the line containing TARGET_LINK_LIBRARIES.
Add " util" as last library to the line f.e. like this:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2016-04-08 12:00:11
|
Revision: 1436
http://sourceforge.net/p/canorus/code/1436
Author: suamor
Date: 2016-04-08 12:00:08 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Fix gcc 5.3 error
Modified Paths:
--------------
trunk/src/core/tar.h
Modified: trunk/src/core/tar.h
===================================================================
--- trunk/src/core/tar.h 2016-04-08 12:00:08 UTC (rev 1435)
+++ trunk/src/core/tar.h 2016-04-08 12:00:08 UTC (rev 1436)
@@ -13,11 +13,11 @@
#include <QFile>
#include <QHash>
#include <memory>
-using std::auto_ptr;
+using std::unique_ptr;
class QIODevice;
-typedef auto_ptr<QIODevice> CAIOPtr;
+typedef unique_ptr<QIODevice> CAIOPtr;
class CATar
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <its...@us...> - 2016-04-08 12:00:10
|
Revision: 1435
http://sourceforge.net/p/canorus/code/1435
Author: itsgeorg
Date: 2016-04-08 12:00:08 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Pass binary midi data directly to QTextStream, fixes midi export again.
Modified Paths:
--------------
trunk/src/export/midiexport.cpp
trunk/src/export/midiexport.h
Modified: trunk/src/export/midiexport.cpp
===================================================================
--- trunk/src/export/midiexport.cpp 2016-04-08 11:59:07 UTC (rev 1434)
+++ trunk/src/export/midiexport.cpp 2016-04-08 12:00:08 UTC (rev 1435)
@@ -316,19 +316,14 @@
}
void CAMidiExport::writeFile() {
- // Header Chunk
- // A midi file here is 8-Bit Ascii, so we need no coding translation,
- // and this seems to switch it off, but I think there should be a null codec, but obviously Qt doesn't have one.
- (*stream()).setCodec("Latin-1");
-
QByteArray headerChunk;
headerChunk.append("MThd...."); // header and space for length
headerChunk.append(word16( 1 )); // Midi-Format version
headerChunk.append(word16( 2 )); // number of tracks, a control track and a music track for a trying out ...
headerChunk.append(word16( CAPlayableLength::playableLengthToTimeLength( CAPlayableLength::Quarter ))); // time division ticks per quarter
setChunkLength( &headerChunk );
- out() << headerChunk;
+ streamQByteArray( headerChunk );
QByteArray controlTrackChunk;
@@ -337,8 +332,8 @@
controlTrackChunk.append( textEvent(0, "It's still a work in progress."));
controlTrackChunk.append( trackEnd());
setChunkLength( &controlTrackChunk );
- //printQByteArray( controlTrackChunk );
- out() << controlTrackChunk;
+ streamQByteArray( controlTrackChunk );
+ //for (int i=0;i<controlTrackChunk.length();i++) out().device()->putChar(controlTrackChunk[i]);
// trackChunk is already filled with midi data,
// let's add chunk header, in reverse, ...
@@ -346,8 +341,7 @@
// ... and add the tail:
trackChunk.append(trackEnd());
setChunkLength( &trackChunk );
- //printQByteArray( trackChunk );
- out() << trackChunk;
+ streamQByteArray( trackChunk );
}
void CAMidiExport::setChunkLength( QByteArray *x ) {
@@ -358,8 +352,12 @@
}
-void CAMidiExport::printQByteArray( QByteArray x )
+void CAMidiExport::streamQByteArray( QByteArray x )
{
+ for (int i=0;i<x.length();i++) // here we pass binary data through QTextStream
+ out().device()->putChar(x[i]);
+ return; // when no debugging
+
for (int i=0; i<x.size(); i++ ) {
printf( " %02x", 0x0ff & x.at(i));
}
Modified: trunk/src/export/midiexport.h
===================================================================
--- trunk/src/export/midiexport.h 2016-04-08 11:59:07 UTC (rev 1434)
+++ trunk/src/export/midiexport.h 2016-04-08 12:00:08 UTC (rev 1435)
@@ -66,7 +66,7 @@
int _trackTime; // which this is the time line for
QVector<QByteArray> trackChunks; // for the future
QVector<int> trackTimes;
- void printQByteArray( QByteArray x ); // for debugging only
+ void streamQByteArray( QByteArray x ); // streaming binary data to midi file, possibly with print for debugging
QByteArray variableLengthValue(int value);
QByteArray word16(int x);
QByteArray textEvent(int time, QString s);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-08 11:59:08
|
Revision: 1434
http://sourceforge.net/p/canorus/code/1434
Author: matevz
Date: 2016-04-08 11:59:07 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Fixed compilation warning.
Modified Paths:
--------------
trunk/src/ui/propertiesdialog.ui
Modified: trunk/src/ui/propertiesdialog.ui
===================================================================
--- trunk/src/ui/propertiesdialog.ui 2016-04-08 10:27:06 UTC (rev 1433)
+++ trunk/src/ui/propertiesdialog.ui 2016-04-08 11:59:07 UTC (rev 1434)
@@ -29,7 +29,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <widget class="QWidget" name="layoutWidget">
+ <widget class="QWidget" name="layoutWidget2">
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-08 10:27:08
|
Revision: 1433
http://sourceforge.net/p/canorus/code/1433
Author: matevz
Date: 2016-04-08 10:27:06 +0000 (Fri, 08 Apr 2016)
Log Message:
-----------
Quick fix for print preview since autoconnect doesn't work yet.
Modified Paths:
--------------
trunk/src/ui/mainwin.cpp
Modified: trunk/src/ui/mainwin.cpp
===================================================================
--- trunk/src/ui/mainwin.cpp 2016-04-07 18:22:09 UTC (rev 1432)
+++ trunk/src/ui/mainwin.cpp 2016-04-08 10:27:06 UTC (rev 1433)
@@ -600,6 +600,7 @@
_musElementFactory = new CAMusElementFactory();
_poPrintPreviewCtl = new CAPreviewCtl( this );
+ connect(uiPrintPreview, SIGNAL(triggered()), _poPrintPreviewCtl, SLOT(on_uiPrintPreview_triggered()));
_poPrintCtl = new CAPrintCtl( this );
//uiPrint->setEnabled( false );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2016-04-07 18:22:13
|
Revision: 1432
http://sourceforge.net/p/canorus/code/1432
Author: matevz
Date: 2016-04-07 18:22:09 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
Fixed mouse move lagging by temporarily disabling mouse tracking on mouse move events until painting is finished.
Modified Paths:
--------------
trunk/src/ui/mainwin.cpp
trunk/src/widgets/scoreview.cpp
trunk/src/widgets/scoreview.h
Modified: trunk/src/ui/mainwin.cpp
===================================================================
--- trunk/src/ui/mainwin.cpp 2015-08-22 12:38:05 UTC (rev 1431)
+++ trunk/src/ui/mainwin.cpp 2016-04-07 18:22:09 UTC (rev 1432)
@@ -1908,6 +1908,8 @@
*/
void CAMainWin::scoreViewMouseMove(QMouseEvent *e, QPoint coords) {
CAScoreView *c = static_cast<CAScoreView*>(sender());
+ c->setMouseTracking(false); // disable mouse move events until we finish with drawing
+
if ( mode() == SelectMode && c->resizeDirection()!=CADrawable::Undefined ) {
int time = c->coordsToTime(coords.x());
time -= (time % CAPlayableLength::musicLengthToTimeLength(CAPlayableLength::Sixteenth)); // round timelength to eighth notes length
@@ -1968,6 +1970,7 @@
}
c->repaint();
}
+ c->setMouseTracking(true); // re-enable mouse move events, we finished rendering
}
/*!
Modified: trunk/src/widgets/scoreview.cpp
===================================================================
--- trunk/src/widgets/scoreview.cpp 2015-08-22 12:38:05 UTC (rev 1431)
+++ trunk/src/widgets/scoreview.cpp 2016-04-07 18:22:09 UTC (rev 1432)
@@ -141,7 +141,6 @@
// init virtual canvas
_canvas = new QWidget(this);
setMouseTracking(true);
- _canvas->setMouseTracking(true);
_repaintArea = 0;
// init animation stuff
@@ -232,6 +231,15 @@
repaint();
}
+/**
+ Reimplementation of the original QWidget's setMouseTracking to set both the
+ widget and the _canvas mouse tracking property.
+ */
+void CAScoreView::setMouseTracking(bool mt) {
+ CAView::setMouseTracking(mt);
+ _canvas->setMouseTracking(mt);
+}
+
CAScoreView *CAScoreView::clone() {
CAScoreView *v = new CAScoreView(_sheet, static_cast<QWidget*>(parent()));
v->rebuild();
Modified: trunk/src/widgets/scoreview.h
===================================================================
--- trunk/src/widgets/scoreview.h 2015-08-22 12:38:05 UTC (rev 1431)
+++ trunk/src/widgets/scoreview.h 2016-04-07 18:22:09 UTC (rev 1432)
@@ -157,6 +157,7 @@
// Scene appearance, properties and actions //
//////////////////////////////////////////////
void rebuild();
+ void setMouseTracking(bool); // reimplemented!
inline const int drawableWidth() { return _canvas->width(); }
inline const int drawableHeight() { return _canvas->height(); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 12:38:07
|
Revision: 1431
http://sourceforge.net/p/canorus/code/1431
Author: matevz
Date: 2015-08-22 12:38:05 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Added transparent background to canorus icon for easier export.
Modified Paths:
--------------
artwork/icons/canoruslogo.svg
Modified: artwork/icons/canoruslogo.svg
===================================================================
--- artwork/icons/canoruslogo.svg 2015-08-22 12:34:58 UTC (rev 1430)
+++ artwork/icons/canoruslogo.svg 2015-08-22 12:38:05 UTC (rev 1431)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -13,10 +14,11 @@
height="1052.3622047"
id="svg13788"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.91 r13725"
sodipodi:modified="true"
sodipodi:docname="canoruslogo.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.1">
<defs
id="defs13790">
<filter
@@ -465,16 +467,17 @@
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="121.96792"
- inkscape:cy="971.95672"
+ inkscape:zoom="7.9195959"
+ inkscape:cx="271.60294"
+ inkscape:cy="991.60203"
inkscape:document-units="px"
inkscape:current-layer="layer1"
- inkscape:window-width="1590"
+ inkscape:window-width="1588"
inkscape:window-height="1126"
inkscape:window-x="0"
inkscape:window-y="0"
- showgrid="false" />
+ showgrid="false"
+ inkscape:window-maximized="0" />
<metadata
id="metadata13793">
<rdf:RDF>
@@ -490,6 +493,15 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.57602584;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3414"
+ width="44.515137"
+ height="44.515137"
+ x="250.24243"
+ y="34.033188"
+ inkscape:export-xdpi="517.57678"
+ inkscape:export-ydpi="517.57678" />
<g
id="g3526"
inkscape:export-filename="/home/matevz/canorus/artwork/icons/wiki_logo.png"
@@ -565,30 +577,34 @@
</g>
<g
id="g13853"
- transform="translate(23.233509,19.192898)">
+ transform="translate(51.321971,12.649057)"
+ inkscape:export-xdpi="517.57678"
+ inkscape:export-ydpi="517.57678">
<g
- transform="matrix(5.9719617e-2,0,0,-5.9719617e-2,208.67761,43.978179)"
+ transform="matrix(0.05971962,0,0,-0.05971962,208.67761,43.978179)"
id="g13756"
style="fill:#000000;fill-opacity:0.44398343;stroke:#000000;stroke-width:13.78757095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51867221"
inkscape:export-filename="/home/matevz/apps/canorus/branches/matevz/src/fonts/timesigC|.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<path
- d="M 199,348 C 202,350 204,350 215,350 C 225,350 227,350 230,348 C 236,344 236,344 236,303 L 236,265 L 253,265 C 277,264 294,260 315,252 C 366,230 406,180 419,122 C 425,97 421,76 409,58 C 392,34 364,24 336,34 C 295,48 276,87 290,129 C 299,157 322,175 352,177 L 362,177 L 360,180 C 353,190 337,205 324,213 C 301,228 275,235 248,235 L 236,235 L 236,0 L 236,-235 L 252,-235 C 270,-234 280,-232 294,-227 C 338,-211 376,-167 394,-110 C 397,-101 400,-91 401,-87 C 404,-78 406,-76 414,-75 C 420,-75 424,-77 428,-82 C 431,-86 431,-89 427,-104 C 422,-122 417,-134 408,-152 C 395,-179 382,-197 364,-215 C 330,-249 292,-265 247,-265 L 236,-265 L 236,-303 C 236,-338 236,-341 234,-344 C 231,-349 228,-350 215,-350 C 201,-350 198,-349 195,-344 C 193,-341 193,-338 193,-300 L 193,-260 L 181,-258 C 135,-247 100,-228 70,-199 C 33,-161 10,-110 2,-44 C 0,-24 0,24 2,44 C 10,110 33,161 70,199 C 102,230 137,248 191,260 L 193,260 L 193,300 C 193,344 193,344 199,348 z M 193,0 L 193,224 C 193,224 190,222 186,220 C 160,205 145,174 140,124 C 136,84 136,-84 140,-123 C 142,-139 145,-159 149,-170 C 157,-194 171,-212 188,-221 L 193,-224 L 193,0 z "
+ d="m 199,348 c 3,2 5,2 16,2 10,0 12,0 15,-2 6,-4 6,-4 6,-45 l 0,-38 17,0 c 24,-1 41,-5 62,-13 51,-22 91,-72 104,-130 6,-25 2,-46 -10,-64 -17,-24 -45,-34 -73,-24 -41,14 -60,53 -46,95 9,28 32,46 62,48 l 10,0 -2,3 c -7,10 -23,25 -36,33 -23,15 -49,22 -76,22 l -12,0 0,-235 0,-235 16,0 c 18,1 28,3 42,8 44,16 82,60 100,117 3,9 6,19 7,23 3,9 5,11 13,12 6,0 10,-2 14,-7 3,-4 3,-7 -1,-22 -5,-18 -10,-30 -19,-48 -13,-27 -26,-45 -44,-63 -34,-34 -72,-50 -117,-50 l -11,0 0,-38 c 0,-35 0,-38 -2,-41 -3,-5 -6,-6 -19,-6 -14,0 -17,1 -20,6 -2,3 -2,6 -2,44 l 0,40 -12,2 c -46,11 -81,30 -111,59 -37,38 -60,89 -68,155 -2,20 -2,68 0,88 8,66 31,117 68,155 32,31 67,49 121,61 l 2,0 0,40 c 0,44 0,44 6,48 z m -6,-348 0,224 c 0,0 -3,-2 -7,-4 -26,-15 -41,-46 -46,-96 -4,-40 -4,-208 0,-247 2,-16 5,-36 9,-47 8,-24 22,-42 39,-51 l 5,-3 0,224 z"
id="path13758"
- style="fill:#000000;fill-opacity:0.44398343;stroke:#000000;stroke-width:13.78757095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51867221" />
+ style="fill:#000000;fill-opacity:0.44398343;stroke:#000000;stroke-width:13.78757095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51867221"
+ inkscape:connector-curvature="0" />
</g>
<g
- transform="matrix(5.9719617e-2,0,0,-5.9719617e-2,207.96411,43.305309)"
+ transform="matrix(0.05971962,0,0,-0.05971962,207.96411,43.305309)"
id="g13752"
style="fill:url(#linearGradient13859);fill-opacity:1;stroke:#e95d00;stroke-width:13.78757095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:export-filename="/home/matevz/apps/canorus/branches/matevz/src/fonts/timesigC|.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<path
- d="M 199,348 C 202,350 204,350 215,350 C 225,350 227,350 230,348 C 236,344 236,344 236,303 L 236,265 L 253,265 C 277,264 294,260 315,252 C 366,230 406,180 419,122 C 425,97 421,76 409,58 C 392,34 364,24 336,34 C 295,48 276,87 290,129 C 299,157 322,175 352,177 L 362,177 L 360,180 C 353,190 337,205 324,213 C 301,228 275,235 248,235 L 236,235 L 236,0 L 236,-235 L 252,-235 C 270,-234 280,-232 294,-227 C 338,-211 376,-167 394,-110 C 397,-101 400,-91 401,-87 C 404,-78 406,-76 414,-75 C 420,-75 424,-77 428,-82 C 431,-86 431,-89 427,-104 C 422,-122 417,-134 408,-152 C 395,-179 382,-197 364,-215 C 330,-249 292,-265 247,-265 L 236,-265 L 236,-303 C 236,-338 236,-341 234,-344 C 231,-349 228,-350 215,-350 C 201,-350 198,-349 195,-344 C 193,-341 193,-338 193,-300 L 193,-260 L 181,-258 C 135,-247 100,-228 70,-199 C 33,-161 10,-110 2,-44 C 0,-24 0,24 2,44 C 10,110 33,161 70,199 C 102,230 137,248 191,260 L 193,260 L 193,300 C 193,344 193,344 199,348 z M 193,0 L 193,224 C 193,224 190,222 186,220 C 160,205 145,174 140,124 C 136,84 136,-84 140,-123 C 142,-139 145,-159 149,-170 C 157,-194 171,-212 188,-221 L 193,-224 L 193,0 z "
+ d="m 199,348 c 3,2 5,2 16,2 10,0 12,0 15,-2 6,-4 6,-4 6,-45 l 0,-38 17,0 c 24,-1 41,-5 62,-13 51,-22 91,-72 104,-130 6,-25 2,-46 -10,-64 -17,-24 -45,-34 -73,-24 -41,14 -60,53 -46,95 9,28 32,46 62,48 l 10,0 -2,3 c -7,10 -23,25 -36,33 -23,15 -49,22 -76,22 l -12,0 0,-235 0,-235 16,0 c 18,1 28,3 42,8 44,16 82,60 100,117 3,9 6,19 7,23 3,9 5,11 13,12 6,0 10,-2 14,-7 3,-4 3,-7 -1,-22 -5,-18 -10,-30 -19,-48 -13,-27 -26,-45 -44,-63 -34,-34 -72,-50 -117,-50 l -11,0 0,-38 c 0,-35 0,-38 -2,-41 -3,-5 -6,-6 -19,-6 -14,0 -17,1 -20,6 -2,3 -2,6 -2,44 l 0,40 -12,2 c -46,11 -81,30 -111,59 -37,38 -60,89 -68,155 -2,20 -2,68 0,88 8,66 31,117 68,155 32,31 67,49 121,61 l 2,0 0,40 c 0,44 0,44 6,48 z m -6,-348 0,224 c 0,0 -3,-2 -7,-4 -26,-15 -41,-46 -46,-96 -4,-40 -4,-208 0,-247 2,-16 5,-36 9,-47 8,-24 22,-42 39,-51 l 5,-3 0,224 z"
id="path13754"
- style="fill:url(#linearGradient13861);fill-opacity:1;stroke:#e95d00;stroke-width:13.78757095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:url(#linearGradient13861);fill-opacity:1;stroke:#e95d00;stroke-width:13.78757095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
</g>
</g>
<g
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 12:35:00
|
Revision: 1430
http://sourceforge.net/p/canorus/code/1430
Author: matevz
Date: 2015-08-22 12:34:58 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Rerun notechecker, if time signature changed.
Modified Paths:
--------------
trunk/src/ui/mainwin.cpp
Modified: trunk/src/ui/mainwin.cpp
===================================================================
--- trunk/src/ui/mainwin.cpp 2015-08-22 12:34:31 UTC (rev 1429)
+++ trunk/src/ui/mainwin.cpp 2015-08-22 12:34:58 UTC (rev 1430)
@@ -3912,6 +3912,10 @@
CATimeSignature *timeSig = dynamic_cast<CATimeSignature*>(v->selection().at(0)->musElement());
if ( timeSig ) {
timeSig->setBeats( beats );
+ if (CACanorus::settings()->useNoteChecker()) {
+ _noteChecker.checkSheet(v->sheet());
+ }
+
CACanorus::rebuildUI(document(), currentSheet());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 12:34:33
|
Revision: 1429
http://sourceforge.net/p/canorus/code/1429
Author: matevz
Date: 2015-08-22 12:34:31 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Fixed default path to (bundled) Lilypond under Windows.
Modified Paths:
--------------
trunk/src/core/settings.cpp
Modified: trunk/src/core/settings.cpp
===================================================================
--- trunk/src/core/settings.cpp 2015-08-22 12:33:39 UTC (rev 1428)
+++ trunk/src/core/settings.cpp 2015-08-22 12:34:31 UTC (rev 1429)
@@ -43,7 +43,7 @@
const CATypesetter::CATypesetterType CASettings::DEFAULT_TYPESETTER = CATypesetter::LilyPond;
#ifdef Q_OS_WIN
-const QString CASettings::DEFAULT_TYPESETTER_LOCATION = "C:/Program files/LilyPond/usr/bin/lilypond-windows.exe";
+const QString CASettings::DEFAULT_TYPESETTER_LOCATION = "LilyPond/usr/bin/lilypond.exe";
#elif Q_OS_MAC
const QString CASettings::DEFAULT_TYPESETTER_LOCATION = "/Applications/LilyPond.app/Contents/Resources/bin/lilypond";
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 12:33:41
|
Revision: 1428
http://sourceforge.net/p/canorus/code/1428
Author: matevz
Date: 2015-08-22 12:33:39 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Updated readme for Canorus compilation under Windows.
Added setting VERSION from the file in setup.nsi.
Modified Paths:
--------------
trunk/windows/Readme.txt
trunk/windows/setup.nsi
Modified: trunk/windows/Readme.txt
===================================================================
--- trunk/windows/Readme.txt 2015-08-22 11:37:27 UTC (rev 1427)
+++ trunk/windows/Readme.txt 2015-08-22 12:33:39 UTC (rev 1428)
@@ -1,19 +1,44 @@
-Canorus Windows builds:
+This readme provides information to compile Canorus under Windows or Wine under
+Linux. It assumes the installation of Qt5.5.0 under C:\Qt\Qt5.5.0 and canorus
+under C:\canorus.
+
+Installing prerequisites:
+=========================
+1) Install Qt 5.x open source SDK for Windows including the mingw compiler.
+ Note: If the installation under Wine produces some warnings, click on Ignore
+ button.
+2) Go to C:\Qt\Qt5.5.0\Tools\mingw492_32\bin and rename mingw32-make.exe to
+ make.exe:
+ copy mingw32-make.exe make.exe
+3) Install cmake 3.x from the official site and add cmake to path.
+4) Install Nullsoft installer 3.x.
+5) OPTIONAL: Install swig-3.x and python.
+6) OPTIONAL: Install lilypond for windows to bundle it with canorus.
+
+Canorus Windows builds:
=======================
-1) Configure Canorus with cmake and set CMAKE_INSTALL_PREFIX to windows/canorus directory.
-2) Compile the project with make and install it (this will install it to windows/canorus).
-3) Install Nullsoft installer (http://nsis.sf.net)
-4) Install FontName plugin (needed for font installation): http://nsis.sourceforge.net/FontName_plug-in
-5) Create an executable .exe installation with Nullsoft installer by using nsis/setup.nsi configuration script.
+1) Add gcc, g++ and make, and qmake to PATH:
+ set PATH=%PATH%;C:\Qt\Qt5.5.0\Tools\mingw492_32\bin;C:\Qt\Qt5.5.0\5.5\mingw492_32\bin
-Adapt as needed, but something like this should compile Canorus from source and create installation package:
-============================================================================================================
-cd c:\canorus-X.Y
-c:\cmake\bin\cmake -G "MinGW Makefiles" -D QT_QMAKE_EXECUTABLE=C:\Qt\4.3.0\bin\qmake.exe -D SWIG_DIR=C:\swigwin-1.3.31 -D SWIG_EXECUTABLE=C:\swigwin-1.3.31\swig.exe -D PYTHON_LIBRARIES=C:\python25\libs -D PYTHON_LIBRARY=C:\python25\python25.dll -D PYTHON_INCLUDE_PATH=C:\python25\include -D CMAKE_INSTALL_PREFIX=windows\canorus .
-c:\mingw\bin\mingw32-make install
-cd c:\canorus-X.Y\windows
-c:\NSIS\makensis setup.nsi
+2) Configure Canorus with cmake and set CMAKE_INSTALL_PREFIX to windows/canorus
+ directory:
+ cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -D QT_QMAKE_EXECUTABLE=C:\Qt\Qt5.5.0\5.5\mingw492_32\bin\qmake.exe -D CMAKE_INSTALL_PREFIX=windows\canorus .
+3) If you want to enable scripting support, you should append the following to the cmake command:
+ -D SWIG_DIR=C:\swigwin-3.0.7 -D SWIG_EXECUTABLE=C:\swigwin-3.0.7\swig.exe -D PYTHON_LIBRARIES=C:\python25\libs -D PYTHON_LIBRARY=C:\python25\python25.dll -D PYTHON_INCLUDE_PATH=C:\python25\include
+
+4) Compile the project with make and install it (this will install it to windows/canorus).
+ make
+ make install
+
+5) OPTIONAL: Bundle lilypond alongside Canorus package:
+ xcopy /E "c:\Program Files (x86)\LilyPond" C:\canorus\windows\canorus\LilyPond
+
+6) Create .exe installation package with Nullsoft installer by using windows/setup.nsi config.
+ "c:\Program files (x86)\NSIS\makensis" setup.nsi
+
+
+
Matevž Jekovec <mat...@gm...>
Canorus development team
-http://www.canorus.org
\ No newline at end of file
+http://www.canorus.org
Modified: trunk/windows/setup.nsi
===================================================================
--- trunk/windows/setup.nsi 2015-08-22 11:37:27 UTC (rev 1427)
+++ trunk/windows/setup.nsi 2015-08-22 12:33:39 UTC (rev 1428)
@@ -4,7 +4,7 @@
Name Canorus
# Defines
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.7.2rc1
+!define /file VERSION "..\VERSION"
!define COMPANY "Matev\x9E Jekovec, Canorus development team"
!define URL http://www.canorus.org
@@ -30,7 +30,7 @@
# Installer pages
!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE ..\LICENSE.GPL
+!insertmacro MUI_PAGE_LICENSE ..\COPYING
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
!insertmacro MUI_PAGE_INSTFILES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 11:37:30
|
Revision: 1427
http://sourceforge.net/p/canorus/code/1427
Author: matevz
Date: 2015-08-22 11:37:27 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Added GPLv3 license.
Modified Paths:
--------------
trunk/COPYING
Modified: trunk/COPYING
===================================================================
--- trunk/COPYING 2015-08-22 10:53:01 UTC (rev 1426)
+++ trunk/COPYING 2015-08-22 11:37:27 UTC (rev 1427)
@@ -1,271 +1,674 @@
-GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
-Version 2, June 1991
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ Preamble
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
-Preamble
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
-The licenses for most software are designed to take away your freedom to
-share and change it. By contrast, the GNU General Public License is intended
-to guarantee your freedom to share and change free software--to make sure
-the software is free for all its users. This General Public License applies
-to most of the Free Software Foundation's software and to any other program
-whose authors commit to using it. (Some other Free Software Foundation
-software is covered by the GNU Library General Public License instead.) You
-can apply it to your programs, too.
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the freedom
-to distribute copies of free software (and charge for this service if you
-wish), that you receive source code or can get it if you want it, that you
-can change the software or use pieces of it in new free programs; and that
-you know you can do these things.
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
-To protect your rights, we need to make restrictions that forbid anyone to
-deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you distribute
-copies of the software, or if you modify it.
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
-For example, if you distribute copies of such a program, whether gratis or
-for a fee, you must give the recipients all the rights that you have. You
-must make sure that they, too, receive or can get the source code. And you
-must show them these terms so they know their rights.
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
-We protect your rights with two steps: (1) copyright the software, and (2)
-offer you this license which gives you legal permission to copy, distribute
-and/or modify the software.
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If
-the software is modified by someone else and passed on, we want its
-recipients to know that what they have is not the original, so that any
-problems introduced by others will not reflect on the original authors'
-reputations.
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
-Finally, any free program is threatened constantly by software patents. We
-wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary. To prevent this, we have made it clear that any patent must be
-licensed for everyone's free use or not licensed at all.
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
-The precise terms and conditions for copying, distribution and modification
-follow.
+ The precise terms and conditions for copying, distribution and
+modification follow.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ TERMS AND CONDITIONS
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms
-of this General Public License. The "Program", below, refers to any such
-program or work, and a "work based on the Program" means either the Program
-or any derivative work under copyright law: that is to say, a work
-containing the Program or a portion of it, either verbatim or with
-modifications and/or translated into another language. (Hereinafter,
-translation is included without limitation in the term "modification".) Each
-licensee is addressed as "you".
+ 0. Definitions.
-Activities other than copying, distribution and modification are not covered
-by this License; they are outside its scope. The act of running the Program
-is not restricted, and the output from the Program is covered only if its
-contents constitute a work based on the Program (independent of having been
-made by running the Program). Whether that is true depends on what the
-Program does.
+ "This License" refers to version 3 of the GNU General Public License.
-1. You may copy and distribute verbatim copies of the Program's source code
-as you receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice and
-disclaimer of warranty; keep intact all the notices that refer to this
-License and to the absence of any warranty; and give any other recipients of
-the Program a copy of this License along with the Program.
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
-You may charge a fee for the physical act of transferring a copy, and you
-may at your option offer warranty protection in exchange for a fee.
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
-2. You may modify your copy or copies of the Program or any portion of it,
-thus forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you
-also meet all of these conditions:
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
- * a) You must cause the modified files to carry prominent notices stating
- that you changed the files and the date of any change.
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
- * b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any part
- thereof, to be licensed as a whole at no charge to all third parties
- under the terms of this License.
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
- * c) If the modified program normally reads commands interactively when
- run, you must cause it, when started running for such interactive use
- in the most ordinary way, to print or display an announcement including
- an appropriate copyright notice and a notice that there is no warranty
- (or else, saying that you provide a warranty) and that users may
- redistribute the program under these conditions, and telling the user
- how to view a copy of this License. (Exception: if the Program itself
- is interactive but does not normally print such an announcement, your
- work based on the Program is not required to print an announcement.)
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be
-reasonably considered independent and separate works in themselves, then
-this License, and its terms, do not apply to those sections when you
-distribute them as separate works. But when you distribute the same sections
-as part of a whole which is a work based on the Program, the distribution of
-the whole must be on the terms of this License, whose permissions for other
-licensees extend to the entire whole, and thus to each and every part
-regardless of who wrote it.
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
-Thus, it is not the intent of this section to claim rights or contest your
-rights to work written entirely by you; rather, the intent is to exercise
-the right to control the distribution of derivative or collective works
-based on the Program.
+ 1. Source Code.
-In addition, mere aggregation of another work not based on the Program with
-the Program (or with a work based on the Program) on a volume of a storage
-or distribution medium does not bring the other work under the scope of this
-License.
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1
-and 2 above provided that you also do one of the following:
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
- * a) Accompany it with the complete corresponding machine-readable source
- code, which must be distributed under the terms of Sections 1 and 2
- above on a medium customarily used for software interchange; or,
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
- * b) Accompany it with a written offer, valid for at least three years,
- to give any third party, for a charge no more than your cost of
- physically performing source distribution, a complete machine-readable
- copy of the corresponding source code, to be distributed under the
- terms of Sections 1 and 2 above on a medium customarily used for
- software interchange; or,
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
- * c) Accompany it with the information you received as to the offer to
- distribute corresponding source code. (This alternative is allowed only
- for noncommercial distribution and only if you received the program in
- object code or executable form with such an offer, in accord with
- Subsection b above.)
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, complete source code means all
-the source code for all modules it contains, plus any associated interface
-definition files, plus the scripts used to control compilation and
-installation of the executable. However, as a special exception, the source
-code distributed need not include anything that is normally distributed (in
-either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
+ The Corresponding Source for a work in source code form is that
+same work.
-If distribution of executable or object code is made by offering access to
-copy from a designated place, then offering equivalent access to copy the
-source code from the same place counts as distribution of the source code,
-even though third parties are not compelled to copy the source along with
-the object code.
+ 2. Basic Permissions.
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy,
-modify, sublicense or distribute the Program is void, and will automatically
-terminate your rights under this License. However, parties who have received
-copies, or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
-5. You are not required to accept this License, since you have not signed
-it. However, nothing else grants you permission to modify or distribute the
-Program or its derivative works. These actions are prohibited by law if you
-do not accept this License. Therefore, by modifying or distributing the
-Program (or any work based on the Program), you indicate your acceptance of
-this License to do so, and all its terms and conditions for copying,
-distributing or modifying the Program or works based on it.
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the original
-licensor to copy, distribute or modify the Program subject to these terms
-and conditions. You may not impose any further restrictions on the
-recipients' exercise of the rights granted herein. You are not responsible
-for enforcing compliance by third parties to this License.
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot distribute so
-as to satisfy simultaneously your obligations under this License and any
-other pertinent obligations, then as a consequence you may not distribute
-the Program at all. For example, if a patent license would not permit
-royalty-free redistribution of the Program by all those who receive copies
-directly or indirectly through you, then the only way you could satisfy both
-it and this License would be to refrain entirely from distribution of the
-Program.
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply and
-the section as a whole is intended to apply in other circumstances.
+ 13. Use with the GNU Affero General Public License.
-It is not the purpose of this section to induce you to infringe any patents
-or other property right claims or to contest validity of any such claims;
-this section has the sole purpose of protecting the integrity of the free
-software distribution system, which is implemented by public license
-practices. Many people have made generous contributions to the wide range of
-software distributed through that system in reliance on consistent
-application of that system; it is up to the author/donor to decide if he or
-she is willing to distribute software through any other system and a
-licensee cannot impose that choice.
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
+ 14. Revised Versions of this License.
-8. If the distribution and/or use of the Program is restricted in certain
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program under this License may add an
-explicit geographical distribution limitation excluding those countries, so
-that distribution is permitted only in or among countries not thus excluded.
-In such case, this License incorporates the limitation as if written in the
-body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of
-the General Public License from time to time. Such new versions will be
-similar in spirit to the present version, but may differ in detail to
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software
-Foundation, write to the Free Software Foundation; we sometimes make
-exceptions for this. Our decision will be guided by the two goals of
-preserving the free status of all derivatives of our free software and of
-promoting the sharing and reuse of software generally.
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
-NO WARRANTY
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO
-THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM
-PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
+ 15. Disclaimer of Warranty.
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO
-LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR
-THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-END OF TERMS AND CONDITIONS
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 10:53:03
|
Revision: 1426
http://sourceforge.net/p/canorus/code/1426
Author: matevz
Date: 2015-08-22 10:53:01 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Added larger Canorus icon with alpha transparency for Windows.
Modified Paths:
--------------
trunk/windows/canorus.ico
Modified: trunk/windows/canorus.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 10:19:41
|
Revision: 1425
http://sourceforge.net/p/canorus/code/1425
Author: matevz
Date: 2015-08-22 10:19:39 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Added support for Qt5 on Windows.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2015-08-22 10:15:37 UTC (rev 1424)
+++ trunk/src/CMakeLists.txt 2015-08-22 10:19:39 UTC (rev 1425)
@@ -736,13 +736,20 @@
IF(MINGW)
# Install Qt libs
- INSTALL( FILES ${QT_BIN_DIR}/Qt5Core.dll ${QT_BIN_DIR}/Qt5Gui.dll ${QT_BIN_DIR}/Qt5Svg.dll ${QT_BIN_DIR}/Qt5Xml.dll ${QT_BIN_DIR}/Qt5Help.dll ${QT_BIN_DIR}/Qt5Sql.dll ${QT_BIN_DIR}/Qt5Network.dll ${QT_BIN_DIR}/Qt5CLucene.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
+ INSTALL( FILES ${QT_BIN_DIR}/Qt5Core.dll ${QT_BIN_DIR}/Qt5Gui.dll ${QT_BIN_DIR}/Qt5Widgets.dll ${QT_BIN_DIR}/Qt5Svg.dll ${QT_BIN_DIR}/Qt5Xml.dll ${QT_BIN_DIR}/Qt5Help.dll ${QT_BIN_DIR}/Qt5Sql.dll ${QT_BIN_DIR}/Qt5Network.dll ${QT_BIN_DIR}/Qt5CLucene.dll ${QT_BIN_DIR}/Qt5PrintSupport.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
# Install qsvg plugin for rendering SVG icons
- INSTALL( FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicon.dll DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR}/iconengines" )
+ get_target_property(QSvgIcon_loc Qt5::QSvgIconPlugin LOCATION)
+ INSTALL( FILES ${QSvgIcon_loc} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR}/iconengines" )
+ # Install qwindows plugin for Microsoft Windows integration
+ get_target_property(QWindows_loc Qt5::QWindowsIntegrationPlugin LOCATION)
+ INSTALL( FILES ${QWindows_loc} DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR}/platforms" )
+
# Install mingwm10.dll - not required anymore?
- #INSTALL( FILES ${MINGW_BIN_DIR}/mingwm10.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
+ INSTALL( FILES ${MINGW_BIN_DIR}/libgcc_s_dw2-1.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
+ INSTALL( FILES ${MINGW_BIN_DIR}/libwinpthread-1.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
+ INSTALL( FILES ${MINGW_BIN_DIR}/libstdc++-6.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
# Install Python libs
IF(USE_PYTHON)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 10:15:39
|
Revision: 1424
http://sourceforge.net/p/canorus/code/1424
Author: matevz
Date: 2015-08-22 10:15:37 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Fixed CMake warning on windows for cmake policy CMP0020.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/CMakeListsQt4.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2015-08-22 08:29:14 UTC (rev 1423)
+++ trunk/CMakeLists.txt 2015-08-22 10:15:37 UTC (rev 1424)
@@ -38,13 +38,14 @@
# Under M$ Windows this is C:\Program files\Canorus
# On Mac OS X it is /Applications for the .app and /Library/Fonts for the fonts, but see note below
IF(MINGW)
+ cmake_policy(SET CMP0020 NEW)
+
IF (NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "C:/Program files/Canorus")
ENDIF (NOT CMAKE_INSTALL_PREFIX)
SET(CANORUS_INSTALL_DATA_DIR "")
SET(CANORUS_INSTALL_BIN_DIR "")
SET(CANORUS_INSTALL_LIB_DIR "")
-
ELSE(MINGW)
IF(APPLE)
# This is where OSX-specific resources and scripts live.
Modified: trunk/CMakeListsQt4.txt
===================================================================
--- trunk/CMakeListsQt4.txt 2015-08-22 08:29:14 UTC (rev 1423)
+++ trunk/CMakeListsQt4.txt 2015-08-22 10:15:37 UTC (rev 1424)
@@ -38,6 +38,8 @@
# Under M$ Windows this is C:\Program files\Canorus
# On Mac OS X it is /Applications for the .app and /Library/Fonts for the fonts, but see note below
IF(MINGW)
+ cmake_policy(SET CMP0020 NEW)
+
IF (NOT CMAKE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX "C:/Program files/Canorus")
ENDIF (NOT CMAKE_INSTALL_PREFIX)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2015-08-22 08:29:16
|
Revision: 1423
http://sourceforge.net/p/canorus/code/1423
Author: matevz
Date: 2015-08-22 08:29:14 +0000 (Sat, 22 Aug 2015)
Log Message:
-----------
Fixed Qt5 dll installation on Windows.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2015-08-22 08:09:48 UTC (rev 1422)
+++ trunk/src/CMakeLists.txt 2015-08-22 08:29:14 UTC (rev 1423)
@@ -736,13 +736,13 @@
IF(MINGW)
# Install Qt libs
- INSTALL( FILES ${QT_BIN_DIR}/QtCore4.dll ${QT_BIN_DIR}/QtGui4.dll ${QT_BIN_DIR}/QtSvg4.dll ${QT_BIN_DIR}/QtXml4.dll ${QT_BIN_DIR}/QtHelp4.dll ${QT_BIN_DIR}/QtSql4.dll ${QT_BIN_DIR}/QtNetwork4.dll ${QT_BIN_DIR}/QtCLucene4.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
+ INSTALL( FILES ${QT_BIN_DIR}/Qt5Core.dll ${QT_BIN_DIR}/Qt5Gui.dll ${QT_BIN_DIR}/Qt5Svg.dll ${QT_BIN_DIR}/Qt5Xml.dll ${QT_BIN_DIR}/Qt5Help.dll ${QT_BIN_DIR}/Qt5Sql.dll ${QT_BIN_DIR}/Qt5Network.dll ${QT_BIN_DIR}/Qt5CLucene.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
# Install qsvg plugin for rendering SVG icons
- INSTALL( FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicon4.dll DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR}/iconengines" )
+ INSTALL( FILES ${QT_PLUGINS_DIR}/iconengines/qsvgicon.dll DESTINATION "${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR}/iconengines" )
- # Install mingwm10.dll
- INSTALL( FILES ${MINGW_BIN_DIR}/mingwm10.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
+ # Install mingwm10.dll - not required anymore?
+ #INSTALL( FILES ${MINGW_BIN_DIR}/mingwm10.dll DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} )
# Install Python libs
IF(USE_PYTHON)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
