Bugfix 5.4.0 to 5.4.1

.github/workflows/build-linux.yml

@@ -45,7 +45,7 @@ jobs:
       run:
         python3 build.py
     - name: Upload ZIP
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v7
       with:
         name: Aura-Text
         path: dist

.github/workflows/build-macos.yml

@@ -39,7 +39,7 @@ jobs:
       run:
         python3 build.py
     - name: Upload ZIP
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v7
       with:
         name: Aura-Text
         path: dist

.github/workflows/build-windows.yml

@@ -40,13 +40,13 @@ jobs:
         path: Aura-Text-setup-x64.iss
 
     - name: Upload ZIP
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v7
       with:
         name: Aura-Text
         path: dist
 
     - name: Upload installer
-      uses: actions/upload-artifact@v4.3.1
+      uses: actions/upload-artifact@v7
       with:
         name: Aura-Text-Installer-Output
         path: Output

auratext/Components/About.py

@@ -10,16 +10,9 @@
     QVBoxLayout,
     QSpacerItem, QHBoxLayout, QLabel, QSizePolicy, QDialog)
 
-if platform.system() == "Windows":
-    local_app_data = os.getenv('LOCALAPPDATA')
-elif platform.system() == "Linux":
-    local_app_data = os.path.expanduser("~/.config")
-elif platform.system() == "Darwin":
-    local_app_data = os.path.expanduser("~/Library/Application Support")
-else:
-    print("Unsupported operating system")
-    sys.exit(1)
-local_app_data = os.path.join(local_app_data, "AuraText")
+from auratext.Misc.boilerplates import get_appdata_dirs
+
+local_app_data, script_dir = get_appdata_dirs()
 
 class AboutAppDialog(QDialog):
     def __init__(self):

auratext/Components/DBViewer.py

@@ -20,7 +20,7 @@ def load_db(self):
         tables = cursor.fetchall()
         con.close()
 
-        db = QSqlDatabase.addDatabase("QSQLITE")
+        db = QSqlDatabase.addDatabase("QSQLITE", "auratext_dbviewer")
         db.setDatabaseName(self.db_path)
 
         if not db.open():

auratext/Components/GitCommit.py

@@ -10,19 +10,11 @@
 import platform
 
 from auratext.Misc.import_res import notepadequalequalComponentImportPathAppend
+from auratext.Misc.boilerplates import get_appdata_dirs
 sys.path.append(notepadequalequalComponentImportPathAppend)
 from notepadequalequal.fileio import retrieve_file
 
-if platform.system() == "Windows":
-    local_app_data = os.getenv('LOCALAPPDATA')
-elif platform.system() == "Linux":
-    local_app_data = os.path.expanduser("~/.config")
-elif platform.system() == "Darwin":
-    local_app_data = os.path.expanduser("~/Library/Application Support")
-else:
-    print("Unsupported operating system")
-    sys.exit(1)
-local_app_data = os.path.join(local_app_data, "AuraText")
+local_app_data, script_dir = get_appdata_dirs()
 cpath = retrieve_file(f"{local_app_data}/data/CPath_Project.txt").strip()
 
 # Load theme

auratext/Components/GitPush.py

@@ -5,19 +5,11 @@
 import platform
 
 from auratext.Misc.import_res import notepadequalequalComponentImportPathAppend
+from auratext.Misc.boilerplates import get_appdata_dirs
 sys.path.append(notepadequalequalComponentImportPathAppend)
 from notepadequalequal.fileio import retrieve_file
 
-if platform.system() == "Windows":
-    local_app_data = os.getenv('LOCALAPPDATA')
-elif platform.system() == "Linux":
-    local_app_data = os.path.expanduser("~/.config")
-elif platform.system() == "Darwin":
-    local_app_data = os.path.expanduser("~/Library/Application Support")
-else:
-    print("Unsupported operating system")
-    sys.exit(1)
-local_app_data = os.path.join(local_app_data, "AuraText")
+local_app_data, script_dir = get_appdata_dirs()
 cpath = retrieve_file(f"{local_app_data}/data/CPath_Project.txt").strip()
 
 class GitPushDialog(QDialog):
@@ -55,9 +47,11 @@ def __init__(self, parent=None):
         push_button = QPushButton("Push")
         self.main_layout.addWidget(push_button)
         push_button.clicked.connect(self.push)
