From b1192101ce6c1a30a7f06e1f9331f1dbc202061f Mon Sep 17 00:00:00 2001 From: Olivier Keshavjee Date: Thu, 30 Nov 2017 11:11:01 +0100 Subject: [PATCH] Adds Format menu to mainWindow ui --- .../actions/format-text-strikethrough.svg | 6 + .../actions/format-text-strikethrough.svg | 6 + .../actions/format-text-strikethrough.svg | 7 + .../actions/format-text-strikethrough.svg | 7 + .../actions/format-text-strikethrough.svg | 6 + .../actions/format-text-strikethrough.svg | 6 + .../actions/format-text-strikethrough.svg | 7 + .../actions/format-text-strikethrough.svg | 6 + manuskript/ui/mainWindow.py | 123 +++++++- manuskript/ui/mainWindow.ui | 290 +++++++++++++++--- 10 files changed, 416 insertions(+), 48 deletions(-) create mode 100644 icons/NumixMsk/128x128/actions/format-text-strikethrough.svg create mode 100644 icons/NumixMsk/16x16/actions/format-text-strikethrough.svg create mode 100644 icons/NumixMsk/22x22/actions/format-text-strikethrough.svg create mode 100644 icons/NumixMsk/24x24/actions/format-text-strikethrough.svg create mode 100644 icons/NumixMsk/256x256/actions/format-text-strikethrough.svg create mode 100644 icons/NumixMsk/32x32/actions/format-text-strikethrough.svg create mode 100644 icons/NumixMsk/48x48/actions/format-text-strikethrough.svg create mode 100644 icons/NumixMsk/64x64/actions/format-text-strikethrough.svg diff --git a/icons/NumixMsk/128x128/actions/format-text-strikethrough.svg b/icons/NumixMsk/128x128/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..39d148f --- /dev/null +++ b/icons/NumixMsk/128x128/actions/format-text-strikethrough.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/NumixMsk/16x16/actions/format-text-strikethrough.svg b/icons/NumixMsk/16x16/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..759dcaf --- /dev/null +++ b/icons/NumixMsk/16x16/actions/format-text-strikethrough.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/NumixMsk/22x22/actions/format-text-strikethrough.svg b/icons/NumixMsk/22x22/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..43c5593 --- /dev/null +++ b/icons/NumixMsk/22x22/actions/format-text-strikethrough.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icons/NumixMsk/24x24/actions/format-text-strikethrough.svg b/icons/NumixMsk/24x24/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..e2e919f --- /dev/null +++ b/icons/NumixMsk/24x24/actions/format-text-strikethrough.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icons/NumixMsk/256x256/actions/format-text-strikethrough.svg b/icons/NumixMsk/256x256/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..ed9f516 --- /dev/null +++ b/icons/NumixMsk/256x256/actions/format-text-strikethrough.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/NumixMsk/32x32/actions/format-text-strikethrough.svg b/icons/NumixMsk/32x32/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..55b1221 --- /dev/null +++ b/icons/NumixMsk/32x32/actions/format-text-strikethrough.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/NumixMsk/48x48/actions/format-text-strikethrough.svg b/icons/NumixMsk/48x48/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..292bdb5 --- /dev/null +++ b/icons/NumixMsk/48x48/actions/format-text-strikethrough.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icons/NumixMsk/64x64/actions/format-text-strikethrough.svg b/icons/NumixMsk/64x64/actions/format-text-strikethrough.svg new file mode 100644 index 0000000..84364b6 --- /dev/null +++ b/icons/NumixMsk/64x64/actions/format-text-strikethrough.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py index 484df03..30df4f4 100644 --- a/manuskript/ui/mainWindow.py +++ b/manuskript/ui/mainWindow.py @@ -378,7 +378,7 @@ class Ui_MainWindow(object): self.scrollAreaPersoInfos.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) self.scrollAreaPersoInfos.setObjectName("scrollAreaPersoInfos") self.scrollAreaPersoInfosWidget = QtWidgets.QWidget() - self.scrollAreaPersoInfosWidget.setGeometry(QtCore.QRect(0, 0, 426, 688)) + self.scrollAreaPersoInfosWidget.setGeometry(QtCore.QRect(0, 0, 204, 606)) self.scrollAreaPersoInfosWidget.setObjectName("scrollAreaPersoInfosWidget") self.formLayout_8 = QtWidgets.QFormLayout(self.scrollAreaPersoInfosWidget) self.formLayout_8.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow) @@ -1040,6 +1040,12 @@ class Ui_MainWindow(object): self.menuTools.setObjectName("menuTools") self.menuEdit = QtWidgets.QMenu(self.menubar) self.menuEdit.setObjectName("menuEdit") + self.mnuFormat = QtWidgets.QMenu(self.menuEdit) + icon = QtGui.QIcon.fromTheme("format-text-bold") + self.mnuFormat.setIcon(icon) + self.mnuFormat.setObjectName("mnuFormat") + self.mnuHeader = QtWidgets.QMenu(self.mnuFormat) + self.mnuHeader.setObjectName("mnuHeader") self.menuView = QtWidgets.QMenu(self.menubar) self.menuView.setObjectName("menuView") self.menuMode = QtWidgets.QMenu(self.menuView) @@ -1214,6 +1220,56 @@ class Ui_MainWindow(object): icon = QtGui.QIcon.fromTheme("edit-rename") self.actRename.setIcon(icon) self.actRename.setObjectName("actRename") + self.actHeaderSetextL1 = QtWidgets.QAction(MainWindow) + self.actHeaderSetextL1.setObjectName("actHeaderSetextL1") + self.actHeaderSetextL2 = QtWidgets.QAction(MainWindow) + self.actHeaderSetextL2.setObjectName("actHeaderSetextL2") + self.actHeaderAtxL1 = QtWidgets.QAction(MainWindow) + self.actHeaderAtxL1.setObjectName("actHeaderAtxL1") + self.actHeaderAtxL2 = QtWidgets.QAction(MainWindow) + self.actHeaderAtxL2.setObjectName("actHeaderAtxL2") + self.actHeaderAtxL3 = QtWidgets.QAction(MainWindow) + self.actHeaderAtxL3.setObjectName("actHeaderAtxL3") + self.actHeaderAtxL4 = QtWidgets.QAction(MainWindow) + self.actHeaderAtxL4.setObjectName("actHeaderAtxL4") + self.actHeaderAtxL5 = QtWidgets.QAction(MainWindow) + self.actHeaderAtxL5.setObjectName("actHeaderAtxL5") + self.actHeaderAtxL6 = QtWidgets.QAction(MainWindow) + self.actHeaderAtxL6.setObjectName("actHeaderAtxL6") + self.actFormatBold = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("format-text-bold") + self.actFormatBold.setIcon(icon) + self.actFormatBold.setObjectName("actFormatBold") + self.actFormatItalic = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("format-text-italic") + self.actFormatItalic.setIcon(icon) + self.actFormatItalic.setObjectName("actFormatItalic") + self.actFormatStrike = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("format-text-strikethrough") + self.actFormatStrike.setIcon(icon) + self.actFormatStrike.setObjectName("actFormatStrike") + self.actFormatVerbatim = QtWidgets.QAction(MainWindow) + self.actFormatVerbatim.setObjectName("actFormatVerbatim") + self.actFormatSuperscript = QtWidgets.QAction(MainWindow) + self.actFormatSuperscript.setObjectName("actFormatSuperscript") + self.actFormatSubscript = QtWidgets.QAction(MainWindow) + self.actFormatSubscript.setObjectName("actFormatSubscript") + self.actFormatCommentBlock = QtWidgets.QAction(MainWindow) + self.actFormatCommentBlock.setObjectName("actFormatCommentBlock") + self.actFormatClear = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("format-text-none") + self.actFormatClear.setIcon(icon) + self.actFormatClear.setObjectName("actFormatClear") + self.actFormatCommentLines = QtWidgets.QAction(MainWindow) + self.actFormatCommentLines.setObjectName("actFormatCommentLines") + self.actFormatUnorderedList = QtWidgets.QAction(MainWindow) + self.actFormatUnorderedList.setObjectName("actFormatUnorderedList") + self.actFormatList = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("view-list") + self.actFormatList.setIcon(icon) + self.actFormatList.setObjectName("actFormatList") + self.actFormatBlockquote = QtWidgets.QAction(MainWindow) + self.actFormatBlockquote.setObjectName("actFormatBlockquote") self.menuFile.addAction(self.actOpen) self.menuFile.addAction(self.menuRecents.menuAction()) self.menuFile.addAction(self.actSave) @@ -1228,12 +1284,39 @@ class Ui_MainWindow(object): self.menuHelp.addAction(self.actAbout) self.menuTools.addAction(self.actSpellcheck) self.menuTools.addAction(self.actToolFrequency) + self.mnuHeader.addAction(self.actHeaderSetextL1) + self.mnuHeader.addAction(self.actHeaderSetextL2) + self.mnuHeader.addSeparator() + self.mnuHeader.addAction(self.actHeaderAtxL1) + self.mnuHeader.addAction(self.actHeaderAtxL2) + self.mnuHeader.addAction(self.actHeaderAtxL3) + self.mnuHeader.addAction(self.actHeaderAtxL4) + self.mnuHeader.addAction(self.actHeaderAtxL5) + self.mnuHeader.addAction(self.actHeaderAtxL6) + self.mnuFormat.addAction(self.mnuHeader.menuAction()) + self.mnuFormat.addSeparator() + self.mnuFormat.addAction(self.actFormatBold) + self.mnuFormat.addAction(self.actFormatItalic) + self.mnuFormat.addAction(self.actFormatStrike) + self.mnuFormat.addAction(self.actFormatVerbatim) + self.mnuFormat.addAction(self.actFormatSuperscript) + self.mnuFormat.addAction(self.actFormatSubscript) + self.mnuFormat.addAction(self.actFormatCommentLines) + self.mnuFormat.addSeparator() + self.mnuFormat.addAction(self.actFormatList) + self.mnuFormat.addAction(self.actFormatUnorderedList) + self.mnuFormat.addAction(self.actFormatBlockquote) + self.mnuFormat.addAction(self.actFormatCommentBlock) + self.mnuFormat.addSeparator() + self.mnuFormat.addAction(self.actFormatClear) 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.mnuFormat.menuAction()) + self.menuEdit.addSeparator() self.menuEdit.addAction(self.actLabels) self.menuEdit.addAction(self.actStatus) self.menuEdit.addAction(self.actSettings) @@ -1366,6 +1449,8 @@ class Ui_MainWindow(object): self.menuHelp.setTitle(_translate("MainWindow", "&Help")) self.menuTools.setTitle(_translate("MainWindow", "&Tools")) self.menuEdit.setTitle(_translate("MainWindow", "&Edit")) + self.mnuFormat.setTitle(_translate("MainWindow", "&Format")) + self.mnuHeader.setTitle(_translate("MainWindow", "&Header")) self.menuView.setTitle(_translate("MainWindow", "&View")) self.menuMode.setTitle(_translate("MainWindow", "&Mode")) self.menuOrganize.setTitle(_translate("MainWindow", "Organi&ze")) @@ -1415,7 +1500,6 @@ class Ui_MainWindow(object): 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")) self.actDelete.setText(_translate("MainWindow", "&Delete")) self.actDelete.setShortcut(_translate("MainWindow", "Del")) self.actMoveUp.setText(_translate("MainWindow", "&Move Up")) @@ -1424,6 +1508,41 @@ class Ui_MainWindow(object): self.actMoveDown.setShortcut(_translate("MainWindow", "Ctrl+Shift+Down")) self.actRename.setText(_translate("MainWindow", "&Rename")) self.actRename.setShortcut(_translate("MainWindow", "F2")) + self.actHeaderSetextL1.setText(_translate("MainWindow", "&Level 1 (setext)")) + self.actHeaderSetextL1.setShortcut(_translate("MainWindow", "Ctrl+Alt+1")) + self.actHeaderSetextL2.setText(_translate("MainWindow", "Level &2")) + self.actHeaderSetextL2.setShortcut(_translate("MainWindow", "Ctrl+Alt+2")) + self.actHeaderAtxL1.setText(_translate("MainWindow", "Level &1 (atx)")) + self.actHeaderAtxL1.setShortcut(_translate("MainWindow", "Ctrl+1")) + self.actHeaderAtxL2.setText(_translate("MainWindow", "L&evel 2")) + self.actHeaderAtxL2.setShortcut(_translate("MainWindow", "Ctrl+2")) + self.actHeaderAtxL3.setText(_translate("MainWindow", "Level &3")) + self.actHeaderAtxL3.setShortcut(_translate("MainWindow", "Ctrl+3")) + self.actHeaderAtxL4.setText(_translate("MainWindow", "Level &4")) + self.actHeaderAtxL4.setShortcut(_translate("MainWindow", "Ctrl+4")) + self.actHeaderAtxL5.setText(_translate("MainWindow", "Level &5")) + self.actHeaderAtxL5.setShortcut(_translate("MainWindow", "Ctrl+5")) + self.actHeaderAtxL6.setText(_translate("MainWindow", "Level &6")) + self.actHeaderAtxL6.setShortcut(_translate("MainWindow", "Ctrl+6")) + self.actFormatBold.setText(_translate("MainWindow", "&Bold")) + self.actFormatBold.setShortcut(_translate("MainWindow", "Ctrl+B")) + self.actFormatItalic.setText(_translate("MainWindow", "&Italic")) + self.actFormatItalic.setShortcut(_translate("MainWindow", "Ctrl+I")) + self.actFormatStrike.setText(_translate("MainWindow", "&Strike")) + self.actFormatVerbatim.setText(_translate("MainWindow", "&Verbatim")) + self.actFormatSuperscript.setText(_translate("MainWindow", "Su&perscript")) + self.actFormatSuperscript.setShortcut(_translate("MainWindow", "Ctrl++")) + self.actFormatSubscript.setText(_translate("MainWindow", "Subsc&ript")) + self.actFormatSubscript.setShortcut(_translate("MainWindow", "Ctrl+-")) + self.actFormatCommentBlock.setText(_translate("MainWindow", "Co&mment block")) + self.actFormatCommentBlock.setShortcut(_translate("MainWindow", "Ctrl+Shift+C")) + self.actFormatClear.setText(_translate("MainWindow", "Clear &formats")) + self.actFormatClear.setShortcut(_translate("MainWindow", "Ctrl+0")) + self.actFormatCommentLines.setText(_translate("MainWindow", "&Comment line(s)")) + self.actFormatCommentLines.setShortcut(_translate("MainWindow", "Ctrl+C")) + self.actFormatUnorderedList.setText(_translate("MainWindow", "&Ordered list")) + self.actFormatList.setText(_translate("MainWindow", "&Unordered list")) + self.actFormatBlockquote.setText(_translate("MainWindow", "B&lockquote")) from manuskript.ui.cheatSheet import cheatSheet from manuskript.ui.editors.mainEditor import mainEditor diff --git a/manuskript/ui/mainWindow.ui b/manuskript/ui/mainWindow.ui index 150f704..0d13a74 100644 --- a/manuskript/ui/mainWindow.ui +++ b/manuskript/ui/mainWindow.ui @@ -629,7 +629,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -640,7 +640,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -651,7 +651,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -662,7 +662,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -737,7 +737,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -751,7 +751,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -815,8 +815,8 @@ 0 0 - 426 - 688 + 204 + 606 @@ -905,7 +905,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -988,7 +988,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -1033,7 +1033,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -1044,7 +1044,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -1075,7 +1075,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. @@ -1136,7 +1136,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1150,7 +1150,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1264,7 +1264,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1281,7 +1281,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1355,7 +1355,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. Ctrl+Return @@ -1375,7 +1375,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. Ctrl+Backspace @@ -1405,7 +1405,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1557,7 +1557,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1571,7 +1571,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1770,7 +1770,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1784,7 +1784,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1798,7 +1798,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1825,7 +1825,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1917,7 +1917,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1931,7 +1931,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -1945,7 +1945,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. true @@ -2137,12 +2137,53 @@ &Edit + + + &Format + + + + .. + + + + &Header + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2286,7 +2327,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. &Open @@ -2298,7 +2339,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. &Save @@ -2310,7 +2351,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. Sa&ve as... @@ -2322,7 +2363,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. &Quit @@ -2340,7 +2381,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. &Show help texts @@ -2358,7 +2399,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. &Spellcheck @@ -2430,7 +2471,7 @@ - ../../../../../../../.designer/backup../../../../../../../.designer/backup + .. S&ettings @@ -2569,9 +2610,6 @@ Dupl&icate - - Ctrl+D - @@ -2621,18 +2659,178 @@ F2 + + + &Level 1 (setext) + + + Ctrl+Alt+1 + + + + + Level &2 + + + Ctrl+Alt+2 + + + + + Level &1 (atx) + + + Ctrl+1 + + + + + L&evel 2 + + + Ctrl+2 + + + + + Level &3 + + + Ctrl+3 + + + + + Level &4 + + + Ctrl+4 + + + + + Level &5 + + + Ctrl+5 + + + + + Level &6 + + + Ctrl+6 + + + + + + .. + + + &Bold + + + Ctrl+B + + + + + + .. + + + &Italic + + + Ctrl+I + + + + + + .. + + + &Strike + + + + + &Verbatim + + + + + Su&perscript + + + Ctrl++ + + + + + Subsc&ript + + + Ctrl+- + + + + + Co&mment block + + + Ctrl+Shift+C + + + + + + .. + + + Clear &formats + + + Ctrl+0 + + + + + &Comment line(s) + + + Ctrl+C + + + + + &Ordered list + + + + + + .. + + + &Unordered list + + + + + B&lockquote + + - textEditView + MDEditCompleter QTextEdit -
manuskript.ui.views.textEditView.h
+
manuskript.ui.views.MDEditCompleter.h
 - - MDEditCompleter - QTextEdit -
manuskript.ui.views.MDEditCompleter.h
- lineEditView QLineEdit