Daniel Brötzmann pushed to branch gtk4 at gajim / gajim
Commits:
0550b37b by wurstsalat at 2024-10-06T13:01:01+02:00
refactor: Use GajimAppWindow in PluginsWindow
- - - - -
1 changed file:
- gajim/gtk/plugins.py
Changes:
=====================================
gajim/gtk/plugins.py
=====================================
@@ -35,6 +35,7 @@
from gajim.gtk.filechoosers import ArchiveChooserDialog
from gajim.gtk.util import EventHelper
from gajim.gtk.util import load_icon_pixbuf
+from gajim.gtk.widgets import GajimAppWindow
log = logging.getLogger('gajim.gtk.plugins')
@@ -53,15 +54,16 @@ class Column(IntEnum):
MANIFEST = 9
-class PluginsWindow(Gtk.ApplicationWindow, EventHelper):
+class PluginsWindow(GajimAppWindow, EventHelper):
def __init__(self) -> None:
- Gtk.ApplicationWindow.__init__(self)
- EventHelper.__init__(self)
+ GajimAppWindow.__init__(
+ self,
+ name='PluginsWindow',
+ title=_('Plugins'),
+ default_height=500
+ )
- self.set_application(app.app)
- self.set_default_size(650, 500)
- self.set_show_menubar(False)
- self.set_title(_('Plugins'))
+ EventHelper.__init__(self)
self._ui = get_builder('plugins.ui', self)
self.set_child(self._ui.plugins_box)
@@ -86,7 +88,6 @@ def __init__(self) -> None:
self._load_repository_manifests()
self.connect('destroy', self._on_destroy)
- # self.connect('key-press-event', self._on_key_press) TODO GTK4
self.register_events([
('plugin-removed', ged.GUI1, self._on_plugin_removed),
@@ -100,8 +101,6 @@ def __init__(self) -> None:
app.plugin_repository.connect('download-failed',
self._on_download_failed)
- self.show()
-
def _on_render_enabled_cell(self,
_tree_column: Gtk.TreeViewColumn,
cell: Gtk.CellRendererToggle,
@@ -128,8 +127,8 @@ def _on_query_tooltip(self,
tooltip: Gtk.Tooltip) -> bool:
context = treeview.get_tooltip_context(x_coord, y_coord, keyboard_mode)
- has_row, _x, _y, model, _path, iter_ = context
- if not has_row or model is None:
+ has_row, model, _path, iter_ = context
+ if not has_row:
return False
row = model[iter_]
@@ -148,13 +147,9 @@ def _on_query_tooltip(self,
tooltip.set_text(plugin.available_text)
else:
tooltip.set_text(row[Column.ERROR_TEXT])
- return True
-
- return False
+ return Gdk.EVENT_STOP
- def _on_key_press(self, _widget: Gtk.Widget, event: Any) -> None:
- if event.keyval == Gdk.KEY_Escape:
- self.destroy()
+ return Gdk.EVENT_PROPAGATE
def _on_destroy(self, *args: Any) -> None:
self._ui.enabled_renderer.run_dispose()
@@ -332,7 +327,7 @@ def _on_configure_plugin(self, _button: Gtk.Button) -> None:
assert plugin is not None
plugin.config_dialog(self) # pyright: ignore
- def _on_uninstall_plugin(self, _button: Gtk.ToolButton) -> None:
+ def _on_uninstall_plugin(self, _button: Gtk.Button) -> None:
selection = self._ui.plugins_treeview.get_selection()
model, iter_ = selection.get_selected()
if not iter_:
@@ -382,7 +377,7 @@ def _on_download_clicked(self, _button: Gtk.Button) -> None:
manifest = row[Column.MANIFEST]
app.plugin_repository.download_plugins([manifest])
- def _on_install_plugin_from_zip(self, _button: Gtk.ToolButton) -> None:
+ def _on_install_plugin_from_zip(self, _button: Gtk.Button) -> None:
def _show_warn_dialog() -> None:
text = _('Archive is malformed')
WarningDialog(text, transient_for=self)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0550b37b2383677e692b28c3f6e9dc48d37b1f7e
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/0550b37b2383677e692b28c3f6e9dc48d37b1f7e
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]
