Philipp Hörist pushed to branch master at gajim / gajim
Commits:
dd39067e by Philipp Hörist at 2017-09-29T02:40:01+02:00
Allow Plugins to use other dialogs
- - - - -
b9aba06f by Philipp Hörist at 2017-09-29T02:41:03+02:00
Remove unused variables
- - - - -
83f4d6e1 by Philipp Hörist at 2017-09-29T02:43:29+02:00
OptionsDialog: Destroy dialog on ESC
- - - - -
2 changed files:
- gajim/options_dialog.py
- gajim/plugins/gui.py
Changes:
=====================================
gajim/options_dialog.py
=====================================
--- a/gajim/options_dialog.py
+++ b/gajim/options_dialog.py
@@ -35,6 +35,11 @@ class OptionsDialog(Gtk.ApplicationWindow):
self.show_all()
self.listbox.connect('row-activated', self.on_row_activated)
+ self.connect('key-press-event', self.on_key_press)
+
+ def on_key_press(self, widget, event):
+ if event.keyval == Gdk.KEY_Escape:
+ self.destroy()
@staticmethod
def on_row_activated(listbox, row):
=====================================
gajim/plugins/gui.py
=====================================
--- a/gajim/plugins/gui.py
+++ b/gajim/plugins/gui.py
@@ -135,9 +135,6 @@ class PluginsWindow(object):
model, iter = treeview_selection.get_selected()
if iter:
plugin = model.get_value(iter, Column.PLUGIN)
- plugin_name = model.get_value(iter, Column.NAME)
- is_active = model.get_value(iter, Column.ACTIVE)
-
self._display_installed_plugin_info(plugin)
else:
self._clear_installed_plugin_info()
@@ -236,11 +233,11 @@ class PluginsWindow(object):
model, iter = selection.get_selected()
if iter:
plugin = model.get_value(iter, Column.PLUGIN)
- plugin_name = model.get_value(iter, Column.NAME)
- is_active = model.get_value(iter, Column.ACTIVE)
-
- result = plugin.config_dialog.run(self.window)
+ if isinstance(plugin.config_dialog, GajimPluginConfigDialog):
+ plugin.config_dialog.run(self.window)
+ else:
+ plugin.config_dialog(self.window)
else:
# No plugin selected. this should never be reached. As configure
@@ -254,8 +251,6 @@ class PluginsWindow(object):
model, iter = selection.get_selected()
if iter:
plugin = model.get_value(iter, Column.PLUGIN)
- plugin_name = model.get_value(iter, Column.NAME)
- is_active = model.get_value(iter, Column.ACTIVE)
try:
app.plugin_manager.remove_plugin(plugin)
except PluginsystemError as e:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/69248b2fe7bd01c5981154d6c8c1bae3105da053...83f4d6e191c9be2b6603f169284e7be442c9c40c
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/69248b2fe7bd01c5981154d6c8c1bae3105da053...83f4d6e191c9be2b6603f169284e7be442c9c40c
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
