|
 |
c7fa7ef |
diff -rupN rosegarden-10.02.old/data/data.qrc rosegarden-10.02/data/data.qrc
|
|
|
c7fa7ef |
--- rosegarden-10.02.old/data/data.qrc 2010-02-13 20:53:39.000000000 -0500
|
|
|
c7fa7ef |
+++ rosegarden-10.02/data/data.qrc 2010-02-17 22:43:22.000000000 -0500
|
|
|
c7fa7ef |
@@ -10,9 +10,6 @@ running:
|
|
|
c7fa7ef |
DO NOT EDIT THIS FILE BY HAND! All changes will be LOST!
|
|
|
c7fa7ef |
-->
|
|
|
c7fa7ef |
<qresource>
|
|
|
c7fa7ef |
-<file>./fonts/LilyPond-feta-design20.pfa</file>
|
|
|
c7fa7ef |
-<file>./fonts/LilyPond-feta-nummer-design10.pfa</file>
|
|
|
c7fa7ef |
-<file>./fonts/LilyPond-parmesan-design20.pfa</file>
|
|
|
c7fa7ef |
<file>./pixmaps/icons/audio-nok.png</file>
|
|
|
c7fa7ef |
<file>./pixmaps/icons/audio-ok.png</file>
|
|
|
c7fa7ef |
<file>./pixmaps/icons/midi-nok.png</file>
|
|
|
c7fa7ef |
diff -rupN rosegarden-10.02.old/scripts/rebuild-qrc rosegarden-10.02/scripts/rebuild-qrc
|
|
|
c7fa7ef |
--- rosegarden-10.02.old/scripts/rebuild-qrc 2010-02-13 20:52:50.000000000 -0500
|
|
|
c7fa7ef |
+++ rosegarden-10.02/scripts/rebuild-qrc 2010-02-17 22:09:46.000000000 -0500
|
|
|
c7fa7ef |
@@ -60,7 +60,7 @@ DO NOT EDIT THIS FILE BY HAND! All chan
|
|
|
c7fa7ef |
<qresource>
|
|
|
c7fa7ef |
EOF
|
|
|
c7fa7ef |
|
|
|
c7fa7ef |
-for ext in pfa png ts qss rc rg rgd rgp rgt xml xpm; do
|
|
|
c7fa7ef |
+for ext in png ts qss rc rg rgd rgp rgt xml xpm; do
|
|
|
c7fa7ef |
writeEntries $ext
|
|
|
c7fa7ef |
done
|
|
|
c7fa7ef |
|
|
|
c7fa7ef |
diff -rupN rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp
|
|
|
c7fa7ef |
--- rosegarden-10.02.old/src/gui/editors/notation/SystemFont.cpp 2010-02-13 20:52:47.000000000 -0500
|
|
|
c7fa7ef |
+++ rosegarden-10.02/src/gui/editors/notation/SystemFont.cpp 2010-02-17 23:38:26.000000000 -0500
|
|
|
c7fa7ef |
@@ -166,24 +166,15 @@ void
|
|
|
c7fa7ef |
SystemFont::unbundleFonts()
|
|
|
c7fa7ef |
{
|
|
|
c7fa7ef |
QStringList fontFiles;
|
|
|
c7fa7ef |
- fontFiles << ResourceFinder().getResourceFiles("fonts", "pfa");
|
|
|
c7fa7ef |
- fontFiles << ResourceFinder().getResourceFiles("fonts", "pfb");
|
|
|
c7fa7ef |
- fontFiles << ResourceFinder().getResourceFiles("fonts", "ttf");
|
|
|
c7fa7ef |
- fontFiles << ResourceFinder().getResourceFiles("fonts", "otf");
|
|
|
c7fa7ef |
+ fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-design20.pfa");
|
|
|
c7fa7ef |
+ fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-nummer-design10.pfa");
|
|
|
c7fa7ef |
+ fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-parmesan-design20.pfa");
|
|
|
c7fa7ef |
|
|
|
c7fa7ef |
NOTATION_DEBUG << "Found font files: " << fontFiles << endl;
|
|
|
c7fa7ef |
|
|
|
c7fa7ef |
for (QStringList::const_iterator i = fontFiles.begin();
|
|
|
c7fa7ef |
i != fontFiles.end(); ++i) {
|
|
|
c7fa7ef |
QString fontFile(*i);
|
|
|
c7fa7ef |
- QString name = QFileInfo(fontFile).fileName();
|
|
|
c7fa7ef |
- if (fontFile.startsWith(":")) {
|
|
|
c7fa7ef |
- ResourceFinder().unbundleResource("fonts", name);
|
|
|
c7fa7ef |
- fontFile = ResourceFinder().getResourcePath("fonts", name);
|
|
|
c7fa7ef |
- if (fontFile.startsWith(":")) { // unbundling failed
|
|
|
c7fa7ef |
- continue;
|
|
|
c7fa7ef |
- }
|
|
|
c7fa7ef |
- }
|
|
|
c7fa7ef |
addFont(fontFile);
|
|
|
c7fa7ef |
}
|
|
|
c7fa7ef |
}
|