Merge pull request #51 from KanoComputing/kano-greeter

Kano Greeter

debian/control

@@ -9,7 +9,8 @@ Package: kano-desktop
 Architecture: all
 Depends: ${misc:Depends}, openbox (>=3.5.2-4~kano.1),
          kdesk (>=1.1-02), chromium, kano-themes, lxmenu-data (>=0.1.2-3~kano),
-         kano-video-files, kano-init-flow (>=1.2.2-1), kano-profile (>=1.2-3), libkdesk-dev
+         kano-video-files, kano-init-flow (>=1.2.2-1), kano-profile (>=1.2-3),
+         libkdesk-dev, gir1.2-lightdm-1
 Replaces: kano-settings (<< 1.1-1.20140512build2), kano-feedback (<< 1.1-3)
 Breaks: kano-settings (<< 1.1-1.20140512build2), kano-feedback (<< 1.1-3)
 Description: The desktop experience of Kanux

debian/install

@@ -1,10 +1,14 @@
 wallpapers usr/share/kano-desktop
 icons usr/share/kano-desktop
 images usr/share/kano-desktop
-lightdm usr/share/kano-desktop
 kdesk usr/share/kano-desktop
+kdesk/.kdeskrc var/lib/lightdm
 Legal usr/share/kano-desktop
 
+kano-greeter/kano-greeter.py usr/share/kano-desktop/kano-greeter
+kano-greeter/kano-greeter.css usr/share/kano-desktop/kano-greeter
+kano-greeter/kano-greeter.desktop usr/share/xgreeters
+
 config/autostart usr/share/kano-desktop/config
 config/chromium usr/share/kano-desktop/config
 config/keyboard/kanokeyboardrc usr/share/kano-desktop/config/keyboard

debian/postinst

@@ -6,14 +6,12 @@
 # License: http://www.gnu.org/licenses/gpl-2.0.txt GNU General Public License v2
 #
 
-lightdm_greeter_config=/etc/lightdm/lightdm-gtk-greeter.conf
-custom_lightdm_greeter_config=/usr/share/kano-desktop/lightdm/lightdm-gtk-greeter.conf
-
 openbox_rc=/etc/xdg/openbox/rc.xml
 lxde_openbox_rc=/etc/xdg/openbox/LXDE/rc.xml
 custom_openbox_rc=/usr/share/kano-desktop/openbox/rc.xml
 
 lightdm_config=/etc/lightdm/lightdm.conf
+lightdm_kdeskrc=/var/lib/lightdm/.kdeskrc
 
 chromium_master_prefs=/etc/chromium/master_preferences
 custom_chromium_master_prefs=/usr/share/kano-desktop/config/chromium/master_preferences
@@ -73,37 +71,20 @@ case "$1" in
         cp $lxde_openbox_rc $lxde_openbox_rc-old
         cat $custom_openbox_rc > $lxde_openbox_rc
 
-        # Configure lightdm
-        cp $lightdm_greeter_config $lightdm_greeter_config-old
-        cat $custom_lightdm_greeter_config > $lightdm_greeter_config
-
-        # Display a list of user names when logging in
-        sed -i 's/#\?\s*\(greeter-hide-users\=\).*/\1false/' "$lightdm_config"
-        sed -i 's/^\s*\(user-session\=\).*/# \1default/' "$lightdm_config"
-
-        # Remove all but our default Ligtdhm Xsession from the Greeter login dialog
-        # these are displayed under the password field, in a drop down list
-        dir_xsession=/usr/share/xsessions
-        dir_xsession_disabled=/usr/share/xsessions/disabled
-        if [ ! -d $dir_xsession_disabled ]; then
-            mkdir -p $dir_xsession_disabled
-        fi
+        ### Configure lightdm ###
 
-        if [ -f $dir_xsession/LXDE.desktop ]; then
-            mv $dir_xsession/LXDE.desktop $dir_xsession_disabled
-        fi
+        # Switch to use the Kano Greeter
+        sed -i 's/^\s*\(greeter-session\=\).*/\1kano-greeter/' "$lightdm_config"
 
