Drop icon resource and use any available info icon from the system th…

…eme instead
ztefn · Sep 4, 2024 · c77d9f5 · c77d9f5
1 parent eb2744b
commit c77d9f5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/data/com.github.ztefn.haguichi.gresource.xml b/data/com.github.ztefn.haguichi.gresource.xml
@@ -25,7 +25,4 @@
     <file preprocess="xml-stripblanks">ui/widgets/sidebar-page.ui</file>
     <file preprocess="xml-stripblanks">ui/window.ui</file>
   </gresource>
-  <gresource prefix="/com/github/ztefn/haguichi/icons/scalable/actions">
-    <file preprocess="xml-stripblanks">info-symbolic.svg</file>
-  </gresource>
 </gresources>
diff --git a/data/icons/resource/info-symbolic.svg b/data/icons/resource/info-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
@@ -52,7 +52,7 @@ test('Validate schema file', compile_schemas,
 
 resources = gnome.compile_resources(app_name.to_lower() + '-resources', app_id + '.gresource.xml',
       c_name: app_name.to_lower(),
-  source_dir: ['icons/resource', 'stylesheets']
+  source_dir: ['stylesheets']
 )
 
 subdir('icons')
diff --git a/data/ui/widgets/command-entry-row.ui b/data/ui/widgets/command-entry-row.ui
@@ -2,8 +2,7 @@
 <interface>
   <template class="HaguichiCommandEntryRow" parent="AdwEntryRow">
     <child type="suffix">
-      <object class="GtkMenuButton">
-        <property name="icon-name">info-symbolic</property>
+      <object class="GtkMenuButton" id="menu_button">
         <property name="tooltip-text" translatable="yes">Command Variables</property>
         <property name="valign">center</property>
         <property name="popover">

diff --git a/src/widgets/command-entry-row.vala b/src/widgets/command-entry-row.vala
@@ -13,6 +13,9 @@
 namespace Haguichi {
     [GtkTemplate (ui = "/com/github/ztefn/haguichi/ui/widgets/command-entry-row.ui")]
     public class CommandEntryRow : Adw.EntryRow {
+        [GtkChild]
+        public unowned Gtk.MenuButton menu_button;
+
         [GtkChild]
         public unowned CommandVariableBox address_var;
         [GtkChild]
@@ -25,5 +28,13 @@ namespace Haguichi {
         public unowned CommandVariableBox file_manager_var;
         [GtkChild]
         public unowned CommandVariableBox remote_desktop_var;
+
+        construct {
+            menu_button.icon_name = Utils.get_available_theme_icon ({
+                "info-symbolic",
+                "help-info-symbolic",
+                "help-about-symbolic"
+            });
+        }
     }
 }