From 3ad4e26dbc5613963394cc12a08329858d9d516e Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 11 May 2020 00:20:46 +0200 Subject: [PATCH] Cleanup of unneeded imports --- nw/core/project.py | 2 +- nw/gui/build.py | 5 ++--- nw/gui/dialogs/docmerge.py | 3 ++- nw/gui/dialogs/docsplit.py | 3 ++- nw/gui/dialogs/itemeditor.py | 2 +- nw/gui/elements/doceditor.py | 2 +- nw/gui/tools/optionstate.py | 1 - nw/guimain.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nw/core/project.py b/nw/core/project.py index 0dcb60b9..23fa2c24 100644 --- a/nw/core/project.py +++ b/nw/core/project.py @@ -44,7 +44,7 @@ from nw.core.tools import projectMaintenance from nw.core.document import NWDoc from nw.common import checkString, checkBool, checkInt, formatTimeStamp from nw.constants import ( - nwFiles, nwConst, nwItemType, nwItemClass, nwItemLayout, nwAlert + nwFiles, nwItemType, nwItemClass, nwItemLayout, nwAlert ) logger = logging.getLogger(__name__) diff --git a/nw/gui/build.py b/nw/gui/build.py index 2e1e5f0f..455c7ec7 100644 --- a/nw/gui/build.py +++ b/nw/gui/build.py @@ -35,9 +35,8 @@ from PyQt5.QtGui import ( QTextOption, QPalette, QColor, QTextDocumentWriter ) from PyQt5.QtWidgets import ( - QDialog, QVBoxLayout, QHBoxLayout, QTextBrowser, QPushButton, - QLabel, QLineEdit, QGroupBox, QGridLayout, QComboBox, QProgressBar, - QMenu, QAction, QFileDialog + QDialog, QVBoxLayout, QHBoxLayout, QTextBrowser, QPushButton, QLabel, + QLineEdit, QGroupBox, QGridLayout, QProgressBar, QMenu, QAction, QFileDialog ) from nw.gui.additions import QSwitch diff --git a/nw/gui/dialogs/docmerge.py b/nw/gui/dialogs/docmerge.py index 097f4217..1094fb78 100644 --- a/nw/gui/dialogs/docmerge.py +++ b/nw/gui/dialogs/docmerge.py @@ -52,10 +52,11 @@ class GuiDocMerge(QDialog): self.outerBox = QHBoxLayout() self.innerBox = QVBoxLayout() - self.setWindowTitle("Merge Documents") self.setLayout(self.outerBox) + self.setWindowTitle("Merge Documents") self.guiDeco = self.theParent.theTheme.loadDecoration("merge",(64,64)) + self.outerBox.setSpacing(16) self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop) self.outerBox.addLayout(self.innerBox) diff --git a/nw/gui/dialogs/docsplit.py b/nw/gui/dialogs/docsplit.py index bfb4e8ee..dc795c77 100644 --- a/nw/gui/dialogs/docsplit.py +++ b/nw/gui/dialogs/docsplit.py @@ -53,10 +53,11 @@ class GuiDocSplit(QDialog): self.outerBox = QHBoxLayout() self.innerBox = QVBoxLayout() - self.setWindowTitle("Split Document") self.setLayout(self.outerBox) + self.setWindowTitle("Split Document") self.guiDeco = self.theParent.theTheme.loadDecoration("split",(64,64)) + self.outerBox.setSpacing(16) self.outerBox.addWidget(self.guiDeco, 0, Qt.AlignTop) self.outerBox.addLayout(self.innerBox) diff --git a/nw/gui/dialogs/itemeditor.py b/nw/gui/dialogs/itemeditor.py index fee4a74f..c94e053e 100644 --- a/nw/gui/dialogs/itemeditor.py +++ b/nw/gui/dialogs/itemeditor.py @@ -31,7 +31,7 @@ import nw from PyQt5.QtCore import Qt from PyQt5.QtWidgets import ( QDialog, QHBoxLayout, QVBoxLayout, QGroupBox, QGridLayout, QLineEdit, - QPushButton, QComboBox, QLabel, QSpacerItem, QSizePolicy, QDialogButtonBox + QComboBox, QLabel, QSpacerItem, QSizePolicy, QDialogButtonBox ) from nw.gui.additions import QSwitch diff --git a/nw/gui/elements/doceditor.py b/nw/gui/elements/doceditor.py index 8aa583da..96ab264f 100644 --- a/nw/gui/elements/doceditor.py +++ b/nw/gui/elements/doceditor.py @@ -32,7 +32,7 @@ from time import time from PyQt5.QtCore import Qt, QTimer, pyqtSlot from PyQt5.QtWidgets import ( - qApp, QTextEdit, QAction, QMenu, QShortcut, QMessageBox, QLabel + qApp, QTextEdit, QAction, QMenu, QShortcut, QMessageBox ) from PyQt5.QtGui import ( QTextCursor, QTextOption, QKeySequence, QFont, QColor, QPalette, diff --git a/nw/gui/tools/optionstate.py b/nw/gui/tools/optionstate.py index 776dbcb0..ed45e7cf 100644 --- a/nw/gui/tools/optionstate.py +++ b/nw/gui/tools/optionstate.py @@ -32,7 +32,6 @@ import nw from os import path -from nw.common import checkString, checkBool, checkInt from nw.constants import nwFiles logger = logging.getLogger(__name__) diff --git a/nw/guimain.py b/nw/guimain.py index c76e9c6f..8a37386c 100644 --- a/nw/guimain.py +++ b/nw/guimain.py @@ -45,7 +45,7 @@ from nw.gui import ( GuiConfigEditor, GuiProjectEditor, GuiItemEditor, GuiProjectOutline, GuiSessionLogView, GuiDocMerge, GuiDocSplit, GuiProjectLoad, GuiBuildNovel ) -from nw.core import NWProject, NWDoc, NWIndex, countWords +from nw.core import NWProject, NWDoc, NWIndex from nw.constants import nwFiles, nwItemType, nwAlert logger = logging.getLogger(__name__)