From 2e9a16fc10b89a5d7314e6eb32ea3d50ca9f3699 Mon Sep 17 00:00:00 2001 From: Boris Pozdena Date: Fri, 13 Oct 2023 11:35:32 +0200 Subject: [PATCH] remove support for option min_notify_changes --- README.md | 4 +++- src/OneDriveGUI.py | 9 --------- src/ui/profile_settings_page.ui | 13 ------------- src/ui/ui_profile_settings_page.py | 18 ++---------------- 4 files changed, 5 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 7842498..64e6324 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -:exclamation: :exclamation: :exclamation: This branch aims to provide compatibility with the upcoming OneDrive v2.5.0-alpha. Still very broken... :exclamation: :exclamation: :exclamation: +:exclamation: :exclamation: :exclamation: This branch aims to provide compatibility with the upcoming OneDrive v2.5.0-alpha. :exclamation: :exclamation: :exclamation: + +If you are using `sync_business_shared_folders` in your config file, you will need manually remove it. \ No newline at end of file diff --git a/src/OneDriveGUI.py b/src/OneDriveGUI.py index d985cfc..a8dd2ab 100644 --- a/src/OneDriveGUI.py +++ b/src/OneDriveGUI.py @@ -1445,7 +1445,6 @@ class ProfileSettingsPage(QWidget, Ui_profile_settings): self.spinBox_monitor_log_frequency.valueChanged.connect(self.set_spin_box_value) self.checkBox_disable_notifications.stateChanged.connect(self.set_check_box_state) self.checkBox_disable_notifications.stateChanged.connect(self.validate_checkbox_input) - self.spinBox_min_notify_changes.valueChanged.connect(self.set_spin_box_value) # Account tab self.pushButton_login.clicked.connect(lambda: main_window.show_login(self.profile)) @@ -1537,8 +1536,6 @@ class ProfileSettingsPage(QWidget, Ui_profile_settings): self.spinBox_monitor_log_frequency.setValue(int(self.temp_profile_config["onedrive"]["monitor_log_frequency"].strip('"'))) self.spinBox_monitor_log_frequency.setEnabled(self.checkBox_enable_logging.isChecked()) self.checkBox_disable_notifications.setChecked(self.get_check_box_state("disable_notifications")) - self.spinBox_min_notify_changes.setValue(int(self.temp_profile_config["onedrive"]["min_notify_changes"].strip('"'))) - self.spinBox_min_notify_changes.setEnabled(self.checkBox_disable_notifications.isChecked()) # Account tab self.config_file = global_config[self.profile]["config_file"].strip('"') @@ -1621,12 +1618,6 @@ class ProfileSettingsPage(QWidget, Ui_profile_settings): self.checkBox_debug_https.setEnabled(False) self.pushButton_log_dir_browse.setEnabled(False) - if self.sender().objectName() == "checkBox_disable_notifications": - if self.checkBox_disable_notifications.isChecked(): - self.spinBox_min_notify_changes.setEnabled(True) - else: - self.spinBox_min_notify_changes.setEnabled(False) - if self.sender().objectName() == "checkBox_webhook_enabled": if self.checkBox_webhook_enabled.isChecked(): self.spinBox_webhook_expiration_interval.setEnabled(True) diff --git a/src/ui/profile_settings_page.ui b/src/ui/profile_settings_page.ui index 70593c7..4f84f6f 100644 --- a/src/ui/profile_settings_page.ui +++ b/src/ui/profile_settings_page.ui @@ -1063,19 +1063,6 @@ Do not upload local changes to OneDrive. Notifications - - - - Minimum number of pending incoming changes necessary to trigger a desktop notification. - - - Minimum notify changes - - - - - - diff --git a/src/ui/ui_profile_settings_page.py b/src/ui/ui_profile_settings_page.py index bed9b1d..1e332b7 100644 --- a/src/ui/ui_profile_settings_page.py +++ b/src/ui/ui_profile_settings_page.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- ################################################################################ -## Form generated from reading UI file 'profile_settings_page.ui' +## Form generated from reading UI file 'profile_settings_pagetiWTyj.ui' ## -## Created by: Qt User Interface Compiler version 6.2.3 +## Created by: Qt User Interface Compiler version 6.2.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -692,16 +692,6 @@ class Ui_profile_settings(object): self.groupBox_6.setObjectName(u"groupBox_6") self.formLayout_3 = QFormLayout(self.groupBox_6) self.formLayout_3.setObjectName(u"formLayout_3") - self.label_min_notify_changes = QLabel(self.groupBox_6) - self.label_min_notify_changes.setObjectName(u"label_min_notify_changes") - - self.formLayout_3.setWidget(1, QFormLayout.LabelRole, self.label_min_notify_changes) - - self.spinBox_min_notify_changes = QSpinBox(self.groupBox_6) - self.spinBox_min_notify_changes.setObjectName(u"spinBox_min_notify_changes") - - self.formLayout_3.setWidget(1, QFormLayout.FieldRole, self.spinBox_min_notify_changes) - self.checkBox_disable_notifications = QCheckBox(self.groupBox_6) self.checkBox_disable_notifications.setObjectName(u"checkBox_disable_notifications") @@ -947,10 +937,6 @@ class Ui_profile_settings(object): #endif // QT_CONFIG(tooltip) self.label_monitor_log_frequency.setText(QCoreApplication.translate("profile_settings", u"Monitor log frequency", None)) self.groupBox_6.setTitle(QCoreApplication.translate("profile_settings", u"Notifications", None)) -#if QT_CONFIG(tooltip) - self.label_min_notify_changes.setToolTip(QCoreApplication.translate("profile_settings", u"Minimum number of pending incoming changes necessary to trigger a desktop notification.", None)) -#endif // QT_CONFIG(tooltip) - self.label_min_notify_changes.setText(QCoreApplication.translate("profile_settings", u"Minimum notify changes", None)) #if QT_CONFIG(tooltip) self.checkBox_disable_notifications.setToolTip(QCoreApplication.translate("profile_settings", u"Do not use desktop notifications in monitor mode.", None)) #endif // QT_CONFIG(tooltip)