mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-05-14 01:42:28 +12:00
Changes menu organization #229
This commit is contained in:
parent
d9547bd36c
commit
c52df2c90d
|
@ -100,7 +100,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
|
||||
# Main Menu
|
||||
for i in [self.actSave, self.actSaveAs, self.actCloseProject,
|
||||
self.menuEdit, self.menuView, self.menuDocuments,
|
||||
self.menuEdit, self.menuView, self.menuOrganize,
|
||||
self.menuTools, self.menuHelp, self.actImport,
|
||||
self.actCompile, self.actSettings]:
|
||||
i.setEnabled(False)
|
||||
|
@ -209,8 +209,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
|
||||
def tabMainChanged(self):
|
||||
"Called when main tab changes."
|
||||
self.menuDocuments.menuAction().setEnabled(self.tabMain.currentIndex()
|
||||
== self.TabRedac)
|
||||
tabIsEditor = self.tabMain.currentIndex() == self.TabRedac
|
||||
self.menuOrganize.menuAction().setEnabled(tabIsEditor)
|
||||
for i in [self.actCut,
|
||||
self.actCopy,
|
||||
self.actPaste,
|
||||
self.actDelete,
|
||||
self.actRename]:
|
||||
i.setEnabled(tabIsEditor)
|
||||
|
||||
def focusChanged(self, old, new):
|
||||
"""
|
||||
|
@ -564,7 +570,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
for i in [self.actOpen, self.menuRecents]:
|
||||
i.setEnabled(False)
|
||||
for i in [self.actSave, self.actSaveAs, self.actCloseProject,
|
||||
self.menuEdit, self.menuView, self.menuDocuments,
|
||||
self.menuEdit, self.menuView, self.menuOrganize,
|
||||
self.menuTools, self.menuHelp, self.actImport,
|
||||
self.actCompile, self.actSettings]:
|
||||
i.setEnabled(True)
|
||||
|
@ -609,7 +615,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
|
|||
for i in [self.actOpen, self.menuRecents]:
|
||||
i.setEnabled(True)
|
||||
for i in [self.actSave, self.actSaveAs, self.actCloseProject,
|
||||
self.menuEdit, self.menuView, self.menuDocuments,
|
||||
self.menuEdit, self.menuView, self.menuOrganize,
|
||||
self.menuTools, self.menuHelp, self.actImport,
|
||||
self.actCompile, self.actSettings]:
|
||||
i.setEnabled(False)
|
||||
|
|
|
@ -1044,8 +1044,8 @@ class Ui_MainWindow(object):
|
|||
self.menuView.setObjectName("menuView")
|
||||
self.menuMode = QtWidgets.QMenu(self.menuView)
|
||||
self.menuMode.setObjectName("menuMode")
|
||||
self.menuDocuments = QtWidgets.QMenu(self.menubar)
|
||||
self.menuDocuments.setObjectName("menuDocuments")
|
||||
self.menuOrganize = QtWidgets.QMenu(self.menubar)
|
||||
self.menuOrganize.setObjectName("menuOrganize")
|
||||
MainWindow.setMenuBar(self.menubar)
|
||||
self.statusbar = QtWidgets.QStatusBar(MainWindow)
|
||||
self.statusbar.setObjectName("statusbar")
|
||||
|
@ -1228,6 +1228,12 @@ class Ui_MainWindow(object):
|
|||
self.menuHelp.addAction(self.actAbout)
|
||||
self.menuTools.addAction(self.actSpellcheck)
|
||||
self.menuTools.addAction(self.actToolFrequency)
|
||||
self.menuEdit.addAction(self.actCut)
|
||||
self.menuEdit.addAction(self.actCopy)
|
||||
self.menuEdit.addAction(self.actPaste)
|
||||
self.menuEdit.addAction(self.actDelete)
|
||||
self.menuEdit.addAction(self.actRename)
|
||||
self.menuEdit.addSeparator()
|
||||
self.menuEdit.addAction(self.actLabels)
|
||||
self.menuEdit.addAction(self.actStatus)
|
||||
self.menuEdit.addAction(self.actSettings)
|
||||
|
@ -1236,23 +1242,15 @@ class Ui_MainWindow(object):
|
|||
self.menuMode.addAction(self.actModeSnowflake)
|
||||
self.menuView.addAction(self.menuMode.menuAction())
|
||||
self.menuView.addSeparator()
|
||||
self.menuDocuments.addAction(self.actCopy)
|
||||
self.menuDocuments.addAction(self.actCut)
|
||||
self.menuDocuments.addAction(self.actPaste)
|
||||
self.menuDocuments.addSeparator()
|
||||
self.menuDocuments.addAction(self.actRename)
|
||||
self.menuDocuments.addAction(self.actDuplicate)
|
||||
self.menuDocuments.addAction(self.actDelete)
|
||||
self.menuDocuments.addSeparator()
|
||||
self.menuDocuments.addAction(self.actMoveUp)
|
||||
self.menuDocuments.addAction(self.actMoveDown)
|
||||
self.menuDocuments.addSeparator()
|
||||
self.menuDocuments.addAction(self.actMerge)
|
||||
self.menuDocuments.addAction(self.actSplitDialog)
|
||||
self.menuDocuments.addAction(self.actSplitCursor)
|
||||
self.menuOrganize.addAction(self.actMoveUp)
|
||||
self.menuOrganize.addAction(self.actMoveDown)
|
||||
self.menuOrganize.addSeparator()
|
||||
self.menuOrganize.addAction(self.actMerge)
|
||||
self.menuOrganize.addAction(self.actSplitDialog)
|
||||
self.menuOrganize.addAction(self.actSplitCursor)
|
||||
self.menubar.addAction(self.menuFile.menuAction())
|
||||
self.menubar.addAction(self.menuEdit.menuAction())
|
||||
self.menubar.addAction(self.menuDocuments.menuAction())
|
||||
self.menubar.addAction(self.menuOrganize.menuAction())
|
||||
self.menubar.addAction(self.menuView.menuAction())
|
||||
self.menubar.addAction(self.menuTools.menuAction())
|
||||
self.menubar.addAction(self.menuHelp.menuAction())
|
||||
|
@ -1370,7 +1368,7 @@ class Ui_MainWindow(object):
|
|||
self.menuEdit.setTitle(_translate("MainWindow", "&Edit"))
|
||||
self.menuView.setTitle(_translate("MainWindow", "&View"))
|
||||
self.menuMode.setTitle(_translate("MainWindow", "&Mode"))
|
||||
self.menuDocuments.setTitle(_translate("MainWindow", "&Documents"))
|
||||
self.menuOrganize.setTitle(_translate("MainWindow", "Organi&ze"))
|
||||
self.dckCheatSheet.setWindowTitle(_translate("MainWindow", "&Cheat sheet"))
|
||||
self.dckSearch.setWindowTitle(_translate("MainWindow", "Sea&rch"))
|
||||
self.dckNavigation.setWindowTitle(_translate("MainWindow", "&Navigation"))
|
||||
|
@ -1414,7 +1412,7 @@ class Ui_MainWindow(object):
|
|||
self.actSplitDialog.setShortcut(_translate("MainWindow", "Ctrl+Shift+K"))
|
||||
self.actSplitCursor.setText(_translate("MainWindow", "Sp&lit at cursor"))
|
||||
self.actSplitCursor.setShortcut(_translate("MainWindow", "Ctrl+K"))
|
||||
self.actMerge.setText(_translate("MainWindow", "&Merge"))
|
||||
self.actMerge.setText(_translate("MainWindow", "M&erge"))
|
||||
self.actMerge.setShortcut(_translate("MainWindow", "Ctrl+M"))
|
||||
self.actDuplicate.setText(_translate("MainWindow", "Dupl&icate"))
|
||||
self.actDuplicate.setShortcut(_translate("MainWindow", "Ctrl+D"))
|
||||
|
|
|
@ -2137,6 +2137,12 @@
|
|||
<property name="title">
|
||||
<string>&Edit</string>
|
||||
</property>
|
||||
<addaction name="actCut"/>
|
||||
<addaction name="actCopy"/>
|
||||
<addaction name="actPaste"/>
|
||||
<addaction name="actDelete"/>
|
||||
<addaction name="actRename"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actLabels"/>
|
||||
<addaction name="actStatus"/>
|
||||
<addaction name="actSettings"/>
|
||||
|
@ -2156,18 +2162,10 @@
|
|||
<addaction name="menuMode"/>
|
||||
<addaction name="separator"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuDocuments">
|
||||
<widget class="QMenu" name="menuOrganize">
|
||||
<property name="title">
|
||||
<string>&Documents</string>
|
||||
<string>Organi&ze</string>
|
||||
</property>
|
||||
<addaction name="actCopy"/>
|
||||
<addaction name="actCut"/>
|
||||
<addaction name="actPaste"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actRename"/>
|
||||
<addaction name="actDuplicate"/>
|
||||
<addaction name="actDelete"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actMoveUp"/>
|
||||
<addaction name="actMoveDown"/>
|
||||
<addaction name="separator"/>
|
||||
|
@ -2177,7 +2175,7 @@
|
|||
</widget>
|
||||
<addaction name="menuFile"/>
|
||||
<addaction name="menuEdit"/>
|
||||
<addaction name="menuDocuments"/>
|
||||
<addaction name="menuOrganize"/>
|
||||
<addaction name="menuView"/>
|
||||
<addaction name="menuTools"/>
|
||||
<addaction name="menuHelp"/>
|
||||
|
@ -2553,10 +2551,11 @@
|
|||
</action>
|
||||
<action name="actMerge">
|
||||
<property name="icon">
|
||||
<iconset theme="merge"/>
|
||||
<iconset theme="merge">
|
||||
<normaloff>.</normaloff>.</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Merge</string>
|
||||
<string>M&erge</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>Ctrl+M</string>
|
||||
|
|
Loading…
Reference in a new issue