diff --git a/nw/__init__.py b/nw/__init__.py index 6be830af..5a0a31a6 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -14,10 +14,12 @@ import sys import getopt import logging -from os import path, remove, rename +from os import path, remove, rename + from PyQt5.QtWidgets import QApplication -from nw.gui.winmain import GuiMain -from nw.config import Config + +from nw.guimain import GuiMain +from nw.config import Config __package__ = "novelWriter" __author__ = "Veronica Berglyd Olsen" diff --git a/nw/convert/__init__.py b/nw/convert/__init__.py index e69de29b..43416a65 100644 --- a/nw/convert/__init__.py +++ b/nw/convert/__init__.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- + +from nw.convert.tokenizer import Tokenizer + +from nw.convert.file.concat import ConcatFile +from nw.convert.file.html import HtmlFile +from nw.convert.file.latex import LaTeXFile +from nw.convert.file.markdown import MarkdownFile +from nw.convert.file.text import TextFile + +from nw.convert.text.tohtml import ToHtml +from nw.convert.text.tolatex import ToLaTeX +from nw.convert.text.tomarkdown import ToMarkdown +from nw.convert.text.totext import ToText + +__all__ = [ + Tokenizer, + ConcatFile, + HtmlFile, + LaTeXFile, + MarkdownFile, + TextFile, + ToHtml, + ToLaTeX, + ToMarkdown, + ToText, +] diff --git a/nw/convert/file/__init__.py b/nw/convert/file/__init__.py index e69de29b..ca28cc43 100644 --- a/nw/convert/file/__init__.py +++ b/nw/convert/file/__init__.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- + +from nw.convert.file.concat import ConcatFile +from nw.convert.file.html import HtmlFile +from nw.convert.file.latex import LaTeXFile +from nw.convert.file.markdown import MarkdownFile +from nw.convert.file.text import TextFile + +__all__ = [ + ConcatFile, + HtmlFile, + LaTeXFile, + MarkdownFile, + TextFile, +] diff --git a/nw/convert/text/__init__.py b/nw/convert/text/__init__.py index e69de29b..078ed943 100644 --- a/nw/convert/text/__init__.py +++ b/nw/convert/text/__init__.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +from nw.convert.text.tohtml import ToHtml +from nw.convert.text.tolatex import ToLaTeX +from nw.convert.text.tomarkdown import ToMarkdown +from nw.convert.text.totext import ToText + +__all__ = [ + ToHtml, + ToLaTeX, + ToMarkdown, + ToText, +] diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py index e69de29b..b5ab1e3c 100644 --- a/nw/gui/__init__.py +++ b/nw/gui/__init__.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- + +# Main Window Elements +from nw.gui.mainmenu import GuiMainMenu +from nw.gui.statusbar import GuiMainStatus + +# Dialogs +from nw.gui.dialogs.configeditor import GuiConfigEditor +from nw.gui.dialogs.export import GuiExport +from nw.gui.dialogs.itemeditor import GuiItemEditor +from nw.gui.dialogs.projecteditor import GuiProjectEditor +from nw.gui.dialogs.sessionlog import GuiSessionLogView +from nw.gui.dialogs.timelineview import GuiTimeLineView + +# GUI Elements +from nw.gui.elements.docdetails import GuiDocDetails +from nw.gui.elements.doceditor import GuiDocEditor +from nw.gui.elements.doctree import GuiDocTree +from nw.gui.elements.docviewer import GuiDocViewer +from nw.gui.elements.noticebar import GuiNoticeBar +from nw.gui.elements.searchbar import GuiSearchBar +from nw.gui.elements.viewdetails import GuiDocViewDetails + +# Tools +from nw.gui.tools.dochighlight import GuiDocHighlighter +from nw.gui.tools.wordcounter import WordCounter + +__all__ = [ + GuiMainMenu, + GuiMainStatus, + GuiConfigEditor, + GuiExport, + GuiItemEditor, + GuiProjectEditor, + GuiSessionLogView, + GuiTimeLineView, + GuiDocDetails, + GuiDocEditor, + GuiDocTree, + GuiDocViewer, + GuiNoticeBar, + GuiSearchBar, + GuiDocViewDetails, + GuiDocHighlighter, + WordCounter, +] diff --git a/nw/gui/dialogs/__init__.py b/nw/gui/dialogs/__init__.py index e69de29b..f5ce2a89 100644 --- a/nw/gui/dialogs/__init__.py +++ b/nw/gui/dialogs/__init__.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- + +from nw.gui.dialogs.configeditor import GuiConfigEditor +from nw.gui.dialogs.export import GuiExport +from nw.gui.dialogs.itemeditor import GuiItemEditor +from nw.gui.dialogs.projecteditor import GuiProjectEditor +from nw.gui.dialogs.sessionlog import GuiSessionLogView +from nw.gui.dialogs.timelineview import GuiTimeLineView + +__all__ = [ + GuiConfigEditor, + GuiExport, + GuiItemEditor, + GuiProjectEditor, + GuiSessionLogView, + GuiTimeLineView, +] diff --git a/nw/gui/dialogs/configeditor.py b/nw/gui/dialogs/configeditor.py index 28f44c80..c7f17771 100644 --- a/nw/gui/dialogs/configeditor.py +++ b/nw/gui/dialogs/configeditor.py @@ -19,10 +19,12 @@ from PyQt5.QtCore import Qt, QSize from PyQt5.QtGui import QIcon, QPixmap, QColor, QBrush, QStandardItemModel, QFont from PyQt5.QtSvg import QSvgWidget from PyQt5.QtWidgets import ( - QDialog, QHBoxLayout, QVBoxLayout, QFormLayout, QLineEdit, QPlainTextEdit, QLabel, - QWidget, QTabWidget, QDialogButtonBox, QSpinBox, QGroupBox, QComboBox, QMessageBox, - QCheckBox, QGridLayout, QFontComboBox, QPushButton, QFileDialog + QDialog, QHBoxLayout, QVBoxLayout, QFormLayout, QLineEdit, QPlainTextEdit, + QLabel, QWidget, QTabWidget, QDialogButtonBox, QSpinBox, QGroupBox, + QComboBox, QMessageBox, QCheckBox, QGridLayout, QFontComboBox, QPushButton, + QFileDialog ) + from nw.enum import nwAlert from nw.constants import nwQuotes diff --git a/nw/gui/dialogs/export.py b/nw/gui/dialogs/export.py index cb4bd113..57bc06ee 100644 --- a/nw/gui/dialogs/export.py +++ b/nw/gui/dialogs/export.py @@ -24,16 +24,11 @@ from PyQt5.QtWidgets import ( QFileDialog, QProgressBar, QSpinBox, QMessageBox ) -from nw.project.document import NWDoc -from nw.tools.translate import numberToWord -from nw.tools.optlaststate import OptLastState -from nw.convert.file.text import TextFile -from nw.convert.file.html import HtmlFile -from nw.convert.file.markdown import MarkdownFile -from nw.convert.file.latex import LaTeXFile -from nw.convert.file.concat import ConcatFile -from nw.common import packageRefURL +from nw.convert import TextFile, HtmlFile, MarkdownFile, LaTeXFile, ConcatFile +from nw.project import NWDoc +from nw.tools import numberToWord, OptLastState from nw.constants import nwFiles +from nw.common import packageRefURL from nw.enum import nwItemType, nwAlert logger = logging.getLogger(__name__) diff --git a/nw/gui/dialogs/projecteditor.py b/nw/gui/dialogs/projecteditor.py index 6daecddc..21aa7e9c 100644 --- a/nw/gui/dialogs/projecteditor.py +++ b/nw/gui/dialogs/projecteditor.py @@ -24,6 +24,7 @@ from PyQt5.QtWidgets import ( QListWidgetItem, QPushButton, QColorDialog, QAbstractItemView, QTreeWidget, QTreeWidgetItem, QCheckBox ) + from nw.enum import nwAlert logger = logging.getLogger(__name__) diff --git a/nw/gui/dialogs/sessionlog.py b/nw/gui/dialogs/sessionlog.py index a897039a..c3a53cf5 100644 --- a/nw/gui/dialogs/sessionlog.py +++ b/nw/gui/dialogs/sessionlog.py @@ -24,8 +24,8 @@ from PyQt5.QtWidgets import ( QCheckBox ) -from nw.tools.optlaststate import OptLastState from nw.constants import nwConst, nwFiles +from nw.tools import OptLastState from nw.enum import nwAlert logger = logging.getLogger(__name__) diff --git a/nw/gui/dialogs/timelineview.py b/nw/gui/dialogs/timelineview.py index 6d78e12a..4d75d01a 100644 --- a/nw/gui/dialogs/timelineview.py +++ b/nw/gui/dialogs/timelineview.py @@ -23,8 +23,8 @@ from PyQt5.QtWidgets import ( QGroupBox, QCheckBox ) -from nw.tools.optlaststate import OptLastState from nw.constants import nwFiles +from nw.tools import OptLastState from nw.enum import nwItemClass logger = logging.getLogger(__name__) diff --git a/nw/gui/elements/__init__.py b/nw/gui/elements/__init__.py index e69de29b..4e198336 100644 --- a/nw/gui/elements/__init__.py +++ b/nw/gui/elements/__init__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +from nw.gui.elements.docdetails import GuiDocDetails +from nw.gui.elements.doceditor import GuiDocEditor +from nw.gui.elements.doctree import GuiDocTree +from nw.gui.elements.docviewer import GuiDocViewer +from nw.gui.elements.noticebar import GuiNoticeBar +from nw.gui.elements.searchbar import GuiSearchBar +from nw.gui.elements.viewdetails import GuiDocViewDetails + +__all__ = [ + GuiDocDetails, + GuiDocEditor, + GuiDocTree, + GuiDocViewer, + GuiNoticeBar, + GuiSearchBar, + GuiDocViewDetails, +] diff --git a/nw/gui/elements/doceditor.py b/nw/gui/elements/doceditor.py index cb1cd2ef..c5438048 100644 --- a/nw/gui/elements/doceditor.py +++ b/nw/gui/elements/doceditor.py @@ -24,10 +24,9 @@ from PyQt5.QtGui import ( QPalette, QTextDocument, ) -from nw.project.document import NWDoc -from nw.gui.tools.dochighlight import GuiDocHighlighter -from nw.gui.tools.wordcounter import WordCounter -from nw.tools.spellcheck import NWSpellCheck +from nw.project import NWDoc +from nw.gui.tools import GuiDocHighlighter, WordCounter +from nw.tools import NWSpellCheck from nw.constants import nwFiles, nwUnicode from nw.enum import nwDocAction, nwAlert diff --git a/nw/gui/elements/doctree.py b/nw/gui/elements/doctree.py index 0f93405a..49673c3f 100644 --- a/nw/gui/elements/doctree.py +++ b/nw/gui/elements/doctree.py @@ -19,7 +19,7 @@ from PyQt5.QtWidgets import ( QTreeWidget, QTreeWidgetItem, QAbstractItemView, QApplication ) -from nw.project.item import NWItem +from nw.project import NWItem from nw.constants import nwLabels from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert diff --git a/nw/gui/elements/docviewer.py b/nw/gui/elements/docviewer.py index 6c6634f0..2636a112 100644 --- a/nw/gui/elements/docviewer.py +++ b/nw/gui/elements/docviewer.py @@ -17,8 +17,7 @@ from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QTextBrowser from PyQt5.QtGui import QTextOption, QFont, QPalette, QColor -from nw.convert.tokenizer import Tokenizer -from nw.convert.text.tohtml import ToHtml +from nw.convert import Tokenizer, ToHtml from nw.enum import nwAlert, nwItemType logger = logging.getLogger(__name__) diff --git a/nw/gui/tools/__init__.py b/nw/gui/tools/__init__.py index e69de29b..48a90468 100644 --- a/nw/gui/tools/__init__.py +++ b/nw/gui/tools/__init__.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- + +from nw.gui.tools.dochighlight import GuiDocHighlighter +from nw.gui.tools.wordcounter import WordCounter + +__all__ = [ + GuiDocHighlighter, + WordCounter, +] diff --git a/nw/gui/winmain.py b/nw/guimain.py similarity index 96% rename from nw/gui/winmain.py rename to nw/guimain.py index 047ccdeb..7909b172 100644 --- a/nw/gui/winmain.py +++ b/nw/guimain.py @@ -23,30 +23,17 @@ from PyQt5.QtWidgets import ( QShortcut, QMessageBox, QProgressDialog, QDialog ) -from nw.gui.mainmenu import GuiMainMenu -from nw.gui.statusbar import GuiMainStatus -from nw.gui.elements.doctree import GuiDocTree -from nw.gui.elements.doceditor import GuiDocEditor -from nw.gui.elements.docviewer import GuiDocViewer -from nw.gui.elements.docdetails import GuiDocDetails -from nw.gui.elements.searchbar import GuiSearchBar -from nw.gui.elements.noticebar import GuiNoticeBar -from nw.gui.elements.viewdetails import GuiDocViewDetails -from nw.gui.dialogs.configeditor import GuiConfigEditor -from nw.gui.dialogs.projecteditor import GuiProjectEditor -from nw.gui.dialogs.export import GuiExport -from nw.gui.dialogs.itemeditor import GuiItemEditor -from nw.gui.dialogs.timelineview import GuiTimeLineView -from nw.gui.dialogs.sessionlog import GuiSessionLogView -from nw.project.project import NWProject -from nw.project.document import NWDoc -from nw.project.item import NWItem -from nw.project.index import NWIndex -from nw.project.backup import NWBackup -from nw.tools.wordcount import countWords +from nw.gui import ( + GuiMainMenu, GuiMainStatus, GuiDocTree, GuiDocEditor, GuiDocViewer, + GuiDocDetails, GuiSearchBar, GuiNoticeBar, GuiDocViewDetails, + GuiConfigEditor, GuiProjectEditor, GuiExport, GuiItemEditor, + GuiTimeLineView, GuiSessionLogView +) +from nw.constants import nwFiles +from nw.project import NWProject, NWDoc, NWItem, NWIndex, NWBackup +from nw.tools import countWords from nw.theme import Theme from nw.enum import nwItemType, nwAlert -from nw.constants import nwFiles logger = logging.getLogger(__name__) diff --git a/nw/project/__init__.py b/nw/project/__init__.py index e69de29b..1bfb4b8c 100644 --- a/nw/project/__init__.py +++ b/nw/project/__init__.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- + +from nw.project.backup import NWBackup +from nw.project.document import NWDoc +from nw.project.index import NWIndex +from nw.project.item import NWItem +from nw.project.project import NWProject +from nw.project.status import NWStatus + +__all__ = [ + NWBackup, + NWDoc, + NWIndex, + NWItem, + NWProject, + NWStatus, +] diff --git a/nw/project/index.py b/nw/project/index.py index 59893dc5..55f3f42e 100644 --- a/nw/project/index.py +++ b/nw/project/index.py @@ -17,9 +17,8 @@ import nw from os import path from nw.project.document import NWDoc -from nw.enum import nwItemType, nwItemClass, nwItemLayout from nw.constants import nwFiles, nwKeyWords -from nw.enum import nwAlert +from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert logger = logging.getLogger(__name__) diff --git a/nw/project/item.py b/nw/project/item.py index cae1777b..a1667032 100644 --- a/nw/project/item.py +++ b/nw/project/item.py @@ -17,8 +17,8 @@ from os import path, mkdir from lxml import etree from datetime import datetime -from nw.enum import nwItemType, nwItemClass, nwItemLayout from nw.common import checkInt +from nw.enum import nwItemType, nwItemClass, nwItemLayout logger = logging.getLogger(__name__) diff --git a/nw/project/project.py b/nw/project/project.py index 46c70de8..b01f5bc7 100644 --- a/nw/project/project.py +++ b/nw/project/project.py @@ -20,11 +20,11 @@ from hashlib import sha256 from datetime import datetime from time import time -from nw.project.item import NWItem from nw.project.status import NWStatus -from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert -from nw.common import checkString, checkBool, checkInt +from nw.project.item import NWItem from nw.constants import nwFiles, nwConst +from nw.common import checkString, checkBool, checkInt +from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert logger = logging.getLogger(__name__) diff --git a/nw/project/status.py b/nw/project/status.py index de49a03c..e3f293f4 100644 --- a/nw/project/status.py +++ b/nw/project/status.py @@ -15,8 +15,8 @@ import nw from lxml import etree -from nw.enum import nwItemClass from nw.common import checkInt +from nw.enum import nwItemClass logger = logging.getLogger(__name__) diff --git a/nw/tools/__init__.py b/nw/tools/__init__.py index e69de29b..d024daad 100644 --- a/nw/tools/__init__.py +++ b/nw/tools/__init__.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- + +from nw.tools.analyse import TextAnalysis +from nw.tools.optlaststate import OptLastState +from nw.tools.spellcheck import NWSpellCheck +from nw.tools.spellenchant import NWSpellEnchant +from nw.tools.translate import numberToWord +from nw.tools.wordcount import countWords + +__all__ = [ + TextAnalysis, + OptLastState, + NWSpellCheck, + NWSpellEnchant, + numberToWord, + countWords, +]