-        if [ -f $dir_xsession/openbox-gnome.desktop ]; then
-            mv $dir_xsession/openbox-gnome.desktop $dir_xsession_disabled
-        fi
+        # Create bin link to the Kano Greeter
+        ln -s /usr/share/kano-desktop/kano-greeter/kano-greeter.py /usr/bin/kano-greeter
 
-        if [ -f $dir_xsession/openbox-kde.desktop ]; then
-            mv $dir_xsession/openbox-kde.desktop $dir_xsession_disabled
-        fi
+        # Change the Kano Greeter backgrounds
+        # For now these are identical to every other user's default but will be different in the future
+        #   sed -i 's|^\(\s*Background.File-medium:\s\).*|\1/usr/share/kano-desktop/wallpapers/kanux-background-1024.png|' "$lightdm_kdeskrc"
+        #   sed -i 's|^\(\s*Background.File-4-3:\s\).*|\1/usr/share/kano-desktop/wallpapers/kanux-background-4-3.png|' "$lightdm_kdeskrc"
+        #   sed -i 's|^\(\s*Background.File-16-9:\s\).*|\1/usr/share/kano-desktop/wallpapers/kanux-background-16-9.png|' "$lightdm_kdeskrc"
 
-        if [ -f $dir_xsession/openbox.desktop ]; then
-            mv $dir_xsession/openbox.desktop $dir_xsession_disabled
-        fi
 
         # Configure chromium
         cp $chromium_master_prefs $chromium_master_prefs-old

debian/postrm

@@ -9,7 +9,6 @@
 openbox_rc=/etc/xdg/openbox/rc.xml
 lxde_openbox_rc=/etc/xdg/openbox/LXDE/rc.xml
 
-lightdm_greeter_config=/etc/lightdm/lightdm_gtk_greeter.conf
 lightdm_config=/etc/lightdm/lightdm.conf
 
 chromium_master_prefs=/etc/chromium/master_preferences
@@ -34,14 +33,8 @@ case "$1" in
             mv $lxde_openbox_rc-old $lxde_openbox_rc
         fi
 
-        # Revert old lightdm greeter config
-        if [ -e "$lightdm_greeter_config-old" ]; then
-            mv $lightdm_greeter_config-old $lightdm_greeter_config
-        fi
-
-        # Don't isplay a list of user names when logging in
-        sed -i 's/#\?\s*\(greeter-hide-users\=\).*/\1true/' "$lightdm_config"
-        sed -i 's/#\?\s*\(user-session\=\).*/\1default/' "$lightdm_config"
+        # Revert to the default greeter
+        sed -i 's/^\s*\(greeter-session\=\).*/\1lightdm-greeter/' "$lightdm_config"
 
         # Removing links
         rm -f /etc/skel/.config/pcmanfm
@@ -50,6 +43,7 @@ case "$1" in
         rm -f /etc/skel/.config/lxterminal
         rm -f /etc/skel/.config/lxsession
         rm -rf /etc/skel/Legal
+        rm -f /usr/bin/kano-greeter
 
         # Revert chromium config
         if [ -e "$chromium_bookmarks-old" ]; then

kano-greeter/kano-greeter.css

@@ -0,0 +1,21 @@
+GtkLabel {
+    font: Bariol 18;
+    font-weight: bold;
+}
+
+GtkEventBox.user {
+    background: @kano_orange;
+    border-width: 3px;
+    border-radius:3px;
+    padding: 12px;
+}
+
+GtkEventBox.user GtkLabel {
+    color: #ffffff;
+}
+
+GtkEventBox.user.hover {
+    background: @kano_orange_lighter;
+    border-color: @active_border;
+    border-style: solid;
+}

kano-greeter/kano-greeter.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Kano Greeter
+Comment=Kano greeter
+Exec=kano-greeter
+Type=Application