Merge pull request #140 from yjg30737/feature/general

Remove QSettings completely, fix default db file related bug

Author: yjg30737

pyqt_openai/replicate_widget/replicateMainWidget.py

@@ -1,6 +1,6 @@
 import os
 
-from PySide6.QtCore import Qt, QSettings
+from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QStackedWidget, QHBoxLayout, QVBoxLayout, QWidget, QSplitter
 
 from pyqt_openai import INI_FILE_NAME, ICON_HISTORY, ICON_SETTING, DEFAULT_SHORTCUT_LEFT_SIDEBAR_WINDOW, \

pyqt_openai/sqlite.py

@@ -3,8 +3,7 @@
 from datetime import datetime
 from typing import List
 
-from PySide6.QtCore import QSettings
-
+from pyqt_openai.config_loader import CONFIG_MANAGER
 from pyqt_openai import THREAD_TABLE_NAME, THREAD_TRIGGER_NAME, \
     THREAD_TABLE_NAME_OLD, \
     THREAD_TRIGGER_NAME_OLD, MESSAGE_TABLE_NAME_OLD, MESSAGE_TABLE_NAME, THREAD_MESSAGE_INSERTED_TR_NAME, \
@@ -19,8 +18,7 @@ def get_db_filename():
     """
     Get the database file's name from the settings.
     """
-    settings = QSettings(INI_FILE_NAME, QSettings.Format.IniFormat)
-    db_path = settings.value("db", DB_FILE_NAME) + ".db"
+    db_path = CONFIG_MANAGER.get_general_property('db') + '.db'
     return db_path
 
 

pyqt_openai/util/script.py

@@ -18,7 +18,7 @@
 from pathlib import Path
 
 import requests
-from PySide6.QtCore import QSettings, Qt, QUrl
+from PySide6.QtCore import Qt, QUrl
 from PySide6.QtGui import QDesktopServices
 from PySide6.QtWidgets import QMessageBox, QFrame
 from jinja2 import Template
@@ -125,15 +125,6 @@ def download_image_as_base64(url: str):
     base64_encoded = base64.b64decode(base64.b64encode(image_data).decode('utf-8'))
     return base64_encoded
 
-def get_font():
-    settings = QSettings(INI_FILE_NAME, QSettings.Format.IniFormat)
-    font_family = settings.value("font_family", DEFAULT_FONT_FAMILY, type=str)
-    font_size = settings.value("font_size", DEFAULT_FONT_SIZE, type=int)
-    return {
-        'font_family': font_family,
-        'font_size': font_size
-    }
-
 def restart_app():
     # Define the arguments to be passed to the executable
     args = [sys.executable, MAIN_INDEX]