From a8bbd36f7cfcd3ee4dc39bfc82e1fb403e9dc242 Mon Sep 17 00:00:00 2001
From: Ward Nakchbandi <hotrod.master@hotmail.com>
Date: Fri, 23 Dec 2022 18:00:56 +0300
Subject: [PATCH] sync

---
 .../gnome-layouts/layout-scripts/gnome2.sh    |   2 +
 .../gnome-layouts/layout-scripts/macos.sh     |   2 +
 .../gnome-layouts/layout-scripts/unity.sh     |   2 +
 .../gnome-layouts/layout-scripts/win10.sh     |   2 +
 .../gnome-layouts/layout-scripts/win11.sh     |   2 +
 src/usr/lib/pika/gnome-layouts/main.py        | 103 ------------------
 src/usr/lib/pika/gnome-layouts/main.ui        |  15 ---
 src/usr/lib/pika/gnome-layouts/main.ui~       |  13 ++-
 8 files changed, 21 insertions(+), 120 deletions(-)

diff --git a/src/usr/lib/pika/gnome-layouts/layout-scripts/gnome2.sh b/src/usr/lib/pika/gnome-layouts/layout-scripts/gnome2.sh
index e4ff0f9..54148af 100755
--- a/src/usr/lib/pika/gnome-layouts/layout-scripts/gnome2.sh
+++ b/src/usr/lib/pika/gnome-layouts/layout-scripts/gnome2.sh
@@ -33,3 +33,5 @@ gnome-extensions enable places-menu@gnome-shell-extensions.gcampax.github.com
 gnome-extensions enable window-list@gnome-shell-extensions.gcampax.github.com
 # Enable arcmenu
 gnome-extensions enable arcmenu@arcmenu.com
+# Enable Desktop Icons
+gnome-extensions enable ding@rastersoft.com
diff --git a/src/usr/lib/pika/gnome-layouts/layout-scripts/macos.sh b/src/usr/lib/pika/gnome-layouts/layout-scripts/macos.sh
index 87d039b..32a15d9 100755
--- a/src/usr/lib/pika/gnome-layouts/layout-scripts/macos.sh
+++ b/src/usr/lib/pika/gnome-layouts/layout-scripts/macos.sh
@@ -33,3 +33,5 @@ gsettings set org.gnome.shell.extensions.just-perfection clock-menu-position 1
 gnome-extensions enable ubuntu-dock@ubuntu.com
 # Enable just perfection
 gnome-extensions enable just-perfection-desktop@just-perfection
+# Enable Desktop Icons
+gnome-extensions enable ding@rastersoft.com
diff --git a/src/usr/lib/pika/gnome-layouts/layout-scripts/unity.sh b/src/usr/lib/pika/gnome-layouts/layout-scripts/unity.sh
index fd3ac18..4050021 100755
--- a/src/usr/lib/pika/gnome-layouts/layout-scripts/unity.sh
+++ b/src/usr/lib/pika/gnome-layouts/layout-scripts/unity.sh
@@ -29,5 +29,7 @@ gsettings set org.gnome.shell.extensions.dash-to-dock dock-position 'LEFT'
 gnome-extensions enable ubuntu-dock@ubuntu.com
 # Enable just perfection
 gnome-extensions enable just-perfection-desktop@just-perfection
+# Enable Desktop Icons
+gnome-extensions enable ding@rastersoft.com
 
 
diff --git a/src/usr/lib/pika/gnome-layouts/layout-scripts/win10.sh b/src/usr/lib/pika/gnome-layouts/layout-scripts/win10.sh
index 9b11573..ab64267 100755
--- a/src/usr/lib/pika/gnome-layouts/layout-scripts/win10.sh
+++ b/src/usr/lib/pika/gnome-layouts/layout-scripts/win10.sh
@@ -28,3 +28,5 @@ gnome-extensions enable dash-to-panel@jderose9.github.com
 gnome-extensions enable arcmenu@arcmenu.com
 # Enable just perfection
 gnome-extensions enable just-perfection-desktop@just-perfection
+# Enable Desktop Icons
+gnome-extensions enable ding@rastersoft.com
diff --git a/src/usr/lib/pika/gnome-layouts/layout-scripts/win11.sh b/src/usr/lib/pika/gnome-layouts/layout-scripts/win11.sh
index 383b290..7d8d996 100755
--- a/src/usr/lib/pika/gnome-layouts/layout-scripts/win11.sh
+++ b/src/usr/lib/pika/gnome-layouts/layout-scripts/win11.sh
@@ -38,3 +38,5 @@ gnome-extensions enable dash-to-panel@jderose9.github.com
 gnome-extensions enable arcmenu@arcmenu.com
 # Enable just perfection
 gnome-extensions enable just-perfection-desktop@just-perfection
+# Enable Desktop Icons
+gnome-extensions enable ding@rastersoft.com
diff --git a/src/usr/lib/pika/gnome-layouts/main.py b/src/usr/lib/pika/gnome-layouts/main.py
index a8f1e5b..88ce90e 100644
--- a/src/usr/lib/pika/gnome-layouts/main.py
+++ b/src/usr/lib/pika/gnome-layouts/main.py
@@ -234,109 +234,6 @@ class Application:
         subprocess.run(["/usr/lib/pika/gnome-layouts/dconf-accent.sh gray"], shell=True)
         subprocess.run(["pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C grey"], shell=True)
         subprocess.run(["echo 'theme change done!'"], shell=True)
