[Git][gajim/gajim][gtk4] refactor: Plugins: Fix buttons order, icons, and hide correctly

[@wurstsalat]

Daniel Brötzmann pushed to branch gtk4 at gajim / gajim


Commits:
bb1243c0 by wurstsalat at 2024-10-30T23:06:19+01:00
refactor: Plugins: Fix buttons order, icons, and hide correctly

- - - - -


2 changed files:

- gajim/data/gui/plugins.ui
- gajim/gtk/plugins.py


Changes:

=====================================
gajim/data/gui/plugins.ui
=====================================
@@ -141,19 +141,19 @@
             <property name="css-classes">toolbar</property>
             <property name="can-focus">0</property>
             <child>
-              <object class="GtkButton" id="uninstall_plugin_button">
+              <object class="GtkButton" id="download_button">
                 <property name="can-focus">0</property>
-                <property name="tooltip-text" translatable="1">Uninstall 
Plugin</property>
+                <property name="halign">end</property>
                 <property name="use-underline">1</property>
-                <property name="icon-name">edit-delete-symbolic</property>
+                <property name="icon-name">folder-download-symbolic</property>
               </object>
             </child>
             <child>
-              <object class="GtkButton" id="download_button">
+              <object class="GtkButton" id="uninstall_plugin_button">
                 <property name="can-focus">0</property>
-                <property name="halign">end</property>
+                <property name="tooltip-text" translatable="1">Uninstall 
Plugin</property>
                 <property name="use-underline">1</property>
-                <property name="icon-name">folder-download-symbolic</property>
+                <property name="icon-name">edit-delete-symbolic</property>
               </object>
             </child>
             <child>
@@ -162,7 +162,8 @@
                 <property name="tooltip-text" translatable="1">Click to view 
Gajim&apos;s wiki page on how to install plugins in Flatpak.</property>
                 <property name="label" translatable="1">help</property>
                 <property name="use-underline">1</property>
-                <property name="icon-name">help-faq-symbolic</property>
+                <property name="visible">0</property>
+                <property name="icon-name">help-about-symbolic</property>
               </object>
             </child>
             <style>


=====================================
gajim/gtk/plugins.py
=====================================
@@ -11,14 +11,16 @@
 from enum import unique
 from pathlib import Path
 
-from gi.repository import Gdk, Gio
+from gi.repository import Gdk
 from gi.repository import GdkPixbuf
+from gi.repository import Gio
 from gi.repository import Gtk
 
 from gajim.common import app
 from gajim.common import configpaths
 from gajim.common import ged
 from gajim.common.exceptions import PluginsystemError
+from gajim.common.ged import EventHelper
 from gajim.common.i18n import _
 from gajim.common.types import PluginRepositoryT
 from gajim.common.util.uri import open_uri
@@ -31,7 +33,6 @@
 from gajim.gtk.dialogs import ConfirmationDialog
 from gajim.gtk.dialogs import DialogButton
 from gajim.gtk.dialogs import WarningDialog
-from gajim.common.ged import EventHelper
 from gajim.gtk.filechoosers import FileChooserButton
 from gajim.gtk.filechoosers import Filter
 from gajim.gtk.widgets import GajimAppWindow
@@ -67,7 +68,7 @@ def __init__(self) -> None:
         self._ui = get_builder('plugins.ui')
         self.set_child(self._ui.plugins_box)
 
-        file_chooser_button = FileChooserButton(
+        self._file_chooser_button = FileChooserButton(
             filters=[
                 Filter(name=_('All files'), patterns=['*']),
                 Filter(name=_('ZIP files'), patterns=['*.zip'], default=True)
@@ -75,14 +76,17 @@ def __init__(self) -> None:
             tooltip=_('Install Plugin from ZIP-File'),
             icon_name='system-software-install-symbolic',
         )
-        self._connect(file_chooser_button, 'path-picked', 
self._on_install_plugin_from_zip)
-        self._ui.toolbar.prepend(file_chooser_button)
+        self._connect(
+            self._file_chooser_button, 'path-picked', 
self._on_install_plugin_from_zip
+        )
+        self._ui.toolbar.prepend(self._file_chooser_button)
+        self._ui.toolbar.reorder_child_after(self._ui.download_button)
 
         if app.is_flatpak():
             self._ui.help_button.show()
             self._ui.download_button.set_visible(False)
             self._ui.uninstall_plugin_button.set_visible(False)
-            self._ui.install_from_zip_button.set_visible(False)
+            self._file_chooser_button.set_visible(False)
 
         self._ui.liststore.set_sort_column_id(Column.NAME,
                                               Gtk.SortType.ASCENDING)



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/bb1243c02943f3ecb0188f9f559e989e12be3e90

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/bb1243c02943f3ecb0188f9f559e989e12be3e90
You're receiving this email because of your account on dev.gajim.org.



_______________________________________________
Commits mailing list -- commits@gajim.org
To unsubscribe send an email to commits-le...@gajim.org