From 7348b440cb1e566e42fbcb122b14747f768c23e2 Mon Sep 17 00:00:00 2001
From: mirkobrombin <send@mirko.pm>
Date: Sat, 10 Sep 2022 15:53:45 +0200
Subject: [PATCH] use better icons

---
 .../vanilla-container-terminal-symbolic.svg   |   2 +
 .../actions/vanilla-package-symbolic.svg      |   2 +
 .../actions/vanilla-puzzle-piece-symbolic.svg | 106 ++++++++++++++++++
 data/icons/meson.build                        |  21 +++-
 vanilla_first_setup/gtk/window.ui             |   8 +-
 .../vanilla-first-setup.gresource.xml         |   5 +
 6 files changed, 137 insertions(+), 7 deletions(-)
 create mode 100644 data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg
 create mode 100644 data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg
 create mode 100644 data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg

diff --git a/data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg b/data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg
new file mode 100644
index 0000000..4f77bea
--- /dev/null
+++ b/data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><g fill="#222222"><path d="m 15 1 v 1 h -1 v -1 z m 0 1 h 1 v 1 h -1 z m -2 -1 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -0.5 c 0 -0.277344 0.222656 -0.5 0.5 -0.5 z m 0 2 v 1 h -1 v -1 z m 15 1 v 1 h -1 v -1 z m -15 1 v 1 h -1 v -1 z m 15 1 v 1 h -1 v -1 z m -15 1 v 1 h -1 v -1 z m 15 1 v 1 h -1 v -1 z m -15 1 v 1 h -1 v -1 z m 15 1 v 1 h -1 v -1 z m -15 1 v 1 h -1 v -1 z m 15 1 v 1 h -1 v -1 z m -15 1 v 1 h -1 v -1 z m 0 1 h 1 v 1 h -1 z m 15 0 v 0.5 c 0 0.277344 -0.222656 0.5 -0.5 0.5 h -0.5 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m -2 0 v 1 h -1 v -1 z m 0 0"/><path d="m 3 3 c -0.554688 0 -1 0.445312 -1 1 v 8 c 0 0.554688 0.445312 1 1 1 h 10 c 0.554688 0 1 -0.445312 1 -1 v -8 c 0 -0.554688 -0.445312 -1 -1 -1 z m 0 2 h 10 v 7 h -10 z m 0 0"/><path d="m 4.492188 5.992188 c -0.203126 0.003906 -0.386719 0.125 -0.460938 0.316406 c -0.078125 0.1875 -0.03125 0.402344 0.113281 0.546875 l 1.648438 1.644531 l -1.648438 1.644531 c -0.128906 0.128907 -0.179687 0.3125 -0.136719 0.488281 c 0.046876 0.175782 0.183594 0.3125 0.359376 0.359376 c 0.175781 0.042968 0.359374 -0.007813 0.488281 -0.136719 l 2 -2 c 0.191406 -0.195313 0.191406 -0.515625 0 -0.710938 l -2 -2 c -0.097657 -0.09375 -0.226563 -0.152343 -0.363281 -0.152343 z m 0 0"/></g></svg>
diff --git a/data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg b/data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg
new file mode 100644
index 0000000..6b5a6ea
--- /dev/null
+++ b/data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 0 16 16" width="16px"><path d="m 7.804688 0.0195312 c -0.128907 0.0273438 -0.25 0.0742188 -0.359376 0.1484378 l -6 4 c -0.277343 0.183593 -0.445312 0.496093 -0.445312 0.832031 v 6 c 0 0.335938 0.167969 0.648438 0.445312 0.832031 l 6 4 c 0.335938 0.222657 0.773438 0.222657 1.109376 0 l 6 -4 c 0.277343 -0.183593 0.445312 -0.496093 0.445312 -0.832031 v -6 c 0 -0.335938 -0.167969 -0.648438 -0.445312 -0.832031 l -6 -4 c -0.21875 -0.1484378 -0.488282 -0.199219 -0.75 -0.1484378 z m 0.195312 2.1796878 v 6.800781 l 5 -3.332031 v 4.796875 l -5 3.335937 v -4.800781 l -5 -3.332031 v -0.132813 z m 0 0" fill="#222222"/></svg>
diff --git a/data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg b/data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg
new file mode 100644
index 0000000..1152da4
--- /dev/null
+++ b/data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <filter id="a" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+ </filter>
+ <mask id="b">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".3"/>
+  </g>
+ </mask>
+ <clipPath id="c">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="d">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".05"/>
+  </g>
+ </mask>
+ <clipPath id="e">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="f">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".05"/>
+  </g>
+ </mask>
+ <clipPath id="g">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="h">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".05"/>
+  </g>
+ </mask>
+ <clipPath id="i">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="j">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".05"/>
+  </g>
+ </mask>
+ <clipPath id="k">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="l">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".05"/>
+  </g>
+ </mask>
+ <clipPath id="m">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="n">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".05"/>
+  </g>
+ </mask>
+ <clipPath id="o">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="p">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".3"/>
+  </g>
+ </mask>
+ <clipPath id="q">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <mask id="r">
+  <g filter="url(#a)">
+   <path d="m0 0h16v16h-16z" fill-opacity=".5"/>
+  </g>
+ </mask>
+ <clipPath id="s">
+  <path d="m0 0h1600v1200h-1600z"/>
+ </clipPath>
+ <g transform="translate(-280 -296)" clip-path="url(#c)" mask="url(#b)">
+  <path d="m562.46 212.06h10.449c-1.1836 0.49219-1.2969 2.4609 0 3h-10.449z" fill="#2e3436"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#e)" mask="url(#d)">
+  <path d="m16 748h1v1h-1z" fill="#2e3436" fill-rule="evenodd"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#g)" mask="url(#f)">
+  <path d="m17 747h1v1h-1z" fill="#2e3436" fill-rule="evenodd"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#i)" mask="url(#h)">
+  <path d="m18 750h1v1h-1z" fill="#2e3436" fill-rule="evenodd"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#k)" mask="url(#j)">
+  <path d="m16 750h1v1h-1z" fill="#2e3436" fill-rule="evenodd"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#m)" mask="url(#l)">
+  <path d="m17 751h1v1h-1z" fill="#2e3436" fill-rule="evenodd"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#o)" mask="url(#n)">
+  <path d="m19 751h1v1h-1z" fill="#2e3436" fill-rule="evenodd"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#q)" mask="url(#p)">
+  <path d="m136 776v7h7v-7z" fill="#2e3436"/>
+ </g>
+ <g transform="translate(-280 -296)" clip-path="url(#s)" mask="url(#r)">
+  <path d="m219 758h3v12h-3z" fill="#2e3436"/>
+ </g>
+ <path d="m6.5 1c-0.83203 0-1.5 0.66797-1.5 1.5v1.5h-3c-0.55469 0-1 0.44531-1 1v3h1.5c0.83203 0 1.5 0.66797 1.5 1.5s-0.66797 1.5-1.5 1.5h-1.5v3c0 0.55469 0.44531 1 1 1h3v-1.5c0-0.83203 0.66797-1.5 1.5-1.5s1.5 0.66797 1.5 1.5v1.5h3c0.55469 0 1-0.44531 1-1v-3h1.5c0.83203 0 1.5-0.66797 1.5-1.5s-0.66797-1.5-1.5-1.5h-1.5v-3c0-0.55469-0.44531-1-1-1h-3v-1.5c0-0.83203-0.66797-1.5-1.5-1.5z" fill="#2e3436"/>
+</svg>
diff --git a/data/icons/meson.build b/data/icons/meson.build
index d4fb2aa..eac6aa6 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -6,8 +6,23 @@ install_data(
   install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir)
 )
 
-symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
+symbolic_dir = join_paths('hicolor', 'symbolic')
 install_data(
-  join_paths(symbolic_dir, ('@0@-symbolic.svg').format(application_id)),
+  join_paths(symbolic_dir, 'apps', ('@0@-symbolic.svg').format(application_id)),
   install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir)
-)
\ No newline at end of file
+)
+
+install_data(
+    join_paths(symbolic_dir, 'actions', 'vanilla-container-terminal-symbolic.svg'),
+    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
+)
+
+install_data(
+    join_paths(symbolic_dir, 'actions', 'vanilla-package-symbolic.svg'),
+    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
+)
+
+install_data(
+    join_paths(symbolic_dir, 'actions', 'vanilla-puzzle-piece-symbolic.svg'),
+    install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'actions')
+)
diff --git a/vanilla_first_setup/gtk/window.ui b/vanilla_first_setup/gtk/window.ui
index bb94cea..539eb5d 100644
--- a/vanilla_first_setup/gtk/window.ui
+++ b/vanilla_first_setup/gtk/window.ui
@@ -52,10 +52,10 @@
               </object>
             </child>
             
-            <!-- Configuration -->
+            <!-- Package Manager -->
             <child>
               <object class="AdwStatusPage">
-                <property name="icon-name">package-x-generic-symbolic</property>
+                <property name="icon-name">vanilla-package-symbolic</property>
                 <property name="title">Choose the Package Manager</property>
                 <property name="description">Choose one or more package managers from the following options.</property>
                 <property name="halign">fill</property>
@@ -129,7 +129,7 @@
             <!-- Sub-System -->
             <child>
               <object class="AdwStatusPage">
-                <property name="icon-name">utilities-terminal-symbolic</property>
+                <property name="icon-name">vanilla-container-terminal-symbolic</property>
                 <property name="title">Sub-System</property>
                 <property name="description">Access a minimal mutable Ubuntu installation integrated with Vanilla OS.</property>
                 <property name="halign">fill</property>
@@ -242,7 +242,7 @@
             <!-- Extra -->
             <child>
               <object class="AdwStatusPage">
-                <property name="icon-name">applications-utilities-symbolic</property>
+                <property name="icon-name">vanilla-puzzle-piece-symbolic</property>
                 <property name="title">Extra Settings</property>
                 <property name="description">The following are optional settings, leave them as they are if you don't know what they do.</property>
                 <property name="halign">fill</property>
diff --git a/vanilla_first_setup/vanilla-first-setup.gresource.xml b/vanilla_first_setup/vanilla-first-setup.gresource.xml
index 14d788f..8398611 100644
--- a/vanilla_first_setup/vanilla-first-setup.gresource.xml
+++ b/vanilla_first_setup/vanilla-first-setup.gresource.xml
@@ -5,4 +5,9 @@
     <file>gtk/dialog-subsystem.ui</file>
     <file>gtk/dialog-prop-nvidia.ui</file>
   </gresource>
+  <gresource prefix="/pm/mirko/FirstSetup/icons/scalable/actions/">
+    <file preprocess="xml-stripblanks">../data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">../data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg</file>
+    <file preprocess="xml-stripblanks">../data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg</file>
+  </gresource>
 </gresources>
\ No newline at end of file