summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-06-07 22:35:32 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-06-07 22:35:32 +0000
commit24647bace9dc64a40a527512a8dd1f8b69dbe893 (patch)
tree475dfb960579fbb6331dde200c30946d6ed96820 /utils
parent42b065f04afffdae502b00383bafa9c925e309f8 (diff)
downloadrockbox-24647bace9dc64a40a527512a8dd1f8b69dbe893.tar.gz
rockbox-24647bace9dc64a40a527512a8dd1f8b69dbe893.zip
Theme Editor: Changed default font to monospaced, changed organization for the application to rockbox.org, moved tab bar in preferences dialog to the top of the window
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26677 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r--utils/themeeditor/main.cpp6
-rw-r--r--utils/themeeditor/preferencesdialog.cpp5
-rw-r--r--utils/themeeditor/preferencesdialog.ui5
-rw-r--r--utils/themeeditor/skindocument.cpp4
4 files changed, 14 insertions, 6 deletions
diff --git a/utils/themeeditor/main.cpp b/utils/themeeditor/main.cpp
index ad4ae6ffae..78df1878f6 100644
--- a/utils/themeeditor/main.cpp
+++ b/utils/themeeditor/main.cpp
@@ -35,9 +35,9 @@ int main(int argc, char* argv[])
35{ 35{
36 QApplication app(argc, argv); 36 QApplication app(argc, argv);
37 37
38 QCoreApplication::setApplicationName(QObject::tr("Rockbox Theme Editor")); 38 QCoreApplication::setApplicationName("Rockbox Theme Editor");
39 QCoreApplication::setApplicationVersion(QObject::tr("Pre-Alpha")); 39 QCoreApplication::setApplicationVersion("Pre-Alpha");
40 QCoreApplication::setOrganizationName(QObject::tr("Rockbox")); 40 QCoreApplication::setOrganizationName("rockbox.org");
41 41
42 EditorWindow mainWindow; 42 EditorWindow mainWindow;
43 mainWindow.show(); 43 mainWindow.show();
diff --git a/utils/themeeditor/preferencesdialog.cpp b/utils/themeeditor/preferencesdialog.cpp
index 9b28b275f8..78f2ed7206 100644
--- a/utils/themeeditor/preferencesdialog.cpp
+++ b/utils/themeeditor/preferencesdialog.cpp
@@ -92,7 +92,10 @@ void PreferencesDialog::loadFont()
92 QSettings settings; 92 QSettings settings;
93 settings.beginGroup("SkinDocument"); 93 settings.beginGroup("SkinDocument");
94 94
95 QVariant family = settings.value("fontFamily", QFont()); 95 QFont def("Monospace");
96 def.setStyleHint(QFont::TypeWriter);
97
98 QVariant family = settings.value("fontFamily", def);
96 int size = settings.value("fontSize", 12).toInt(); 99 int size = settings.value("fontSize", 12).toInt();
97 100
98 settings.endGroup(); 101 settings.endGroup();
diff --git a/utils/themeeditor/preferencesdialog.ui b/utils/themeeditor/preferencesdialog.ui
index af10875721..3d4a60142f 100644
--- a/utils/themeeditor/preferencesdialog.ui
+++ b/utils/themeeditor/preferencesdialog.ui
@@ -17,7 +17,7 @@
17 <item> 17 <item>
18 <widget class="QTabWidget" name="prefsGroups"> 18 <widget class="QTabWidget" name="prefsGroups">
19 <property name="tabPosition"> 19 <property name="tabPosition">
20 <enum>QTabWidget::West</enum> 20 <enum>QTabWidget::North</enum>
21 </property> 21 </property>
22 <property name="currentIndex"> 22 <property name="currentIndex">
23 <number>0</number> 23 <number>0</number>
@@ -120,6 +120,9 @@
120 <property name="text"> 120 <property name="text">
121 <string>Error Color</string> 121 <string>Error Color</string>
122 </property> 122 </property>
123 <property name="buddy">
124 <cstring>errorButton</cstring>
125 </property>
123 </widget> 126 </widget>
124 </item> 127 </item>
125 <item> 128 <item>
diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/skindocument.cpp
index aa8fc500d3..3da248a30b 100644
--- a/utils/themeeditor/skindocument.cpp
+++ b/utils/themeeditor/skindocument.cpp
@@ -151,7 +151,9 @@ void SkinDocument::settingsChanged()
151 errorColor.setProperty(QTextFormat::FullWidthSelection, true); 151 errorColor.setProperty(QTextFormat::FullWidthSelection, true);
152 152
153 /* Setting the font */ 153 /* Setting the font */
154 QFont family = settings.value("fontFamily", QFont()).value<QFont>(); 154 QFont def("Monospace");
155 def.setStyleHint(QFont::TypeWriter);
156 QFont family = settings.value("fontFamily", def).value<QFont>();
155 family.setPointSize(settings.value("fontSize", 12).toInt()); 157 family.setPointSize(settings.value("fontSize", 12).toInt());
156 editor->setFont(family); 158 editor->setFont(family);
157 159