kadu/gotify-tray-customized
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename setting keys

Browse Source
This commit is contained in:
dries.k
2022-04-05 12:55:35 +02:00
parent baefe5cac5
commit e5ce9f6201
5 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gotify_tray/database/default_settings.py
View File

@@ -6,9 +6,8 @@ from ..__version__ import __title__
DEFAULT_SETTINGS = { DEFAULT_SETTINGS = {
"message/check_missed/notify": True, "message/check_missed/notify": True,
"message/last_id": 0,
"logging/level": "Disabled", "logging/level": "Disabled",
"settings/export_path": os.path.join( "export/path": os.path.join(
Path.home(), f"{__title__.replace(' ', '-').lower()}-settings.bytes" Path.home(), f"{__title__.replace(' ', '-').lower()}-settings.bytes"
), ),
"shortcuts/quit": "Ctrl+Q", "shortcuts/quit": "Ctrl+Q",

4
gotify_tray/database/settings.py
View File

@@ -23,8 +23,8 @@ class Settings(QtCore.QSettings):
for key in self.allKeys() for key in self.allKeys()
if not ( # skip settings that might not translate well between platforms if not ( # skip settings that might not translate well between platforms
isinstance(self.value(key), QtCore.QByteArray) isinstance(self.value(key), QtCore.QByteArray)
or key == "settings/export_path" or key == "export/path"
or key == "message/last_id" or key == "message/last"
) )
} }

6
gotify_tray/gui/MainApplication.py
View File

@@ -127,8 +127,8 @@ class MainApplication(QtWidgets.QApplication):
) )
def update_last_id(self, i: int): def update_last_id(self, i: int):
if i > settings.value("message/last_id", type=int): if i > settings.value("message/last", type=int):
settings.setValue("message/last_id", i) settings.setValue("message/last", i)
def listener_opened_callback(self): def listener_opened_callback(self):
self.main_window.set_active() self.main_window.set_active()
@@ -140,7 +140,7 @@ class MainApplication(QtWidgets.QApplication):
return return
def get_missed_messages_callback(page: gotify.GotifyPagedMessagesModel): def get_missed_messages_callback(page: gotify.GotifyPagedMessagesModel):
last_id = settings.value("message/last_id", type=int) last_id = settings.value("message/last", type=int)
ids = [] ids = []
page.messages.reverse() page.messages.reverse()

5
gotify_tray/gui/widgets/ServerInfoDialog.py
View File

@@ -73,10 +73,7 @@ class ServerInfoDialog(QtWidgets.QDialog, Ui_Dialog):
def import_callback(self): def import_callback(self):
fname = QtWidgets.QFileDialog.getOpenFileName( fname = QtWidgets.QFileDialog.getOpenFileName(
self, self, "Import Settings", settings.value("export/path", type=str), "*",
"Import Settings",
settings.value("settings/export_path", type=str),
"*",
)[0] )[0]
if fname and os.path.exists(fname): if fname and os.path.exists(fname):
self.import_settings_task = ImportSettingsTask(fname) self.import_settings_task = ImportSettingsTask(fname)

12
gotify_tray/gui/widgets/SettingsDialog.py
View File

@@ -99,15 +99,12 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
def export_callback(self): def export_callback(self):
fname = QtWidgets.QFileDialog.getSaveFileName( fname = QtWidgets.QFileDialog.getSaveFileName(
self, self, "Export Settings", settings.value("export/path", type=str), "*",
"Export Settings",
settings.value("settings/export_path", type=str),
"*",
)[0] )[0]
if fname and os.path.exists(os.path.dirname(fname)): if fname and os.path.exists(os.path.dirname(fname)):
self.export_settings_task = ExportSettingsTask(fname) self.export_settings_task = ExportSettingsTask(fname)
self.export_settings_task.start() self.export_settings_task.start()
settings.setValue("settings/export_path", fname) settings.setValue("export/path", fname)
def import_success_callback(self): def import_success_callback(self):
response = QtWidgets.QMessageBox.information( response = QtWidgets.QMessageBox.information(
@@ -118,10 +115,7 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
def import_callback(self): def import_callback(self):
fname = QtWidgets.QFileDialog.getOpenFileName( fname = QtWidgets.QFileDialog.getOpenFileName(
self, self, "Import Settings", settings.value("export/path", type=str), "*",
"Import Settings",
settings.value("settings/export_path", type=str),
"*",
)[0] )[0]
if fname and os.path.exists(fname): if fname and os.path.exists(fname):
self.import_settings_task = ImportSettingsTask(fname) self.import_settings_task = ImportSettingsTask(fname)