-
-    #### Desktop Switch ####
-    def on_desktop_switch_active_notify(self, switch, state):
-        if switch.get_active() == True :
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/desktop.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/desktop.sh disable"], shell=True)
-    pass
-    #### Audio Switch ####
-    def on_audio_switch_active_notify(self, switch, state):
-        if switch.get_active() == True :
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/audio.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/audio.sh disable"], shell=True)
-    pass
-    #### Blur Switch ####  
-    def on_blur_switch_active_notify(self, switch, state):
-        if switch.get_active() == True :
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/blur.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/blur.sh disable"], shell=True)
-    pass
-    #### Tray Switch ####  
-    def on_tray_switch_active_notify(self, switch, state):
-        if switch.get_active() == True :
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/tray.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/tray.sh disable"], shell=True)
-    pass
-    #### workspace Switch ####
-    def on_workspace_switch_active_notify(self, switch, state):
-        if switch.get_active() == True :
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/workspace.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/workspace.sh disable"], shell=True)
-    pass
-    #### x11 Switch ####
-    def on_x11_switch_active_notify(self, switch, state):
-        if switch.get_active() == True :
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/x11.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/x11.sh disable"], shell=True)
-    pass
-    #### clipboard Switch ####
-    def on_clipboard_switch_active_notify(self, switch, state):
-        if switch.get_active() == True :
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/clipboard.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/clipboard.sh disable"], shell=True)
-    pass
-    #### caffeine Switch ####
-    def on_caffeine_switch_active_notify(self, switch, state):
-        if switch.get_active() == True:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/caffeine.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/caffeine.sh disable"], shell=True)
-    pass
-    #### supergfxctl Switch ####
-    def on_supergfxctl_switch_active_notify(self, switch, state):
-        if switch.get_active() == True:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/supergfxctl.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/supergfxctl.sh disable"], shell=True)
-    pass
-    #### kde Switch ####
-    def on_kde_switch_active_notify(self, switch, state):
-        if switch.get_active() == True:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/kde.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/kde.sh disable"], shell=True)
-    pass
-    #### weather Switch ####
-    def on_weather_switch_active_notify(self, switch, state):
-        if switch.get_active() == True:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/weather.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/weather.sh disable"], shell=True)
-    pass
-    #### stats Switch ####
-    def on_stats_switch_active_notify(self, switch, state):
-        if switch.get_active() == True:
-                subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/stats.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/stats.sh disable"], shell=True)
-    pass
-    #### hid Switch ####
-    def on_hid_switch_active_notify(self, switch, state):
-        if switch.get_active() == True:
-                subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/hid.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/hid.sh disable"], shell=True)
-    pass
-    #### Pop Switch ####
-    def on_pop_switch_active_notify(self, switch, state):
-        if switch.get_active() == True:
-                subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/pop.sh enable"], shell=True)
-        else:
-            subprocess.run(["/usr/lib/pika/gnome-layouts/settings-scripts/pop.sh disable"], shell=True)
-    pass
-
-    def on_install_all_pressed(self, widget):
-        subprocess.run(["/usr/lib/pika/gnome-layouts/all.sh"], shell=True)
-    pass
     
 Application()
 Gtk.main()
diff --git a/src/usr/lib/pika/gnome-layouts/main.ui b/src/usr/lib/pika/gnome-layouts/main.ui
index f3561c7..63fce66 100644
--- a/src/usr/lib/pika/gnome-layouts/main.ui
+++ b/src/usr/lib/pika/gnome-layouts/main.ui
@@ -23,21 +23,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkStackSwitcher" id="main_switcher">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="homogeneous">True</property>
-            <property name="stack">main_stack</property>
-            <signal name="show" handler="on_main_switcher_show" swapped="no"/>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack-type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkStack" id="main_stack">
             <property name="visible">True</property>
diff --git a/src/usr/lib/pika/gnome-layouts/main.ui~ b/src/usr/lib/pika/gnome-layouts/main.ui~
index 7d512d5..f3561c7 100644
--- a/src/usr/lib/pika/gnome-layouts/main.ui~
+++ b/src/usr/lib/pika/gnome-layouts/main.ui~
@@ -355,8 +355,8 @@
                             <property name="name">accent_box</property>
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="valign">start</property>
-                            <property name="homogeneous">True</property>
+                            <property name="halign">center</property>
+                            <property name="valign">center</property>
                             <child>
                               <object class="GtkButton" id="blue_accent_button">
                                 <property name="visible">True</property>
@@ -364,6 +364,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="blue_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="blue_accent_image">
@@ -387,6 +388,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="green_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="green_accent_image">
@@ -410,6 +412,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="yellow_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="yellow_accent_image">
@@ -433,6 +436,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="orange_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="orange_accent_image">
@@ -456,6 +460,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="red_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="red_accent_image">
@@ -479,6 +484,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="magenta_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="magenta_accent_image">
@@ -502,6 +508,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="purple_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="purple_accent_image">
@@ -525,6 +532,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="brown_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="brown_accent_image">
@@ -548,6 +556,7 @@
                                 <property name="receives-default">True</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
+                                <property name="relief">none</property>
                                 <signal name="pressed" handler="gray_accent_button_pressed_cb" swapped="no"/>
                                 <child>
                                   <object class="GtkImage" id="gray_accent_image">