Blob Blame History Raw
diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.cpp mscore-0.9.4/mscore/mscore/mscore.cpp
--- mscore-0.9.4.old/mscore/mscore/mscore.cpp	2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/mscore.cpp	2009-02-21 13:10:15.000000000 -0500
@@ -1576,12 +1576,12 @@ 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);
diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
--- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-21 12:56:04.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-21 13:06:05.000000000 -0500
@@ -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,11 +29,11 @@
       <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 alias="data/instruments.xml">../share/templates/instruments.xml</file>
+
+
+
       <file>data/splash.jpg</file>
-      <file alias="data/demo.msc">../demos/promenade.msc</file>
+
 
       <file>data/speaker.svg</file>
       <file>data/midiin.svg</file>
diff -rupN mscore-0.9.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
--- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-21 12:56:04.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-21 13:34:13.000000000 -0500
@@ -122,7 +122,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);
 
@@ -163,7 +163,7 @@ void Preferences::init()
       layoutBreakColor         = Qt::green;
       antialiasedDrawing       = true;
       sessionStart             = SCORE_SESSION;
-      startScore               = ":/data/demo.msc";
+      startScore               = INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc";
       workingDirectory         = ".";
       lastSaveDirectory        = ".";
       lastSaveCopyDirectory    = ".";
@@ -185,7 +185,7 @@ void Preferences::init()
 
       midiExpandRepeats        = true;
       playRepeats              = true;
-      instrumentList           = ":/data/instruments.xml";
+      instrumentList           = INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml";
 
       alternateNoteEntryMethod = false;
       useMidiOutput            = false;
@@ -403,8 +403,8 @@ void Preferences::read()
       else if (ss == "empty")
             sessionStart = EMPTY_SESSION;
 
-      startScore     = s.value("startScore", ":/data/demo.msc").toString();
-      instrumentList = s.value("instrumentList", ":/data/instruments.xml").toString();
+      startScore     = s.value("startScore", INSTPREFIX "/share/" INSTALL_NAME "demos/promenade.msc").toString();
+      instrumentList = s.value("instrumentList", INSTPREFIX "/share/" INSTALL_NAME "templates/instruments.xml").toString();
 
       s.beginGroup("PlayPanel");
       playPanelPos = s.value("pos", QPoint(100, 300)).toPoint();