summaryrefslogtreecommitdiffstats
path: root/utils/themeeditor
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-07-06 19:32:12 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-07-06 19:32:12 +0000
commit120f3e1c10c36fd5d174741d0da81ba84fc79ae3 (patch)
tree991a96e1aabf2786b4229d2d9ee583b8747947b9 /utils/themeeditor
parent91d6fa7e1b3188c85d83b17e9585ea9f8244e205 (diff)
downloadrockbox-120f3e1c10c36fd5d174741d0da81ba84fc79ae3.tar.gz
rockbox-120f3e1c10c36fd5d174741d0da81ba84fc79ae3.zip
Theme Editor: Default theme font is now correctly loaded
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27321 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor')
-rw-r--r--utils/themeeditor/graphics/rbscreen.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/utils/themeeditor/graphics/rbscreen.cpp b/utils/themeeditor/graphics/rbscreen.cpp
index c212a6c1fc..df72d5005b 100644
--- a/utils/themeeditor/graphics/rbscreen.cpp
+++ b/utils/themeeditor/graphics/rbscreen.cpp
@@ -73,7 +73,13 @@ RBScreen::RBScreen(const RBRenderInfo& info, bool remote,
}
}
- fonts.insert(0, new RBFont("Nothin'"));
+ fonts.insert(0, new RBFont("Default"));
+ QString defaultFont = settings->value("font", "");
+ if(defaultFont != "")
+ {
+ defaultFont.replace("/.rockbox", settings->value("themebase", ""));
+ fonts.insert(1, new RBFont(defaultFont));
+ }
if(parent == 0)
{