GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

add the toolbar config back to the prefs, so osx users can toggle

Browse source
This commit is contained in:
Damien Elmes 2011-04-17 04:56:13 +09:00
parent 6efd9b9cbb
commit 4a931f811f
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aqt/main.py
View file

@ -586,6 +586,8 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
toggle.setText(_("Toggle Toolbar")) toggle.setText(_("Toggle Toolbar"))
self.connect(toggle, SIGNAL("triggered()"), self.connect(toggle, SIGNAL("triggered()"),
self.onToolbarToggle) self.onToolbarToggle)
if not self.config['showToolbar']:
tb.hide()
def onToolbarToggle(self): def onToolbarToggle(self):
tb = self.form.toolBar tb = self.form.toolBar
@ -1155,7 +1157,7 @@ It can take a long time. Proceed?""")):
addHook("macLoadEvent", self.onMacLoad) addHook("macLoadEvent", self.onMacLoad)
if isMac: if isMac:
qt_mac_set_menubar_icons(False) qt_mac_set_menubar_icons(False)
self.setUnifiedTitleAndToolBarOnMac(True) self.setUnifiedTitleAndToolBarOnMac(self.config['showToolbar'])
# mac users expect a minimize option # mac users expect a minimize option
self.minimizeShortcut = QShortcut("Ctrl+m", self) self.minimizeShortcut = QShortcut("Ctrl+m", self)
self.connect(self.minimizeShortcut, SIGNAL("activated()"), self.connect(self.minimizeShortcut, SIGNAL("activated()"),

2
aqt/preferences.py
View file

@ -147,6 +147,7 @@ class Preferences(QDialog):
self.form.deleteMedia.setChecked(self.config['deleteMedia']) self.form.deleteMedia.setChecked(self.config['deleteMedia'])
self.form.stripHTML.setChecked(self.config['stripHTML']) self.form.stripHTML.setChecked(self.config['stripHTML'])
self.form.autoplaySounds.setChecked(self.config['autoplaySounds']) self.form.autoplaySounds.setChecked(self.config['autoplaySounds'])
self.form.showToolbar.setChecked(self.config['showToolbar'])
self.connect(self.form.documentFolder, self.connect(self.form.documentFolder,
SIGNAL("clicked()"), SIGNAL("clicked()"),
self.onChangeFolder) self.onChangeFolder)
@ -159,6 +160,7 @@ class Preferences(QDialog):
self.config['autoplaySounds'] = self.form.autoplaySounds.isChecked() self.config['autoplaySounds'] = self.form.autoplaySounds.isChecked()
self.config['loadLastDeck'] = self.form.openLastDeck.isChecked() self.config['loadLastDeck'] = self.form.openLastDeck.isChecked()
self.config['deleteMedia'] = self.form.deleteMedia.isChecked() self.config['deleteMedia'] = self.form.deleteMedia.isChecked()
self.config['showToolbar'] = self.form.showToolbar.isChecked()
def codeToIndex(self, code): def codeToIndex(self, code):
n = 0 n = 0

8
designer/preferences.ui
View file

@ -451,6 +451,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QCheckBox" name="showToolbar">
<property name="text">
<string>Show toolbar</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -523,6 +530,7 @@
<tabstop>stripHTML</tabstop> <tabstop>stripHTML</tabstop>
<tabstop>openLastDeck</tabstop> <tabstop>openLastDeck</tabstop>
<tabstop>deleteMedia</tabstop> <tabstop>deleteMedia</tabstop>
<tabstop>showToolbar</tabstop>
<tabstop>documentFolder</tabstop> <tabstop>documentFolder</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>