Merge pull request #125 from codesardine/master

Update webdad

community/webdad/Packages-Desktop

@@ -4,6 +4,7 @@ networkmanager-openconnect
 networkmanager-openvpn
 networkmanager-pptp
 networkmanager-vpnc
+networkmanager-dispatcher-ntpd
 ntp
 mobile-broadband-provider-info
 modemmanager
@@ -73,7 +74,7 @@ noto-fonts
 ttf-roboto
 
 ## Games
->extra steam-manjaro # needed for the workspaces
+>extra steam-manjaro 
 pingus
 gnome-mahjongg
 aisleriot
@@ -106,7 +107,7 @@ pamac
 
 ## Display manager
 lightdm
-lightdm-slick-greeter
+lightdm-webkit2-greeter-manjaro
 accountsservice  # Enhanced user accounts handling
 
 # bluetooth
@@ -118,16 +119,15 @@ bluez-plugins
 # improve responsiveness 
 preload
 irqbalance
-tracker
 
 # WebDad desktop
+jade-desktop-mode
 manjaro-webdad-settings
 webdad-speech
 webdad-webapps
 jade-dashboard
 cairo-dock
-jwm
+kwin
-compton
 hyper
 cairo-dock-plug-ins
 zeitgeist            # needed for cairo-dock events
@@ -135,11 +135,12 @@ pa-applet
 blueman
 dunst
 dex
-feh
 polkit-gnome
 manjaro-hello
 manjaro-settings-manager
+#manjaro-settings-manager-kcm
 manjaro-settings-manager-notifier
+#systemsettings
 network-manager-applet
 pavucontrol
 gnome-keyring      # fix wlan segfault
@@ -154,16 +155,11 @@ sushi
 file-roller
 timeshift
 
-## Themes QT/GTK/SDDM
-paper-icon-theme-git
-xcursor-breeze
-
 ## Applications
-kodi      # needed for the workspaces
 lxrandr-gtk3
 gthumb
 >extra simple-scan
-imagewriter
+etcher
 dmidecode # optional dependency inxi
 gedit
 nano
@@ -177,7 +173,6 @@ inxi
 >extra libreoffice-fresh
 >extra vlc-nightly
 ms-office-online
-riot-desktop
 atom
 
 # Compression
@@ -199,7 +194,7 @@ xf86-input-keyboard
 xf86-input-libinput
 xf86-input-mouse
 xf86-input-void
-xf86-input-wacom
+#xf86-input-wacom
 xf86-input-synaptics
 
 ## Xorg Server and Graphics

community/webdad/desktop-overlay/etc/lightdm/lightdm-webkit2-greeter.conf

@@ -0,0 +1,35 @@
+#
+# [greeter]
+# debug_mode          = Greeter theme debug mode.
+# detect_theme_errors = Provide an option to load a fallback theme when theme errors are detected.
+# screensaver_timeout = Blank the screen after this many seconds of inactivity.
+# secure_mode         = Don't allow themes to make remote http requests.
+# time_format         = A moment.js format string so the greeter can generate localized time for display.
+# time_language       = Language to use when displaying the time or "auto" to use the system's language.
+# webkit_theme        = Webkit theme to use.
+#
+# NOTE: See moment.js documentation for format string options: http://momentjs.com/docs/#/displaying/format/
+#
+
+[greeter]
+debug_mode          = false
+detect_theme_errors = false
+screensaver_timeout = 300
+secure_mode         = true
+time_format         = LT
+time_language       = auto
+webkit_theme        = manjaro
+
+#
+# [branding]
+# background_images = Path to directory that contains background images for use by themes.
+# logo              = Path to logo image for use by greeter themes.
+# user_image        = Default user image/avatar. This is used by themes for users that have no .face image.
+#
+# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home)
+#
+
+[branding]
+background_images = /usr/share/backgrounds
+logo              = /usr/share/pixmaps/webdad/manjaro.png
+user_image        = /usr/share/pixmaps/manjaro-logo-user.png

community/webdad/desktop-overlay/etc/lightdm/lightdm.conf

@@ -1,6 +1,6 @@
 [Seat:*]
 
-greeter-session=lightdm-slick-greeter
+greeter-session=lightdm-webkit2-greeter
 user-session=jade
 session-wrapper=/etc/lightdm/Xsession
 

community/webdad/desktop-overlay/etc/lightdm/slick-greeter.conf

@@ -1,14 +0,0 @@
-[Greeter]
-background=/usr/share/backgrounds/webdad-wallpaper.png
-background-color=#222D32
-draw-grid=false
-theme-name=Adapta-Eta-Maia
-icon-theme-name=Paper
-font-name='Roboto 10'
-xft-antialias=true
-xft-hintstyle=hintfull
-enable-hidpi=auto
-show-hostname=false
-show-a11y=false
-show-power=false
-show-keyboard=false

community/webdad/desktop-overlay/usr/share/icons/default/index.theme

@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=xcursor-breeze

community/webdad/live-overlay/etc/calamares/modules/packages.conf

@@ -1,5 +1,9 @@
 backend: pacman
 
+skip_if_no_internet: false
+update_db: true
+
 operations:
   - install:
     - jdk8-openjdk
+    - gnome-sceenshot

community/webdad/live-overlay/etc/lightdm/lightdm.conf

@@ -1,6 +1,6 @@
 [Seat:*]
 
-greeter-session=lightdm-slick-greeter
+greeter-session=lightdm-webkit2-greeter
 user-session=jade
 session-wrapper=/etc/lightdm/Xsession
 autologin-user=manjaro

community/webdad/live-overlay/etc/webdad/cairo-dock/current_theme/launchers/03launcher.desktop

@@ -48,3 +48,4 @@ Order=23.3125
 Icon Type=0
 Type=Application
 Origin=
+Name[en_GB]=03launcher

community/webdad/live-overlay/etc/webdad/cairo-dock/current_theme/launchers/06container.desktop

@@ -0,0 +1,26 @@
+#3.4.1
+
+#[gtk-about]
+
+[Desktop Entry]
+
+#F[Icon]
+frame_maininfo=
+
+#d+ Name of the container it belongs to:
+Container=_MainDock_
+
+#v
+sep_display=
+
+#> Separators' appearance is defined in the global configuration.
+Icon=
+
+
+#X[Extra parameters]
+frame_extra=
+#f[0;100] Order you want for this launcher among the others:
+Order=23.0625
+
+Icon Type=2
+Type=Separator