Blob Blame History Raw
diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.cpp mscore-0.9.5/mscore/mscore/mscore.cpp
--- mscore-0.9.5.old/mscore/mscore/mscore.cpp	2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/mscore.cpp	2009-08-21 16:05:43.000000000 -0400
@@ -1559,17 +1559,17 @@ int main(int argc, char* argv[])
       //  load internal fonts
       //
 
-      if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore-20.ttf")) {
+      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-20.ttf")) {
             fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
             if (!debugMode)
                   exit(-1);
             }
-      if (-1 == QFontDatabase::addApplicationFont(":/fonts/mscore1-20.ttf")) {
+      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore1-20.ttf")) {
             fprintf(stderr, "Mscore: fatal error: cannot load internal font\n");
             if (!debugMode)
                   exit(-1);
             }
-      if (-1 == QFontDatabase::addApplicationFont(":/fonts/MuseJazz.ttf")) {
+      if (-1 == QFontDatabase::addApplicationFont(INSTPREFIX "/share/fonts/mscore/mscore-MuseJazz.ttf")) {
             fprintf(stderr, "Mscore: fatal error: cannot load internal font MuseJazz.ttf\n");
             if (!debugMode)
                   exit(-1);
diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
--- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-21 12:50:24.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 16:05:43.000000000 -0400
@@ -2,9 +2,9 @@
 <RCC version="1.0">
    <qresource>
       <file>data/repeat.svg</file>
-      <file>data/paper1.png</file>
-      <file>data/paper2.png</file>
-      <file>data/paper3.png</file>
+
+
+
       <file>data/text_bold.svg</file>
       <file>data/text_italic.svg</file>
       <file>data/text_left.svg</file>
@@ -29,12 +29,12 @@
       <file>data/viewmag.xpm</file>
       <file>data/subscript.svg</file>
       <file>data/superscript.svg</file>
-      <file alias="fonts/mscore-20.ttf">fonts/mscore-20.ttf</file>
-      <file alias="fonts/mscore1-20.ttf">fonts/mscore1-20.ttf</file>
-      <file>fonts/MuseJazz.ttf</file>
-      <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
+
+
+
+
       <file>data/splash.jpg</file>
-      <file alias="data/demo.mscx">../demos/promenade.mscx</file>
+
 
       <file>data/speaker.svg</file>
       <file>data/midiin.svg</file>
diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
--- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 16:06:54.000000000 -0400
@@ -129,7 +129,7 @@ void Preferences::init()
       bgUseColor         = true;
       fgUseColor         = false;
       bgWallpaper        = QString();
-      fgWallpaper        = ":/data/paper3.png";
+      fgWallpaper        = INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png";
       fgColor.setRgb(50, 50, 50);
       bgColor.setRgb(0x76, 0x76, 0x6e);
 
@@ -169,7 +169,7 @@ void Preferences::init()
       layoutBreakColor         = Qt::green;
       antialiasedDrawing       = true;
       sessionStart             = SCORE_SESSION;
-      startScore               = ":/data/demo.mscx";
+      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx";
       workingDirectory         = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
       showSplashScreen         = true;
 
@@ -189,7 +189,7 @@ void Preferences::init()
 
       midiExpandRepeats        = true;
       playRepeats              = true;
-      instrumentList           = ":/data/instruments.xml";
+      instrumentList           = INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml";
 
       alternateNoteEntryMethod = false;
       useMidiOutput            = false;
@@ -328,7 +328,7 @@ void Preferences::read()
       bgUseColor      = s.value("bgUseColor", true).toBool();
       fgUseColor      = s.value("fgUseColor", false).toBool();
       bgWallpaper     = s.value("bgWallpaper").toString();
-      fgWallpaper     = s.value("fgWallpaper", ":/data/paper3.png").toString();
+      fgWallpaper     = s.value("fgWallpaper", INSTPREFIX "/share/" INSTALL_NAME "wallpaper/paper3.png").toString();
       fgColor         = s.value("fgColor", QColor(50,50,50)).value<QColor>();
       bgColor         = s.value("bgColor", QColor(0x76, 0x76, 0x6e)).value<QColor>();
 
@@ -412,8 +412,8 @@ void Preferences::read()
       else if (ss == "empty")
             sessionStart = EMPTY_SESSION;
 
-      startScore     = s.value("startScore", ":/data/demo.mscx").toString();
-      instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
+      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.mscx").toString();
+      instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
 
       s.beginGroup("PlayPanel");
       playPanelPos = s.value("pos", QPoint(100, 300)).toPoint();