Update docs, index and build, and rename viewsbar to sidebar

docs/source/conf.py

@@ -42,7 +42,7 @@ templates_path = ["_templates"]
 source_suffix = ".rst"
 master_doc = "index"
 today_fmt = "%A, %d %B %Y at %H:%M"
-language = None
+language = "en"
 exclude_patterns = []
 pygments_style = "sphinx"
 pygments_dark_style = "monokai"

docs/source/index.rst

@@ -27,8 +27,8 @@ JSON files. See the :ref:`a_breakdown_storage` section for more details.
 
 Any operating system that can run Python 3 and has the Qt 5 libraries should be able to run
 novelWriter. It runs fine on Linux, Windows and macOS, and users have tested it on other platforms
-too. novelWriter can be run directly from the Python source, installed from the pip tool. See
-:ref:`a_started` for more details.
+too. novelWriter can be run directly from the Python source, or installed from packages or the pip
+tool. See :ref:`a_started` for more details.
 
 .. note::
    Version 1.5 introduced a few changes that will require you to make a few minor modifications to

docs/source/requirements.txt

@@ -1,4 +1,4 @@
 furo
-sphinx~=4.0
-pygments~=2.7
+sphinx>=4.0
+pygments>=2.7
 docutils==0.17.1

novelwriter/gui/__init__.py

@@ -28,7 +28,7 @@ from novelwriter.gui.outline import GuiOutlineView
 from novelwriter.gui.projtree import GuiProjectView
 from novelwriter.gui.statusbar import GuiMainStatus
 from novelwriter.gui.theme import GuiTheme
-from novelwriter.gui.viewsbar import GuiViewsBar
+from novelwriter.gui.sidebar import GuiSideBar
 
 __all__ = [
     "GuiDocEditor",
@@ -41,5 +41,5 @@ __all__ = [
     "GuiOutlineView",
     "GuiProjectView",
     "GuiTheme",
-    "GuiViewsBar",
+    "GuiSideBar",
 ]

novelwriter/gui/sidebar.py

@@ -1,7 +1,7 @@
 """
-novelWriter – GUI Main Window Views ToolBar
+novelWriter – GUI Main Window SideBar
 ===========================================
-GUI class for the main window "Views" toolbar
+GUI class for the main window side bar
 
 File History:
 Created: 2022-05-10 [1.7b1]
@@ -36,14 +36,14 @@ from novelwriter.enum import nwView
 logger = logging.getLogger(__name__)
 
 
-class GuiViewsBar(QToolBar):
+class GuiSideBar(QToolBar):
 
     viewChangeRequested = pyqtSignal(nwView)
 
     def __init__(self, mainGui):
         super().__init__(parent=mainGui)
 
-        logger.debug("Initialising GuiViewsBar ...")
+        logger.debug("Initialising GuiSideBar ...")
 
         self.mainConf  = novelwriter.CONFIG
         self.mainGui   = mainGui
@@ -123,7 +123,7 @@ class GuiViewsBar(QToolBar):
 
         self.updateTheme()
 
-        logger.debug("GuiViewsBar initialisation complete")
+        logger.debug("GuiSideBar initialisation complete")
 
         return
 
@@ -142,4 +142,4 @@ class GuiViewsBar(QToolBar):
 
         return
 
-# END Class GuiViewsBar
+# END Class GuiSideBar

novelwriter/guimain.py

@@ -41,7 +41,7 @@ from PyQt5.QtWidgets import (
 from novelwriter.gui import (
     GuiDocEditor, GuiDocViewDetails, GuiDocViewer, GuiItemDetails, GuiMainMenu,
     GuiMainStatus, GuiNovelView, GuiOutlineView, GuiProjectView, GuiTheme,
-    GuiViewsBar
+    GuiSideBar
 )
 from novelwriter.dialogs import (
     GuiAbout, GuiPreferences, GuiProjectDetails, GuiProjectLoad,
@@ -118,7 +118,7 @@ class GuiMain(QMainWindow):
         self.itemDetails = GuiItemDetails(self)
         self.outlineView = GuiOutlineView(self)
         self.mainMenu    = GuiMainMenu(self)
-        self.viewsBar    = GuiViewsBar(self)
+        self.viewsBar    = GuiSideBar(self)
 
         # Project Tree Stack
         self.projStack = QStackedWidget()