Fix clock, add BSPWM

Demonstrandum · Jan 28, 2020 · df23021 · df23021
1 parent 8ade179
commit df23021
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -12,8 +12,10 @@
   * [Screenshots](#screenshots)
     + [Splash Screen](#splash-screen)
     + [Login Screen](#login-screen)
+    + [Login Screen with Virtual Keyboard](#login-screen-with-virtual-keyboard)
     + [Login Screen with Clock](#login-screen-with-clock)
     + [Settings Screen](#settings-screen)
+    + [Theming Screen](#theming-screen)
 
 ## Installation
 
@@ -65,16 +67,24 @@ A live preview of what your greeter may look like may be viewed by either:
 
 ### Splash Screen
 
-![splash](https://github.com/Demonstrandum/Saluto/blob/master/demo/splash.png?raw=true)
+![splash](demo/splash.png)
 
 ### Login Screen
 
-![login](https://github.com/Demonstrandum/Saluto/blob/master/demo/login.png?raw=true)
+![login](demo/login.png)
+
+### Login Screen with Virtual Keyboard
+
+![login-keyboard](demo/login-keyboard.png)
 
 ### Login Screen with Clock
 
-![login-with-clock](https://github.com/Demonstrandum/lightdm-eh8/blob/master/demo/login-clock.png?raw=true)
+![login-clock](demo/login-clock.png)
 
 ### Settings Screen
 
-![settings](https://github.com/Demonstrandum/Saluto/blob/master/demo/settings.png?raw=true)
+![settings](demo/settings.png)
+
+### Theming Screen
+
+![theming](demo/theming.png)
diff --git a/demo/login-clock.png b/demo/login-clock.png
diff --git a/demo/login-keyboard.png b/demo/login-keyboard.png
diff --git a/demo/login.png b/demo/login.png
diff --git a/demo/settings.png b/demo/settings.png
diff --git a/demo/splash.png b/demo/splash.png
diff --git a/demo/theming.png b/demo/theming.png
diff --git a/src/assets/default_images/desktops/bspwm.png b/src/assets/default_images/desktops/bspwm.png
diff --git a/src/assets/default_images/desktops/white-gear-icon-6.jpg b/src/assets/default_images/desktops/white-gear-icon-6.jpg
diff --git a/src/assets/default_images/wallpapers/1532564867739.png b/src/assets/default_images/wallpapers/1532564867739.png
diff --git a/src/assets/default_images/wallpapers/1532575538303.jpg b/src/assets/default_images/wallpapers/1532575538303.jpg
diff --git a/src/assets/default_images/wallpapers/1579652499063.jpg b/src/assets/default_images/wallpapers/1579652499063.jpg
diff --git a/src/assets/default_images/wallpapers/EJ2tvsICil0.jpg b/src/assets/default_images/wallpapers/EJ2tvsICil0.jpg
diff --git a/src/assets/default_images/wallpapers/Solid_Aqua_Graphite.png b/src/assets/default_images/wallpapers/Solid_Aqua_Graphite.png
diff --git a/src/components/Clock.vue b/src/components/Clock.vue
@@ -1,9 +1,6 @@
 <template>
     <div class="clock" :class="{ 'small': small }">
-        <span id="hours">
-            {{ part !== '' ? hours : $options.filters.pad(hours) }}
-        </span>
-        :{{ minutes | pad }}
+        <span id="hours">{{ part !== '' ? hours : $options.filters.pad(hours) }}</span>:{{ minutes | pad }}
         <span id="part">{{ part }}</span>
 
         <div id="date">

diff --git a/src/components/SelectItem.vue b/src/components/SelectItem.vue
@@ -47,6 +47,8 @@ export default {
                     icon = "kde";
                 } else if (key.indexOf("gnome") > -1) {
                     icon = "gnome";
+                } else if (key.indexOf("bspwm") > -1) {
+                    icon = "bspwm";
                 } else if (key.indexOf("xfce") > -1) {
                     icon = "xfce";
                 } else if (key.indexOf("unity") > -1 || key.indexOf("ubuntu") > -1) {

diff --git a/src/lightdm.js b/src/lightdm.js
@@ -37,8 +37,8 @@ if (window.lightdm_debug) {
                 key: 'xfce'
             },
             {
-                name: 'Cinnamon',
-                key: 'cinnamon'
+                name: 'BSPWM',
+                key: 'bspwm'
             },
             {
                 name: 'i3wm',

diff --git a/src/themer.js b/src/themer.js
@@ -1,10 +1,26 @@
 import { settings } from './settings';
 
 export const DEFAULT_COLOR = '#657285';
-const DEFAULT_BG = {
-    default: require('./assets/images/wallpapers/background.png'),
-    blurred: require('./assets/images/wallpapers/blurred/background.png')
-};
+
+const wall_dir = './assets/images/wallpapers';
+const require_wallpaper = wallpaper => ({
+    default: require(`${wall_dir}/${wallpaper}`),
+    blurred: require(`${wall_dir}/blurred/${wallpaper}`)
+});
+
+const DEFAULT_NAMES = [
+    'background.png',
+    '1532564867739.png', '1579652499063.jpg',
+    'EJ2tvsICil0.jpg', '1532575538303.jpg',
+    'Solid_Aqua_Graphite.png'
+];
+
+const DEFAULT_WALLPAPERS = DEFAULT_NAMES.map(require_wallpaper);
+
+const unique_objects = _ =>
+    _.map(JSON.stringify)
+        .filter((e, i, self) => self.indexOf(e) === i)
+        .map(JSON.parse);
 
 export let color = localStorage.getItem('color') || DEFAULT_COLOR;
 export let background = getBackground();
@@ -47,7 +63,10 @@ export function backgrounds() {
     };
 
     let result = dirlist(greeter_config.branding.background_images);
-    return [DEFAULT_BG, ...result];
+    return unique_objects([
+        ...DEFAULT_WALLPAPERS,
+        ...result
+    ]);
 }
 
 function getBackground() {
@@ -57,7 +76,7 @@ function getBackground() {
     }
 
     if (!localStorage.getItem('background'))
-        return DEFAULT_BG;
+        return DEFAULT_WALLPAPERS[0];
     return {
         default: localStorage.getItem('background'),
         blurred: localStorage.getItem('background_blurred')