[Rosegarden-bugs] SF.net SVN: rosegarden:[10447] trunk/rosegarden/src

[<dmm...@us...>]

Revision: 10447
          http://rosegarden.svn.sourceforge.net/rosegarden/?rev=10447&view=rev
Author:   dmmcintyr
Date:     2009-06-29 03:15:58 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
* finish unkinking the new LilyPond exportable font size bits

Seems OK now, but it still has the air of a quick and dirty hack about it.

Modified Paths:
--------------
    trunk/rosegarden/src/document/io/LilyPondExporter.cpp
    trunk/rosegarden/src/document/io/LilyPondExporter.h
    trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.cpp
    trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.h

Modified: trunk/rosegarden/src/document/io/LilyPondExporter.cpp
===================================================================
--- trunk/rosegarden/src/document/io/LilyPondExporter.cpp	2009-06-28 20:34:49 UTC (rev 10446)
+++ trunk/rosegarden/src/document/io/LilyPondExporter.cpp	2009-06-29 03:15:58 UTC (rev 10447)
@@ -118,7 +118,7 @@
 
     m_paperSize = settings.value("lilypapersize", PAPER_A4).toUInt() ;
     m_paperLandscape = qStrToBool(settings.value("lilypaperlandscape", "false")) ;
-    m_fontSize = settings.value("lilyfontsize", 20).toUInt() ;
+    m_fontSize = settings.value("lilyfontsize", FONT_20).toUInt() ;
     m_raggedBottom = qStrToBool(settings.value("lilyraggedbottom", "false")) ;
     m_exportSelection = settings.value("lilyexportselection", EXPORT_NONMUTED_TRACKS).toUInt() ;
     m_exportLyrics = qStrToBool(settings.value("lilylyricshalignment", EXPORT_LYRICS_LEFT)) ;

Modified: trunk/rosegarden/src/document/io/LilyPondExporter.h
===================================================================
--- trunk/rosegarden/src/document/io/LilyPondExporter.h	2009-06-28 20:34:49 UTC (rev 10446)
+++ trunk/rosegarden/src/document/io/LilyPondExporter.h	2009-06-29 03:15:58 UTC (rev 10447)
@@ -179,6 +179,7 @@
      * to the index to arrive at the real font size for export
      */
     static const unsigned int FONT_OFFSET = 6;
+    static const unsigned int FONT_20 = 20 + FONT_OFFSET;
 
     unsigned int m_exportLyrics;
     static const unsigned int EXPORT_NO_LYRICS = 0;

Modified: trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.cpp
===================================================================
--- trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.cpp	2009-06-28 20:34:49 UTC (rev 10446)
+++ trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.cpp	2009-06-29 03:15:58 UTC (rev 10447)
@@ -155,10 +155,8 @@
     m_lilyFontSize->setToolTip(tr("<qt>Choose the font size of the score.</qt>"));
     for (unsigned int i = 0; i < 24; i++) {
         bool recommended = false;
-        unsigned int j = i - 6; // should be a constant as in LilyPondExporter;
-                                // we add this to the index to get point sizes
-                                // from 6 to 30
-        switch (j) {
+        int printSize = i + FONT_OFFSET;
+        switch (printSize) {
             case 11:
             case 13:
             case 16:
@@ -168,7 +166,7 @@
             case 26: recommended = true; break;
             default: recommended = false;
         }
-        QString fontString = tr("%1 pt %2").arg(i).arg(recommended ? tr("(recommended)") : "");
+        QString fontString = tr("%1 pt %2").arg(printSize).arg(recommended ? tr("(recommended)") : "");
         m_lilyFontSize->addItem(fontString);
     }
     layoutBasic->addWidget(m_lilyFontSize, 3, 1);
@@ -281,7 +279,7 @@
     }
     m_lilyPaperSize->setCurrentIndex(settings.value("lilypapersize", defaultPaperSize).toUInt());
     m_lilyPaperLandscape->setChecked(qStrToBool(settings.value("lilypaperlandscape", "false")));
-    m_lilyFontSize->setCurrentIndex(settings.value("lilyfontsize", 4).toUInt());
+    m_lilyFontSize->setCurrentIndex(settings.value("lilyfontsize", FONT_20).toUInt());
     m_lilyRaggedBottom->setChecked(qStrToBool(settings.value("lilyraggedbottom", "false")));
     m_lilyChordNamesMode->setChecked(qStrToBool(settings.value("lilychordnamesmode", "false")));
     m_lilyExportLyrics->setCurrentIndex(settings.value("lilyexportlyrics", 1).toUInt());

Modified: trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.h
===================================================================
--- trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.h	2009-06-28 20:34:49 UTC (rev 10446)
+++ trunk/rosegarden/src/gui/dialogs/LilyPondOptionsDialog.h	2009-06-29 03:15:58 UTC (rev 10447)
@@ -66,6 +66,10 @@
     HeadersConfigurationPage *m_headersPage;
 
     void populateDefaultValues();
+
+    static const unsigned int FONT_OFFSET = 6;
+    static const unsigned int FONT_20 = 20 + FONT_OFFSET;
+
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.