Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the new calibre style default on windows and OS X

Browse Source
This commit is contained in:
Kovid Goyal 2012-06-13 13:38:14 +05:30
parent 0fa0fca0b5
commit 5ad53d4e02
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/__init__.py
View File

@ -106,7 +106,7 @@ gprefs.defaults['auto_add_path'] = None
gprefs.defaults['auto_add_check_for_duplicates'] = False gprefs.defaults['auto_add_check_for_duplicates'] = False
gprefs.defaults['blocked_auto_formats'] = [] gprefs.defaults['blocked_auto_formats'] = []
gprefs.defaults['auto_add_auto_convert'] = True gprefs.defaults['auto_add_auto_convert'] = True
gprefs.defaults['widget_style'] = 'system' gprefs.defaults['ui_style'] = 'calibre' if iswindows or isosx else 'system'
# }}} # }}}
NONE = QVariant() #: Null value to return from the data function of item models NONE = QVariant() #: Null value to return from the data function of item models
@ -782,7 +782,7 @@ class Application(QApplication):
font.setStretch(s) font.setStretch(s)
QApplication.setFont(font) QApplication.setFont(font)
if force_calibre_style or gprefs['widget_style'] != 'system': if force_calibre_style or gprefs['ui_style'] != 'system':
self.load_calibre_style() self.load_calibre_style()
else: else:
st = self.style() st = self.style()

2
src/calibre/gui2/preferences/look_feel.py
View File

@ -101,7 +101,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('gui_layout', config, restart_required=True, choices= r('gui_layout', config, restart_required=True, choices=
[(_('Wide'), 'wide'), (_('Narrow'), 'narrow')]) [(_('Wide'), 'wide'), (_('Narrow'), 'narrow')])
r('widget_style', gprefs, restart_required=True, choices= r('ui_style', gprefs, restart_required=True, choices=
[(_('System default'), 'system'), (_('Calibre style'), [(_('System default'), 'system'), (_('Calibre style'),
'calibre')]) 'calibre')])

4
src/calibre/gui2/preferences/look_feel.ui
View File

@ -187,12 +187,12 @@
<string>User interface &amp;style (needs restart):</string> <string>User interface &amp;style (needs restart):</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>opt_widget_style</cstring> <cstring>opt_ui_style</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="opt_widget_style"/> <widget class="QComboBox" name="opt_ui_style"/>
</item> </item>
</layout> </layout>
</widget> </widget>