Daniel Brötzmann pushed to branch mainwindow at gajim / gajim

Commits: 6cb6c5d2 by wurstsalat at 2021-10-03T18:15:29+02:00 Preferences: Remove iconset setting

- - - - - 181c53ea by wurstsalat at 2021-10-03T18:15:34+02:00 Settings: Remove show_avatars_in_roster

- - - - -

3 changed files:

- gajim/common/setting_values.py - gajim/data/gui/preferences.ui - gajim/gtk/preferences.py

Changes:

===================================== gajim/common/setting_values.py ===================================== @@ -85,7 +85,6 @@ class _ACCOUNT_DEFAULT: 'muc_highlight_words': '', 'muc_prefer_direct_msg': True, 'show_status_msgs_in_roster': True, - 'show_avatars_in_roster': True, 'avatar_position_in_roster': 'right', 'print_status_in_chats': False, 'log_contact_status_changes': False,

===================================== gajim/data/gui/preferences.ui ===================================== @@ -55,34 +55,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkGrid" id="contact_list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="row_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Contact List Appearance</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> <child> <placeholder/> </child> @@ -462,34 +434,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkGrid" id="status_icon"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="row_spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Status Icon</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object>

===================================== gajim/gtk/preferences.py ===================================== @@ -37,7 +37,6 @@ from .settings import SettingsDialog from .sidebar_switcher import SideBarSwitcher from .video_preview import VideoPreview -from .util import get_available_iconsets from .util import open_window from .util import get_app_window from .util import get_builder @@ -74,7 +73,6 @@ def __init__(self):

prefs = [ ('window_behaviour', WindowBehaviour), - ('contact_list', ContactList), ('chats', Chats), ('group_chats', GroupChats), ('file_preview', FilePreview), @@ -84,7 +82,6 @@ def __init__(self): ('automatic_status', AutomaticStatus), ('themes', Themes), ('emoji', Emoji), - ('status_icon', StatusIcon), ('server', Server), ('audio', Audio), ('video', Video), @@ -189,28 +186,6 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings)

-class ContactList(PreferenceBox): - def __init__(self, *args): - - # TODO: Evaluate settings (and connect them) - - settings = [ - Setting(SettingKind.SWITCH, - _('Show Avatars'), - SettingType.CONFIG, - 'show_avatars_in_roster', - callback=self._on_show_avatar_in_roster_changed), - ] - - PreferenceBox.__init__(self, settings) - - @staticmethod - def _on_show_avatar_in_roster_changed(*args): - # TODO - # app.interface.roster.setup_and_draw_roster() - pass - - class Chats(PreferenceBox): def __init__(self, *args):

@@ -714,33 +689,6 @@ def _toggle_emoticons(): ctrl.toggle_emoticons()

-class StatusIcon(PreferenceBox): - def __init__(self, *args): - - # TODO: Remove this section completely? - - iconset_items = [] - for _index, iconset_name in enumerate(get_available_iconsets()): - iconset_items.append(iconset_name) - - settings = [ - Setting(SettingKind.POPOVER, - _('Status Icon Set'), - SettingType.CONFIG, - 'iconset', - props={'entries': iconset_items}, - callback=self._on_iconset_changed), - ] - - PreferenceBox.__init__(self, settings) - - @staticmethod - def _on_iconset_changed(*args): - # TODO: - # app.interface.roster.update_icons() - pass - - class Server(PreferenceBox): def __init__(self, *args):

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f32d4388115c82b141cf4cc031b505e6...