Prepare v1.1.0 based on novxlib v1.0.0

- Integrate the toolbar.
- Refactor.

.project

@@ -11,7 +11,6 @@
 		<project>noveltree_templates</project>
 		<project>noveltree_themes</project>
 		<project>noveltree_timeline</project>
-		<project>noveltree_toolbar</project>
 		<project>noveltree_updater</project>
 		<project>noveltree_yw7</project>
 		<project>novxlib</project>

VERSION

@@ -1,3 +1,3 @@
 [LATEST]
-version = 1.0.1
-download_link = https://github.com/peter88213/noveltree/raw/main/dist/noveltree_v1.0.1.zip
+version = 1.1.0
+download_link = https://github.com/peter88213/noveltree/raw/main/dist/noveltree_v1.1.0.zip

docs/changelog.md

@@ -8,6 +8,13 @@
 
 See the [GitHub "Features" project](https://github.com/users/peter88213/projects/14).
 
+### v1.1.0
+
+- Integrate the toolbar. 
+  If the *noveltree_toolbar* plugin is installed, please delete it with the Plugin manager.
+- Refactor.
+Based on novxlib v1.0.0
+
 ### v1.0.1
 
 - Fix the plugin API version constant.

docs/help/help.md

@@ -52,6 +52,7 @@ With [arcs](arcs), you can link your plot to the narrative.
 - **[Import menu](import_menu)**
 - **[Tools menu](tools_menu)**
 - **[Tree view context menu](tree_context_menu)**
+- **[The Toolbar](toolbar)**
 
 ---
 

docs/help/toolbar.md

@@ -0,0 +1,47 @@
+[Project homepage](../index) > [Instructions for use](../usage) > [Online help](help) > Tree view context menu
+
+--- 
+
+# The toolbar
+
+---
+
+![Go back](icons/tb_goBack.png) Go back in the browsing history.
+
+![Go forward](icons/tb_goForward.png) Go forward in the browsing history.
+
+---
+
+![Show Book](icons/tb_viewBook.png) Go to the "Book" branch and expand it. Same as **View > Show Book** or **F12**.
+
+![Show Characters](icons/tb_viewCharacters.png) Go to the "Characters" branch and expand it. Same as **View > Show Characters** or **F7**.
+
+![Show Locations](icons/tb_viewLocations.png) Go to the "Locations" branch and expand it. Same as **View > Show Locations** or **F8**.
+
+![Show Items](icons/tb_viewItems.png) Go to the "Items" branch and expand it. Same as **View > Show Items** or **F9**.
+
+![Show Arcs](icons/tb_viewArcs.png) Go to the "Arcs" branch and expand it. Same as **View > Show Arcs** or **F10**.
+
+
+![Show Project notes](icons/tb_viewProjectnotes.png) Go to the "Project notes" branch and expand it. Same as **View > Show Project notes** or **F11**.
+
+---
+
+![Save](icons/tb_save.png) Save the project. Same as **File > Save** or **Ctrl-S**.
+
+![Lock/Unlock](icons/tb_lock.png) Toggle the lock status of the project.
+
+![Export manuscript](icons/tb_manuscript.png) Export the manuscript for editing. Same as **Export > Manuscript for editing** or **F4**.
+
+![Update from manuscript](icons/tb_updateFromManuscript.png) Discard the current manuscript, if nes chapters or sections have been inserted. Same as selecting the manuscript under **Import**, or **F6**.
+
+---
+
+![Toggle Text viewer](icons/tb_viewer.png) Toggle Text viewer. Same as **View > Toggle Text viewer** or **Ctrl-T**.
+
+![Toggle Properties](icons/tb_properties.png) Toggle Properties. Same as **View > Toggle Properties** or **Ctrl-Alt-T**.
+
+---
+
+
+[<< Previous](tree_context_menu) -- [First >>](file_menu)

docs/help/tree_context_menu.md

@@ -148,4 +148,4 @@ Sets the selected character's status. This can be *major* or *minor*.
 
 ---
 
-[<< Previous](tools_menu) -- [First >>](file_menu)
+[<< Previous](tools_menu) -- [Nextt >>](toolbar_menu)

docs/icons/LICENSE.txt

@@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) 2024 Peter Triesberger
+Copyright (c) 2018 Akveo.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

docs/icons/README.md

@@ -0,0 +1,3 @@
+# Credits
+
+The Icons are based on the [Eva Icons](https://akveo.github.io/eva-icons/#/), published under the [MIT License](http://www.opensource.org/licenses/mit-license.php). The original black and white icons were colored for this plugin by the maintainer. 

docs/index.md

@@ -32,7 +32,6 @@ you might want to take a look at the [yw_novx conversion tools](https://github.c
 
 *noveltree's* functionality can be extended by plugins. Here are some examples:
 
-- [A toolbar with buttons for frequently used commands](https://peter88213.github.io/noveltree_toolbar/)
 - [A yw7 file importer/exporter](https://peter88213.github.io/noveltree_yw7/)
 - [An on-demand update checker](https://peter88213.github.io/noveltree_updater/)
 - [A daily progress log viewer](https://peter88213.github.io/noveltree_progress/)
@@ -65,9 +64,9 @@ I use the program myself and fix errors immediately if I notice any. As far as I
 
 ## Download and install
 
-[Download the latest release (version 1.0.1)](https://github.com/peter88213/noveltree/raw/main/dist/noveltree_v1.0.1.zip)
+[Download the latest release (version 1.1.0)](https://github.com/peter88213/noveltree/raw/main/dist/noveltree_v1.1.0.zip)
 
-- Extract the "noveltree_v1.0.1" folder from the downloaded zipfile "noveltree_v1.0.1.zip".
+- Extract the "noveltree_v1.1.0" folder from the downloaded zipfile "noveltree_v1.1.0.zip".
 - Move into this new folder and open "README.md" for further instructions.
 - You may wish to install plugins; the [section editor](https://peter88213.github.io/noveltree_editor/) is highly recommended.
 
@@ -85,7 +84,9 @@ See the [instructions for use](usage)
 
 ## Credits
 
-The icons are made using the free *Pusab* font by Ryoichi Tsunekawa, [Flat-it](http://flat-it.com/).
+The app icons are made using the free *Pusab* font by Ryoichi Tsunekawa, [Flat-it](http://flat-it.com/).
+The toolbar icons are based on the [Eva Icons](https://akveo.github.io/eva-icons/#/), published under the [MIT License](http://www.opensource.org/licenses/mit-license.php). The original black and white icons were colored for this plugin by the maintainer. 
+
 
 ## License
 

docs/template/index.md

@@ -32,7 +32,6 @@ you might want to take a look at the [yw_novx conversion tools](https://github.c
 
 *noveltree's* functionality can be extended by plugins. Here are some examples:
 
-- [A toolbar with buttons for frequently used commands](https://peter88213.github.io/noveltree_toolbar/)
 - [A yw7 file importer/exporter](https://peter88213.github.io/noveltree_yw7/)
 - [An on-demand update checker](https://peter88213.github.io/noveltree_updater/)
 - [A daily progress log viewer](https://peter88213.github.io/noveltree_progress/)
@@ -85,7 +84,9 @@ See the [instructions for use](usage)
 
 ## Credits
 
-The icons are made using the free *Pusab* font by Ryoichi Tsunekawa, [Flat-it](http://flat-it.com/).
+The app icons are made using the free *Pusab* font by Ryoichi Tsunekawa, [Flat-it](http://flat-it.com/).
+The toolbar icons are based on the [Eva Icons](https://akveo.github.io/eva-icons/#/), published under the [MIT License](http://www.opensource.org/licenses/mit-license.php). The original black and white icons were colored for this plugin by the maintainer. 
+
 
 ## License
 

i18n/de.po

@@ -3,9 +3,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.1\n"
-"POT-Creation-Date: 2024-01-09 13:34:42\n"
-"PO-Revision-Date: 2024-01-09 13:34:42\n"
+"Project-Id-Version: 1.1.0\n"
+"POT-Creation-Date: 2024-01-10 12:22:49\n"
+"PO-Revision-Date: 2024-01-10 12:22:49\n"
 "Last-Translator: Peter Triesberger\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -148,6 +148,9 @@ msgstr "Kann Datei nicht schreiben"
 msgid "Change Level"
 msgstr "Ebene ändern"
 
+msgid "Change icon size"
+msgstr "Symbolgröße ändern"
+
 msgid "Chapter"
 msgstr "Kapitel"
 
@@ -517,6 +520,9 @@ msgstr "Mit dem vorhergehenden zusammenfassen"
 msgid "Language code"
 msgstr "Sprachencode"
 
+msgid "Large toolbar icons"
+msgstr "Große Symbole in der Werkzeugleiste"
+
 msgid "Latest backup successfully restored."
 msgstr "Letzte Sicherung erfolgreich wiederhergestellt."
 
@@ -916,6 +922,9 @@ msgstr "Text"
 msgid "Text file"
 msgstr "Textdatei"
 
+msgid "The change takes effect after next startup."
+msgstr "Die Änderung wird beim nächsten Programmstart wirksam"
+
 msgid "The plugin remains active until next start."
 msgstr "Das Plugin bleibt bis zum nächsten Start aktiv."
 

i18n/messages.pot

@@ -3,8 +3,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0.1\n"
-"POT-Creation-Date: 2024-01-09 13:34:42\n"
+"Project-Id-Version: 1.1.0\n"
+"POT-Creation-Date: 2024-01-10 12:22:49\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: LANGUAGE\n"
@@ -149,6 +149,9 @@ msgstr ""
 msgid "Change Level"
 msgstr ""
 
+msgid "Change icon size"
+msgstr ""
+
 msgid "Chapter"
 msgstr ""
 
@@ -518,6 +521,9 @@ msgstr ""
 msgid "Language code"
 msgstr ""
 
+msgid "Large toolbar icons"
+msgstr ""
+
 msgid "Latest backup successfully restored."
 msgstr ""
 
@@ -917,6 +923,9 @@ msgstr ""
 msgid "Text file"
 msgstr ""
 
+msgid "The change takes effect after next startup."
+msgstr ""
+
 msgid "The plugin remains active until next start."
 msgstr ""
 

src/icons/toolbar/LICENSE.txt

@@ -0,0 +1,23 @@
+The MIT License (MIT)
+
+Copyright (c) 2024 Peter Triesberger
+Copyright (c) 2018 Akveo.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

src/icons/toolbar/README.md

@@ -0,0 +1,3 @@
+# Credits
+
+The Icons are based on the [Eva Icons](https://akveo.github.io/eva-icons/#/), published under the [MIT License](http://www.opensource.org/licenses/mit-license.php). The original black and white icons were colored for this plugin by the maintainer. 

src/noveltree_.py

@@ -75,7 +75,7 @@
     arcs_width=55,
     points_width=300,
     column_order='wc;vp;sy;st;nt;dt;tm;dr;tg;po;ac;pt;ar'
-)
+    )
 OPTIONS = dict(
     show_contents=True,
     show_properties=True,
@@ -94,7 +94,8 @@
     show_cr_goals=True,
     detach_prop_win=False,
     discard_tmp_docs=True,
-)
+    large_icons=False,
+    )
 
 
 def main():

src/noveltreelib/view/contents_window/contents_viewer.py

@@ -26,8 +26,10 @@ def __init__(self, parent, model, view, controller):
         """Put a text box to the specified window.
         
         Positional arguments:
-            view: NoveltreeUi -- The instanitating controller.
             parent: tk.Frame -- The parent window.
+            model -- reference to the main model instance of the application.
+            view -- reference to the main view instance of the application.
+            controller -- reference to the main controller instance of the application.
         
         Required keyword arguments:
             show_markup: bool 

src/noveltreelib/view/nv_view.py

@@ -45,6 +45,7 @@
 from noveltreelib.view.view_options_window import ViewOptionsWindow
 from noveltreelib.view.contents_window.contents_viewer import ContentsViewer
 from noveltreelib.view.properties_window.properties_viewer import PropertiesViewer
+from noveltreelib.view.toolbar import Toolbar
 
 
 class NvView:
@@ -174,6 +175,10 @@ def __init__(self, model, controller, title):
         #--- Add commands and submenus to the main menu.
         self._build_menu()
 
+        #--- Add a toolbar.
+        self._toolbar = Toolbar(self, self._ctrl)
+        self.views.append(self._toolbar)
+
         #--- tk root event bindings.
         self._bind_events()
 
@@ -234,6 +239,11 @@ def disable_menu(self):
         self.fileMenu.entryconfig(_('Save'), state='disabled')
         self.fileMenu.entryconfig(_('Save as...'), state='disabled')
         self.fileMenu.entryconfig(_('Discard manuscript'), state='disabled')
+        for view in self.views:
+            try:
+                view.disable_menu()
+            except AttributeError:
+                pass
 
     def dock_properties_frame(self, event=None):
         """Dock the properties window at the right pane, if detached."""
@@ -257,12 +267,12 @@ def dock_properties_frame(self, event=None):
             pass
         return 'break'
 
-    def edit_settings(self, event=None):
-        """Open a toplevel window to edit the program settings."""
+    def _view_options(self, event=None):
+        """Open a toplevel window to edit the view options."""
         offset = 300
         __, x, y = self.root.geometry().split('+')
         windowGeometry = f'+{int(x)+offset}+{int(y)+offset}'
-        ViewOptionsWindow(windowGeometry, self.tv)
+        ViewOptionsWindow(windowGeometry, self)
         return 'break'
 
     def enable_menu(self):
@@ -285,6 +295,11 @@ def enable_menu(self):
         self.fileMenu.entryconfig(_('Save'), state='normal')
         self.fileMenu.entryconfig(_('Save as...'), state='normal')
         self.fileMenu.entryconfig(_('Discard manuscript'), state='normal')
+        for view in self.views:
+            try:
+                view.enable_menu()
+            except AttributeError:
+                pass
 
     def on_change_selection(self, nodeId):
         """Event handler for element selection.
@@ -455,7 +470,10 @@ def refresh(self):
             self.pathBar.config(bg=self.root.cget('background'))
             self.pathBar.config(fg='black')
         for view in self.views:
-            view.refresh()
+            try:
+                view.refresh()
+            except AttributeError:
+                pass
         self.set_title()
 
     def _bind_events(self):
@@ -537,7 +555,7 @@ def _build_menu(self):
         self.viewMenu.add_command(label=_('Toggle Properties'), accelerator=self._KEY_TOGGLE_PROPERTIES[1], command=self.toggle_properties_view)
         self.viewMenu.add_command(label=_('Detach/Dock Properties'), accelerator=self._KEY_DETACH_PROPERTIES[1], command=self.toggle_properties_window)
         self.viewMenu.add_separator()
-        self.viewMenu.add_command(label=_('Options'), command=self.edit_settings)
+        self.viewMenu.add_command(label=_('Options'), command=self._view_options)
 
         # Part
         self.partMenu = tk.Menu(self.mainMenu, tearoff=0)