Merge branch '3.2' of github.com:abcdesktopio/oc.user into 3.2

Dockerfile.ubuntu

@@ -178,7 +178,6 @@ RUN apt-get update  && \
         wmctrl \
         cups-client \
         pulseaudio-utils \
-        pavumeter \
         xauth \
         websockify \
      && apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -191,31 +190,31 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	adwaita-icon-theme \
 	adwaita-qt \
 	xclip \
+    gsetroot \
      && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 
-# install openbox 
+# install openbox custome packages 
 RUN mkdir -p /tmp/packages
-COPY --from=openbox_ubuntu_builder /openbox/libobt*             /tmp/packages/
-COPY --from=openbox_ubuntu_builder /openbox/openbox_3.6.1*      /tmp/packages/
-COPY --from=openbox_ubuntu_builder /openbox/libobrender*        /tmp/packages/
-
+COPY --from=openbox_ubuntu_builder /openbox/libobt* /openbox/openbox_3.6.1* /openbox/libobrender* /tmp/packages/
 RUN apt-get update  && \
         apt-get install -y --no-install-recommends -f /tmp/packages/*.deb  && \
-	apt-get install -y --no-install-recommends feh && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*        
 
 # 
+# Uncommant lines to add picom compositor and watermarking support 
+#
 # to add compositor ( this option takes more memory in user's pod )
 # picom need hsetroot 
 # xsetroot is not supported by picom
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-	picom \
-	hsetroot && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+#RUN apt-get update && \
+#    apt-get install -y --no-install-recommends \
+#	picom \
+#	hsetroot && \
+#    apt-get clean && \
+#    rm -rf /var/lib/apt/lists/*
+#
 
 # install composer
 COPY --from=ubuntu_node_modules_builder /composer /composer
@@ -271,7 +270,10 @@ RUN date > /etc/build.date
 # install qterminal xfonts-base
 RUN if [ "${TARGET_MODE}" != "hardening" ]; then \
 	apt-get update && \
-        apt-get install -y --no-install-recommends qterminal xfonts-base && \
+        apt-get install -y --no-install-recommends \
+		qterminal \
+		xfonts-base \
+		pavumeter && \
 	apt-get clean && rm -rf /var/lib/apt/lists/*; \
     fi
 

composer/.gtkrc-2.0

@@ -1,10 +1,10 @@
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
-gtk-theme-name="Mojave-Light"
-gtk-icon-theme-name="McMojave-circle"
+gtk-theme-name="Clearlooks"
+gtk-icon-theme-name="ubuntu-mono-dark"
 gtk-font-name="Droid Sans Regular 10"
-# gtk-cursor-theme-name="Adwaita"
-# gtk-cursor-theme-size=0
+gtk-cursor-theme-name="Adwaita"
+gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_ICONS
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1

composer/esetroot.sh

@@ -3,7 +3,13 @@ bgColor=$1
 imgName=$2
 if [ -x /usr/bin/Esetroot ]; then
       	/usr/bin/Esetroot -bg "${bgColor}" -center -fit  "${imgName}"
-else      
-     	killall /usr/bin/feh
-	/usr/bin/feh --no-fehbg --bg-center --borderless --image-bg "${bgColor}" "${imgName}"
+else
+    if [ -x /usr/bin/hsetroot ]; then
+   	 /usr/bin/hsetroot  -solid '${bgColor}' -center "${imgName}"
+    else
+    	if [ -x /usr/bin/feh ]; then 	
+		killall /usr/bin/feh
+		/usr/bin/feh --no-fehbg --bg-center --borderless --image-bg "${bgColor}" "${imgName}"
+    	fi
+    fi
 fi

composer/openbox/autostart.sh

@@ -16,13 +16,9 @@ BG_COLOR="#6ec6f0"
 if [ -x /usr/bin/hsetroot ]; then
 	/usr/bin/hsetroot -solid "$BG_COLOR" 2>>$STDOUT_LOGFILE
 else
-	if [ -x /usr/bin/gsetroot ]; then
-		/usr/bin/gsetroot -solid "$BG_COLOR" 2>>$STDOUT_LOGFILE
-        else
-		if [ -x /usr/bin/xsetroot ]; then 
- 			/usr/bin/xsetroot -solid "$BG_COLOR" 2>>$STDOUT_LOGFILE
-    		fi
-      	fi
+	if [ -x /usr/bin/xsetroot ]; then 
+ 		/usr/bin/xsetroot -solid "$BG_COLOR" 2>>$STDOUT_LOGFILE
+    	fi
 fi
 
 # start picom

etc/X11/openbox/rc.xml

@@ -42,7 +42,7 @@
                   'Active' - where the active window is -->
   </placement>
   <notify>
-	<filenamepid>/var/run/desktop/spawner.pid</filenamepid>
+    <filenamepid>/var/run/desktop/spawner.pid</filenamepid>
   </notify>
   <theme>
     <name>Arc_OSX</name>
@@ -704,10 +704,10 @@
     <!-- show the manage desktops section in the client-list-(combined-)menu -->
   </menu>
   <applications>
-  	<application type="normal">
-		<focus>yes</focus>
-        </application>
-  <!--
+    <application type="normal">
+      <focus>yes</focus>
+    </application>
+    <!--
 	<application type="normal">
 		<maximized>yes</maximized>
 	</application>