+
+        self.notAGitRepoError = "Not a Git repository. Please initialize a Git repository."
 
         if not self.is_git_repo():
-            print(self, "Error", "Not a Git repository. Please initialize a Git repository.")
+            print(self, "Error", self.notAGitRepoError)
             self.reject()
             return
 

auratext/Components/GitRebase.py

@@ -1,7 +1,9 @@
+from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import QDialog, QVBoxLayout, QLabel, QLineEdit, QPushButton, QTableWidget, QTableWidgetItem, QComboBox, QHeaderView, QMessageBox
 import subprocess
 import tempfile
 import os
+import platform
 
 class GitRebaseDialog(QDialog):
     def __init__(self, path):
@@ -115,12 +117,19 @@ def start_rebase(self):
             with open(script_path, 'w') as f:
                 f.write(rebase_script)
 
-            # For Windows, we need to create a simple batch file to act as the editor
-            editor_script_path = os.path.join(tempfile.gettempdir(), 'auratext-rebase-editor.bat')
-            with open(editor_script_path, 'w') as f:
-                # The batch script will be called by git with the path to the git-rebase-todo file
-                # We overwrite that file with our generated script.
-                f.write(f'copy "{script_path}" %1 > NUL')
+            if platform.system() == "Windows":
+                # For Windows, we need to create a simple batch file to act as the editor
+                editor_script_path = os.path.join(tempfile.gettempdir(), 'auratext-rebase-editor.bat')
+                with open(editor_script_path, 'w') as f:
+                    # The batch script will be called by git with the path to the git-rebase-todo file
+                    # We overwrite that file with our generated script.
+                    f.write(f'copy "{script_path}" %1 > NUL')
+            else:
+                editor_script_path = os.path.join(tempfile.gettempdir(), 'auratext-rebase-editor.sh')
+                with open(editor_script_path, 'w') as f:
+                    unixRScriptContents = "#!/bin/sh" + '\n' + f'cp "{script_path}" "$1"' + "\n"
+                    f.write(unixRScriptContents)
+                    os.chmod(editor_script_path, 0o755)
 
             env = os.environ.copy()
             env["GIT_SEQUENCE_EDITOR"] = f'"{editor_script_path}"'

auratext/Components/Linter.py

@@ -18,16 +18,9 @@
 from pylint.reporters.json_reporter import JSONReporter
 import json
 
-if platform.system() == "Windows":
-    local_app_data = os.getenv('LOCALAPPDATA')
-elif platform.system() == "Linux":
-    local_app_data = os.path.expanduser("~/.config")
-elif platform.system() == "Darwin":
-    local_app_data = os.path.expanduser("~/Library/Application Support")
-else:
-    print("Unsupported operating system")
-    sys.exit(1)
-local_app_data = os.path.join(local_app_data, "AuraText")
+from auratext.Misc.boilerplates import get_appdata_dirs
+
+local_app_data, script_dir = get_appdata_dirs()
 
 
 class LintMessage:

auratext/Components/TabWidget.py

@@ -1,63 +1 @@
-"""
-A custom tab widget for the AuraText editor, supporting drag-and-drop reordering and a context"""
-
-from PyQt6.QtCore import QMimeData, QPoint
-from PyQt6.QtGui import QPixmap, QRegion, QAction
-from PyQt6.QtWidgets import QTabWidget, QMenu
-
-
-class TabWidget(QTabWidget):
-    def __init__(self, parent=None, new=None):
-        super().__init__(parent)
-        self.setAcceptDrops(True)
-        self.tabBar().setMouseTracking(True)
-        self.setMovable(True)
-        self.setDocumentMode(True)
-        if new:
-            TabWidget.setup(self)
-
-    def __setstate__(self, data):
-        self.__init__(new=False)
-        self.setParent(data["parent"])
-        for widget, tabname in data["tabs"]:
-            self.addTab(widget, tabname)
-        TabWidget.setup(self)
-
-    def __getstate__(self):
-        data = {
-            "parent": self.parent(),
-            "tabs": [],
-        }
-        tab_list = data["tabs"]
-        for k in range(self.count()):
-            tab_name = self.tabText(k)
-            widget = self.widget(k)
-            tab_list.append((widget, tab_name))
-        return data
-
-    def setup(self):
-        pass
-
-    def mouseMoveEvent(self, e):
-        globalPos = self.mapToGlobal(e.pos())
-        tabBar = self.tabBar()
-        posInTab = tabBar.mapFromGlobal(globalPos)
-        index = tabBar.tabAt(e.pos())
-        tabRect = tabBar.tabRect(index)
-
-        pixmap = QPixmap(tabRect.size())
-        tabBar.render(pixmap, QPoint(), QRegion(tabRect))
-        mimeData = QMimeData()
-
-    def contextMenuEvent(self, event):
-        menu = QMenu(self)
-        close_alltabs = QAction("Close All Tabs", self)
-
-        close_alltabs.triggered.connect(self.close_all_tabs)
-
-        menu.addAction(close_alltabs)
-
-        menu.exec(event.globalPos())
-
-    def close_all_tabs(self):
-        self.clear()
+from auratext.Core.TabWidget import *

