Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
b764b510 by wurstsalat at 2022-05-28T21:01:20+02:00
imprv: SideBarSwitcher: Add width parameter
- - - - -
661a3025 by wurstsalat at 2022-05-28T21:01:45+02:00
imprv: Unify ContactInfo and GroupchatDetails elements width
- - - - -
6 changed files:
- gajim/data/gui/contact_info.ui
- gajim/gtk/contact_info.py
- gajim/gtk/contact_settings.py
- gajim/gtk/groupchat_details.py
- gajim/gtk/groupchat_settings.py
- gajim/gtk/sidebar_switcher.py
Changes:
=====================================
gajim/data/gui/contact_info.ui
=====================================
@@ -409,6 +409,9 @@
</child>
</object>
</child>
+ <style>
+ <class name="padding-18"/>
+ </style>
</object>
<packing>
<property name="name">information</property>
@@ -711,6 +714,9 @@
</child>
</object>
</child>
+ <style>
+ <class name="padding-18"/>
+ </style>
</object>
<packing>
<property name="name">settings</property>
=====================================
gajim/gtk/contact_info.py
=====================================
@@ -93,7 +93,7 @@ def __init__(self,
self._tasks: list[Task] = []
self._devices: dict[str, DeviceGrid] = {}
- self._switcher = SideBarSwitcher()
+ self._switcher = SideBarSwitcher(width=250)
self._switcher.set_stack(self._ui.main_stack, rows_visible=False)
self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1)
self._ui.main_stack.connect('notify::visible-child-name',
=====================================
gajim/gtk/contact_settings.py
=====================================
@@ -27,9 +27,9 @@
class ContactSettings(SettingsBox):
def __init__(self, account: str, jid: JID) -> None:
SettingsBox.__init__(self, account, str(jid))
-
self.get_style_context().add_class('settings-border')
self.set_selection_mode(Gtk.SelectionMode.NONE)
+ self.set_size_request(700, -1)
self.set_valign(Gtk.Align.START)
self.set_halign(Gtk.Align.CENTER)
=====================================
gajim/gtk/groupchat_details.py
=====================================
@@ -62,7 +62,7 @@ def __init__(self,
self._ui = get_builder('groupchat_details.ui')
self._ui.connect_signals(self)
- self._switcher = SideBarSwitcher()
+ self._switcher = SideBarSwitcher(width=250)
self._switcher.set_stack(self._ui.main_stack)
self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1)
self._ui.main_stack.connect('notify::visible-child-name',
@@ -148,6 +148,7 @@ def _add_groupchat_info(self) -> None:
def _add_groupchat_settings(self) -> None:
main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=24)
+ main_box.get_style_context().add_class('padding-18')
settings_box = GroupChatSettings(self.account, self._contact.jid)
main_box.add(settings_box)
=====================================
gajim/gtk/groupchat_settings.py
=====================================
@@ -27,9 +27,9 @@
class GroupChatSettings(SettingsBox):
def __init__(self, account: str, jid: JID) -> None:
SettingsBox.__init__(self, account, str(jid))
-
self.get_style_context().add_class('settings-border')
self.set_selection_mode(Gtk.SelectionMode.NONE)
+ self.set_size_request(700, -1)
self.set_valign(Gtk.Align.START)
self.set_halign(Gtk.Align.CENTER)
=====================================
gajim/gtk/sidebar_switcher.py
=====================================
@@ -23,10 +23,12 @@
class SideBarSwitcher(Gtk.ListBox):
- def __init__(self):
+ def __init__(self, width: Optional[int] = None) -> None:
Gtk.ListBox.__init__(self)
self.set_vexpand(True)
self.get_style_context().add_class('settings-menu')
+ if width is not None:
+ self.set_size_request(width, -1)
self.connect('row-activated', self._on_row_activated)
self._stack = cast(Gtk.Stack, None)
self._rows: dict[str, Row] = {}
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/061c999533cd4b7c1ccdae99e06dda82ab2f7ac1...661a3025f364cf2ba4fbc351ef50e15941fdae41
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/061c999533cd4b7c1ccdae99e06dda82ab2f7ac1...661a3025f364cf2ba4fbc351ef50e15941fdae41
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
