Daniel Brötzmann pushed to branch gtk4 at gajim / gajim
Commits:
a1263aa9 by wurstsalat at 2024-10-04T13:49:54+02:00
fix mam preferences dialog
- - - - -
2 changed files:
- gajim/data/gui/mam_preferences.ui
- gajim/gtk/mam_preferences.py
Changes:
=====================================
gajim/data/gui/mam_preferences.ui
=====================================
@@ -30,7 +30,6 @@
<object class="GtkBox" id="mam_box">
<property name="width_request">400</property>
<property name="height_request">300</property>
- <property name="border_width">18</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
@@ -72,7 +71,6 @@
<object class="GtkScrolledWindow">
<property name="height_request">150</property>
<property name="focusable">1</property>
- <property name="shadow_type">in</property>
<property name="child">
<object class="GtkTreeView" id="pref_view">
<property name="focusable">1</property>
@@ -129,7 +127,6 @@
<object class="GtkBox">
<property name="css-classes">toolbar</property>
<property name="can_focus">0</property>
- <property name="icon_size">4</property>
<child>
<object class="GtkButton" id="add">
<property name="can_focus">0</property>
=====================================
gajim/gtk/mam_preferences.py
=====================================
@@ -29,26 +29,25 @@ def __init__(self, account: str) -> None:
Gtk.ApplicationWindow.__init__(self)
EventHelper.__init__(self)
self.set_application(app.app)
- self.set_position(Gtk.WindowPosition.CENTER)
self.set_show_menubar(False)
self.set_title(_('Archiving Preferences for %s') % account)
- self.connect_after('key-press-event', self._on_key_press)
+ controller = Gtk.EventControllerKey()
+ controller.connect_after('key-pressed', self._on_key_pressed)
+ self.add_controller(controller)
self.account = account
self._client = app.get_client(account)
self._destroyed = False
self._ui = get_builder('mam_preferences.ui', self)
- self.add(self._ui.mam_box)
+ self.set_child(self._ui.mam_box)
self._spinner = Gtk.Spinner()
self._ui.overlay.add_overlay(self._spinner)
self._set_mam_box_state(False)
self.connect('destroy', self._on_destroy)
- self._ui.connect_signals(self)
- self.show_all()
self._activate_spinner()
@@ -156,8 +155,14 @@ def _disable_spinner(self) -> None:
self._spinner.hide()
self._spinner.stop()
- def _on_key_press(self,
- _widget: MamPreferences,
- event: Any) -> None:
- if event.keyval == Gdk.KEY_Escape:
+ def _on_key_pressed(
+ self,
+ _event_controller_key: Gtk.EventControllerKey,
+ keyval: int,
+ _keycode: int,
+ _state: Gdk.ModifierType
+ ) -> bool:
+ if keyval == Gdk.KEY_Escape:
self.destroy()
+ return True
+ return False
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a1263aa90127d041c12af3ddbe003d79dd1cec48
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a1263aa90127d041c12af3ddbe003d79dd1cec48
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
