* - GResource the custom icons

lainsce · Jul 20, 2018 · 6364189 · 6364189
1 parent 3a43199
commit 6364189
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/data/app.gresource.xml b/data/app.gresource.xml
@@ -5,5 +5,7 @@
         <file alias="app-stylesheet.css" compressed="true">styles/app-stylesheet.css</file>
         <file alias="app-stylesheet-dark.css" compressed="true">styles/app-stylesheet-dark.css</file>
         <file alias="app-stylesheet-sepia.css" compressed="true">styles/app-stylesheet-sepia.css</file>
+        <file alias="set-font.svg">icons/24/set-font.svg</file>
+        <file alias="mode-change-symbolic.svg">icons/symbolic/mode-change-symbolic.svg</file>
     </gresource>
-</gresources>
+</gresources>
diff --git a/data/meson.build b/data/meson.build
@@ -14,21 +14,6 @@ foreach i : icon_sizes
     )
 endforeach
 
-install_data(
-    join_paths('icons', 'symbolic', 'mode-change-symbolic.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps')
-)
-
-install_data(
-    join_paths('icons', '24', 'set-font.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '24x24', 'apps')
-)
-
-install_data(
-    join_paths('icons', '24', 'set-font.svg'),
-    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '24x24@2', 'apps')
-)
-
 install_data(
     meson.project_name() + '.gschema.xml',
     install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -138,6 +138,9 @@ namespace Quilter {
                     height_request: 600,
                     width_request: 700);
 
+            weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
+            default_theme.add_resource_path ("/com/github/lainsce/quilter");
+
             statusbar.update_wordcount ();
             statusbar.update_linecount ();
             statusbar.update_readtimecount ();

diff --git a/src/Widgets/Preferences.vala b/src/Widgets/Preferences.vala
@@ -168,6 +168,9 @@ namespace Quilter.Widgets {
         }
 
         private Gtk.Widget get_interface_grid () {
+            weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
+            default_theme.add_resource_path ("/com/github/lainsce/quilter");
+
             var main_settings = AppSettings.get_default ();
             var interface_grid = new Gtk.Grid ();
             interface_grid.row_spacing = 6;
@@ -177,9 +180,7 @@ namespace Quilter.Widgets {
 
             var mode_header = new Granite.HeaderLabel (_("Modes"));
             var color_button_light = new Gtk.Button ();
-            var color_button_light_icon = new Gtk.Image ();
-            color_button_light_icon.gicon = new ThemedIcon ("mode-change-symbolic");
-            color_button_light_icon.pixel_size = 48;
+            var color_button_light_icon = new Gtk.Image.from_icon_name ("mode-change-symbolic", Gtk.IconSize.DIALOG);
             color_button_light.set_image (color_button_light_icon);
             color_button_light.halign = Gtk.Align.CENTER;
             color_button_light.height_request = 64;
@@ -192,9 +193,7 @@ namespace Quilter.Widgets {
             var color_button_light_text = new Gtk.Label (_("Light Mode"));
 
             var color_button_sepia = new Gtk.Button ();
-            var color_button_sepia_icon = new Gtk.Image ();
-            color_button_sepia_icon.gicon = new ThemedIcon ("mode-change-symbolic");
-            color_button_sepia_icon.pixel_size = 48;
+            var color_button_sepia_icon = new Gtk.Image.from_icon_name ("mode-change-symbolic", Gtk.IconSize.DIALOG);
             color_button_sepia.set_image (color_button_sepia_icon);
             color_button_sepia.halign = Gtk.Align.CENTER;
             color_button_sepia.height_request = 64;
@@ -207,9 +206,7 @@ namespace Quilter.Widgets {
             var color_button_sepia_text = new Gtk.Label (_("Sepia Mode"));
 
             var color_button_dark = new Gtk.Button ();
-            var color_button_dark_icon = new Gtk.Image ();
-            color_button_dark_icon.gicon = new ThemedIcon ("mode-change-symbolic");
-            color_button_dark_icon.pixel_size = 48;
+            var color_button_dark_icon = new Gtk.Image.from_icon_name ("mode-change-symbolic", Gtk.IconSize.DIALOG);
             color_button_dark.set_image (color_button_dark_icon);
             color_button_dark.halign = Gtk.Align.CENTER;
             color_button_dark.height_request = 64;