Skip to content

Commit

Permalink
Adds Format menu to mainWindow ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@olivierkes
olivierkes committed Nov 30, 2017
1 parent 3527f4a commit b119210
Show file tree
Hide file tree
Showing 10 changed files with 416 additions and 48 deletions.
6 changes: 6 additions & 0 deletions icons/NumixMsk/128x128/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions icons/NumixMsk/16x16/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions icons/NumixMsk/22x22/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions icons/NumixMsk/24x24/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions icons/NumixMsk/256x256/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions icons/NumixMsk/32x32/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions icons/NumixMsk/48x48/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions icons/NumixMsk/64x64/actions/format-text-strikethrough.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 121 additions & 2 deletions manuskript/ui/mainWindow.py
View file
Expand Up @@ -378,7 +378,7 @@ def setupUi(self, MainWindow):
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)
Expand Down Expand Up @@ -1040,6 +1040,12 @@ def setupUi(self, MainWindow):
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)
Expand Down Expand Up @@ -1214,6 +1220,56 @@ def setupUi(self, MainWindow):
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)
Expand All @@ -1228,12 +1284,39 @@ def setupUi(self, MainWindow):
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)
Expand Down Expand Up @@ -1366,6 +1449,8 @@ def retranslateUi(self, MainWindow):
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"))
Expand Down Expand Up @@ -1415,7 +1500,6 @@ def retranslateUi(self, MainWindow):
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"))
Expand All @@ -1424,6 +1508,41 @@ def retranslateUi(self, MainWindow):
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
Expand Down

0 comments on commit b119210

Please sign in to comment.