From d95dfb18fdc6ccb47483ad4bbf67fccdb6cd00e8 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 2 Jul 2019 08:55:55 -0500 Subject: [PATCH] Removed some settings no longer needed --- src/interactors/configuration.py | 2 -- src/presenters/configuration.py | 2 -- src/session.defaults | 2 -- src/views/dialogs/configuration.py | 4 ---- 4 files changed, 10 deletions(-) diff --git a/src/interactors/configuration.py b/src/interactors/configuration.py index 4f67807..895ce0a 100644 --- a/src/interactors/configuration.py +++ b/src/interactors/configuration.py @@ -59,8 +59,6 @@ class configurationInteractor(base.baseInteractor): self.presenter.update_setting(section="general", setting="update_channel", value=update_channel) self.presenter.update_setting(section="chat", setting="notify_online", value=self.view.get_value("chat", "notify_online")) self.presenter.update_setting(section="chat", setting="notify_offline", value=self.view.get_value("chat", "notify_offline")) - self.presenter.update_setting(section="chat", setting="open_unread_conversations", value=self.view.get_value("chat", "open_unread_conversations")) - self.presenter.update_setting(section="chat", setting="automove_to_conversations", value=self.view.get_value("chat", "automove_to_conversations")) self.presenter.update_setting(section="chat", setting="notifications", value=self.presenter.get_notification_type(self.view.get_value("chat", "notifications"))) self.presenter.update_setting(section="load_at_startup", setting="audio_albums", value=self.view.get_value("startup", "audio_albums")) self.presenter.update_setting(section="load_at_startup", setting="video_albums", value=self.view.get_value("startup", "video_albums")) diff --git a/src/presenters/configuration.py b/src/presenters/configuration.py index d76f1db..28c046b 100644 --- a/src/presenters/configuration.py +++ b/src/presenters/configuration.py @@ -59,8 +59,6 @@ class configurationPresenter(base.basePresenter): self.send_message("create_tab", tab="chat") self.send_message("set", tab="chat", setting="notify_online", value=self.session.settings["chat"]["notify_online"]) self.send_message("set", tab="chat", setting="notify_offline", value=self.session.settings["chat"]["notify_offline"]) - self.send_message("set", tab="chat", setting="open_unread_conversations", value=self.session.settings["chat"]["open_unread_conversations"]) - self.send_message("set", tab="chat", setting="automove_to_conversations", value=self.session.settings["chat"]["automove_to_conversations"]) self.send_message("set", tab="chat", setting="notifications", value=self.get_notification_label(self.session.settings["chat"]["notifications"])) self.send_message("create_tab", tab="startup_options") self.send_message("set", tab="startup", setting="audio_albums", value=self.session.settings["load_at_startup"]["audio_albums"]) diff --git a/src/session.defaults b/src/session.defaults index a0fa2a4..4bb51e5 100644 --- a/src/session.defaults +++ b/src/session.defaults @@ -20,8 +20,6 @@ count_for_audio_buffers = integer(default=1000) [chat] notify_online = boolean(default=True) notify_offline = boolean(default=True) -open_unread_conversations = boolean(default=True) -automove_to_conversations = boolean(default=False) notifications = string(default="custom") [load_at_startup] diff --git a/src/views/dialogs/configuration.py b/src/views/dialogs/configuration.py index 5b55748..774e93d 100644 --- a/src/views/dialogs/configuration.py +++ b/src/views/dialogs/configuration.py @@ -46,10 +46,6 @@ class chat(wx.Panel, widgetUtils.BaseDialog): sizer.Add(self.notify_online, 0, wx.ALL, 5) self.notify_offline = wx.CheckBox(self, wx.NewId(), _("Show notifications when users are offline")) sizer.Add(self.notify_offline, 0, wx.ALL, 5) - self.open_unread_conversations = wx.CheckBox(self, wx.NewId(), _("Open unread conversations at startup")) - sizer.Add(self.open_unread_conversations, 0, wx.ALL, 5) - self.automove_to_conversations = wx.CheckBox(self, wx.NewId(), _("Move focus to new conversations")) - sizer.Add(self.automove_to_conversations, 0, wx.ALL, 5) lbl = wx.StaticText(self, wx.NewId(), _("Notification type")) self.notifications = wx.ComboBox(self, wx.NewId(), choices=[_("Native"), _("Custom"),], value=_("Native"), style=wx.CB_READONLY) nbox = wx.BoxSizer(wx.HORIZONTAL)