auratext/Components/ToDo.py

@@ -10,17 +10,9 @@
     QVBoxLayout, QListWidget, QPushButton, QHBoxLayout, QMessageBox, QDialog, QLineEdit
 )
 from notepadequalequal.fileio import retrieve_file
+from auratext.Misc.boilerplates import get_appdata_dirs
 
-if platform.system() == "Windows":
-    local_app_data = os.getenv('LOCALAPPDATA')
-elif platform.system() == "Linux":
-    local_app_data = os.path.expanduser("~/.config")
-elif platform.system() == "Darwin":
-    local_app_data = os.path.expanduser("~/Library/Application Support")
-else:
-    print("Unsupported operating system")
-    sys.exit(1)
-local_app_data = os.path.join(local_app_data, "AuraText")
+local_app_data, script_dir = get_appdata_dirs()
 cpath = retrieve_file(f"{local_app_data}/data/CPath_Project.txt").strip()
 
 def check_folder_exists(folder_path):
@@ -36,12 +28,12 @@ def create_folder(folder_path):
         pass
 
 
-if check_folder_exists(f"{cpath}/Aura Text/"):
+if check_folder_exists(f"{cpath}/.auratext/"):
     pass
 else:
-    create_folder(f"{cpath}/Aura Text")
+    create_folder(f"{cpath}/.auratext")
 # Path to the CSV file
-CSV_FILE = f"{cpath}/Aura Text/todo.csv"
+CSV_FILE = f"{cpath}/.auratext/todo.csv"
 
 
 class ToDoApp(QDialog):

auratext/Components/statusBar.py

@@ -14,18 +14,9 @@
 from PyQt6.QtWidgets import QFrame, QHBoxLayout, QLabel, QStatusBar, QWidget, QPushButton
 
 # from ..scripts.color_scheme_loader import color_schemes
-from auratext.Misc.boilerplates import get_font_for_platform
-
-if platform.system() == "Windows":
-    local_app_data = os.getenv('LOCALAPPDATA')
-elif platform.system() == "Linux":
-    local_app_data = os.path.expanduser("~/.config")
-elif platform.system() == "Darwin":
-    local_app_data = os.path.expanduser("~/Library/Application Support")
-else:
-    print("Unsupported operating system")
-    sys.exit(1)
-local_app_data = os.path.join(local_app_data, "AuraText")
+from auratext.Misc.boilerplates import get_font_for_platform, get_appdata_dirs
+
+local_app_data, script_dir = get_appdata_dirs()
 with open(f"{local_app_data}/data/theme.json", "r") as themes_file:
     _themes = json.load(themes_file)
 
@@ -160,7 +151,7 @@ def __init__(self, parent=None, greeting=None):
         self.editModeLabel.setFont(smallFont)
         self.editModeLabel.setStyleSheet(
             f"""
-            color: {"#FFFFFF;"};
+            color: #FFFFFF;
             font-weight: bold;
             margin-bottom: 5px;
             """

auratext/Core/Lexers.py

@@ -381,7 +381,7 @@ def verilog(self):
     lexer.setDefaultColor(QColor("#FFFFFF"))
     self.current_editor.setLexer(lexer)
     lexer.setPaper(QColor(self._themes["editor_theme"]))
-    lexer.setColor(QColor(self._themes["editor_theme"]), lexer.Comment)
+    lexer.setColor(QColor("#808080"), lexer.Comment)
     lexer.setColor(QColor("#FFA500"), lexer.Keyword)
     lexer.setFont(get_font_for_platform(size=14, plain=True))