Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
4f5f110e
by lovetox at 2020-08-31T21:38:38+02:00
2 changed files:
Changes:
| ... | ... | @@ -585,8 +585,6 @@ class GenericSettingPage(Gtk.Box): |
| 585 | 585 |
|
| 586 | 586 |
self.pack_end(self.listbox, True, True, 0)
|
| 587 | 587 |
|
| 588 |
- self.listbox.connect('row-activated', self.on_row_activated)
|
|
| 589 |
- |
|
| 590 | 588 |
def connect_signal(self, stack):
|
| 591 | 589 |
return stack.connect('notify::visible-child',
|
| 592 | 590 |
self._on_visible_child_changed)
|
| ... | ... | @@ -595,10 +593,6 @@ class GenericSettingPage(Gtk.Box): |
| 595 | 593 |
if self == stack.get_visible_child():
|
| 596 | 594 |
self.listbox.update_states()
|
| 597 | 595 |
|
| 598 |
- @staticmethod
|
|
| 599 |
- def on_row_activated(_listbox, row):
|
|
| 600 |
- row.on_row_activated()
|
|
| 601 |
- |
|
| 602 | 596 |
|
| 603 | 597 |
class GeneralPage(GenericSettingPage):
|
| 604 | 598 |
|
| ... | ... | @@ -61,17 +61,12 @@ class SettingsDialog(Gtk.ApplicationWindow): |
| 61 | 61 |
self.add(self.listbox)
|
| 62 | 62 |
|
| 63 | 63 |
self.show_all()
|
| 64 |
- self.listbox.connect('row-activated', self.on_row_activated)
|
|
| 65 | 64 |
self.connect('key-press-event', self.on_key_press)
|
| 66 | 65 |
|
| 67 | 66 |
def on_key_press(self, _widget, event):
|
| 68 | 67 |
if event.keyval == Gdk.KEY_Escape:
|
| 69 | 68 |
self.destroy()
|
| 70 | 69 |
|
| 71 |
- @staticmethod
|
|
| 72 |
- def on_row_activated(_listbox, row):
|
|
| 73 |
- row.on_row_activated()
|
|
| 74 |
- |
|
| 75 | 70 |
def get_setting(self, name):
|
| 76 | 71 |
return self.listbox.get_setting(name)
|
| 77 | 72 |
|
| ... | ... | @@ -105,6 +100,12 @@ class SettingsBox(Gtk.ListBox): |
| 105 | 100 |
for setting, callback in extend:
|
| 106 | 101 |
self.map[setting] = callback
|
| 107 | 102 |
|
| 103 |
+ self.listbox.connect('row-activated', self.on_row_activated)
|
|
| 104 |
+ |
|
| 105 |
+ @staticmethod
|
|
| 106 |
+ def on_row_activated(_listbox, row):
|
|
| 107 |
+ row.on_row_activated()
|
|
| 108 |
+ |
|
| 108 | 109 |
def add_setting(self, setting):
|
| 109 | 110 |
if not isinstance(setting, Gtk.ListBoxRow):
|
| 110 | 111 |
if setting.props is not None:
|