Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits:
-
6cb6c5d2
by wurstsalat at 2021-10-03T18:15:29+02:00
-
181c53ea
by wurstsalat at 2021-10-03T18:15:34+02:00
3 changed files:
Changes:
| ... | ... | @@ -85,7 +85,6 @@ class _ACCOUNT_DEFAULT: |
| 85 | 85 |
'muc_highlight_words': '',
|
| 86 | 86 |
'muc_prefer_direct_msg': True,
|
| 87 | 87 |
'show_status_msgs_in_roster': True,
|
| 88 |
- 'show_avatars_in_roster': True,
|
|
| 89 | 88 |
'avatar_position_in_roster': 'right',
|
| 90 | 89 |
'print_status_in_chats': False,
|
| 91 | 90 |
'log_contact_status_changes': False,
|
| ... | ... | @@ -55,34 +55,6 @@ |
| 55 | 55 |
<property name="position">0</property>
|
| 56 | 56 |
</packing>
|
| 57 | 57 |
</child>
|
| 58 |
- <child>
|
|
| 59 |
- <object class="GtkGrid" id="contact_list">
|
|
| 60 |
- <property name="visible">True</property>
|
|
| 61 |
- <property name="can_focus">False</property>
|
|
| 62 |
- <property name="orientation">vertical</property>
|
|
| 63 |
- <property name="row_spacing">12</property>
|
|
| 64 |
- <child>
|
|
| 65 |
- <object class="GtkLabel">
|
|
| 66 |
- <property name="visible">True</property>
|
|
| 67 |
- <property name="can_focus">False</property>
|
|
| 68 |
- <property name="label" translatable="yes">Contact List Appearance</property>
|
|
| 69 |
- <property name="xalign">0</property>
|
|
| 70 |
- <style>
|
|
| 71 |
- <class name="bold"/>
|
|
| 72 |
- </style>
|
|
| 73 |
- </object>
|
|
| 74 |
- <packing>
|
|
| 75 |
- <property name="left_attach">0</property>
|
|
| 76 |
- <property name="top_attach">0</property>
|
|
| 77 |
- </packing>
|
|
| 78 |
- </child>
|
|
| 79 |
- </object>
|
|
| 80 |
- <packing>
|
|
| 81 |
- <property name="expand">False</property>
|
|
| 82 |
- <property name="fill">True</property>
|
|
| 83 |
- <property name="position">1</property>
|
|
| 84 |
- </packing>
|
|
| 85 |
- </child>
|
|
| 86 | 58 |
<child>
|
| 87 | 59 |
<placeholder/>
|
| 88 | 60 |
</child>
|
| ... | ... | @@ -462,34 +434,6 @@ |
| 462 | 434 |
<property name="position">1</property>
|
| 463 | 435 |
</packing>
|
| 464 | 436 |
</child>
|
| 465 |
- <child>
|
|
| 466 |
- <object class="GtkGrid" id="status_icon">
|
|
| 467 |
- <property name="visible">True</property>
|
|
| 468 |
- <property name="can_focus">False</property>
|
|
| 469 |
- <property name="orientation">vertical</property>
|
|
| 470 |
- <property name="row_spacing">12</property>
|
|
| 471 |
- <child>
|
|
| 472 |
- <object class="GtkLabel">
|
|
| 473 |
- <property name="visible">True</property>
|
|
| 474 |
- <property name="can_focus">False</property>
|
|
| 475 |
- <property name="label" translatable="yes">Status Icon</property>
|
|
| 476 |
- <property name="xalign">0</property>
|
|
| 477 |
- <style>
|
|
| 478 |
- <class name="bold"/>
|
|
| 479 |
- </style>
|
|
| 480 |
- </object>
|
|
| 481 |
- <packing>
|
|
| 482 |
- <property name="left_attach">0</property>
|
|
| 483 |
- <property name="top_attach">0</property>
|
|
| 484 |
- </packing>
|
|
| 485 |
- </child>
|
|
| 486 |
- </object>
|
|
| 487 |
- <packing>
|
|
| 488 |
- <property name="expand">False</property>
|
|
| 489 |
- <property name="fill">True</property>
|
|
| 490 |
- <property name="position">2</property>
|
|
| 491 |
- </packing>
|
|
| 492 |
- </child>
|
|
| 493 | 437 |
</object>
|
| 494 | 438 |
</child>
|
| 495 | 439 |
</object>
|
| ... | ... | @@ -37,7 +37,6 @@ |
| 37 | 37 |
from .settings import SettingsDialog
|
| 38 | 38 |
from .sidebar_switcher import SideBarSwitcher
|
| 39 | 39 |
from .video_preview import VideoPreview
|
| 40 |
-from .util import get_available_iconsets
|
|
| 41 | 40 |
from .util import open_window
|
| 42 | 41 |
from .util import get_app_window
|
| 43 | 42 |
from .util import get_builder
|
| ... | ... | @@ -74,7 +73,6 @@ def __init__(self): |
| 74 | 73 |
|
| 75 | 74 |
prefs = [
|
| 76 | 75 |
('window_behaviour', WindowBehaviour),
|
| 77 |
- ('contact_list', ContactList),
|
|
| 78 | 76 |
('chats', Chats),
|
| 79 | 77 |
('group_chats', GroupChats),
|
| 80 | 78 |
('file_preview', FilePreview),
|
| ... | ... | @@ -84,7 +82,6 @@ def __init__(self): |
| 84 | 82 |
('automatic_status', AutomaticStatus),
|
| 85 | 83 |
('themes', Themes),
|
| 86 | 84 |
('emoji', Emoji),
|
| 87 |
- ('status_icon', StatusIcon),
|
|
| 88 | 85 |
('server', Server),
|
| 89 | 86 |
('audio', Audio),
|
| 90 | 87 |
('video', Video),
|
| ... | ... | @@ -189,28 +186,6 @@ def __init__(self, *args): |
| 189 | 186 |
PreferenceBox.__init__(self, settings)
|
| 190 | 187 |
|
| 191 | 188 |
|
| 192 |
-class ContactList(PreferenceBox):
|
|
| 193 |
- def __init__(self, *args):
|
|
| 194 |
- |
|
| 195 |
- # TODO: Evaluate settings (and connect them)
|
|
| 196 |
- |
|
| 197 |
- settings = [
|
|
| 198 |
- Setting(SettingKind.SWITCH,
|
|
| 199 |
- _('Show Avatars'),
|
|
| 200 |
- SettingType.CONFIG,
|
|
| 201 |
- 'show_avatars_in_roster',
|
|
| 202 |
- callback=self._on_show_avatar_in_roster_changed),
|
|
| 203 |
- ]
|
|
| 204 |
- |
|
| 205 |
- PreferenceBox.__init__(self, settings)
|
|
| 206 |
- |
|
| 207 |
- @staticmethod
|
|
| 208 |
- def _on_show_avatar_in_roster_changed(*args):
|
|
| 209 |
- # TODO
|
|
| 210 |
- # app.interface.roster.setup_and_draw_roster()
|
|
| 211 |
- pass
|
|
| 212 |
- |
|
| 213 |
- |
|
| 214 | 189 |
class Chats(PreferenceBox):
|
| 215 | 190 |
def __init__(self, *args):
|
| 216 | 191 |
|
| ... | ... | @@ -714,33 +689,6 @@ def _toggle_emoticons(): |
| 714 | 689 |
ctrl.toggle_emoticons()
|
| 715 | 690 |
|
| 716 | 691 |
|
| 717 |
-class StatusIcon(PreferenceBox):
|
|
| 718 |
- def __init__(self, *args):
|
|
| 719 |
- |
|
| 720 |
- # TODO: Remove this section completely?
|
|
| 721 |
- |
|
| 722 |
- iconset_items = []
|
|
| 723 |
- for _index, iconset_name in enumerate(get_available_iconsets()):
|
|
| 724 |
- iconset_items.append(iconset_name)
|
|
| 725 |
- |
|
| 726 |
- settings = [
|
|
| 727 |
- Setting(SettingKind.POPOVER,
|
|
| 728 |
- _('Status Icon Set'),
|
|
| 729 |
- SettingType.CONFIG,
|
|
| 730 |
- 'iconset',
|
|
| 731 |
- props={'entries': iconset_items},
|
|
| 732 |
- callback=self._on_iconset_changed),
|
|
| 733 |
- ]
|
|
| 734 |
- |
|
| 735 |
- PreferenceBox.__init__(self, settings)
|
|
| 736 |
- |
|
| 737 |
- @staticmethod
|
|
| 738 |
- def _on_iconset_changed(*args):
|
|
| 739 |
- # TODO:
|
|
| 740 |
- # app.interface.roster.update_icons()
|
|
| 741 |
- pass
|
|
| 742 |
- |
|
| 743 |
- |
|
| 744 | 692 |
class Server(PreferenceBox):
|
| 745 | 693 |
def __init__(self, *args):
|
| 746 | 694 |
|