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: <su...@us...> - 2012-09-01 16:20:48
|
Revision: 1297
http://canorus.svn.sourceforge.net/canorus/?rev=1297&view=rev
Author: suamor
Date: 2012-09-01 16:20:42 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn fixes:
- Move method implementation from header to avoid
compiler problem with possible undefined member
- Move some member default initialisation to head of constructor
Modified Paths:
--------------
trunk/src/layout/drawablefunctionmarkcontext.cpp
Modified: trunk/src/layout/drawablefunctionmarkcontext.cpp
===================================================================
--- trunk/src/layout/drawablefunctionmarkcontext.cpp 2012-09-01 16:18:09 UTC (rev 1296)
+++ trunk/src/layout/drawablefunctionmarkcontext.cpp 2012-09-01 16:20:42 UTC (rev 1297)
@@ -12,11 +12,11 @@
#include "score/functionmarkcontext.h"
CADrawableFunctionMarkContext::CADrawableFunctionMarkContext(CAFunctionMarkContext *context, double x, double y, int numberOfLines)
- : CADrawableContext(context, x, y) {
+ : CADrawableContext(context, x, y),
+ _numberOfLines(numberOfLines),
+ _currentLineIdx(0) {
setDrawableContextType( CADrawableContext::DrawableFunctionMarkContext );
- _numberOfLines = numberOfLines;
- _currentLineIdx = 0;
setWidth( 0 );
setHeight( 45*numberOfLines - 10*(numberOfLines-1) );
}
@@ -44,3 +44,8 @@
return y;
}
+
+void CADrawableFunctionMarkContext::nextLine() {
+ ++_currentLineIdx;
+ _currentLineIdx = _currentLineIdx % _numberOfLines;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-09-01 16:18:15
|
Revision: 1296
http://canorus.svn.sourceforge.net/canorus/?rev=1296&view=rev
Author: suamor
Date: 2012-09-01 16:18:09 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes:
- Unused variable commented
- Added missing cases that were not handled
- clone: Return a value for default case
Modified Paths:
--------------
trunk/src/layout/drawablefunctionmark.cpp
Modified: trunk/src/layout/drawablefunctionmark.cpp
===================================================================
--- trunk/src/layout/drawablefunctionmark.cpp 2012-09-01 15:51:14 UTC (rev 1295)
+++ trunk/src/layout/drawablefunctionmark.cpp 2012-09-01 16:18:09 UTC (rev 1296)
@@ -7,6 +7,7 @@
#include <QPainter>
#include <QFont>
+#include <stdio.h>
#include "layout/drawablefunctionmark.h"
#include "layout/drawablefunctionmarkcontext.h"
@@ -26,7 +27,7 @@
_extenderLineVisible = false;
_extenderLineOnly = false;
- CAMusElement *prevMusElt;
+ //CAMusElement *prevMusElt;
setWidth( 11 ); // default width
// function mark is stable
if (// tonic degree is tonic
@@ -50,6 +51,8 @@
case CAFunctionMark::N: _text="N"; _width=14; break;
case CAFunctionMark::L: _text="L"; _width=11; break;
case CAFunctionMark::K: _text="K"; _width=12; break;
+ case CAFunctionMark::Undefined:
+ break;
}
else
// function mark is not stable - its tonic degree is not Tonic
@@ -69,6 +72,8 @@
case CAFunctionMark::N: _text="N"; _width=12; break;
case CAFunctionMark::L: _text="L"; _width=9; break;
case CAFunctionMark::K: _text="K"; _width=10; break;
+ case CAFunctionMark::Undefined:
+ break;
}
if (function->isMinor()) { //prepend a small circle
@@ -196,6 +201,13 @@
case CAFunctionMark::T: _width+=10; break;
case CAFunctionMark::S: _width+=11; break;
case CAFunctionMark::D: _width+=12; break;
+ case CAFunctionMark::F:
+ case CAFunctionMark::K:
+ case CAFunctionMark::L:
+ case CAFunctionMark::N:
+ case CAFunctionMark::Undefined:
+ fprintf(stderr,"Warning: CADrawableFunctionMarkSupport::CADrawableFunctionMarkSupport - Unhandled mark %d",f1->functionMark()->tonicDegree());
+ break;
}
} else {
_width = f2->xPos() + f2->width() - f1->xPos(); // multiple tonicization
@@ -272,6 +284,8 @@
case Alterations:
font.setPixelSize(qRound( 9*s.z ));
break;
+ case Rectangle:
+ break;
}
// fill in the text values for functions
@@ -292,6 +306,8 @@
case CAFunctionMark::N: text="N"; break;
case CAFunctionMark::L: text="L"; break;
case CAFunctionMark::K: text="K"; break;
+ case CAFunctionMark::Undefined:
+ break;
}
if (minor)
@@ -399,5 +415,7 @@
case Alterations:
return new CADrawableFunctionMarkSupport(Alterations, (CAFunctionMark*)(_musElement), (newContext)?newContext:_drawableContext, _xPos, _yPos);
break;
+ default:
+ return 0;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-09-01 15:51:20
|
Revision: 1295
http://canorus.svn.sourceforge.net/canorus/?rev=1295&view=rev
Author: suamor
Date: 2012-09-01 15:51:14 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Unused variable commented
Modified Paths:
--------------
trunk/src/layout/drawablecontext.cpp
Modified: trunk/src/layout/drawablecontext.cpp
===================================================================
--- trunk/src/layout/drawablecontext.cpp 2012-09-01 15:50:14 UTC (rev 1294)
+++ trunk/src/layout/drawablecontext.cpp 2012-09-01 15:51:14 UTC (rev 1295)
@@ -20,7 +20,7 @@
right border is larger than \a x2.
*/
QList<CADrawableMusElement*> CADrawableContext::findInRange( double x1, double x2 ) {
- int i;
+ //int i;
QList<CADrawableMusElement*> list;
for (int i=0; i<_drawableMusElementList.size(); i++) {
if ( static_cast<CADrawable*>(_drawableMusElementList[i])->xPos() <= x2 && // The object is normal and fits into the area
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-09-01 15:50:20
|
Revision: 1294
http://canorus.svn.sourceforge.net/canorus/?rev=1294&view=rev
Author: suamor
Date: 2012-09-01 15:50:14 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled
Modified Paths:
--------------
trunk/src/layout/drawableclef.cpp
Modified: trunk/src/layout/drawableclef.cpp
===================================================================
--- trunk/src/layout/drawableclef.cpp 2012-09-01 15:49:12 UTC (rev 1293)
+++ trunk/src/layout/drawableclef.cpp 2012-09-01 15:50:14 UTC (rev 1294)
@@ -90,6 +90,11 @@
case CAClef::C:
p->drawText(s.x, qRound(s.y + (clef()->offset()>0?CLEF_EIGHT_SIZE*s.z:0) + 0.5*(height() - (clef()->offset()?CLEF_EIGHT_SIZE:0))*s.z), QString(CACanorus::fetaCodepoint("clefs.C")));
break;
+ case CAClef::Tab:
+ case CAClef::PercussionHigh:
+ case CAClef::PercussionLow:
+ fprintf(stderr,"Warning: CADrawableClef::draw - Unhandled type %d",clef()->clefType());
+ break;
}
if (clef()->offset()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-09-01 15:49:18
|
Revision: 1293
http://canorus.svn.sourceforge.net/canorus/?rev=1293&view=rev
Author: suamor
Date: 2012-09-01 15:49:12 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Large Warn Fixes: Added missing cases that were not handled
Modified Paths:
--------------
trunk/src/layout/drawablebarline.cpp
Modified: trunk/src/layout/drawablebarline.cpp
===================================================================
--- trunk/src/layout/drawablebarline.cpp 2012-08-27 19:37:27 UTC (rev 1292)
+++ trunk/src/layout/drawablebarline.cpp 2012-09-01 15:49:12 UTC (rev 1293)
@@ -46,6 +46,8 @@
case CABarline::Dotted:
setWidth( DOTTED_BARLINE_WIDTH );
break;
+ case CABarline::Undefined:
+ break;
}
setHeight( staff->height() );
@@ -180,6 +182,8 @@
p->drawLine( qRound(s.x), s.y,
qRound(s.x), qRound(s.y + height()*s.z) );
break;
+ case CABarline::Undefined:
+ break;
}
p->setBrush(QBrush(s.color, Qt::NoBrush)); // reset the painter's brush
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-08-27 19:37:35
|
Revision: 1292
http://canorus.svn.sourceforge.net/canorus/?rev=1292&view=rev
Author: matevz
Date: 2012-08-27 19:37:27 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Committed new Czech translation contributed by Pavel Fric.
Modified Paths:
--------------
trunk/src/lang/cs.ts
Modified: trunk/src/lang/cs.ts
===================================================================
--- trunk/src/lang/cs.ts 2012-08-27 19:32:05 UTC (rev 1291)
+++ trunk/src/lang/cs.ts 2012-08-27 19:37:27 UTC (rev 1292)
@@ -6,102 +6,103 @@
<message>
<location filename="../widgets/actionseditor.cpp" line="155"/>
<source>Shortcut</source>
- <translation type="unfinished"></translation>
+ <translation>Klávesová zkratka</translation>
</message>
<message>
<location filename="../widgets/actionseditor.cpp" line="155"/>
<source>Description</source>
- <translation type="unfinished"></translation>
+ <translation>Popis</translation>
</message>
<message>
<location filename="../widgets/actionseditor.cpp" line="155"/>
<source>Name</source>
- <translation type="unfinished"></translation>
+ <translation>Název</translation>
</message>
<message>
<location filename="../widgets/actionseditor.cpp" line="162"/>
<source>&Save shortcuts</source>
- <translation type="unfinished"></translation>
+ <translation>&Uložit klávesové zkratky</translation>
</message>
<message>
<location filename="../widgets/actionseditor.cpp" line="163"/>
<source>&Load shortcuts</source>
- <translation type="unfinished"></translation>
+ <translation>&Nahrát klávesové zkratky</translation>
</message>
<message>
<location filename="../widgets/actionseditor.cpp" line="167"/>
<source>&Save midi commands</source>
- <translation type="unfinished"></translation>
+ <translation>&Uložit příkazy MIDI</translation>
</message>
<message>
<location filename="../widgets/actionseditor.cpp" line="168"/>
<source>&Load midi commands</source>
- <translation type="unfinished"></translation>
+ <translation>&Nahrát příkazy MIDI</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="424"/>
- <location filename="../widgets/actionseditor.cpp" line="484"/>
+ <location filename="../widgets/actionseditor.cpp" line="425"/>
+ <location filename="../widgets/actionseditor.cpp" line="498"/>
<source>Shortcut files</source>
- <translation type="unfinished"></translation>
+ <translation>Soubory s klávesovými zkratkami</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="429"/>
- <location filename="../widgets/actionseditor.cpp" line="486"/>
+ <location filename="../widgets/actionseditor.cpp" line="431"/>
+ <location filename="../widgets/actionseditor.cpp" line="502"/>
<source>Midi command files</source>
- <translation type="unfinished"></translation>
+ <translation>Soubory s příkazy MIDI</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="433"/>
+ <location filename="../widgets/actionseditor.cpp" line="435"/>
<source>Choose a filename</source>
- <translation type="unfinished"></translation>
+ <translation>Vybrat název souboru</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="443"/>
+ <location filename="../widgets/actionseditor.cpp" line="445"/>
<source>Confirm overwrite?</source>
- <translation type="unfinished"></translation>
+ <translation>Potvrdit přepsání?</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="444"/>
+ <location filename="../widgets/actionseditor.cpp" line="446"/>
<source>The file %1 already exists.
Do you want to overwrite?</source>
- <translation type="unfinished"></translation>
+ <translation>Soubor %1 již existuje.
+Chcete jej přepsat?</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="456"/>
- <location filename="../widgets/actionseditor.cpp" line="495"/>
+ <location filename="../widgets/actionseditor.cpp" line="458"/>
+ <location filename="../widgets/actionseditor.cpp" line="511"/>
<source>Error</source>
- <translation type="unfinished"></translation>
+ <translation>Chyba</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="457"/>
+ <location filename="../widgets/actionseditor.cpp" line="459"/>
<source>The file couldn't be saved</source>
- <translation type="unfinished"></translation>
+ <translation>Soubor se nepodařilo uložit</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="488"/>
+ <location filename="../widgets/actionseditor.cpp" line="504"/>
<source>Choose a file</source>
- <translation type="unfinished"></translation>
+ <translation>Vybrat soubor</translation>
</message>
<message>
- <location filename="../widgets/actionseditor.cpp" line="496"/>
+ <location filename="../widgets/actionseditor.cpp" line="512"/>
<source>The file couldn't be loaded</source>
- <translation type="unfinished"></translation>
+ <translation>Soubor se nepodařilo nahrát</translation>
</message>
</context>
<context>
<name>CAAutoRecovery</name>
<message>
- <location filename="../core/autorecovery.cpp" line="121"/>
+ <location filename="../core/autorecovery.cpp" line="122"/>
<source>- Document %1 last modified on %2.</source>
<translation>- Dokument %1 byl naposledy změněn %2.</translation>
</message>
<message>
- <location filename="../core/autorecovery.cpp" line="139"/>
+ <location filename="../core/autorecovery.cpp" line="140"/>
<source>Document recovery</source>
<translation>Obnova dokumentu</translation>
</message>
<message>
- <location filename="../core/autorecovery.cpp" line="140"/>
+ <location filename="../core/autorecovery.cpp" line="141"/>
<source>Previous session of Canorus was unexpectedly closed.
The following documents were successfully recovered:
@@ -137,42 +138,60 @@
<name>CAExport</name>
<message>
<location filename="../export/export.cpp" line="154"/>
- <source>Exporting...</source>
- <translation>Vyváží se...</translation>
+ <source>Exporting</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../export/export.cpp" line="156"/>
- <source>Ready.</source>
- <translation>Vyřízeno.</translation>
+ <location filename="../export/export.cpp" line="160"/>
+ <source>Ready</source>
+ <translation type="unfinished">Připraven</translation>
</message>
<message>
<location filename="../export/export.cpp" line="158"/>
- <source>Data stream not defined.</source>
- <translation>Cesta k datům nebyla stanovena.</translation>
+ <source>Unable to open file for writing</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CAImport</name>
<message>
- <location filename="../import/import.cpp" line="197"/>
- <source>Importing...</source>
- <translation>Zavádí se...</translation>
- </message>
- <message>
<location filename="../import/import.cpp" line="199"/>
- <source>Ready.</source>
- <translation>Vyřízeno.</translation>
+ <source>Importing</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../import/import.cpp" line="201"/>
- <source>File not found or data stream not defined.</source>
- <translation>Soubor nebyl nalezen, nebo nebyla stanovena cesta k datům.</translation>
+ <source>Ready</source>
+ <translation type="unfinished">Připraven</translation>
</message>
+ <message>
+ <location filename="../import/import.cpp" line="203"/>
+ <source>Unable to open file for reading</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
+ <name>CAKeySignatureCtl</name>
+ <message>
+ <location filename="../scorectl/keysignaturectl.cpp" line="68"/>
+ <source>change key signature</source>
+ <comment>undo</comment>
+ <translation type="unfinished">Změnit předznamenání</translation>
+ </message>
+</context>
+<context>
+ <name>CAKeySignatureUI</name>
+ <message>
+ <location filename="../scoreui/keysignatureui.cpp" line="38"/>
+ <source>Key Signature ToolBar</source>
+ <translation type="unfinished">Nástrojový panel pro výběr předznamenání</translation>
+ </message>
+</context>
+<context>
<name>CALilyPondExport</name>
<message>
- <location filename="../export/lilypondexport.cpp" line="591"/>
+ <location filename="../export/lilypondexport.cpp" line="847"/>
<source>arr.</source>
<comment>arrangement</comment>
<translation>Úpr.</translation>
@@ -181,17 +200,22 @@
<context>
<name>CALilyPondImport</name>
<message>
- <location filename="../import/lilypondimport.cpp" line="642"/>
+ <location filename="../import/lilypondimport.cpp" line="77"/>
+ <source>Lilypond imported sheet</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../import/lilypondimport.cpp" line="683"/>
<source>Ready</source>
<translation>Připraven</translation>
</message>
<message>
- <location filename="../import/lilypondimport.cpp" line="644"/>
+ <location filename="../import/lilypondimport.cpp" line="685"/>
<source>Importing...</source>
<translation>Zavádí se...</translation>
</message>
<message>
- <location filename="../import/lilypondimport.cpp" line="646"/>
+ <location filename="../import/lilypondimport.cpp" line="687"/>
<source>Error while importing!
Line %1:%2.</source>
<translation>Během zavedení došlo k chybě!
@@ -201,1522 +225,1607 @@
<context>
<name>CAMainWin</name>
<message>
- <location filename="../ui/mainwin.cpp" line="234"/>
+ <location filename="../ui/mainwin.cpp" line="245"/>
<source>Insert ToolBar</source>
- <translation>Nástrojová lišta pro vkládání</translation>
+ <translation>Nástrojový panel pro vkládání</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="235"/>
+ <location filename="../ui/mainwin.cpp" line="246"/>
<source>Select Context</source>
<translation>Výběr prostředí</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="245"/>
+ <location filename="../ui/mainwin.cpp" line="257"/>
<source>Select Clef</source>
<translation>Výběr klíče</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="257"/>
+ <location filename="../ui/mainwin.cpp" line="269"/>
<source>Select Time Signature</source>
<translation>Výběr taktu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="266"/>
+ <location filename="../ui/mainwin.cpp" line="278"/>
<source>Select Barline</source>
<translation>Výběr taktové čáry</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="324"/>
+ <location filename="../ui/mainwin.cpp" line="336"/>
<source>Context ToolBar</source>
- <translation>Nástrojová lišta pro prostředí</translation>
+ <translation>Nástrojový panel pro prostředí</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="338"/>
+ <location filename="../ui/mainwin.cpp" line="350"/>
<source>Voice ToolBar</source>
- <translation>Nástrojová lišta pro hlas</translation>
+ <translation>Nástrojový panel pro hlas</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="349"/>
+ <location filename="../ui/mainwin.cpp" line="361"/>
<source>Select Voice Stem Direction</source>
<translation>Výběr směru nožiček u hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="355"/>
+ <location filename="../ui/mainwin.cpp" line="367"/>
<source>Playable ToolBar</source>
- <translation>Nástrojová lišta pro výběr hratelných not a pauz</translation>
+ <translation>Nástrojový panel pro výběr hratelných not a pomlk</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="356"/>
+ <location filename="../ui/mainwin.cpp" line="368"/>
<source>Select Length</source>
<translation>Výběr notových délek</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="367"/>
+ <location filename="../ui/mainwin.cpp" line="379"/>
<source>Select Note Stem Direction</source>
- <translation>Směr nožiček u not</translation>
+ <translation>Výběr směru nožiček u not</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3778"/>
+ <location filename="../ui/mainwin.cpp" line="4016"/>
<source>About Qt</source>
<translation>O Qt</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3782"/>
+ <location filename="../ui/mainwin.cpp" line="4020"/>
<source>About Canorus</source>
<translation>O Canoru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1630"/>
- <location filename="../ui/mainwin.cpp" line="4982"/>
+ <location filename="../ui/mainwin.cpp" line="1719"/>
+ <location filename="../ui/mainwin.cpp" line="5306"/>
<source>Staff%1</source>
<translation>Notová osnova %1</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1251"/>
+ <location filename="../ui/mainwin.cpp" line="1314"/>
<source>Voice%1</source>
<translation>Hlas %1</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1269"/>
- <location filename="../ui/mainwin.cpp" line="1276"/>
- <location filename="../ui/mainwin.cpp" line="1304"/>
- <location filename="../ui/mainwin.cpp" line="2811"/>
+ <location filename="../ui/mainwin.cpp" line="1332"/>
+ <location filename="../ui/mainwin.cpp" line="1339"/>
+ <location filename="../ui/mainwin.cpp" line="1367"/>
+ <location filename="../ui/mainwin.cpp" line="3235"/>
<source>Canorus</source>
<translation>Canorus</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1277"/>
+ <location filename="../ui/mainwin.cpp" line="1340"/>
<source>Are you sure do you want to delete voice
%1 and all its notes?</source>
<translation>Jste si jist, že chcete smazat hlas
%1 i se všemi jeho notami?</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1305"/>
+ <location filename="../ui/mainwin.cpp" line="1368"/>
<source>Are you sure do you want to delete context
%1 and all its contents?</source>
<translation>Jste si jist, že chcete smazat prostředí
%1 i všechen jeho obsah?</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="327"/>
+ <location filename="../ui/mainwin.cpp" line="339"/>
<source>Context name</source>
- <translation>Název pro prostředí</translation>
+ <translation>Název prostředí</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="341"/>
+ <location filename="../ui/mainwin.cpp" line="353"/>
<source>Current Voice number</source>
<translation>Číslo nynějšího hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="348"/>
+ <location filename="../ui/mainwin.cpp" line="360"/>
<source>Voice name</source>
<translation>Označení hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="696"/>
+ <location filename="../ui/mainwin.cpp" line="715"/>
<source>Voice stem direction</source>
<translation>Směr nožiček u hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="658"/>
+ <location filename="../ui/mainwin.cpp" line="681"/>
<source>Playable length</source>
<translation>Hratelná délka not</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="669"/>
+ <location filename="../ui/mainwin.cpp" line="692"/>
<source>Note stem direction</source>
<translation>Směr nožiček u not</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="320"/>
+ <location filename="../ui/mainwin.cpp" line="332"/>
<source>Sheet ToolBar</source>
- <translation>Nástrojová lišta pro listy</translation>
+ <translation>Nástrojový panel pro listy</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1270"/>
+ <location filename="../ui/mainwin.cpp" line="1333"/>
<source>Cannot delete the last voice in the staff!</source>
- <translation>V notové osnově nelze smazat poslední hlas!</translation>
+ <translation>Nelze smazat poslední hlas v notové osnově!</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="390"/>
- <source>Key Signature ToolBar</source>
- <translation>Nástrojová lišta pro výběr předznamenání/klíče</translation>
- </message>
- <message>
- <location filename="../ui/mainwin.cpp" line="395"/>
+ <location filename="../ui/mainwin.cpp" line="402"/>
<source>Time Signature ToolBar</source>
- <translation>Nástrojová lišta pro výběr taktového označení</translation>
+ <translation>Nástrojový panel pro výběr taktového označení</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="400"/>
+ <location filename="../ui/mainwin.cpp" line="407"/>
<source>Number of beats</source>
<translation>Počet dob</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="407"/>
+ <location filename="../ui/mainwin.cpp" line="414"/>
<source>Beat</source>
<translation>Doba</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="240"/>
+ <location filename="../ui/mainwin.cpp" line="252"/>
<source>Select Slur Type</source>
<translation>Výběr typu legatového obloučku</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="247"/>
+ <location filename="../ui/mainwin.cpp" line="259"/>
<source>Treble Clef</source>
<translation>Houslový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="249"/>
+ <location filename="../ui/mainwin.cpp" line="261"/>
<source>Bass Clef</source>
<translation>Basový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="254"/>
+ <location filename="../ui/mainwin.cpp" line="266"/>
<source>Alto Clef</source>
<translation>Altový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="242"/>
+ <location filename="../ui/mainwin.cpp" line="254"/>
<source>Tie</source>
- <translation>Oblouček</translation>
+ <translation>Ligatura</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="243"/>
+ <location filename="../ui/mainwin.cpp" line="255"/>
<source>Slur</source>
- <translation>Oblouček legáta</translation>
+ <translation>Legato</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="244"/>
+ <location filename="../ui/mainwin.cpp" line="256"/>
<source>Phrasing Slur</source>
- <translation>Oblouček frázování</translation>
+ <translation>Frázovací oblouček</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="268"/>
+ <location filename="../ui/mainwin.cpp" line="280"/>
<source>Single Barline</source>
<translation>Jednoduchá taktová čára</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="269"/>
+ <location filename="../ui/mainwin.cpp" line="281"/>
<source>Double Barline</source>
- <translation>Zdojená taktová čára</translation>
+ <translation>Dvojitá taktová čára</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="270"/>
+ <location filename="../ui/mainwin.cpp" line="282"/>
<source>End Barline</source>
- <translation>Taktová čára na konci</translation>
+ <translation>Koncová taktová čára</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="271"/>
+ <location filename="../ui/mainwin.cpp" line="283"/>
<source>Dotted Barline</source>
- <translation>Taktová čára s tečkou</translation>
+ <translation>Tečkovaná taktová čára</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="272"/>
+ <location filename="../ui/mainwin.cpp" line="284"/>
<source>Repeat Open</source>
- <translation>Zopakování otevření</translation>
+ <translation>Opakování otevřené</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="273"/>
+ <location filename="../ui/mainwin.cpp" line="285"/>
<source>Repeat Closed</source>
- <translation>Zopakování zavření</translation>
+ <translation>Opakování zavřené</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="351"/>
+ <location filename="../ui/mainwin.cpp" line="363"/>
<source>Voice Stems Neutral</source>
<translation>Neutrální směr nožiček hlasů</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="352"/>
+ <location filename="../ui/mainwin.cpp" line="364"/>
<source>Voice Stems Up</source>
<translation>Směr nožiček hlasů nahoru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="353"/>
+ <location filename="../ui/mainwin.cpp" line="365"/>
<source>Voice Stems Down</source>
<translation>Směr nožiček hlasů dolů</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="369"/>
+ <location filename="../ui/mainwin.cpp" line="381"/>
<source>Note Stem Neutral</source>
- <translation>Neutrální směr nožiček hlasů</translation>
+ <translation>Neutrální směr nožičky noty</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="370"/>
+ <location filename="../ui/mainwin.cpp" line="382"/>
<source>Note Stem Up</source>
- <translation>Směr nožiček nahoru</translation>
+ <translation>Směr nožičky noty nahoru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="371"/>
+ <location filename="../ui/mainwin.cpp" line="383"/>
<source>Note Stem Down</source>
- <translation>Směr nožiček dolů</translation>
+ <translation>Směr nožičky noty dolů</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="372"/>
+ <location filename="../ui/mainwin.cpp" line="384"/>
<source>Note Stem Preferred</source>
- <translation>Upřednostňovaný směr nožiček </translation>
+ <translation>Upřednostňovaný směr nožičky noty</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="274"/>
+ <location filename="../ui/mainwin.cpp" line="286"/>
<source>Repeat Closed-Open</source>
- <translation>Zopakování zavření-otevření</translation>
+ <translation>Opakování zavřené-otevřené</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="421"/>
- <location filename="../ui/mainwin.cpp" line="439"/>
- <location filename="../ui/mainwin.cpp" line="447"/>
+ <location filename="../ui/mainwin.cpp" line="442"/>
+ <location filename="../ui/mainwin.cpp" line="460"/>
+ <location filename="../ui/mainwin.cpp" line="468"/>
<source>Tonic</source>
- <translation>První stupeň tóniny(tónika)</translation>
+ <translation>První stupeň tóniny (tónika)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="422"/>
- <location filename="../ui/mainwin.cpp" line="440"/>
- <location filename="../ui/mainwin.cpp" line="449"/>
+ <location filename="../ui/mainwin.cpp" line="443"/>
+ <location filename="../ui/mainwin.cpp" line="461"/>
+ <location filename="../ui/mainwin.cpp" line="470"/>
<source>Subdominant</source>
<translation>Čtvrtý stupeň diatonické stupnice (subdominanta)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="423"/>
- <location filename="../ui/mainwin.cpp" line="441"/>
- <location filename="../ui/mainwin.cpp" line="451"/>
+ <location filename="../ui/mainwin.cpp" line="444"/>
+ <location filename="../ui/mainwin.cpp" line="462"/>
+ <location filename="../ui/mainwin.cpp" line="472"/>
<source>Dominant</source>
<translation>Pátý stupeň diatonické stupnice (dominanta)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="424"/>
- <location filename="../ui/mainwin.cpp" line="452"/>
+ <location filename="../ui/mainwin.cpp" line="445"/>
+ <location filename="../ui/mainwin.cpp" line="473"/>
<source>II</source>
<translation>II</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="425"/>
- <location filename="../ui/mainwin.cpp" line="453"/>
+ <location filename="../ui/mainwin.cpp" line="446"/>
+ <location filename="../ui/mainwin.cpp" line="474"/>
<source>III</source>
<translation>III</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="426"/>
- <location filename="../ui/mainwin.cpp" line="454"/>
+ <location filename="../ui/mainwin.cpp" line="447"/>
+ <location filename="../ui/mainwin.cpp" line="475"/>
<source>VI</source>
<translation>VI</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="427"/>
- <location filename="../ui/mainwin.cpp" line="455"/>
+ <location filename="../ui/mainwin.cpp" line="448"/>
+ <location filename="../ui/mainwin.cpp" line="476"/>
<source>VII</source>
<translation>VII</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="428"/>
+ <location filename="../ui/mainwin.cpp" line="449"/>
<source>Cadenze</source>
- <translation>Kadence (melodický spád)</translation>
+ <translation>Kadence</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="429"/>
- <location filename="../ui/mainwin.cpp" line="442"/>
- <location filename="../ui/mainwin.cpp" line="448"/>
+ <location filename="../ui/mainwin.cpp" line="450"/>
+ <location filename="../ui/mainwin.cpp" line="463"/>
+ <location filename="../ui/mainwin.cpp" line="469"/>
<source>minor Tonic</source>
- <translation>První stupeň mollové tóniny</translation>
+ <translation>První stupeň molové tóniny</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="430"/>
- <location filename="../ui/mainwin.cpp" line="443"/>
- <location filename="../ui/mainwin.cpp" line="450"/>
+ <location filename="../ui/mainwin.cpp" line="451"/>
+ <location filename="../ui/mainwin.cpp" line="464"/>
+ <location filename="../ui/mainwin.cpp" line="471"/>
<source>minor Subdominant</source>
- <translation>Subdominanta mollové tóniny</translation>
+ <translation>Subdominanta molové tóniny</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="431"/>
+ <location filename="../ui/mainwin.cpp" line="452"/>
<source>Napolitan</source>
<translation>Neapolský</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="432"/>
+ <location filename="../ui/mainwin.cpp" line="453"/>
<source>Phrygian</source>
<translation>Frýgický</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="433"/>
+ <location filename="../ui/mainwin.cpp" line="454"/>
<source>Lydian</source>
- <translation>Lydický</translation>
+ <translation>Lýdický</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="434"/>
+ <location filename="../ui/mainwin.cpp" line="455"/>
<source>IV</source>
<translation>IV</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="435"/>
+ <location filename="../ui/mainwin.cpp" line="456"/>
<source>V</source>
<translation>V</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="419"/>
+ <location filename="../ui/mainwin.cpp" line="440"/>
<source>Select Function Name</source>
- <translation>Vybrat označení činnosti</translation>
+ <translation>Vybrat název funkce</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="437"/>
+ <location filename="../ui/mainwin.cpp" line="458"/>
<source>Select Chord Area</source>
- <translation>Vybrat oblast akordu (souzvuku)</translation>
+ <translation>Vybrat oblast akordu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="445"/>
+ <location filename="../ui/mainwin.cpp" line="466"/>
<source>Select Tonic Degree</source>
<translation>Vybrat první stupeň tóniny</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="237"/>
+ <location filename="../ui/mainwin.cpp" line="248"/>
<source>New Staff</source>
<translation>Nová notová osnova</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="238"/>
+ <location filename="../ui/mainwin.cpp" line="249"/>
<source>New Lyrics context</source>
- <translation>Nové textové prostředí</translation>
+ <translation>Nové prostředí textu písně</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1647"/>
- <location filename="../ui/mainwin.cpp" line="4996"/>
+ <location filename="../ui/mainwin.cpp" line="1736"/>
+ <location filename="../ui/mainwin.cpp" line="5320"/>
<source>LyricsContext%1</source>
- <translation>Prostředí textu %1</translation>
+ <translation>Prostředí textu písně %1</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="330"/>
+ <location filename="../ui/mainwin.cpp" line="342"/>
<source>Stanza number</source>
<translation>Číslo sloky</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="335"/>
+ <location filename="../ui/mainwin.cpp" line="347"/>
<source>Associated voice</source>
- <translation>Příslušející hlas</translation>
+ <translation>Spojený hlas</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1228"/>
+ <location filename="../ui/mainwin.cpp" line="1291"/>
<source>new sheet</source>
<comment>undo</comment>
<translation>Nový list</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1249"/>
+ <location filename="../ui/mainwin.cpp" line="1312"/>
<source>new voice</source>
<comment>undo</comment>
<translation>Nový hlas</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1283"/>
+ <location filename="../ui/mainwin.cpp" line="1346"/>
<source>voice removal</source>
<comment>undo</comment>
<translation>Odstranění hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1311"/>
+ <location filename="../ui/mainwin.cpp" line="1374"/>
<source>context removal</source>
<comment>undo</comment>
<translation>Odstranění prostředí</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1626"/>
+ <location filename="../ui/mainwin.cpp" line="1715"/>
<source>new staff</source>
<comment>undo</comment>
<translation>Nová notová osnova</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1638"/>
+ <location filename="../ui/mainwin.cpp" line="1727"/>
<source>new lyrics context</source>
<comment>undo</comment>
- <translation>Nové textové prostředí</translation>
+ <translation>Nové prostředí textu písně</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1953"/>
+ <location filename="../ui/mainwin.cpp" line="2053"/>
<source>insert barline</source>
<comment>undo</comment>
<translation>Vložit taktovou čáru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="1985"/>
+ <location filename="../ui/mainwin.cpp" line="2085"/>
<source>rise note</source>
<comment>undo</comment>
<translation>Zvýšit notu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="2023"/>
+ <location filename="../ui/mainwin.cpp" line="2123"/>
<source>lower note</source>
<comment>undo</comment>
<translation>Snížit notu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="2068"/>
+ <location filename="../ui/mainwin.cpp" line="2168"/>
<source>add sharp</source>
<comment>undo</comment>
<translation>Přidat křížek</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="2102"/>
+ <location filename="../ui/mainwin.cpp" line="2202"/>
<source>add flat</source>
<comment>undo</comment>
<translation>Přidat béčko</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="2129"/>
+ <location filename="../ui/mainwin.cpp" line="2229"/>
<source>set dotted</source>
<comment>undo</comment>
- <translation>Prodloužit</translation>
+ <translation>Nastavit tečkované</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="4749"/>
+ <location filename="../ui/mainwin.cpp" line="5048"/>
<source>deletion of elements</source>
<comment>undo</comment>
<translation>Smazat prvky</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="2286"/>
+ <location filename="../ui/mainwin.cpp" line="2407"/>
<source>insertion of music element</source>
<comment>undo</comment>
<translation>Vložit noty a pauzy</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3149"/>
+ <location filename="../ui/mainwin.cpp" line="3314"/>
<source>change voice name</source>
<comment>undo</comment>
<translation>Změnit název hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3298"/>
+ <location filename="../ui/mainwin.cpp" line="3470"/>
<source>lyrics edit</source>
<comment>undo</comment>
- <translation>Upravit text</translation>
+ <translation>Upravit text písně</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3694"/>
+ <location filename="../ui/mainwin.cpp" line="3932"/>
<source>commit CanorusML source</source>
<comment>undo</comment>
- <translation>Předat CanorusML Data</translation>
+ <translation>Zapsat data CanorusML</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3713"/>
- <location filename="../ui/mainwin.cpp" line="3748"/>
+ <location filename="../ui/mainwin.cpp" line="3951"/>
+ <location filename="../ui/mainwin.cpp" line="3986"/>
<source>commit LilyPond source</source>
<comment>undo</comment>
- <translation>Předat LilyPond Data</translation>
+ <translation>Zapsat data LilyPond</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3866"/>
+ <location filename="../ui/mainwin.cpp" line="4104"/>
<source>deletion of the sheet</source>
<comment>undo</comment>
<translation>Smazat list</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3924"/>
+ <location filename="../ui/mainwin.cpp" line="4163"/>
<source>change sheet name</source>
<comment>undo</comment>
<translation>Změnit název listu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3944"/>
+ <location filename="../ui/mainwin.cpp" line="4183"/>
<source>change context name</source>
<comment>undo</comment>
<translation>Změnit název prostředí</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3963"/>
+ <location filename="../ui/mainwin.cpp" line="4202"/>
<source>change stanza number</source>
<comment>undo</comment>
- <translation>Změnit název číslo sloky</translation>
+ <translation>Změnit číslo sloky</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3975"/>
+ <location filename="../ui/mainwin.cpp" line="4214"/>
<source>change associated voice</source>
<comment>undo</comment>
- <translation>Změnit příslušející hlas</translation>
+ <translation>Změnit spojený hlas</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3986"/>
+ <location filename="../ui/mainwin.cpp" line="4225"/>
<source>change voice stem direction</source>
<comment>undo</comment>
<translation>Změnit směr nožiček u hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="4003"/>
+ <location filename="../ui/mainwin.cpp" line="4242"/>
<source>change note stem direction</source>
<comment>undo</comment>
<translation>Změnit směr nožiček u not</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="248"/>
+ <location filename="../ui/mainwin.cpp" line="260"/>
<source>French Clef</source>
<translation>Houslový klíč (francouzský)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="250"/>
+ <location filename="../ui/mainwin.cpp" line="262"/>
<source>Varbaritone Clef</source>
<translation>Barytonový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="251"/>
+ <location filename="../ui/mainwin.cpp" line="263"/>
<source>Subbass Clef</source>
<translation>Subbasový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="252"/>
+ <location filename="../ui/mainwin.cpp" line="264"/>
<source>Soprano Clef</source>
<translation>Sopránový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="253"/>
+ <location filename="../ui/mainwin.cpp" line="265"/>
<source>Mezzosoprano Clef</source>
<translation>Mezzosopránový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="255"/>
+ <location filename="../ui/mainwin.cpp" line="267"/>
<source>Tenor Clef</source>
<translation>Tenorový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="256"/>
+ <location filename="../ui/mainwin.cpp" line="268"/>
<source>Baritone Clef</source>
<translation>Barytonový klíč</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="344"/>
+ <location filename="../ui/mainwin.cpp" line="356"/>
<source>Voice instrument</source>
<translation>Nástroj hlasu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="409"/>
+ <location filename="../ui/mainwin.cpp" line="416"/>
<source>Clef ToolBar</source>
- <translation>Výběr klíče</translation>
+ <translation>Nástrojový panel pro výběr klíče</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="416"/>
+ <location filename="../ui/mainwin.cpp" line="423"/>
<source>Clef offset</source>
<translation>Posunutí klíče</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="581"/>
+ <location filename="../ui/mainwin.cpp" line="603"/>
<source>Undo</source>
<translation>Zpět</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="588"/>
+ <location filename="../ui/mainwin.cpp" line="610"/>
<source>Redo</source>
<translation>Znovu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3131"/>
+ <location filename="../ui/mainwin.cpp" line="3296"/>
<source>change clef offset</source>
<comment>undo</comment>
<translation>Změnit posunutí klíče</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="4566"/>
+ <location filename="../ui/mainwin.cpp" line="4865"/>
<source>cut</source>
<comment>undo</comment>
<translation>Vyjmout</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="4956"/>
+ <location filename="../ui/mainwin.cpp" line="5280"/>
<source>paste</source>
<comment>undo</comment>
<translation>Vložit</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="436"/>
- <location filename="../ui/mainwin.cpp" line="444"/>
+ <location filename="../ui/mainwin.cpp" line="457"/>
+ <location filename="../ui/mainwin.cpp" line="465"/>
<source>None</source>
<translation>Žádný</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3092"/>
- <source>change key signature</source>
- <comment>undo</comment>
- <translation>Změnit předznamenání</translation>
- </message>
- <message>
- <location filename="../ui/mainwin.cpp" line="3356"/>
+ <location filename="../ui/mainwin.cpp" line="3601"/>
<source>change function</source>
<comment>undo</comment>
- <translation>Změnit popis činnosti</translation>
+ <translation>Změnit funkci</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3379"/>
+ <location filename="../ui/mainwin.cpp" line="3624"/>
<source>change chord area</source>
<comment>undo</comment>
<translation>Změnit oblast akordu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3402"/>
+ <location filename="../ui/mainwin.cpp" line="3647"/>
<source>change tonic degree</source>
<comment>undo</comment>
- <translation>Vybrat stupeň tóniny</translation>
+ <translation>Změnit první stupeň tóniny</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3424"/>
+ <location filename="../ui/mainwin.cpp" line="3669"/>
<source>set/unset ellipse</source>
<comment>undo</comment>
- <translation>Zapnout/Vypnout výpustku</translation>
+ <translation>Zapnout/Vypnout elipsu</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="3206"/>
+ <location filename="../ui/mainwin.cpp" line="3378"/>
<source>change playable length</source>
<comment>undo</comment>
<translation>Změnit hratelnou délku</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="275"/>
+ <location filename="../ui/mainwin.cpp" line="287"/>
<source>Select Mark</source>
<translation>Vybrat značku</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="277"/>
+ <location filename="../ui/mainwin.cpp" line="289"/>
<source>Tempo</source>
<translation>Tempo</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="278"/>
+ <location filename="../ui/mainwin.cpp" line="290"/>
<source>Ritardando</source>
- <translation>Ritardando (postupně zvolněný)</translation>
+ <translation>Ritardando (postupně zvolněno)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="279"/>
+ <location filename="../ui/mainwin.cpp" line="291"/>
<source>Accellerando</source>
<translation>Accellerando (zrychleně)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="280"/>
+ <location filename="../ui/mainwin.cpp" line="292"/>
<source>Dynamic</source>
- <translation>Dynamika (hudební značky určující hlasitost)</translation>
+ <translation>Dynamika</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="281"/>
+ <location filename="../ui/mainwin.cpp" line="293"/>
<source>Crescendo</source>
<translation>Crescendo (postupné zvýšení hlasitosti)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="282"/>
+ <location filename="../ui/mainwin.cpp" line="294"/>
<source>Decrescendo</source>
<translation>Decrescendo (postupné snížení hlasitosti)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="284"/>
+ <location filename="../ui/mainwin.cpp" line="296"/>
<source>Arbitrary Text</source>
<translation>Libovolný text</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="287"/>
+ <location filename="../ui/mainwin.cpp" line="299"/>
<source>Bookmark</source>
<translation>Záložka</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="288"/>
+ <location filename="../ui/mainwin.cpp" line="300"/>
<source>Rehersal Mark</source>
- <translation>Značka zkoušky</translation>
+ <translation>Značka pro zkoušku</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="283"/>
+ <location filename="../ui/mainwin.cpp" line="295"/>
<source>Fermata</source>
- <translation>Fermata (koruna)</translation>
+ <translation>Koruna (fermata)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="285"/>
+ <location filename="../ui/mainwin.cpp" line="297"/>
<source>Repeat Mark</source>
- <translation>Opakovací znaménko</translation>
+ <translation>Značka pro opakování</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="290"/>
- <location filename="../ui/mainwin.cpp" line="496"/>
+ <location filename="../ui/mainwin.cpp" line="302"/>
+ <location filename="../ui/mainwin.cpp" line="517"/>
<source>Instrument Change</source>
<translation>Změna nástroje</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="289"/>
+ <location filename="../ui/mainwin.cpp" line="301"/>
<source>Fingering</source>
<translation>Prstoklad</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="239"/>
- <source>New Function Mark context</source>
+ <location filename="../ui/mainwin.cpp" line="250"/>
+ <source>New Figured Bass context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="286"/>
+ <location filename="../ui/mainwin.cpp" line="251"/>
+ <source>New Function Mark context</source>
+ <translation>Prostředí nové funkční značky</translation>
+ </message>
+ <message>
+ <location filename="../ui/mainwin.cpp" line="298"/>
<source>Pedal Mark</source>
- <translation type="unfinished"></translation>
+ <translation>Značka pro pedál</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="291"/>
+ <location filename="../ui/mainwin.cpp" line="303"/>
<source>Articulation Mark</source>
<translation>Značka pro artikulaci</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="293"/>
+ <location filename="../ui/mainwin.cpp" line="305"/>
<source>Accent</source>
- <translation>Akcent (důraz)</translation>
+ <translation>Přízvuk (důraz)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="294"/>
+ <location filename="../ui/mainwin.cpp" line="306"/>
<source>Marcato</source>
<translation>Marcato (důrazně)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="295"/>
+ <location filename="../ui/mainwin.cpp" line="307"/>
<source>Stacatissimo</source>
<translation>Stacatissimo (velmi krátce)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="296"/>
+ <location filename="../ui/mainwin.cpp" line="308"/>
<source>Espressivo</source>
<translation>Espressivo (výrazně)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="297"/>
+ <location filename="../ui/mainwin.cpp" line="309"/>
<source>Staccato</source>
<translation>Staccato (krátce)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="298"/>
+ <location filename="../ui/mainwin.cpp" line="310"/>
<source>Tenuto</source>
<translation>Tenuto (drženě)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="299"/>
+ <location filename="../ui/mainwin.cpp" line="311"/>
<source>Portato</source>
<translation>Portato</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="300"/>
+ <location filename="../ui/mainwin.cpp" line="312"/>
<source>UpBow</source>
<translation>Tah smyčcem nahoru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="301"/>
+ <location filename="../ui/mainwin.cpp" line="313"/>
<source>DownBow</source>
- <translation>Vedení smyčce dolů</translation>
+ <translation>Tah smyčcem dolů</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="302"/>
+ <location filename="../ui/mainwin.cpp" line="314"/>
<source>Flageloet</source>
<translation>Flažolet</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="303"/>
+ <location filename="../ui/mainwin.cpp" line="315"/>
<source>Open</source>
<translation>Otevřít</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="304"/>
+ <location filename="../ui/mainwin.cpp" line="316"/>
<source>Stopped</source>
<translation>Zastaveno</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="305"/>
+ <location filename="../ui/mainwin.cpp" line="317"/>
<source>Turn</source>
- <translation>Dvojitý příraz</translation>
+ <translation>Dvojitý příraz (obal)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="306"/>
+ <location filename="../ui/mainwin.cpp" line="318"/>
<source>ReverseTurn</source>
- <translation>Obrácený dvojitý příraz</translation>
+ <translation>Obrácený dvojitý příraz (obrácený obal)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="307"/>
+ <location filename="../ui/mainwin.cpp" line="319"/>
<source>Trill</source>
<translation>Trylek</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="308"/>
+ <location filename="../ui/mainwin.cpp" line="320"/>
<source>Prall</source>
- <translation>Náraz</translation>
+ <translation>Náraz (nátryl)</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="309"/>
+ <location filename="../ui/mainwin.cpp" line="321"/>
<source>Mordent</source>
- <translation>Morden</translation>
+ <translation>Mordent</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="310"/>
+ <location filename="../ui/mainwin.cpp" line="322"/>
<source>Prall-Prall</source>
<translation>Dvojitý náraz</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="311"/>
+ <location filename="../ui/mainwin.cpp" line="323"/>
<source>Prall-Mordent</source>
- <translation>Náraz-morden</translation>
+ <translation>Náraz-mordent</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="312"/>
+ <location filename="../ui/mainwin.cpp" line="324"/>
<source>Up-Prall</source>
- <translation>Směrem nahoru-náraz</translation>
+ <translation>Náraz směrem nahoru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="313"/>
+ <location filename="../ui/mainwin.cpp" line="325"/>
<source>Down-Prall</source>
<translation>Náraz směrem dolů</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="314"/>
+ <location filename="../ui/mainwin.cpp" line="326"/>
<source>Up-Mordent</source>
- <translation>Morden směrem nahoru</translation>
+ <translation>Mordent směrem nahoru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="315"/>
+ <location filename="../ui/mainwin.cpp" line="327"/>
<source>Down-Mordent</source>
- <translation>Morden směrem dolů</translation>
+ <translation>Mordent směrem dolů</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="316"/>
+ <location filename="../ui/mainwin.cpp" line="328"/>
<source>Prall-Down</source>
<translation>Náraz směrem dolů</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="317"/>
+ <location filename="../ui/mainwin.cpp" line="329"/>
<source>Prall-Up</source>
<translation>Náraz-směrem nahoru</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="318"/>
+ <location filename="../ui/mainwin.cpp" line="330"/>
<source>Line-Prall</source>
<translation>Linka-Náraz</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="366"/>
+ <location filename="../ui/mainwin.cpp" line="378"/>
<source>HundredTwentyEighth</source>
<comment>note</comment>
- <translation type="unfinished"></translation>
+ <translation>Stodvacetiosminová nota</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="373"/>
+ <location filename="../ui/mainwin.cpp" line="385"/>
<source>Select Tuplet Type</source>
- <translation type="unfinished"></translation>
+ <translation>Vybrat typ rytmické notové skupiny</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="375"/>
+ <location filename="../ui/mainwin.cpp" line="387"/>
<source>Triplet</source>
- <translation type="unfinished"></translation>
+ <translation>Triola</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="376"/>
+ <location filename="../ui/mainwin.cpp" line="388"/>
<source>Tuplet</source>
- <translation type="unfinished"></translation>
+ <translation>Rytmická notová skupina</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="381"/>
+ <location filename="../ui/mainwin.cpp" line="393"/>
<source>Number of notes</source>
- <translation type="unfinished"></translation>
+ <translation>Počet not</translation>
</message>
<message>
- <location filename="../ui/mainwin.cpp" line="382"/>
+ ...
[truncated message content] |
|
From: <su...@us...> - 2012-08-27 19:32:11
|
Revision: 1291
http://canorus.svn.sourceforge.net/canorus/?rev=1291&view=rev
Author: suamor
Date: 2012-08-27 19:32:05 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes: Cast count to integer for comparison (and for for loop)
Modified Paths:
--------------
trunk/src/interface/rtmididevice.cpp
Modified: trunk/src/interface/rtmididevice.cpp
===================================================================
--- trunk/src/interface/rtmididevice.cpp 2012-08-27 19:31:33 UTC (rev 1290)
+++ trunk/src/interface/rtmididevice.cpp 2012-08-27 19:32:05 UTC (rev 1291)
@@ -59,7 +59,7 @@
if (port==-1 || _outOpen)
return false;
- if (_out && _out->getPortCount() > port) { // check outputs
+ if (_out && (int)_out->getPortCount() > port) { // check outputs
try {
_out->openPort(port);
} catch (RtError &error) {
@@ -78,7 +78,7 @@
if (port==-1 || _inOpen)
return false;
- if (_in && _in->getPortCount() > port) { // check outputs
+ if (_in && (int)_in->getPortCount() > port) { // check outputs
try {
_in->openPort(port);
} catch (RtError &error) {
@@ -130,7 +130,7 @@
QMap<int, QString> CARtMidiDevice::getOutputPorts() {
QMap<int, QString> outPorts;
try {
- for (int i=0; _out && i<_out->getPortCount(); i++)
+ for (int i=0; _out && i<(int)_out->getPortCount(); i++)
outPorts.insert(i, QString::fromStdString(_out->getPortName(i)));
} catch (RtError &error) {
error.printMessage();
@@ -142,7 +142,7 @@
QMap<int, QString> CARtMidiDevice::getInputPorts() {
QMap<int, QString> inPorts;
try {
- for (int i=0; _in && i<_in->getPortCount(); i++)
+ for (int i=0; _in && i<(int)_in->getPortCount(); i++)
inPorts.insert(i, QString::fromStdString(_in->getPortName(i)));
} catch (RtError &error) {
error.printMessage();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-27 19:31:39
|
Revision: 1290
http://canorus.svn.sourceforge.net/canorus/?rev=1290&view=rev
Author: suamor
Date: 2012-08-27 19:31:33 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes: Destruktor is now virtual
Modified Paths:
--------------
trunk/src/interface/rtmididevice.h
Modified: trunk/src/interface/rtmididevice.h
===================================================================
--- trunk/src/interface/rtmididevice.h 2012-08-27 19:29:07 UTC (rev 1289)
+++ trunk/src/interface/rtmididevice.h 2012-08-27 19:31:33 UTC (rev 1290)
@@ -21,7 +21,7 @@
class CARtMidiDevice : public CAMidiDevice {
public:
CARtMidiDevice();
- ~CARtMidiDevice();
+ virtual ~CARtMidiDevice();
QMap<int, QString> getOutputPorts();
QMap<int, QString> getInputPorts();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-27 19:29:13
|
Revision: 1289
http://canorus.svn.sourceforge.net/canorus/?rev=1289&view=rev
Author: suamor
Date: 2012-08-27 19:29:07 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes: bufferedInput did not return a value (now "0" pointer)
Modified Paths:
--------------
trunk/src/interface/pyconsoleinterface.h
Modified: trunk/src/interface/pyconsoleinterface.h
===================================================================
--- trunk/src/interface/pyconsoleinterface.h 2012-08-27 19:28:18 UTC (rev 1288)
+++ trunk/src/interface/pyconsoleinterface.h 2012-08-27 19:29:07 UTC (rev 1289)
@@ -21,7 +21,7 @@
char* bufferedInput(char* prompt); // Input goes to script
void bufferedOutput(char* bufInp, bool bStdErr);
#else
- char* bufferedInput(char* prompt) {}
+ char* bufferedInput(char* prompt) { return 0; }
void bufferedOutput(char* bufInp, bool bStdErr) {}
#endif
CAPyConsoleInterface () {}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-27 19:28:24
|
Revision: 1288
http://canorus.svn.sourceforge.net/canorus/?rev=1288&view=rev
Author: suamor
Date: 2012-08-27 19:28:18 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- Cast to integer in for loop
- Fixed: New method installPlugin needs to return a value
Modified Paths:
--------------
trunk/src/interface/pluginmanager.cpp
Modified: trunk/src/interface/pluginmanager.cpp
===================================================================
--- trunk/src/interface/pluginmanager.cpp 2012-08-27 19:25:55 UTC (rev 1287)
+++ trunk/src/interface/pluginmanager.cpp 2012-08-27 19:28:18 UTC (rev 1288)
@@ -87,7 +87,7 @@
// search the plugins paths and creates a list of directories for each plugin
QDir curDir(systemPluginsPath);
- for (int j=0; j<curDir.count(); j++) {
+ for (int j=0; j<(int)curDir.count(); j++) {
pluginPaths << curDir.absolutePath() + "/" + curDir[j];
}
@@ -221,6 +221,7 @@
*/
bool CAPluginManager::installPlugin(QString path) {
/// \todo zlib needed
+ return false;
}
/*!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-27 19:26:02
|
Revision: 1287
http://canorus.svn.sourceforge.net/canorus/?rev=1287&view=rev
Author: suamor
Date: 2012-08-27 19:25:55 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes: removeArgument return the removeAll result value
Modified Paths:
--------------
trunk/src/interface/pluginaction.h
Modified: trunk/src/interface/pluginaction.h
===================================================================
--- trunk/src/interface/pluginaction.h 2012-08-27 19:24:44 UTC (rev 1286)
+++ trunk/src/interface/pluginaction.h 2012-08-27 19:25:55 UTC (rev 1287)
@@ -39,7 +39,7 @@
void setLang(QString lang) { _lang = lang; }
void setFunction(QString function) { _function = function; }
void addArgument(QString arg) { _args << arg; }
- bool removeArgument(QString arg) { _args.removeAll(arg); }
+ bool removeArgument(QString arg) { return _args.removeAll(arg); }
void setFilename(QString filename) { _filename = filename; }
void setOnAction(QString onAction) { _onAction = onAction; }
void setExportFilter(QString lang, QString value) { _exportFilter[lang] = value; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-27 19:24:50
|
Revision: 1286
http://canorus.svn.sourceforge.net/canorus/?rev=1286&view=rev
Author: suamor
Date: 2012-08-27 19:24:44 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes: Fix rebuildDocument used outside SWIGCPP #define
Modified Paths:
--------------
trunk/src/interface/plugin.cpp
Modified: trunk/src/interface/plugin.cpp
===================================================================
--- trunk/src/interface/plugin.cpp 2012-08-27 19:22:58 UTC (rev 1285)
+++ trunk/src/interface/plugin.cpp 2012-08-27 19:24:44 UTC (rev 1286)
@@ -80,6 +80,10 @@
bool CAPlugin::callAction(CAPluginAction *action, CAMainWin *mainWin, CADocument *document, QEvent *evt, QPoint *coords, QString filename) {
bool error=false;
+#ifndef SWIGCPP
+ bool rebuildDocument = false;
+#endif
+
#ifdef USE_RUBY
QList<VALUE> rubyArgs;
#endif
@@ -87,7 +91,6 @@
QList<PyObject*> pythonArgs;
#endif
- bool rebuildDocument = false;
// Convert arguments to its needed scripting language types
QList<QString> args = action->args();
@@ -96,7 +99,9 @@
// Currently selected document
if (val=="document") {
+#ifndef SWIGCPP
rebuildDocument = true;
+#endif
#ifdef USE_RUBY
if (action->lang()=="ruby") {
rubyArgs << CASwigRuby::toRubyObject(document, CASwigRuby::Document);
@@ -263,7 +268,7 @@
#ifndef SWIGCPP
if (action->refresh()) {
- if (rebuildDocument)
+ if (rebuildDocument == true)
CACanorus::rebuildUI(document);
else
CACanorus::rebuildUI(document, mainWin->currentSheet());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-27 19:23:04
|
Revision: 1285
http://canorus.svn.sourceforge.net/canorus/?rev=1285&view=rev
Author: suamor
Date: 2012-08-27 19:22:58 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes: Variables x, drawableStaff defined but not used
Modified Paths:
--------------
trunk/src/interface/keybdinput.cpp
Modified: trunk/src/interface/keybdinput.cpp
===================================================================
--- trunk/src/interface/keybdinput.cpp 2012-08-27 19:19:21 UTC (rev 1284)
+++ trunk/src/interface/keybdinput.cpp 2012-08-27 19:22:58 UTC (rev 1285)
@@ -68,7 +68,7 @@
event = m[0];
velocity = m[2];
if ( event == CAMidiDevice::Midi_Note_On && velocity !=0 ) {
- CADiatonicPitch x = CADiatonicPitch::diatonicPitchFromMidiPitch( m[1] );
+ //CADiatonicPitch x = CADiatonicPitch::diatonicPitchFromMidiPitch( m[1] );
midiInEventToScore( _mw->currentScoreView(), m );
}
}
@@ -112,9 +112,9 @@
CADrawableContext *drawableContext = v->currentContext();
CAStaff *staff=0;
- CADrawableStaff *drawableStaff = 0;
+ //CADrawableStaff *drawableStaff = 0;
if (drawableContext) {
- drawableStaff = dynamic_cast<CADrawableStaff*>(drawableContext);
+ //drawableStaff = dynamic_cast<CADrawableStaff*>(drawableContext);
staff = dynamic_cast<CAStaff*>(drawableContext->context());
}
@@ -187,7 +187,7 @@
delete note;
}
- CAMusElement *elt = voice->lastMusElement();
+ //CAMusElement *elt = voice->lastMusElement();
CABarline *b = static_cast<CABarline*>( voice->previousByType( CAMusElement::Barline,
voice->lastMusElement()));
//CABarline *b = static_cast<CABarline*>(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-27 19:19:27
|
Revision: 1284
http://canorus.svn.sourceforge.net/canorus/?rev=1284&view=rev
Author: suamor
Date: 2012-08-27 19:19:21 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
Large Warn Fixes: Contains description about all the fixes in one files
Added Paths:
-----------
trunk/large-warn-fixes.txt
Added: trunk/large-warn-fixes.txt
===================================================================
--- trunk/large-warn-fixes.txt (rev 0)
+++ trunk/large-warn-fixes.txt 2012-08-27 19:19:21 UTC (rev 1284)
@@ -0,0 +1,202 @@
+Hi,
+
+I added a number of warning flags and mark warning as errors so they get fixed.
+I did a large work fixing all the warning I got due to that change. One hope
+was to find the reason why Canorus crashes on exit. I use the currently widely
+spread gcc 4.4.3 (4.4.4/4.5.1 is the latest available) on Ubuntu 10.04 LTS.
+
+Also I tried to integrate duma into Canorus but on start I got an error happening
+inside the libORBit called from the Gnome settings system (might be related to
+the fact that I use Gnome desktop, so this bug would not necessarily occur on
+every system). Duma is a library to detect heap space errors (heap protection,
+i.e. overruns are detected (or underruns alternatively). I remember to have
+seen an option that ignores errors in libraries not directly belonging to the
+application so I will try that out as well in the hope to find more potential
+problems.
+
+I need your help, to look into all the changes I did, as I might have accidently
+introduces bugs. Especially places where I added additionally braces on mixed &&
+and || conditions, but also for return values which were missing all over the place.
+
+Changes done when fixing warnings
+=================================
+
+export:
+midiexport.h: getIn/OutputPorts return dummy ports as temporary fix
+export.cpp: Return tr("Ready") in readableStatus for unknown status
+midiexport.cpp:
+ - Added missing cases for exportDocumentImpl (why was there a case in the first place ?)
+ - Added missing cases for exportSheetImpl (why was there a case in the first place ?)
+lilypondexport.cpp:
+ - Bug ? exportVoiceImpl missing several cases of music elements
+ - && / || warning logic solved with additional braces
+ - Bug ? exportPlayable missing many cases of music elements
+ - Bug ? exportMarks missing many cases of (articulation) marks
+ - Bug ? exportNoteMarks missing nearly all cases of (note ?) marks
+ - Fix bug in playableLengthToLilyPond by setting length to default value
+ - Fix bug in restTypeToLilyPond by returning a default rest
+ - Fix bug in barlineTypeToLilyPond by returning a default rest
+ - Bug ? exportSheetImpl missing many cases of context types
+ - Bug ? exportSheetImpl missing many cases of context types
+ - Bug ? exportScoreBlock missing many cases of context types
+ - No assignment in if!
+ - CANORUS_VERSION is undefined and leads to error
+ -> make cannot be used inside "src" folder ?
+canorusmlexport.cpp:
+ - unused variable commented
+ - Bug ? exportVoiceImpl missing several cases of music elements
+ - && / || warning logic solved with additional braces
+ - Bug ? Undefined marks not handled in exportMarks
+musicxmlexport.cpp: unused variable commented
+
+import:
+imort.cpp:
+ - not all cases handled (run)
+ - Return "Ready" in readableStatus for unknown status
+ - Unfixed: Status isn't translated
+lilypondimport.cpp:
+ - unused variable commented
+ - Return "Ready" in readableStatus for unknown status
+ - Unfixed: Status isn't translated
+midiimport.cpp:
+ - Unused variables commented
+ - Return "Ready" in readableStatus for unknown status
+ - Bugfix: Keysig / Timesig was not assigned properly - please check and test
+ - Unfixed: Status isn't translated
+canorusmlimport.cpp:
+ - Return values not defined in all cases (importMark)
+ - Bug ? Custom case not handled in startElement
+ - && / || warning logic solved with additional braces
+ - Added missing cases for endElement (why was there a case in the first place ?)
+musicxmlimport.cpp:
+ - Bug ? importDocumentImpl does not handle several cases
+ - Bug: stem assigned but never used - don't know how to fix it (commented)
+ - Unused variable commented
+import/pmidi:
+wrapper.c:
+ - Commented unused variable
+
+interface:
+pluginaction.h: removeArgument return the removeAll result value
+pyconsoleinterface.h: bufferedInput did not return a value (now "0" pointer)
+plugin.cpp: Fix rebuildDocument used outside SWIGCPP #define
+keybdinput.cpp: Variables x, drawableStaff defined but not used
+
+layout:
+drawablefunctionmarkcontext: Move method implementation from header to avoid
+ compiler problem with possible undefined member
+drawablekeysignature.cpp: && / || warning logic solved with additional braces
+drawablemark.cpp: Added missing cases that were not handled
+drawablenote.cpp: Added missing cases that were not handled
+drawablerest.cpp: Added missing cases that were not handled
+drawabeslur.cpp: Added missing cases that were not handled
+drawabletimesignature.cpp: Added missing break in some cases
+kdtree.h: && / || warning logic solved with additional braces
+layoutengine.cpp:
+ - && / || warning logic solved with additional braces
+ - Unused variable commented
+ - Added missing cases that were not handled
+ - Possible bug due to unused variable placedSymbol
+
+score:
+articulation.h setAssociatedNote - additionally return 'n'
+interval.cpp:
+ - && / || warning logic solved with additional braces
+ - Unused variable commented
+ - Return values not defined in all cases (qualityToReadable)
+clef.cpp: Arrays on stack moved to heap to avoid potential stack overflow
+muselement.cpp: Several music element types were not handled
+functionmarkcontext.cpp: && / || warning logic solved with additional braces
+figuredbasscontext.cpp: unused variable commented
+lyricscontext.cpp: unused variable commented
+voice.cpp:
+ - && / || warning logic solved with additional braces
+ - Unused variable commented
+ - Fixed bug where synchronizeMusElements did not return any result
+note.cpp: return values not well defined in all cases (stem)
+keysignature.cpp:
+ - Added missing cases for clone (why was there a case in the first place ?)
+ - return values not defined in all cases (bufferedInput)
+timesignature.cpp: return values not defined in all cases (timeSignatureTypeML)
+slur.cpp: Added missing cases for slurStyleToString
+tuplet.cpp: Changed initialization sequence
+fermata.cpp: Return NormalFermata in fermataTypeFromString for unknown strings
+repeatmark.cpp: Return Undefined in repeatMarkTypeFromString for unknown strings
+ritardando.cpp: Return Ritardando in ritardandoTypeFromString for unknown strings
+fingering.cpp: return values not defined in all cases (fingerNumberToString)
+dynamic.cpp: return values not defined in all cases (dynamicTextToString)
+crescendo.cpp: Return Crescendo in crescendoTypeFromString for unknown strings
+
+core:
+transpose.cpp:
+ - Bug: LyricsContext, FiguredBassContext not handled (marked ToDo)
+ - && / || warning logic solved with additional braces
+ - Bug: Some music elements not handled (those marked as ToDo)
+tar.cpp:
+ - Signed/unsigned comparison (resolved unsigned)
+ - No assignment in if!
+ Possible bug! tar.read/dest.write only done when pad > 0 ?
+ - Unused variables commented
+ - Signed/unsigned comparison (resolved signed)
+ - Bug: Comparison "< 0" against unsigned variable. Temporary fix
+ was to cast this variable to signed.
+ - Enlarging buffer size for stack protection
+ - Commented some unused variables (including possible assignments)
+muselementfactory.cpp:
+ - Several music element types were not handled
+ - Try to make && and || logic definite (compiler)
+ - Return false in configureTuplet method (not implemented)
+
+midirecorder.cpp: Changed initialization sequence
+
+control:
+externprogram.h: Fixed bug that waitForFinished did not return a value
+externprogram.cpp: Fixed several output format bugs (error cases) in programExited
+typesetctl.cpp: Fixed bug that waitForFinished did not return a value
+
+rtmidi:
+rtmidi.cpp
+ - Updated tp 1.0.15
+ - Signed/unsigned comparison (resolved signed)
+ - Removed check for warnings due to ALSA API generating warning
+ that cannot be resolved without breaking ALSA API itself.
+
+scripting:
+canoruspython.i: Workaround for problem compiling with new swig version 2
+swigpython.h: Add method and structure from swig for above workaround
+ -> I haven't any quick good idea how to fix the problem properly
+swigpython.cpp: Bugfix: Add missing return value to callPycli
+
+pluginmanager
+
+ui:
+mainwin.cpp:
+ - Commented unused variables
+ - && / || warning logic solved with additional braces
+ - Added missing cases that were not handled
+ - Save document did not return true or false without document
+ - Open document did not return the document!
+ - Possible bug: variables stanza, rebuild set but never used
+propertiesdialog.cpp:
+ - Several context types not handled
+ - Commented unused item
+ - Bug: Sheet properties supposed to be stored are not stored at all!
+ Code currently commented to compile
+ Also never defines variables inside a loop
+
+widgets
+actionseditor.cpp:
+ - Bug: Assignment instead of comparison
+ - Problem: bSCuts not yet used (need to check)
+menutoolbutton.cpp: ^ / | warning logic solved with additional braces
+resourceview.cpp: No assignment in if!
+scoreview.cpp: && / || warning logic solved with additional braces
+
+I also consider to check our code with some more advanced compiler checker to
+find potential problems like Codan, the new code analysis tool from the latest
+Eclipse Helios Edition. We could also add cppcheck to our nightly build section.
+and send results to either the developer or some other dedicated mailing list.
+
+BTW: The most annyoing thing were unhandled cases. Please take more care about
+that in the future. Thanks in advance.
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 15:03:22
|
Revision: 1283
http://canorus.svn.sourceforge.net/canorus/?rev=1283&view=rev
Author: suamor
Date: 2012-08-26 15:03:16 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes: Commented unused variable
Modified Paths:
--------------
trunk/src/import/pmidi/wrapper.c
Modified: trunk/src/import/pmidi/wrapper.c
===================================================================
--- trunk/src/import/pmidi/wrapper.c 2012-08-26 15:01:36 UTC (rev 1282)
+++ trunk/src/import/pmidi/wrapper.c 2012-08-26 15:03:16 UTC (rev 1283)
@@ -23,7 +23,7 @@
*/
static struct rootElement *root;
static struct sequenceState *seq;
-static unsigned long end;
+//static unsigned long end;
//static snd_seq_event_t *ep;
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 15:01:42
|
Revision: 1282
http://canorus.svn.sourceforge.net/canorus/?rev=1282&view=rev
Author: suamor
Date: 2012-08-26 15:01:36 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- Bug ? importDocumentImpl does not handle several cases
- Bug: stem assigned but never used - don't know how to fix it (commented)
- Unused variable commented
Modified Paths:
--------------
trunk/src/import/musicxmlimport.cpp
Modified: trunk/src/import/musicxmlimport.cpp
===================================================================
--- trunk/src/import/musicxmlimport.cpp 2012-08-26 15:00:48 UTC (rev 1281)
+++ trunk/src/import/musicxmlimport.cpp 2012-08-26 15:01:36 UTC (rev 1282)
@@ -95,6 +95,15 @@
}
break;
}
+ case ProcessingInstruction:
+ case EntityReference:
+ case Comment:
+ case Characters:
+ case EndElement:
+ case EndDocument:
+ case Invalid:
+ case NoToken:
+ break;
}
}
@@ -210,7 +219,7 @@
void CAMusicXmlImport::readPartList() {
if (name()!="part-list") return;
- CASheet *sheet = _document->addSheet();
+ //CASheet *sheet = _document->addSheet();
while (!atEnd() && !(tokenType()==EndElement && name()=="part-list")) {
readNext();
@@ -402,7 +411,7 @@
int staff = 1;
CAPlayableLength length;
CADiatonicPitch pitch;
- CANote::CAStemDirection stem = CANote::StemPreferred;
+ //CANote::CAStemDirection stem = CANote::StemPreferred;
int lyricsNumber=-1;
bool hyphen = false;
bool melisma = false;
@@ -426,8 +435,8 @@
length = CAPlayableLength::timeLengthToPlayableLengthList( (duration/(float)divisions) * 256 ).first();
} else if (name()=="stem") {
QString s = readElementText();
- if (s=="up") stem = CANote::StemUp;
- else if (s=="down") stem = CANote::StemDown;
+ //if (s=="up") stem = CANote::StemUp;
+ //else if (s=="down") stem = CANote::StemDown;
} else if (name()=="pitch") {
int alter = 0;
QString step;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 15:00:58
|
Revision: 1281
http://canorus.svn.sourceforge.net/canorus/?rev=1281&view=rev
Author: suamor
Date: 2012-08-26 15:00:48 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- Unused variables commented
- Return "Ready" in readableStatus for unknown status
- Bugfix: Keysig / Timesig was not assigned properly - please check and test
- Unfixed: Status isn't translated
Modified Paths:
--------------
trunk/src/import/midiimport.cpp
Modified: trunk/src/import/midiimport.cpp
===================================================================
--- trunk/src/import/midiimport.cpp 2012-08-26 14:58:38 UTC (rev 1280)
+++ trunk/src/import/midiimport.cpp 2012-08-26 15:00:48 UTC (rev 1281)
@@ -248,7 +248,7 @@
for (voiceIndex=0; !leftOverNote && voiceIndex<_allChannelsEvents[pmidi_out.chan]->size();voiceIndex++) {
if (_allChannelsEvents[pmidi_out.chan]->at(voiceIndex)->size()) {
- int tnext = _allChannelsEvents[pmidi_out.chan]->at(voiceIndex)->back()->_nextTime;
+ //int tnext = _allChannelsEvents[pmidi_out.chan]->at(voiceIndex)->back()->_nextTime;
if (pmidi_out.time < _allChannelsEvents[pmidi_out.chan]->at(voiceIndex)->back()->_nextTime &&
// pmidi_out.note == _allChannelsEvents[pmidi_out.chan]->at(voiceIndex)->back()->_pitch
_allChannelsEvents[pmidi_out.chan]->at(voiceIndex)->back()->_pitchList.indexOf( pmidi_out.note ) >= 0 ) {
@@ -467,6 +467,7 @@
if (pmidi_out.key == 0) {
CADiatonicKey dk = CADiatonicKey(
pmidi_out.key, pmidi_out.minor ? CADiatonicKey::Minor : CADiatonicKey::Major );
+ musElemKeySig = new CAKeySignature( dk, staff, 0 );
}
musElemTimeSig = new CATimeSignature( pmidi_out.top, pmidi_out.bottom, staff, 0 );
@@ -475,6 +476,9 @@
if ( musElemKeySig ) {
voice->append( musElemKeySig, false );
}
+ if ( musElemTimeSig ) {
+ voice->append( musElemTimeSig, false );
+ }
writeMidiChannelEventsToVoice_New( ch, voiceIndex, staff, voice );
setProgress(_numberOfAllVoices ? nImportedVoices*100/_numberOfAllVoices : 50 );;
@@ -516,7 +520,7 @@
if ( staff->keySignatureReferences().size() < _actualKeySignatureIndex+1 ) {
staff->addKeySignatureReference( new CAKeySignature( _allChannelsKeySignatures[_actualKeySignatureIndex]->diatonicKey(), staff, time ));
}
- int jj = staff->keySignatureReferences().size();
+ //int jj = staff->keySignatureReferences().size();
return staff->keySignatureReferences()[_actualKeySignatureIndex];
}
return 0;
@@ -580,7 +584,7 @@
int time = 0; // current time in the loop, only increasing, for tracking notes and rests
int length;
int program;
- int tempo = 0;
+ //int tempo = 0;
_actualClefIndex = -1; // for each voice we run down the list of time signatures of the sheet, all staffs.
_actualKeySignatureIndex = -1; // for each voice we run down the list of time signatures of the sheet, all staffs.
@@ -778,6 +782,7 @@
case 5:
return tr("Drawing score...");
}
+ return "Ready";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:58:44
|
Revision: 1280
http://canorus.svn.sourceforge.net/canorus/?rev=1280&view=rev
Author: suamor
Date: 2012-08-26 14:58:38 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- unused variable commented
- Return "Ready" in readableStatus for unknown status
- Unfixed: Status isn't translated
Modified Paths:
--------------
trunk/src/import/lilypondimport.cpp
Modified: trunk/src/import/lilypondimport.cpp
===================================================================
--- trunk/src/import/lilypondimport.cpp 2012-08-26 14:57:40 UTC (rev 1279)
+++ trunk/src/import/lilypondimport.cpp 2012-08-26 14:58:38 UTC (rev 1280)
@@ -553,7 +553,7 @@
return ret;
else { // length written
// count dots
- int d=0;
+ //int d=0;
int dStart;
for (int i = dStart = elt.indexOf(".",start);
i!=-1 && i<elt.size() && elt[i]=='.';
@@ -686,4 +686,5 @@
case -1:
return tr("Error while importing!\nLine %1:%2.").arg(curLine()).arg(curChar());
}
+ return "Ready";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:57:46
|
Revision: 1279
http://canorus.svn.sourceforge.net/canorus/?rev=1279&view=rev
Author: suamor
Date: 2012-08-26 14:57:40 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- not all cases handled (run)
- Return "Ready" in readableStatus for unknown status
- Unfixed: Status isn't translated
Modified Paths:
--------------
trunk/src/import/import.cpp
Modified: trunk/src/import/import.cpp
===================================================================
--- trunk/src/import/import.cpp 2012-08-26 14:56:52 UTC (rev 1278)
+++ trunk/src/import/import.cpp 2012-08-26 14:57:40 UTC (rev 1279)
@@ -144,6 +144,8 @@
emit functionMarkContextImported( fmc );
break;
}
+ case Undefined:
+ break;
}
if (status()>0) { // error - bad implemented filter
@@ -200,4 +202,5 @@
case -1:
return tr("Unable to open file for reading");
}
+ return "Ready";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:56:58
|
Revision: 1278
http://canorus.svn.sourceforge.net/canorus/?rev=1278&view=rev
Author: suamor
Date: 2012-08-26 14:56:52 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- Return values not defined in all cases (importMark)
- Bug ? Custom case not handled in startElement
- && / || warning logic solved with additional braces
- Added missing cases for endElement (why was there a case in the first place ?)
Modified Paths:
--------------
trunk/src/import/canorusmlimport.cpp
Modified: trunk/src/import/canorusmlimport.cpp
===================================================================
--- trunk/src/import/canorusmlimport.cpp 2012-08-26 14:55:22 UTC (rev 1277)
+++ trunk/src/import/canorusmlimport.cpp 2012-08-26 14:56:52 UTC (rev 1278)
@@ -308,6 +308,8 @@
);
break;
}
+ case CAKeySignature::Custom:
+ break;
}
_curMusElt = _curKeySig;
@@ -462,7 +464,7 @@
f->addNumber( attributes.value("number").toInt(), attributes.value("accs").toInt() );
}
- } else if (qName == "function-mark" || _version.startsWith("0.5") && qName == "function-marking") {
+ } else if (qName == "function-mark" || ( _version.startsWith("0.5") && qName == "function-marking") ) {
// CAFunctionMark
CAFunctionMark *f =
new CAFunctionMark(
@@ -589,6 +591,9 @@
case CAKeySignature::MajorMinor:
_curKeySig->setDiatonicKey( _curDiatonicKey );
break;
+ case CAKeySignature::Modus:
+ case CAKeySignature::Custom:
+ break;
}
// lookup an element with the same type at the same time
@@ -862,6 +867,8 @@
);
break;
}
+ case CAMark::Undefined:
+ break;
}
if (_curMark) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:55:28
|
Revision: 1277
http://canorus.svn.sourceforge.net/canorus/?rev=1277&view=rev
Author: suamor
Date: 2012-08-26 14:55:22 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes: unused variable commented
Modified Paths:
--------------
trunk/src/export/musicxmlexport.cpp
Modified: trunk/src/export/musicxmlexport.cpp
===================================================================
--- trunk/src/export/musicxmlexport.cpp 2012-08-26 14:54:18 UTC (rev 1276)
+++ trunk/src/export/musicxmlexport.cpp 2012-08-26 14:55:22 UTC (rev 1277)
@@ -56,7 +56,7 @@
It uses DOM object internally for writing the XML output.
*/
void CAMusicXmlExport::exportDocumentImpl(CADocument *doc) {
- int depth = 0;
+ //int depth = 0;
out().setCodec("UTF-8");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:54:25
|
Revision: 1276
http://canorus.svn.sourceforge.net/canorus/?rev=1276&view=rev
Author: suamor
Date: 2012-08-26 14:54:18 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes: getIn/OutputPorts return dummy ports as temporary fix
Modified Paths:
--------------
trunk/src/export/midiexport.h
Modified: trunk/src/export/midiexport.h
===================================================================
--- trunk/src/export/midiexport.h 2012-08-26 14:53:14 UTC (rev 1275)
+++ trunk/src/export/midiexport.h 2012-08-26 14:54:18 UTC (rev 1276)
@@ -38,8 +38,8 @@
// Interface to file export //
//////////////////////////////
*/
- QMap<int, QString> getOutputPorts() { };
- QMap<int, QString> getInputPorts() { };
+ QMap<int, QString> getOutputPorts() { return m_InputPorts; }
+ QMap<int, QString> getInputPorts() { return m_OutputPorts; }
bool openOutputPort(int port) { return true; } // return true on success, false otherwise
bool openInputPort(int port) { return true; } // return true on success, false otherwise
@@ -95,6 +95,11 @@
*/
CAVoice *_curVoice;
CASheet *_curSheet;
+
+ // Dummy members for getOutputPorts/getInputPorts
+ QMap<int, QString> m_InputPorts;
+ QMap<int, QString> m_OutputPorts;
+
/*
CAContext *_curContext;
int _curContextIndex;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:53:20
|
Revision: 1275
http://canorus.svn.sourceforge.net/canorus/?rev=1275&view=rev
Author: suamor
Date: 2012-08-26 14:53:14 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- Added missing cases for exportDocumentImpl (why was there a case in the first place ?)
- Added missing cases for exportSheetImpl (why was there a case in the first place ?)
Modified Paths:
--------------
trunk/src/export/midiexport.cpp
Modified: trunk/src/export/midiexport.cpp
===================================================================
--- trunk/src/export/midiexport.cpp 2012-08-26 14:52:02 UTC (rev 1274)
+++ trunk/src/export/midiexport.cpp 2012-08-26 14:53:14 UTC (rev 1275)
@@ -245,6 +245,7 @@
for (int c = 0; c < doc->sheetList()[0]->contextList().size(); ++c ) {
switch (sheet->contextList()[c]->contextType()) {
case CAContext::Staff:
+ {
// exportStaffVoices( static_cast<CAStaff*>(sheet->contextList()[c]) );
CAStaff *staff = static_cast<CAStaff*>(sheet->contextList()[c]);
for ( int v = 0; v < staff->voiceList().size(); ++v ) {
@@ -252,6 +253,12 @@
count++;
//std::cout << "Hallo " << c << " " << v << "\n" << std::endl;
}
+ break;
+ }
+ case CAContext::LyricsContext:
+ case CAContext::FunctionMarkContext:
+ case CAContext::FiguredBassContext:
+ break;
}
}
@@ -288,6 +295,7 @@
for (int c = 0; c < sheet->contextList().size(); ++c ) {
switch (sheet->contextList()[c]->contextType()) {
case CAContext::Staff:
+ {
// exportStaffVoices( static_cast<CAStaff*>(sheet->contextList()[c]) );
CAStaff *staff = static_cast<CAStaff*>(sheet->contextList()[c]);
for ( int v = 0; v < staff->voiceList().size(); ++v ) {
@@ -295,6 +303,12 @@
count++;
//std::cout << "Hallo " << c << " " << v << "\n" << std::endl;
}
+ break;
+ }
+ case CAContext::LyricsContext:
+ case CAContext::FunctionMarkContext:
+ case CAContext::FiguredBassContext:
+ break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:52:09
|
Revision: 1274
http://canorus.svn.sourceforge.net/canorus/?rev=1274&view=rev
Author: suamor
Date: 2012-08-26 14:52:02 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
- Bug ? exportVoiceImpl missing several cases of music elements
- && / || warning logic solved with additional braces
- Bug ? exportPlayable missing many cases of music elements
- Bug ? exportMarks missing many cases of (articulation) marks
- Bug ? exportNoteMarks missing nearly all cases of (note ?) marks
- Fix bug in playableLengthToLilyPond by setting length to default value
- Fix bug in restTypeToLilyPond by returning a default rest
- Fix bug in barlineTypeToLilyPond by returning a default rest
- Bug ? exportSheetImpl missing many cases of context types
- Bug ? exportSheetImpl missing many cases of context types
- Bug ? exportScoreBlock missing many cases of context types
- No assignment in if!
- CANORUS_VERSION is undefined and leads to error
-> make cannot be used inside "src" folder ?
Modified Paths:
--------------
trunk/src/export/lilypondexport.cpp
Modified: trunk/src/export/lilypondexport.cpp
===================================================================
--- trunk/src/export/lilypondexport.cpp 2012-08-26 14:46:52 UTC (rev 1273)
+++ trunk/src/export/lilypondexport.cpp 2012-08-26 14:52:02 UTC (rev 1274)
@@ -133,6 +133,17 @@
_timeSignatureFound = true;
break;
}
+ case CAMusElement::Note:
+ case CAMusElement::Rest:
+ case CAMusElement::MidiNote:
+ case CAMusElement::Slur:
+ case CAMusElement::Tuplet:
+ case CAMusElement::Syllable:
+ case CAMusElement::FunctionMark:
+ case CAMusElement::FiguredBassMark:
+ case CAMusElement::Mark:
+ case CAMusElement::Undefined:
+ break;
}
if ( v->musElementList()[i]->isPlayable() ) {
@@ -200,20 +211,20 @@
}
// place slurs and phrasing slurs
- if (!note->isPartOfChord() && note->slurEnd() ||
- note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->slurEnd() ) {
+ if ((!note->isPartOfChord() && note->slurEnd()) ||
+ ( note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->slurEnd() ) ) {
out() << ")";
}
- if (!note->isPartOfChord() && note->phrasingSlurEnd() ||
- note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->phrasingSlurEnd() ) {
+ if ((!note->isPartOfChord() && note->phrasingSlurEnd()) ||
+ ( note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->phrasingSlurEnd() ) ) {
out() << "\\)";
}
- if (!note->isPartOfChord() && note->slurStart() ||
- note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->slurStart() ) {
+ if ((!note->isPartOfChord() && note->slurStart()) ||
+ ( note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->slurStart() ) ) {
out() << "(";
}
- if (!note->isPartOfChord() && note->phrasingSlurStart() ||
- note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->phrasingSlurStart() ) {
+ if ((!note->isPartOfChord() && note->phrasingSlurStart()) ||
+ ( note->isPartOfChord() && note->isLastInChord() && note->getChord().at(0)->phrasingSlurStart() ) ) {
out() << "\\(";
}
@@ -247,6 +258,19 @@
break;
}
+ case CAMusElement::Clef:
+ case CAMusElement::Barline:
+ case CAMusElement::TimeSignature:
+ case CAMusElement::KeySignature:
+ case CAMusElement::MidiNote:
+ case CAMusElement::Slur:
+ case CAMusElement::Tuplet:
+ case CAMusElement::Syllable:
+ case CAMusElement::FunctionMark:
+ case CAMusElement::FiguredBassMark:
+ case CAMusElement::Mark:
+ case CAMusElement::Undefined:
+ break;
}
if ( elt->isLastInTuplet() ) {
@@ -305,10 +329,44 @@
out() << "-. "; break;
case CAArticulation::Tenuto:
out() << "-- "; break;
+ case CAArticulation::Staccatissimo:
+ case CAArticulation::Espressivo:
+ case CAArticulation::Portato:
+ case CAArticulation::UpBow:
+ case CAArticulation::DownBow:
+ case CAArticulation::Flageolet:
+ case CAArticulation::Open:
+ case CAArticulation::Stopped:
+ case CAArticulation::Turn:
+ case CAArticulation::ReverseTurn:
+ case CAArticulation::Trill:
+ case CAArticulation::Prall:
+ case CAArticulation::Mordent:
+ case CAArticulation::PrallMordent:
+ case CAArticulation::PrallPrall:
+ case CAArticulation::DownPrall:
+ case CAArticulation::UpPrall:
+ case CAArticulation::UpMordent:
+ case CAArticulation::DownMordent:
+ case CAArticulation::PrallDown:
+ case CAArticulation::PrallUp:
+ case CAArticulation::LinePrall:
+ case CAArticulation::Undefined:
+ break;
}
break;
}
+ case CAMark::Tempo:
+ case CAMark::Ritardando:
+ case CAMark::Crescendo:
+ case CAMark::Pedal:
+ case CAMark::InstrumentChange:
+ case CAMark::Undefined:
+ case CAMark::BookMark:
+ case CAMark::RepeatMark:
+ case CAMark::Fingering:
+ break;
}
}
}
@@ -332,6 +390,20 @@
out() << " ";
break;
}
+ case CAMark::Text:
+ case CAMark::Tempo:
+ case CAMark::Ritardando:
+ case CAMark::Crescendo:
+ case CAMark::Pedal:
+ case CAMark::InstrumentChange:
+ case CAMark::Undefined:
+ case CAMark::BookMark:
+ case CAMark::RepeatMark:
+ case CAMark::Dynamic:
+ case CAMark::RehersalMark:
+ case CAMark::Articulation:
+ case CAMark::Fermata:
+ break;
}
}
}
@@ -361,6 +433,20 @@
};
break;
}
+ case CAMark::Fingering:
+ case CAMark::Tempo:
+ case CAMark::Ritardando:
+ case CAMark::Crescendo:
+ case CAMark::Pedal:
+ case CAMark::InstrumentChange:
+ case CAMark::Undefined:
+ case CAMark::BookMark:
+ case CAMark::RepeatMark:
+ case CAMark::Dynamic:
+ case CAMark::RehersalMark:
+ case CAMark::Articulation:
+ case CAMark::Fermata:
+ break;
}
}
}
@@ -544,7 +630,7 @@
Converts the note length to LilyPond syntax.
*/
const QString CALilyPondExport::playableLengthToLilyPond( CAPlayableLength playableLength ) {
- QString length;
+ QString length = "4";
switch (playableLength.musicLength()) {
case CAPlayableLength::Breve:
length = "\\breve";
@@ -573,6 +659,9 @@
case CAPlayableLength::HundredTwentyEighth:
length = "128";
break;
+ case CAPlayableLength::Undefined:
+ length = "4";
+ break;
}
for (int j=0; j<playableLength.dotted(); j++) length += ".";
@@ -618,7 +707,11 @@
case CARest::Hidden:
return "s";
break;
+ case CARest::Undefined:
+ return "r";
+ break;
}
+ return "r";
}
/*!
@@ -647,7 +740,11 @@
case CABarline::Dotted:
return ":";
break;
+ case CABarline::Undefined:
+ return "|";
+ break;
}
+ return "|";
}
const QString CALilyPondExport::syllableToLilyPond( CASyllable *s ) {
@@ -729,6 +826,9 @@
case CAContext::LyricsContext:
exportLyricsContextBlock( static_cast<CALyricsContext*>(sheet->contextList()[c]) );
break;
+ case CAContext::FunctionMarkContext:
+ case CAContext::FiguredBassContext:
+ break;
}
}
@@ -924,6 +1024,9 @@
break;
}
+ case CAContext::FunctionMarkContext:
+ case CAContext::FiguredBassContext:
+ break;
}
} // for(contexts)
@@ -941,7 +1044,8 @@
}
CALyricsContext *lc;
- if (lc = dynamic_cast<CALyricsContext*>(sheet->contextList()[ i ])) {
+ lc = dynamic_cast<CALyricsContext*>(sheet->contextList()[ i ]);
+ if (lc) {
QString lcName = lc->name();
spellNumbers(lcName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <su...@us...> - 2012-08-26 14:46:58
|
Revision: 1273
http://canorus.svn.sourceforge.net/canorus/?rev=1273&view=rev
Author: suamor
Date: 2012-08-26 14:46:52 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Large Warn Fixes:
Return tr("Ready") in readableStatus for unknown status
Modified Paths:
--------------
trunk/src/export/export.cpp
Modified: trunk/src/export/export.cpp
===================================================================
--- trunk/src/export/export.cpp 2012-08-26 14:45:44 UTC (rev 1272)
+++ trunk/src/export/export.cpp 2012-08-26 14:46:52 UTC (rev 1273)
@@ -157,4 +157,5 @@
case -1:
return tr("Unable to open file for writing");
}
+ return tr("Ready");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
