Merge pull request #7 from m-xim/dev

Fix theme

Author: m-xim

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 120

CHANGELOG.md

@@ -1,6 +1,36 @@
+# [1.3.0-dev.4](https://github.com/m-xim/fluentus/compare/v1.3.0-dev.3...v1.3.0-dev.4) (2025-02-08)
+
+
+### Bug Fixes
+
+* **ui:** Update hover color for 'new_project' button and padding folder_button ([6263a8a](https://github.com/m-xim/fluentus/commit/6263a8a648811562dec00fb849dfc7277d102041))
+
+# [1.3.0-dev.3](https://github.com/m-xim/fluentus/compare/v1.3.0-dev.2...v1.3.0-dev.3) (2025-02-08)
+
+
+### Bug Fixes
+
+* **start_window.ui:** Adjust alternate row background in Projects table ([6864911](https://github.com/m-xim/fluentus/commit/6864911d2b2642578fb7be415046039235612cfd))
+
+# [1.3.0-dev.2](https://github.com/m-xim/fluentus/compare/v1.3.0-dev.1...v1.3.0-dev.2) (2025-02-08)
+
+
+### Bug Fixes
+
+* new_folder.png path ([254a470](https://github.com/m-xim/fluentus/commit/254a47095453fd127823fe05a84cce2f2c89150c))
+
+# [1.3.0-dev.1](https://github.com/m-xim/fluentus/compare/v1.2.0...v1.3.0-dev.1) (2025-02-08)
+
+
+### Bug Fixes
+
+* **FluentAPI:** remove debug prints ([d355745](https://github.com/m-xim/fluentus/commit/d3557456aece15a6314f332198b6bb8f2fb531f1))
+* **theme:** correct system operations display in light theme ([f6122ec](https://github.com/m-xim/fluentus/commit/f6122ec40b8aa0e93e95972c9123d5e275b76c68))
+
 # [1.3.0](https://github.com/m-xim/fluentus/compare/v1.2.0...v1.3.0) (2025-02-01)
 
 
+
 ### Features
 
 * **start_window:** add Delete key shortcut for removing selected projects ([e14421c](https://github.com/m-xim/fluentus/commit/e14421c7a5efda7e027c8df9d7875a21df9ca49b))

src/app.py

@@ -5,13 +5,21 @@
 from PyQt6.QtCore import Qt, QModelIndex, QEvent
 from PyQt6.QtGui import QDragEnterEvent, QDropEvent, QResizeEvent, QShortcut
 from PyQt6.QtSql import QSqlTableModel
-from PyQt6.QtWidgets import QApplication, QMessageBox, QFileDialog, QMainWindow, QPushButton, QTableView
+from PyQt6.QtWidgets import (
+    QApplication,
+    QMessageBox,
+    QFileDialog,
+    QMainWindow,
+    QPushButton,
+    QTableView,
+)
 from loguru import logger
 
 from src.database.manager import DatabaseManager
 from src.editor import FluentusEditor
 from src.logger import configure_logger
 from src.utils.config_reader import get_config, DatabaseConfig
+from src.utils.icon_utils import get_tinted_icon
 from src.utils.resource_path import resource_path
 from src.widgets.drag_overlay import DragOverlay
 
@@ -25,14 +33,26 @@ def __init__(self) -> None:
         super().__init__()
 
         # Initialize database config
-        db_config: DatabaseConfig = get_config(model=DatabaseConfig, root_key="database")
+        db_config: DatabaseConfig = get_config(
+            model=DatabaseConfig, root_key="database"
+        )
 
         # Create database manager
-        self.db_manager = DatabaseManager(db_name=db_config.name, table_name=db_config.tables.projects)
+        self.db_manager = DatabaseManager(
+            db_name=db_config.name, table_name=db_config.tables.projects
+        )
 
         # Load UI
         uic.loadUi(resource_path("resource/ui/start_window.ui"), self)
 
+        # Set theme
+        self.new_project: QPushButton
+        self.new_project.setIcon(
+            get_tinted_icon(
+                resource_path("resource/icons/new_folder.png"), self.new_project
+            )
+        )
+
         # Retrieve required widgets
         self.projects: QTableView = self.findChild(QTableView, "projects")
         self.new_project: QPushButton = self.findChild(QPushButton, "new_project")
@@ -43,21 +63,27 @@ def __init__(self) -> None:
         # Initialize database (create table if it doesn't exist)
         if not self.db_manager.initialize_database():
             logger.error("Database initialization failed.")
-            QMessageBox.critical(self, "Database Error", "Failed to initialize database.")
+            QMessageBox.critical(
+                self, "Database Error", "Failed to initialize database."
+            )
             sys.exit(1)
 
         # Connect to the database
         if not self.db_manager.create_connection():
             logger.error("Database connection failed.")
-            QMessageBox.critical(self, "Database Error", "Failed to connect to database.")
+            QMessageBox.critical(
+                self, "Database Error", "Failed to connect to database."
+            )
             sys.exit(1)
 
         # Set up the model and link it to the table view
         self.model = QSqlTableModel(self)
         self.model.setTable(db_config.tables.projects)
         self.model.setEditStrategy(QSqlTableModel.EditStrategy.OnFieldChange)
         self.model.select()
-        self.model.setHeaderData(self.model.fieldIndex("folder"), Qt.Orientation.Horizontal, "Folder")
+        self.model.setHeaderData(
+            self.model.fieldIndex("folder"), Qt.Orientation.Horizontal, "Folder"
+        )
 
         # Configure the projects table view
         self.projects.setModel(self.model)
@@ -68,7 +94,9 @@ def __init__(self) -> None:
         self.projects.doubleClicked.connect(self.open_editor)
 
         shortcut_delete = QShortcut(Qt.Key.Key_Delete, self.projects)
-        shortcut_delete.activated.connect(lambda: self.delete_rows(self.model, self.projects))
+        shortcut_delete.activated.connect(
+            lambda: self.delete_rows(self.model, self.projects)
+        )
 
         # Connect the "New Project" button click event
         self.new_project.clicked.connect(self.create_new_project)
@@ -105,11 +133,15 @@ def add_project(self, folder: str) -> None:
         :param folder: Path to the project folder.
         """
         if self.db_manager.project_exists(folder):
-            QMessageBox.warning(self, "Warning", "A project with this path already exists.")
+            QMessageBox.warning(
+                self, "Warning", "A project with this path already exists."
+            )
             return
 
         if not self.db_manager.add_project(folder):
-            QMessageBox.critical(self, "Error", "Failed to add the project to the database.")
+            QMessageBox.critical(
+                self, "Error", "Failed to add the project to the database."
+            )
             return
 
         # Refresh the model to display the new record
@@ -129,8 +161,7 @@ def delete_rows(model: QSqlTableModel, table_view: QTableView) -> None:
             QMessageBox.critical(
                 table_view,
                 "Deletion Error",
-                f"Unable to delete rows:"
-                f"\n{model.lastError().text()}"
+                f"Unable to delete rows:" f"\n{model.lastError().text()}",
             )
         else:
             model.select()

src/config.toml

@@ -13,4 +13,7 @@ check = "check"
 [table_column]
 icon = ""
 variable = "Variable"
-translation = "Translation"
+translation = "Translation"
+
+[colors]
+highlight = "#D9AD2B"

src/database/manager.py

@@ -58,7 +58,9 @@ def create_connection(self) -> bool:
         if not db.open():
             error = db.lastError().text()
             logger.error(f"Failed to connect to the database: {error}")
-            QMessageBox.critical(None, "Database Error", f"Failed to connect to the database: {error}")
+            QMessageBox.critical(
+                None, "Database Error", f"Failed to connect to the database: {error}"
+            )
             return False
 
         logger.info("Database connection established.")
@@ -75,7 +77,9 @@ def project_exists(self, folder: str) -> bool:
         query.prepare(f"SELECT COUNT(*) FROM {self.table_name} WHERE folder = :folder")
         query.bindValue(":folder", folder)
         if not query.exec():
-            logger.error(f"Failed to check project existence: {query.lastError().text()}")
+            logger.error(
+                f"Failed to check project existence: {query.lastError().text()}"
+            )
             return False
 
         if query.next():

src/editor.py

@@ -3,7 +3,14 @@
 
 from PyQt6 import uic
 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QWidget, QMessageBox, QFileDialog, QPlainTextEdit, QCheckBox, QComboBox
+from PyQt6.QtWidgets import (
+    QWidget,
+    QMessageBox,
+    QFileDialog,
+    QPlainTextEdit,
+    QCheckBox,
+    QComboBox,
+)
 
 from src.fluent_api.FluentAPI import FluentAPI
 from src.utils.config_reader import get_config, Program
@@ -24,7 +31,7 @@ def __init__(self, folder: Optional[str] = None):
         self.table_manager = None
 
         # Load UI
-        uic.loadUi(resource_path('resource/ui/editor_window.ui'), self)
+        uic.loadUi(resource_path("resource/ui/editor_window.ui"), self)
 
         self.editors = [
             (self.value_1, "value", self.lang_1),
@@ -38,7 +45,7 @@ def __init__(self, folder: Optional[str] = None):
         self.key_press_filter = KeyPressFilter()
 
         for editor, field, lang in self.editors:
-            if isinstance(editor, QPlainTextEdit) and field == 'value':
+            if isinstance(editor, QPlainTextEdit) and field == "value":
                 editor.installEventFilter(self.key_press_filter)
 
         # Connect buttons and language selectors
@@ -52,9 +59,13 @@ def __init__(self, folder: Optional[str] = None):
         # Connect editor signals dynamically
         for editor, field, lang in self.editors:
             if isinstance(editor, QPlainTextEdit):
-                editor.textChanged.connect(partial(self.update_cache, editor, field, lang))
+                editor.textChanged.connect(
+                    partial(self.update_cache, editor, field, lang)
+                )
             elif isinstance(editor, QCheckBox):
-                editor.stateChanged.connect(partial(self.update_cache, editor, field, lang))
+                editor.stateChanged.connect(
+                    partial(self.update_cache, editor, field, lang)
+                )
 
         # Initialize with folder if provided
         if folder:
@@ -69,7 +80,9 @@ def _initialize_folder(self, folder: str) -> None:
         self.fluent_api = FluentAPI(folder)
 
         # Initialize table manager
-        self.table_manager = TableManager(self.table, self.fluent_api, self.load_variable)
+        self.table_manager = TableManager(
+            self.table, self.fluent_api, self.load_variable
+        )
 
         self.folder_text.setText(folder)
         self.refresh_editing_state()
@@ -81,7 +94,9 @@ def save_all_changes(self):
         """Save all changes and notify the user."""
         if self.fluent_api.edited:
             self.fluent_api.save_all_files()
-            QMessageBox.information(self, "Save Changes", "All changes have been saved successfully!")
+            QMessageBox.information(
+                self, "Save Changes", "All changes have been saved successfully!"
+            )
             self.refresh_editing_state(False)
         else:
             QMessageBox.information(self, "No Changes", "No changes have been made.")
@@ -118,7 +133,7 @@ def load_variable(self):
             language = lang.currentText()
             data = self.fluent_api.get_translation(variable, language)
 
-            if attribute and field == 'value':
+            if attribute and field == "value":
                 content = data.attributes[attribute]
             else:
                 content = getattr(data, field, None)
@@ -134,7 +149,7 @@ def load_variable(self):
                     editor.setPlainText(value_new)
                     editor.blockSignals(False)
 
-                    if field == 'value':
+                    if field == "value":
                         last_key = self.key_press_filter.get_last_key(editor)
                         if last_key not in (Qt.Key.Key_Backspace, Qt.Key.Key_Space):
                             position = min(position + 1, len(value_new))
@@ -159,16 +174,24 @@ def _open_start_window(self):
 
         self.close()
 
-    def update_cache(self, editor: Union[QPlainTextEdit, QCheckBox], field: str, lang: QComboBox):
+    def update_cache(
+        self, editor: Union[QPlainTextEdit, QCheckBox], field: str, lang: QComboBox
+    ):
         """Update the cache when an editor field is modified."""
 
         variable, attribute = self.table_manager.get_selected_names()
         if not variable:
             return
 
-        new_content = editor.toPlainText() if isinstance(editor, QPlainTextEdit) else editor.isChecked()
+        new_content = (
+            editor.toPlainText()
+            if isinstance(editor, QPlainTextEdit)
+            else editor.isChecked()
+        )
 
-        if self.fluent_api.update(variable, lang.currentText(), field, new_content, attribute):
+        if self.fluent_api.update(
+            variable, lang.currentText(), field, new_content, attribute
+        ):
             self.table_manager.set_current_item(lang.currentText())
 
         self.load_variable()
@@ -178,12 +201,14 @@ def update_cache(self, editor: Union[QPlainTextEdit, QCheckBox], field: str, lan
 
     def refresh_editing_state(self, edit_status: Optional[bool] = None) -> None:
         """Refreshes the editing status in 'fluent_api' and updates the window title."""
-        
+
         if edit_status is not None:
             self.fluent_api.edited = edit_status
 
-        folder_suffix = f" - {self.fluent_api.folder_path}" if self.fluent_api.folder_path else ""
-        program = get_config(Program, 'program')
+        folder_suffix = (
+            f" - {self.fluent_api.folder_path}" if self.fluent_api.folder_path else ""
+        )
+        program = get_config(Program, "program")
 
         if self.fluent_api.edited:
             window_title = f"*{program.title}{folder_suffix}"
@@ -196,7 +221,7 @@ def closeEvent(self, event):
         """Handle the close event with unsaved changes."""
         if self.fluent_api.edited:
             dialog = CloseDialog(self)
-            result = dialog.exec()
+            dialog.exec()
 
             if dialog.choice == "save":
                 self.fluent_api.save_all_files()