Rewritten Tab System (#44)

Author: not-nef

src/main.py

@@ -2,11 +2,12 @@
 
 import tkinter, ntkutils, pygments
 from pathlib import Path
+from tkinter import ttk
 
 import config, tabmanager
 import settings.applysettings as a
 import settings.UI as settingsui
-import generatesize as size 
+import generatesize as size
 import vars as v
 import mdpreview as md
 from widgets.textwidget import ScrollText, ScrollCode
@@ -21,15 +22,15 @@
 root.update_idletasks()
 ntkutils.placeappincenter(root)
 
-root.update()
+root.update_idletasks()
 
 closeimg = tkinter.PhotoImage(file=Path("assets/close_light.png"))
 closeimg2 = tkinter.PhotoImage(file=Path("assets/close_dark.png"))
 
 def settings_():
     settingsui.build()
     root.wait_window(settingsui.settings)
-    
+
     if settingsui.save == True:
         v.cfg = settingsui.cfg
         a.applysettings()
@@ -38,9 +39,8 @@ def closepreview():
     md.close()
     textwidget.text.bind("<KeyPress>", refreshtitle)
 
-tabbar = tkinter.Frame(root, height="75", bg="#202020")
-tabbar.pack(fill="both")
-tabbar.pack_propagate(False) 
+notebook = ttk.Notebook(root)
+notebook.pack(fill="both", expand=True)
 
 if cfg["linenumbers"] and not cfg["syntax-highlighting"]:
     textwidget = ScrollText(root, width=100, borderwidth=0, height=root.winfo_height() - 125)
@@ -61,7 +61,7 @@ def closepreview():
 
 
 footer = tkinter.Frame(root, width=root.winfo_width(), height=25)
-footer.update()
+footer.update_idletasks()
 footer.place(y=root.winfo_height() - 25)
 footer.pack_propagate(False)
 
@@ -107,17 +107,19 @@ def refreshtitle(e):
 v.root = root
 v.textwidget = textwidget
 v.filedir = filedir
-v.tabbar = tabbar
+v.tabbar = notebook
 v.footer = footer
 v.closeimg = closeimg
 v.closeimg2 = closeimg2
 
 a.applysettings()
 
-tabmanager.cbuttons[0].place(x=71) # The first cbutton has to be placed like that because it seems like the winfo functions return wrong values the first time
-tabmanager.buildtabs()
+notebook.add(tkinter.Frame(), text=tabmanager.tabs[0][0], image=closeimg, compound="right")
+
+
+
+notebook.bind('<ButtonRelease-1>', tabmanager.click, add="+") # Bind Left mouse button to write content of selected tab into the text widget
 
 root.update_idletasks()
 root.deiconify()
-
 root.mainloop()

src/settings/applysettings.py

@@ -9,9 +9,7 @@ def applysettings():
     else: sv_ttk.set_theme(v.cfg["theme"].lower()) 
 
     if v.cfg["theme"] == "Dark" or (v.cfg["theme"] == "System" and darkdetect.isDark()): 
-        v.tabbar.configure(bg="#202020")
         v.footer.configure(bg="#202020")
-
         v.closeimg.configure(file="assets/close_light.png")
         v.closeimg2.configure(file="assets/close_dark.png")
 
@@ -23,8 +21,6 @@ def applysettings():
         try: v.textwidget.numberLines.mode = "dark"
         except AttributeError: pass
     else: 
-        v.tabbar.configure(bg="#f3f3f3")
-
         v.footer.configure(bg="#f3f3f3")
         v.closeimg.configure(file="assets/close_dark.png")
         v.closeimg2.configure(file="assets/close_light.png")
@@ -57,4 +53,4 @@ def applysettings():
 
     try: v.textwidget.numberLines.redraw()
     except AttributeError: pass
-    tabmanager.buildtabs()
+    #tabmanager.buildtabs()

src/tabmanager.py

@@ -1,161 +1,137 @@
+from __future__ import annotations
+
 import ntkutils, tkinter
-from tkinter import ttk, filedialog
+from tkinter import PhotoImage, ttk, filedialog, Event
 from pygments.lexers import get_lexer_for_filename
 import pygments.lexers
+import pyautogui
 
 import vars as v
 import filetype as f
 
-tabbuttons = []
-cbuttons = []
 tabs = [["Untitled", "", "unsaved", "*"]]
 
-
-def update(file):
+def updatetab(file):
     tabs[v.tabselected][0] = file.name.split("/")[-1]
     tabs[v.tabselected][2] = file.name
-    tabs[v.tabselected][3] = ""   
+    tabs[v.tabselected][3] = ""
 
 def updatetitle(): v.root.title("txt2 - {} {}".format(tabs[v.tabselected][0], tabs[v.tabselected][3]))
 
-def _open(x):
+def new():
     tabs[v.tabselected][1] = v.textwidget.text.get("1.0", "end")
-    v.tabselected = tabbuttons.index(x)
-
     v.textwidget.text.delete("1.0", "end")
-    v.textwidget.text.insert("1.0", tabs[v.tabselected][1])
-    v.textwidget.text.delete("end-1c", "end")
-
-    v.filedir.configure(text=tabs[v.tabselected][2])
+    tabs.append(["Untitled", "", "unsaved", "*"])
+    v.filedir.configure(text="unsaved")
+    v.tabselected = v.tabselected + 1
 
-    buildtabs()
-    updatetitle()
-    setlexer()
-
-def close(e, x):
-    if not v.tabselected == cbuttons.index(x):
-        tabs.pop(cbuttons.index(x))
-        if cbuttons.index(x) < v.tabselected: v.tabselected = v.tabselected - 1
-            
-        buildtabs()
-    else:
-        if len(cbuttons) > 1:
-            tabs.pop(v.tabselected)
-            v.tabselected = v.tabselected - 1
+    try: v.textwidget.redraw()
+    except: pass
 
-            buildtabs()
+    v.tabbar.add(tkinter.Frame(), text=tabs[v.tabselected][0], image=v.closeimg, compound="right")
+    v.tabbar.select(v.tabselected)
 
-            v.textwidget.text.delete("1.0", "end")
-            v.textwidget.text.insert("1.0", tabs[v.tabselected][1])
-            updatetitle()
-            v.filedir.configure(text=tabs[v.tabselected][2])
-        else:
-            v.root.destroy()
-
-def new():
-    if not len(tabs) == 10:
-        tabs[v.tabselected][1] = v.textwidget.text.get("1.0", "end")
-        v.textwidget.text.delete("1.0", "end")
-        tabs.append(["Untitled", "", "unsaved", "*"])
-        v.filedir.configure(text="unsaved")
-        v.tabselected = len(tabbuttons)
-
-        buildtabs()
-        updatetitle()
-        if v.cfg["syntax-highlighting"]: v.textwidget.text._set_lexer(pygments.lexers.TextLexer)
-    else: print("Tab limit reached")
+    updatetitle()
+    if v.cfg["syntax-highlighting"]: v.textwidget.text._set_lexer(pygments.lexers.TextLexer)
 
 def save(e="", saveas=False):
     if tabs[v.tabselected][2] == "unsaved" or saveas:
         file = filedialog.asksaveasfile()
         if file == None: return
     else: file = open(tabs[v.tabselected][2], "w")
-    
+
     if file != None:
         file.write(v.textwidget.text.get("1.0", "end"))
 
-        update(file)
+        updatetab(file)
         v.filedir.configure(text=file.name)
 
         file.close()
 
-        buildtabs()
         updatetitle()
         setlexer()
 
 def openfile(e=""):
-    if not len(tabs) == 10: 
-        file = filedialog.askopenfile()
-        content = file.read()
-
-        if not v.textwidget.text.get("1.0", "end").replace("\n", "") == "": new()
-
-        update(file)
+    file = filedialog.askopenfile()
+    content = file.read()
 
-        file.close()
-
-        v.textwidget.text.insert("1.0", content)
-        v.filedir.configure(text=tabs[v.tabselected][2])
-
-        buildtabs()
-        updatetitle()
-        setlexer()
-    else:
-        print("Tab limit reached")
+    if v.textwidget.text.get("1.0", "end").replace("\n", "") != "": 
+        new()
 
-def changetype():
-    if tabs[v.tabselected][2] == "unsaved": save()
-    else:
-        result = f.get(tabs[v.tabselected][2])
-        tabs[v.tabselected][2] = result
-        tabs[v.tabselected][0] = result.split("/")[-1]
-        v.filedir.configure(text=result)
+    updatetab(file)
 
-        buildtabs()
-        updatetitle()
-        setlexer()
+    file.close()
 
-def on_enters(e, x): x.configure(bg=v.selected_hover)
-def on_leaves(e, x): x.configure(bg=v.selected)
-def on_enter(e, x): x.configure(bg=v.normal_hover)
-def on_leave(e, x): x.configure(bg=v.normal)
+    v.tabbar.tab(v.tabselected, text=tabs[v.tabselected][0], image=v.closeimg, compound="right")
+    v.textwidget.text.insert("1.0", content)
+    v.filedir.configure(text=tabs[v.tabselected][2])
 
-def buildtabs():
-    ntkutils.clearwin(v.tabbar)
-    tabbuttons.clear()
-    cbuttons.clear()
+    updatetitle()
+    setlexer()
 
-    for i in tabs:
-        button = ttk.Button(v.tabbar, text=i[0] + "       ", image=v.closeimg, compound="right")
-        button.pack(side="left", padx=10)
-        button.configure(command=lambda x=button: _open(x))
-        button.update()
+def opentab(event, tabdeleted=False):
+    if not tabdeleted: tabs[v.tabselected][1] = v.textwidget.text.get("1.0", "end")
 
-        cbutton = tkinter.Label(v.tabbar, font=("", 15), image=v.closeimg, bg=v.normal)
-        cbutton.place(x=button.winfo_x() + button.winfo_width() - 37, y=23)
-        cbutton.bind("<1>", lambda event, x=cbutton:close(event, x)) # Execute closetab on click
+    v.tabselected = v.tabbar.index(v.tabbar.select())
 
-        tabbuttons.append(button)
-        cbuttons.append(cbutton)
+    v.textwidget.text.delete("1.0", "end")
+    v.textwidget.text.insert("1.0", tabs[v.tabselected][1])
+    v.textwidget.text.delete("end-1c", "end")
 
-    tabbuttons[v.tabselected].configure(style="Accent.TButton")
+    v.filedir.configure(text=tabs[v.tabselected][2])
 
-    # This makes the background change to the hover color when hovering over the button
-    for i in tabbuttons:
-        if tabbuttons.index(i) == v.tabselected:
-            i.bind("<Enter>", lambda event, x=cbuttons[v.tabselected]: on_enters(event, x))
-            i.bind("<Leave>", lambda event, x=cbuttons[v.tabselected]: on_leaves(event, x))
-        else:
-            i.bind("<Enter>", lambda event, x=cbuttons[tabbuttons.index(i)]: on_enter(event, x))
-            i.bind("<Leave>", lambda event, x=cbuttons[tabbuttons.index(i)]: on_leave(event, x))
+    try: v.textwidget.redraw()
+    except: pass
 
-    cbuttons[v.tabselected].configure(bg=v.selected, image=v.closeimg2)
+    updatetitle()
+    setlexer()
 
 def setlexer():
     if v.cfg["syntax-highlighting"]:
         try: lexer = get_lexer_for_filename(tabs[v.tabselected][0])
         except pygments.util.ClassNotFound: lexer = pygments.lexers.TextLexer
-        lexer = "pygments.lexers." + str(lexer).split(".")[-1].removesuffix(">")
+        lexer = "pygments.lexers." + str(lexer).split(".")[-1].removesuffix(">").removesuffix("'")
         v.textwidget.text._set_lexer(eval(lexer))
         try: v.textwidget.redraw()
-        except: pass
+        except: pass
+
+# The following two functions contain code copied from https://github.com/Akuli/porcupine
+
+def closetab(event):
+    before = v.tabbar.index(f"@{event.x},{event.y}")
+    after = before + 1
+
+    if v.tabbar.index(v.tabbar.tabs()[before:after][0]) < v.tabselected:
+        v.tabselected = v.tabselected - 1
+
+    tabs.pop(v.tabbar.index(v.tabbar.tabs()[before:after][0]))
+    v.tabbar.forget(v.tabbar.tabs()[before:after][0])
+    opentab(event, True)
+
+def click(event) -> None:
+    if event.widget.identify(event.x, event.y) == "label":
+        # find the right edge of the top label (including close button)
+        right = event.x
+        while event.widget.identify(right, event.y) == "label":
+            right += 1
+
+        if event.x >= right - v.closeimg.width():
+            if event.widget.index("end") != 1:
+                closetab(event)
+            else:
+                v.root.destroy()
+        else:
+            opentab(event)
+    else:
+        opentab(event)
+
+def changetype():
+    if tabs[v.tabselected][2] == "unsaved": save()
+    else:
+        result = f.get(tabs[v.tabselected][2])
+        tabs[v.tabselected][2] = result
+        tabs[v.tabselected][0] = result.split("/")[-1]
+        v.filedir.configure(text=result)
+
+        updatetitle()
+        setlexer()