Reorganise constants, and add ISO language codes in order to drop dependency pycountry

nw/gui/__init__.py

@@ -26,21 +26,21 @@ 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,
+    "GuiMainMenu",
+    "GuiMainStatus",
+    "GuiConfigEditor",
+    "GuiExport",
+    "GuiItemEditor",
+    "GuiProjectEditor",
+    "GuiSessionLogView",
+    "GuiTimeLineView",
+    "GuiDocDetails",
+    "GuiDocEditor",
+    "GuiDocTree",
+    "GuiDocViewer",
+    "GuiNoticeBar",
+    "GuiSearchBar",
+    "GuiDocViewDetails",
+    "GuiDocHighlighter",
+    "WordCounter",
 ]

nw/gui/dialogs/__init__.py

@@ -8,10 +8,10 @@ from nw.gui.dialogs.sessionlog import GuiSessionLogView
 from nw.gui.dialogs.timelineview import GuiTimeLineView
 
 __all__ = [
-    GuiConfigEditor,
-    GuiExport,
-    GuiItemEditor,
-    GuiProjectEditor,
-    GuiSessionLogView,
-    GuiTimeLineView,
+    "GuiConfigEditor",
+    "GuiExport",
+    "GuiItemEditor",
+    "GuiProjectEditor",
+    "GuiSessionLogView",
+    "GuiTimeLineView",
 ]

nw/gui/dialogs/configeditor.py

@@ -25,8 +25,7 @@ from PyQt5.QtWidgets import (
     QFileDialog
 )
 
-from nw.enum import nwAlert
-from nw.constants import nwQuotes
+from nw.constants import nwAlert, nwQuotes
 
 logger = logging.getLogger(__name__)
 

nw/gui/dialogs/export.py

@@ -27,9 +27,8 @@ from PyQt5.QtWidgets import (
 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
+from nw.constants import nwFiles, nwItemType, nwAlert
 
 logger = logging.getLogger(__name__)
 

nw/gui/dialogs/itemeditor.py

@@ -22,8 +22,7 @@ from PyQt5.QtWidgets import (
     QLineEdit, QPushButton, QComboBox
 )
 
-from nw.enum import nwItemLayout, nwItemClass, nwItemType
-from nw.constants import nwLabels
+from nw.constants import nwLabels, nwItemLayout, nwItemClass, nwItemType
 
 logger = logging.getLogger(__name__)
 

nw/gui/dialogs/projecteditor.py

@@ -25,7 +25,7 @@ from PyQt5.QtWidgets import (
     QTreeWidgetItem, QCheckBox
 )
 
-from nw.enum import nwAlert
+from nw.constants import nwAlert
 
 logger = logging.getLogger(__name__)
 

nw/gui/dialogs/sessionlog.py

@@ -24,9 +24,8 @@ from PyQt5.QtWidgets import (
     QCheckBox
 )
 
-from nw.constants import nwConst, nwFiles
+from nw.constants import nwConst, nwFiles, nwAlert
 from nw.tools import OptLastState
-from nw.enum import nwAlert
 
 logger = logging.getLogger(__name__)
 

nw/gui/dialogs/timelineview.py

@@ -23,9 +23,8 @@ from PyQt5.QtWidgets import (
     QGroupBox, QCheckBox
 )
 
-from nw.constants import nwFiles
+from nw.constants import nwFiles, nwItemClass
 from nw.tools import OptLastState
-from nw.enum import nwItemClass
 
 logger = logging.getLogger(__name__)
 

nw/gui/elements/__init__.py

@@ -9,11 +9,11 @@ from nw.gui.elements.searchbar import GuiSearchBar
 from nw.gui.elements.viewdetails import GuiDocViewDetails
 
 __all__ = [
-    GuiDocDetails,
-    GuiDocEditor,
-    GuiDocTree,
-    GuiDocViewer,
-    GuiNoticeBar,
-    GuiSearchBar,
-    GuiDocViewDetails,
+    "GuiDocDetails",
+    "GuiDocEditor",
+    "GuiDocTree",
+    "GuiDocViewer",
+    "GuiNoticeBar",
+    "GuiSearchBar",
+    "GuiDocViewDetails",
 ]

nw/gui/elements/doceditor.py

@@ -27,8 +27,7 @@ from PyQt5.QtGui import (
 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
+from nw.constants import nwFiles, nwUnicode, nwDocAction, nwAlert
 
 logger = logging.getLogger(__name__)
 

nw/gui/elements/doctree.py

@@ -20,8 +20,9 @@ from PyQt5.QtWidgets import (
 )
 
 from nw.project import NWItem
-from nw.constants import nwLabels
-from nw.enum import nwItemType, nwItemClass, nwItemLayout, nwAlert
+from nw.constants import (
+    nwLabels, nwItemType, nwItemClass, nwItemLayout, nwAlert
+)
 
 logger = logging.getLogger(__name__)
 

nw/gui/elements/docviewer.py

@@ -18,7 +18,7 @@ from PyQt5.QtWidgets import QTextBrowser
 from PyQt5.QtGui import QTextOption, QFont, QPalette, QColor
 
 from nw.convert import Tokenizer, ToHtml
-from nw.enum import nwAlert, nwItemType
+from nw.constants import nwAlert, nwItemType
 
 logger = logging.getLogger(__name__)
 

nw/gui/elements/searchbar.py

@@ -19,7 +19,7 @@ from PyQt5.QtWidgets import (
     QFrame, QGridLayout, QLabel, QLineEdit, QPushButton, QApplication
 )
 
-from nw.enum import nwDocAction
+from nw.constants import nwDocAction
 
 logger = logging.getLogger(__name__)
 

nw/gui/mainmenu.py

@@ -17,7 +17,7 @@ from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QIcon, QDesktopServices
 from PyQt5.QtWidgets import QMenuBar, QAction, QMessageBox
 
-from nw.enum import nwItemType, nwItemClass, nwDocAction
+from nw.constants import nwItemType, nwItemClass, nwDocAction
 
 logger = logging.getLogger(__name__)
 

nw/gui/tools/__init__.py

@@ -4,6 +4,6 @@ from nw.gui.tools.dochighlight import GuiDocHighlighter
 from nw.gui.tools.wordcounter import WordCounter
 
 __all__ = [
-    GuiDocHighlighter,
-    WordCounter,
+    "GuiDocHighlighter",
+    "WordCounter",
 ]