From b354ede7e29495b3353d6100784a0c7a96bbcc83 Mon Sep 17 00:00:00 2001
From: Richard Neese <r.neese@gmail.com>
Date: Wed, 11 Aug 2021 17:03:35 -0400
Subject: [PATCH] revert xcfe to old look (#3090)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* revert xcfe to old look

* fix login screen xfce old look

* Re-add monitorVirtual-1

* There is not such icon

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
---
 .../focal/environments/xfce/debian/postinst   |  2 +-
 .../xfce-perchannel-xml/xfce4-desktop.xml     | 30 +++++++++----------
 .../xfce-perchannel-xml/xfce4-panel.xml       |  2 +-
 .../xfconf/xfce-perchannel-xml/xsettings.xml  |  4 +--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/config/desktop/focal/environments/xfce/debian/postinst b/config/desktop/focal/environments/xfce/debian/postinst
index eca04fecfe..0e1d6fad28 100644
--- a/config/desktop/focal/environments/xfce/debian/postinst
+++ b/config/desktop/focal/environments/xfce/debian/postinst
@@ -1,6 +1,6 @@
 # overwrite stock lightdm greeter configuration
 if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi
-if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-blue-monday-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi
+
 
 #Adjust xsettings.xml for NumixBlue Theme Ubuntu
 if [ -f /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml ]; then sed -i 's/Xfce-dusk/NumixBlue/g' /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml; fi
diff --git a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index 62b5f260bc..bc68c936e9 100644
--- a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -7,52 +7,52 @@
 	<property name="workspace0" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg"/>
+          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
         </property>
         <property name="workspace1" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg"/>
+          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg"/>
         </property>
       </property>
       <property name="monitor1" type="empty">
 	<property name="workspace0" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg"/>
+          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
         </property>
         <property name="workspace1" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg"/>
+          <property name="image-path" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg"/>
         </property>
       </property>
       <property name="monitorHDMI-1" type="empty">
         <property name="workspace0" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
         </property>
         <property name="workspace1" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg"/>
         </property>
       </property>
       <property name="monitoreDP-1" type="empty">
         <property name="workspace0" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
         </property>
         <property name="workspace1" type="empty">
           <property name="color-style" type="int" value="0"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg"/>
         </property>
       </property>
     </property>
@@ -60,17 +60,17 @@
       <property name="workspace0" type="empty">
         <property name="color-style" type="int" value="0"/>
         <property name="image-style" type="int" value="5"/>
-        <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg"/>
+        <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg"/>
       </property>
       <property name="workspace1" type="empty">
         <property name="color-style" type="int" value="0"/>
         <property name="image-style" type="int" value="5"/>
-        <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg"/>
+        <property name="last-image" type="string" value="/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg"/>
       </property>
     </property>
     <property name="single-workspace-mode" type="bool" value="false"/>
   </property>
-  <property name="desktop-icons" type="empty">
+ <property name="desktop-icons" type="empty">
     <property name="icon-size" type="uint" value="32"/>
     <property name="file-icons" type="empty">
       <property name="show-home" type="bool" value="false"/>
diff --git a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 5ea68d9bf4..8ac955df71 100644
--- a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -23,7 +23,7 @@
   </property>
   <property name="plugins" type="empty">
     <property name="plugin-1" type="string" value="applicationsmenu">
-      <property name="button-icon" type="string" value="/usr/share/icons/armbian/icon-menu-med-blue.png"/>
+      <property name="button-icon" type="string" value="/usr/share/pixmaps/armbian/armbian.png"/>
     </property>
     <property name="plugin-2" type="string" value="actions">
       <property name="items" type="array">
diff --git a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
index 25d3480d84..63ab3e258b 100644
--- a/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/packages/blobs/desktop/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -2,8 +2,8 @@
 
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Xfce-dusk"/>
-    <property name="IconThemeName" type="string" value="LoginIcons"/>
+    <property name="ThemeName" type="string" value="Numix"/>
+    <property name="IconThemeName" type="string" value="Numix"/>
     <property name="DoubleClickTime" type="empty"/>
     <property name="DoubleClickDistance" type="empty"/>
     <property name="DndDragThreshold" type="empty"/>