From aed93550f2cff38052acbe54eaf3cb34a7b42fee Mon Sep 17 00:00:00 2001 From: Olivier Keshavjee Date: Sun, 15 Oct 2017 22:23:06 +0200 Subject: [PATCH] Adds missing icons, and changes one in navigation dock (#159) --- .../128x128/actions/stock_timezone.svg | 99 ++++++++++++++ icons/NumixMsk/128x128/emblems/emblem-web.svg | 5 + icons/NumixMsk/16/actions/configure.svg | 16 --- .../16/actions/folder_color_picker.svg | 11 -- icons/NumixMsk/16/actions/history-view.svg | 7 - .../categories/applications-development.svg | 6 - .../categories/preferences-desktop-theme.svg | 7 - .../16/categories/preferences-system-time.svg | 11 -- .../NumixMsk/16x16/actions/stock_timezone.svg | 125 ++++++++++++++++++ icons/NumixMsk/16x16/emblems/emblem-web.svg | 6 + .../NumixMsk/22x22/actions/stock_timezone.svg | 103 +++++++++++++++ icons/NumixMsk/22x22/emblems/emblem-web.svg | 5 + .../NumixMsk/24x24/actions/stock_timezone.svg | 104 +++++++++++++++ icons/NumixMsk/24x24/emblems/emblem-web.svg | 5 + .../256x256/actions/stock_timezone.svg | 99 ++++++++++++++ icons/NumixMsk/256x256/emblems/emblem-web.svg | 5 + .../NumixMsk/32x32/actions/stock_timezone.svg | 99 ++++++++++++++ icons/NumixMsk/32x32/emblems/emblem-web.svg | 5 + .../NumixMsk/48x48/actions/stock_timezone.svg | 99 ++++++++++++++ icons/NumixMsk/48x48/emblems/emblem-web.svg | 5 + .../NumixMsk/64x64/actions/stock_timezone.svg | 99 ++++++++++++++ .../NumixMsk/64x64/actions/view-list-tree.svg | 14 ++ icons/NumixMsk/64x64/emblems/emblem-web.svg | 5 + manuskript/mainWindow.py | 12 +- manuskript/ui/mainWindow.py | 32 +++-- manuskript/ui/mainWindow.ui | 14 +- manuskript/ui/settings_ui.py | 16 ++- manuskript/ui/settings_ui.ui | 14 +- 28 files changed, 945 insertions(+), 83 deletions(-) create mode 100644 icons/NumixMsk/128x128/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/128x128/emblems/emblem-web.svg delete mode 100644 icons/NumixMsk/16/actions/configure.svg delete mode 100644 icons/NumixMsk/16/actions/folder_color_picker.svg delete mode 100644 icons/NumixMsk/16/actions/history-view.svg delete mode 100644 icons/NumixMsk/16/categories/applications-development.svg delete mode 100644 icons/NumixMsk/16/categories/preferences-desktop-theme.svg delete mode 100644 icons/NumixMsk/16/categories/preferences-system-time.svg create mode 100644 icons/NumixMsk/16x16/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/16x16/emblems/emblem-web.svg create mode 100644 icons/NumixMsk/22x22/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/22x22/emblems/emblem-web.svg create mode 100644 icons/NumixMsk/24x24/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/24x24/emblems/emblem-web.svg create mode 100644 icons/NumixMsk/256x256/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/256x256/emblems/emblem-web.svg create mode 100644 icons/NumixMsk/32x32/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/32x32/emblems/emblem-web.svg create mode 100644 icons/NumixMsk/48x48/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/48x48/emblems/emblem-web.svg create mode 100644 icons/NumixMsk/64x64/actions/stock_timezone.svg create mode 100644 icons/NumixMsk/64x64/actions/view-list-tree.svg create mode 100644 icons/NumixMsk/64x64/emblems/emblem-web.svg diff --git a/icons/NumixMsk/128x128/actions/stock_timezone.svg b/icons/NumixMsk/128x128/actions/stock_timezone.svg new file mode 100644 index 00000000..d53d0ca0 --- /dev/null +++ b/icons/NumixMsk/128x128/actions/stock_timezone.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/128x128/emblems/emblem-web.svg b/icons/NumixMsk/128x128/emblems/emblem-web.svg new file mode 100644 index 00000000..49738d46 --- /dev/null +++ b/icons/NumixMsk/128x128/emblems/emblem-web.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/NumixMsk/16/actions/configure.svg b/icons/NumixMsk/16/actions/configure.svg deleted file mode 100644 index d84cddbe..00000000 --- a/icons/NumixMsk/16/actions/configure.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/icons/NumixMsk/16/actions/folder_color_picker.svg b/icons/NumixMsk/16/actions/folder_color_picker.svg deleted file mode 100644 index 1d149f51..00000000 --- a/icons/NumixMsk/16/actions/folder_color_picker.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/icons/NumixMsk/16/actions/history-view.svg b/icons/NumixMsk/16/actions/history-view.svg deleted file mode 100644 index 1710d71a..00000000 --- a/icons/NumixMsk/16/actions/history-view.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/icons/NumixMsk/16/categories/applications-development.svg b/icons/NumixMsk/16/categories/applications-development.svg deleted file mode 100644 index 68d61d7d..00000000 --- a/icons/NumixMsk/16/categories/applications-development.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/icons/NumixMsk/16/categories/preferences-desktop-theme.svg b/icons/NumixMsk/16/categories/preferences-desktop-theme.svg deleted file mode 100644 index 035afacd..00000000 --- a/icons/NumixMsk/16/categories/preferences-desktop-theme.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/icons/NumixMsk/16/categories/preferences-system-time.svg b/icons/NumixMsk/16/categories/preferences-system-time.svg deleted file mode 100644 index 2738e8b9..00000000 --- a/icons/NumixMsk/16/categories/preferences-system-time.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/icons/NumixMsk/16x16/actions/stock_timezone.svg b/icons/NumixMsk/16x16/actions/stock_timezone.svg new file mode 100644 index 00000000..546e3d42 --- /dev/null +++ b/icons/NumixMsk/16x16/actions/stock_timezone.svg @@ -0,0 +1,125 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/16x16/emblems/emblem-web.svg b/icons/NumixMsk/16x16/emblems/emblem-web.svg new file mode 100644 index 00000000..ab8ad613 --- /dev/null +++ b/icons/NumixMsk/16x16/emblems/emblem-web.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/NumixMsk/22x22/actions/stock_timezone.svg b/icons/NumixMsk/22x22/actions/stock_timezone.svg new file mode 100644 index 00000000..bc8d2054 --- /dev/null +++ b/icons/NumixMsk/22x22/actions/stock_timezone.svg @@ -0,0 +1,103 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/22x22/emblems/emblem-web.svg b/icons/NumixMsk/22x22/emblems/emblem-web.svg new file mode 100644 index 00000000..dab06cfc --- /dev/null +++ b/icons/NumixMsk/22x22/emblems/emblem-web.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/NumixMsk/24x24/actions/stock_timezone.svg b/icons/NumixMsk/24x24/actions/stock_timezone.svg new file mode 100644 index 00000000..388753ab --- /dev/null +++ b/icons/NumixMsk/24x24/actions/stock_timezone.svg @@ -0,0 +1,104 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/24x24/emblems/emblem-web.svg b/icons/NumixMsk/24x24/emblems/emblem-web.svg new file mode 100644 index 00000000..658b67af --- /dev/null +++ b/icons/NumixMsk/24x24/emblems/emblem-web.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/NumixMsk/256x256/actions/stock_timezone.svg b/icons/NumixMsk/256x256/actions/stock_timezone.svg new file mode 100644 index 00000000..2ec2d0e6 --- /dev/null +++ b/icons/NumixMsk/256x256/actions/stock_timezone.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/256x256/emblems/emblem-web.svg b/icons/NumixMsk/256x256/emblems/emblem-web.svg new file mode 100644 index 00000000..b44b3190 --- /dev/null +++ b/icons/NumixMsk/256x256/emblems/emblem-web.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/NumixMsk/32x32/actions/stock_timezone.svg b/icons/NumixMsk/32x32/actions/stock_timezone.svg new file mode 100644 index 00000000..475b281f --- /dev/null +++ b/icons/NumixMsk/32x32/actions/stock_timezone.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/32x32/emblems/emblem-web.svg b/icons/NumixMsk/32x32/emblems/emblem-web.svg new file mode 100644 index 00000000..a6e9cdba --- /dev/null +++ b/icons/NumixMsk/32x32/emblems/emblem-web.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/NumixMsk/48x48/actions/stock_timezone.svg b/icons/NumixMsk/48x48/actions/stock_timezone.svg new file mode 100644 index 00000000..3986f935 --- /dev/null +++ b/icons/NumixMsk/48x48/actions/stock_timezone.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/48x48/emblems/emblem-web.svg b/icons/NumixMsk/48x48/emblems/emblem-web.svg new file mode 100644 index 00000000..9024c80f --- /dev/null +++ b/icons/NumixMsk/48x48/emblems/emblem-web.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/NumixMsk/64x64/actions/stock_timezone.svg b/icons/NumixMsk/64x64/actions/stock_timezone.svg new file mode 100644 index 00000000..f938e2cf --- /dev/null +++ b/icons/NumixMsk/64x64/actions/stock_timezone.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/64x64/actions/view-list-tree.svg b/icons/NumixMsk/64x64/actions/view-list-tree.svg new file mode 100644 index 00000000..9ed47ebc --- /dev/null +++ b/icons/NumixMsk/64x64/actions/view-list-tree.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/icons/NumixMsk/64x64/emblems/emblem-web.svg b/icons/NumixMsk/64x64/emblems/emblem-web.svg new file mode 100644 index 00000000..d6e89dfe --- /dev/null +++ b/icons/NumixMsk/64x64/emblems/emblem-web.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/manuskript/mainWindow.py b/manuskript/mainWindow.py index 409accbc..db14c354 100644 --- a/manuskript/mainWindow.py +++ b/manuskript/mainWindow.py @@ -904,7 +904,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): "application-text-template", #applications-publishing "stock_people", "stock_shuffle", - "applications-internet", + "emblem-web", #stock_timezone applications-internet "gtk-index", #applications-versioncontrol "gtk-edit", "applications-debugging" @@ -1104,9 +1104,9 @@ class MainWindow(QMainWindow, Ui_MainWindow): ] menus = [ - (self.tr("Tree"), "Tree"), - (self.tr("Index cards"), "Cork"), - (self.tr("Outline"), "Outline") + (self.tr("Tree"), "Tree", "view-list-tree"), + (self.tr("Index cards"), "Cork", "view-cards"), + (self.tr("Outline"), "Outline", "view-outline") ] submenus = { @@ -1135,8 +1135,10 @@ class MainWindow(QMainWindow, Ui_MainWindow): # print("Generating menus with", settings.viewSettings) - for mnu, mnud in menus: + for mnu, mnud, icon in menus: m = QMenu(mnu, self.menuView) + if icon: + m.setIcon(QIcon.fromTheme(icon)) for s, sd in submenus[mnud]: m2 = QMenu(s, m) agp = QActionGroup(m2) diff --git a/manuskript/ui/mainWindow.py b/manuskript/ui/mainWindow.py index 9c13e469..a2a9a74e 100644 --- a/manuskript/ui/mainWindow.py +++ b/manuskript/ui/mainWindow.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'manuskript/ui/mainWindow.ui' # -# Created: Sat Oct 14 21:07:22 2017 +# Created: Sun Oct 15 22:19:14 2017 # by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -1138,8 +1138,12 @@ class Ui_MainWindow(object): self.actSpellcheck.setIcon(icon) self.actSpellcheck.setObjectName("actSpellcheck") self.actLabels = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("folder_color_picker") + self.actLabels.setIcon(icon) self.actLabels.setObjectName("actLabels") self.actStatus = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("applications-development") + self.actStatus.setIcon(icon) self.actStatus.setObjectName("actStatus") self.actViewTree = QtWidgets.QAction(MainWindow) self.actViewTree.setObjectName("actViewTree") @@ -1166,10 +1170,14 @@ class Ui_MainWindow(object): self.actCloseProject.setIcon(icon) self.actCloseProject.setObjectName("actCloseProject") self.actCompile = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("document-export") + self.actCompile.setIcon(icon) self.actCompile.setObjectName("actCompile") self.actToolFrequency = QtWidgets.QAction(MainWindow) self.actToolFrequency.setObjectName("actToolFrequency") self.actAbout = QtWidgets.QAction(MainWindow) + icon = QtGui.QIcon.fromTheme("stock_view-details") + self.actAbout.setIcon(icon) self.actAbout.setObjectName("actAbout") self.menuFile.addAction(self.actOpen) self.menuFile.addAction(self.menuRecents.menuAction()) @@ -1200,7 +1208,7 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.stack.setCurrentIndex(1) - self.tabMain.setCurrentIndex(3) + self.tabMain.setCurrentIndex(6) self.tabSummary.setCurrentIndex(0) self.tabPersos.setCurrentIndex(0) self.tabPlot.setCurrentIndex(0) @@ -1339,18 +1347,18 @@ class Ui_MainWindow(object): self.actAbout.setText(_translate("MainWindow", "&About")) self.actAbout.setToolTip(_translate("MainWindow", "About Manuskript")) -from manuskript.ui.views.textEditCompleter import textEditCompleter -from manuskript.ui.views.metadataView import metadataView +from manuskript.ui.views.textEditView import textEditView +from manuskript.ui.cheatSheet import cheatSheet +from manuskript.ui.editors.mainEditor import mainEditor from manuskript.ui.welcome import welcome -from manuskript.ui.search import search -from manuskript.ui.views.lineEditView import lineEditView +from manuskript.ui.views.characterTreeView import characterTreeView from manuskript.ui.views.basicItemView import basicItemView -from manuskript.ui.views.outlineView import outlineView from manuskript.ui.views.storylineView import storylineView from manuskript.ui.views.treeView import treeView -from manuskript.ui.views.textEditView import textEditView -from manuskript.ui.editors.mainEditor import mainEditor -from manuskript.ui.views.sldImportance import sldImportance +from manuskript.ui.search import search from manuskript.ui.views.plotTreeView import plotTreeView -from manuskript.ui.cheatSheet import cheatSheet -from manuskript.ui.views.characterTreeView import characterTreeView +from manuskript.ui.views.metadataView import metadataView +from manuskript.ui.views.outlineView import outlineView +from manuskript.ui.views.lineEditView import lineEditView +from manuskript.ui.views.sldImportance import sldImportance +from manuskript.ui.views.textEditCompleter import textEditCompleter diff --git a/manuskript/ui/mainWindow.ui b/manuskript/ui/mainWindow.ui index c55e7104..000cf691 100644 --- a/manuskript/ui/mainWindow.ui +++ b/manuskript/ui/mainWindow.ui @@ -124,7 +124,7 @@ QTabWidget::Rounded - 3 + 6 true @@ -2349,11 +2349,17 @@ QListView::item:hover { + + + &Labels... + + + &Status... @@ -2423,6 +2429,9 @@ QListView::item:hover { + + + Co&mpile @@ -2436,6 +2445,9 @@ QListView::item:hover { + + + &About diff --git a/manuskript/ui/settings_ui.py b/manuskript/ui/settings_ui.py index b5aa705c..10903dc8 100644 --- a/manuskript/ui/settings_ui.py +++ b/manuskript/ui/settings_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'manuskript/ui/settings_ui.ui' # -# Created: Sun Oct 15 14:43:30 2017 +# Created: Sun Oct 15 22:18:32 2017 # by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -584,7 +584,8 @@ class Ui_Settings(object): self.verticalLayout_17.addLayout(self.horizontalLayout_9) spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout_17.addItem(spacerItem5) - self.tabViews.addTab(self.tab, "") + icon = QtGui.QIcon.fromTheme("view-list-tree") + self.tabViews.addTab(self.tab, icon, "") self.tab_2 = QtWidgets.QWidget() self.tab_2.setObjectName("tab_2") self.verticalLayout_11 = QtWidgets.QVBoxLayout(self.tab_2) @@ -746,7 +747,8 @@ class Ui_Settings(object): self.verticalLayout_11.addWidget(self.groupBox_6) spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) self.verticalLayout_11.addItem(spacerItem6) - self.tabViews.addTab(self.tab_2, "") + icon = QtGui.QIcon.fromTheme("view-outline") + self.tabViews.addTab(self.tab_2, icon, "") self.tab_3 = QtWidgets.QWidget() self.tab_3.setObjectName("tab_3") self.gridLayout_3 = QtWidgets.QGridLayout(self.tab_3) @@ -921,7 +923,8 @@ class Ui_Settings(object): self.cmbCorkCorner.addItem("") self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.cmbCorkCorner) self.gridLayout_3.addWidget(self.groupBox_5, 0, 0, 2, 1) - self.tabViews.addTab(self.tab_3, "") + icon = QtGui.QIcon.fromTheme("view-cards") + self.tabViews.addTab(self.tab_3, icon, "") self.tab_4 = QtWidgets.QWidget() self.tab_4.setObjectName("tab_4") self.horizontalLayout_11 = QtWidgets.QHBoxLayout(self.tab_4) @@ -1146,7 +1149,8 @@ class Ui_Settings(object): self.spnEditorParaBelow.setObjectName("spnEditorParaBelow") self.formLayout_9.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.spnEditorParaBelow) self.horizontalLayout_11.addWidget(self.groupBox_13) - self.tabViews.addTab(self.tab_4, "") + icon = QtGui.QIcon.fromTheme("view-text") + self.tabViews.addTab(self.tab_4, icon, "") self.verticalLayout_9.addWidget(self.tabViews) self.stack.addWidget(self.stackedWidgetPage2) self.stackedWidgetPage3 = QtWidgets.QWidget() @@ -1634,7 +1638,7 @@ class Ui_Settings(object): self.retranslateUi(Settings) self.stack.setCurrentIndex(2) - self.tabViews.setCurrentIndex(0) + self.tabViews.setCurrentIndex(3) self.themeStack.setCurrentIndex(1) self.themeEditStack.setCurrentIndex(0) self.lstMenu.currentRowChanged['int'].connect(self.stack.setCurrentIndex) diff --git a/manuskript/ui/settings_ui.ui b/manuskript/ui/settings_ui.ui index 68c23b3b..052ca463 100644 --- a/manuskript/ui/settings_ui.ui +++ b/manuskript/ui/settings_ui.ui @@ -792,9 +792,12 @@ text-align:center; - 0 + 3 + + + Tree @@ -1168,6 +1171,9 @@ text-align:center; + + + Outline @@ -1511,6 +1517,9 @@ text-align:center; + + + Index cards @@ -1909,6 +1918,9 @@ text-align:center; + + + Text editor