From d78dd24291e34ebe847bb2f5d3794973e6c3dd5e Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 12 May 2020 21:51:57 +0200 Subject: [PATCH] Some minor fixes, add qApp info, and a PNG app icon --- nw/__init__.py | 3 +++ nw/assets/icons/novelWriter.png | Bin 0 -> 32303 bytes nw/gui/elements/doctree.py | 4 ++-- nw/gui/elements/searchbar.py | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 nw/assets/icons/novelWriter.png diff --git a/nw/__init__.py b/nw/__init__.py index 3330c6b6..332b7009 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -31,6 +31,7 @@ import logging from os import path, remove, rename +from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication from nw.guimain import GuiMain @@ -225,6 +226,8 @@ def main(sysArgs=None): nwApp = QApplication([__package__,("-style=%s" % qtStyle)]) nwApp.setApplicationName(__package__) nwApp.setApplicationVersion(__version__) + nwApp.setWindowIcon(QIcon(CONFIG.appIcon)) + nwApp.setOrganizationDomain("novelwriter.io") nwGUI = GuiMain() sys.exit(nwApp.exec_()) diff --git a/nw/assets/icons/novelWriter.png b/nw/assets/icons/novelWriter.png new file mode 100644 index 0000000000000000000000000000000000000000..4543f575787d5034bd4a80e8ae21a2298a8646fb GIT binary patch literal 32303 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 literal 0 HcmV?d00001 diff --git a/nw/gui/elements/doctree.py b/nw/gui/elements/doctree.py index 92a006de..e67bd1b6 100644 --- a/nw/gui/elements/doctree.py +++ b/nw/gui/elements/doctree.py @@ -31,7 +31,7 @@ import nw from PyQt5.QtCore import Qt, QSize from PyQt5.QtGui import QFont, QColor from PyQt5.QtWidgets import ( - QTreeWidget, QTreeWidgetItem, QAbstractItemView, QApplication, QMessageBox + qApp, QTreeWidget, QTreeWidgetItem, QAbstractItemView, QMessageBox ) from nw.core import NWDoc @@ -207,7 +207,7 @@ class GuiDocTree(QTreeWidget): """Move an item up or down in the tree, but only if the treeView has focus. This also applies when the menu is used. """ - if QApplication.focusWidget() == self and self.theParent.hasProject: + if qApp.focusWidget() == self and self.theParent.hasProject: tHandle = self.getSelectedHandle() tItem = self._getTreeItem(tHandle) pItem = tItem.parent() diff --git a/nw/gui/elements/searchbar.py b/nw/gui/elements/searchbar.py index 68518d8d..ad9f9e81 100644 --- a/nw/gui/elements/searchbar.py +++ b/nw/gui/elements/searchbar.py @@ -30,7 +30,7 @@ import nw from PyQt5.QtCore import Qt from PyQt5.QtWidgets import ( - QFrame, QGridLayout, QLabel, QLineEdit, QPushButton, QApplication + qApp, QFrame, QGridLayout, QLabel, QLineEdit, QPushButton ) from nw.constants import nwDocAction @@ -127,7 +127,7 @@ class GuiSearchBar(QFrame): return def _doSearch(self): - modKey = QApplication.keyboardModifiers() + modKey = qApp.keyboardModifiers() if modKey == Qt.ShiftModifier: self.theParent.docEditor.docAction(nwDocAction.GO_PREV) else: