chore: self destroy if all windows cloased

3 files changed, 34 insertions, 5 deletions

diff --git a/src/config/defaults.py b/src/config/defaults.py
index f0da742..f3796dc 100644
--- a/src/config/defaults.py
+++ b/src/config/defaults.py
@@ -42,3 +42,5 @@ MAC_KEYBINDS = {
     "Hide Others": f"meta-Shift-H",  # Hide Others
     "Show All": f"meta-Shift-A",  # Show All
 }
+
+ICONS_FOLDER = "icons"
diff --git a/src/helpers/windows.py b/src/helpers/windows.py
index fc2ebbf..3ed578e 100644
--- a/src/helpers/windows.py
+++ b/src/helpers/windows.py
@@ -1,5 +1,8 @@
+import os
 import tkinter as tk
 
+from config.defaults import ICONS_FOLDER
+
 
 class TextyWindow(tk.Toplevel):
     def __init__(self, parent):
@@ -19,9 +22,26 @@ class TextyWindow(tk.Toplevel):
         self.parent.log("Resize, Move, and Close bindings set to save preferences.")
 
         self.config(menu=self.parent.get_menubar())
+        self.set_toolbar()
 
     def on_close(self):
-        if self.parent.system == "aqua":
-            self.destroy()
-        else:
-            self.quit()
+        self.parent.destroy_window(self)
+
+    def draw_layout(self):
+        self.parent.log("Drawing layout")
+
+    def set_toolbar(self):
+        self.parent.log("Drawing Toolbar")
+
+        toolbar = tk.Frame(self, bd=1, relief=tk.RAISED)
+
+        # add icon 16x16 buttons
+        def get_icon(name):
+            return tk.PhotoImage(file=os.path.join(ICONS_FOLDER, name))
+
+        new_icon = get_icon("new.png")
+        save_icon = get_icon("save.png")
+        cut_icon = get_icon("cut.png")
+        copy_icon = get_icon("copy.png")
+        paste_icon = get_icon("paste.png")
+        print_icon = get_icon("print.png")
diff --git a/src/texty.py b/src/texty.py
index 5e847a5..a8c92b1 100644
--- a/src/texty.py
+++ b/src/texty.py
@@ -26,16 +26,23 @@ class Texty(tk.Tk):
                 self.system, sys.platform
             )
         )
-
+        self.windows = 0
         self.withdraw()
         self.create_window()
 
     def create_window(self):
+        self.windows += 1
         window = TextyWindow(self)
         window.grab_set()
         window.focus_set()
         window.mainloop()
 
+    def destroy_window(self, window):
+        self.windows -= 1
+        window.destroy()
+        if self.windows == 0:
+            self.destroy()
+
     def get_window_geometry(self):
         width = self.prefs.get("width")
         height = self.prefs.get("height")