rearrange and clarify menus

This commit is contained in:
Damien Elmes 2008-12-21 00:31:16 +09:00
parent 7ad0686928
commit 44b5b1670a
2 changed files with 61 additions and 51 deletions

View file

@ -1311,9 +1311,6 @@ Error was:\n%(f1)s\n...\n%(f2)s""") % {'f1': fmt1, 'f2': fmt2})
deckRelatedMenus = (
"Tools",
"Advanced",
"Plugins",
"Current",
)
def connectMenuActions(self):
@ -1423,7 +1420,8 @@ Error was:\n%(f1)s\n...\n%(f2)s""") % {'f1': fmt1, 'f2': fmt2})
self.maybeShowKanjiStats()
self.mainWin.actionEditCurrent.setEnabled(False)
self.mainWin.actionMarkCard.setEnabled(False)
self.mainWin.menuCurrent.setEnabled(False)
self.mainWin.actionSuspendCard.setEnabled(False)
self.mainWin.actionDelete.setEnabled(False)
def enableCardMenuItems(self):
self.maybeEnableUndo()
@ -1435,7 +1433,8 @@ Error was:\n%(f1)s\n...\n%(f2)s""") % {'f1': fmt1, 'f2': fmt2})
self.mainWin.actionRepeatAudio.setEnabled(snd)
self.mainWin.actionEditCurrent.setEnabled(True)
self.mainWin.actionMarkCard.setEnabled(True)
self.mainWin.menuCurrent.setEnabled(True)
self.mainWin.actionSuspendCard.setEnabled(True)
self.mainWin.actionDelete.setEnabled(True)
def maybeShowKanjiStats(self):
if not self.deck:

View file

@ -643,15 +643,12 @@
<addaction name="actionRedo" />
<addaction name="separator" />
<addaction name="actionAddcards" />
<addaction name="actionEditCurrent" />
<addaction name="actionEditdeck" />
<addaction name="separator" />
<addaction name="actionActiveTags" />
<addaction name="separator" />
<addaction name="actionDisplayProperties" />
<addaction name="actionModelProperties" />
<addaction name="actionDeckProperties" />
<addaction name="separator" />
<addaction name="actionPreferences" />
<addaction name="actionMarkCard" />
<addaction name="actionSuspendCard" />
<addaction name="actionDelete" />
</widget>
<widget class="QMenu" name="menuDeck" >
<property name="title" >
@ -700,28 +697,36 @@
<addaction name="actionLookup_es" />
<addaction name="actionLookup_esk" />
</widget>
<addaction name="actionGraphs" />
<addaction name="actionDstats" />
<addaction name="actionKstats" />
<addaction name="actionCstats" />
<addaction name="separator" />
<addaction name="menu_Lookup" />
<addaction name="separator" />
<addaction name="actionCram" />
</widget>
<widget class="QMenu" name="menuAdvanced" >
<property name="title" >
<string>&amp;Advanced</string>
</property>
<addaction name="actionCheckDatabaseIntegrity" />
<addaction name="actionCheckMediaDatabase" />
<addaction name="separator" />
<addaction name="actionOptimizeDatabase" />
<addaction name="separator" />
<addaction name="actionMergeModels" />
</widget>
<addaction name="actionGraphs" />
<addaction name="actionDstats" />
<addaction name="actionKstats" />
<addaction name="actionCstats" />
<addaction name="separator" />
<addaction name="actionRepeatAudio" />
<addaction name="menu_Lookup" />
<addaction name="separator" />
<addaction name="menuAdvanced" />
<addaction name="separator" />
<addaction name="actionCram" />
</widget>
<widget class="QMenu" name="menu_Settings" >
<property name="title" >
<string>&amp;Settings</string>
</property>
<widget class="QMenu" name="menuPlugins" >
<property name="title" >
<string>&amp;Plugins</string>
<string>P&amp;lugins</string>
</property>
<widget class="QMenu" name="menuStartup" >
<property name="title" >
@ -736,23 +741,19 @@
<addaction name="separator" />
<addaction name="menuStartup" />
</widget>
<widget class="QMenu" name="menuCurrent" >
<property name="title" >
<string>&amp;Current</string>
</property>
<addaction name="actionRepeatAudio" />
<addaction name="actionActiveTags" />
<addaction name="separator" />
<addaction name="actionEditCurrent" />
<addaction name="actionMarkCard" />
<addaction name="actionSuspendCard" />
<addaction name="actionDelete" />
<addaction name="actionDisplayProperties" />
<addaction name="actionModelProperties" />
<addaction name="actionDeckProperties" />
<addaction name="separator" />
<addaction name="menuPlugins" />
<addaction name="actionPreferences" />
</widget>
<addaction name="menuDeck" />
<addaction name="menuEdit" />
<addaction name="menuCurrent" />
<addaction name="menuTools" />
<addaction name="menuPlugins" />
<addaction name="menuAdvanced" />
<addaction name="menu_Settings" />
<addaction name="menuHelp" />
</widget>
<widget class="QStatusBar" name="statusbar" >
@ -911,7 +912,7 @@
<normaloff>:/icons/configure.png</normaloff>:/icons/configure.png</iconset>
</property>
<property name="text" >
<string>&amp;Preferences...</string>
<string>&amp;Preferences</string>
</property>
<property name="statusTip" >
<string>Application-wide preferences.</string>
@ -1068,7 +1069,7 @@
<normaloff>:/icons/preferences-desktop-font.png</normaloff>:/icons/preferences-desktop-font.png</iconset>
</property>
<property name="text" >
<string>Disp&amp;lay Properties...</string>
<string>&amp;Fonts and Colours...</string>
</property>
<property name="statusTip" >
<string>Customize fonts, colours and alignment.</string>
@ -1088,7 +1089,7 @@
<normaloff>:/icons/rating.png</normaloff>:/icons/rating.png</iconset>
</property>
<property name="text" >
<string>&amp;Mark</string>
<string>&amp;Mark Fact</string>
</property>
<property name="shortcut" >
<string>Ctrl+M</string>
@ -1100,7 +1101,7 @@
<normaloff>:/icons/media-playback-pause.png</normaloff>:/icons/media-playback-pause.png</iconset>
</property>
<property name="text" >
<string>&amp;Suspend</string>
<string>&amp;Suspend Fact</string>
</property>
<property name="statusTip" >
<string>Stop reviewing this card until it's unsuspended in the editor.</string>
@ -1112,7 +1113,7 @@
<normaloff>:/icons/kpersonalizer.png</normaloff>:/icons/kpersonalizer.png</iconset>
</property>
<property name="text" >
<string>&amp;Model Properties...</string>
<string>Current &amp;Model...</string>
</property>
<property name="statusTip" >
<string>Customize card layout, fields, etc.</string>
@ -1288,7 +1289,7 @@
<normaloff>:/icons/edit-rename.png</normaloff>:/icons/edit-rename.png</iconset>
</property>
<property name="text" >
<string>&amp;Edit...</string>
<string>Edit &amp;Current...</string>
</property>
<property name="shortcut" >
<string>Ctrl+E</string>
@ -1309,7 +1310,17 @@
<normaloff>:/icons/editdelete.png</normaloff>:/icons/editdelete.png</iconset>
</property>
<property name="text" >
<string>&amp;Delete</string>
<string>&amp;Delete Card</string>
</property>
</action>
<action name="action123" >
<property name="text" >
<string>123</string>
</property>
</action>
<action name="action_Delete_Fact" >
<property name="text" >
<string>&amp;Delete Fact</string>
</property>
</action>
</widget>