# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1445739824 -3600
# Node ID 45dbe89f4307abfefd6b1a183ceadde6f2f68963
# Parent  d2dc20032ed1bbc8af390893bb89a71914837341
xset-screensaver.sh: some fixes

diff -r d2dc20032ed1 -r 45dbe89f4307 xorg-xset/stuff/xorg-xset.desktop
--- a/xorg-xset/stuff/xorg-xset.desktop	Sun Oct 25 02:48:19 2015 +0200
+++ b/xorg-xset/stuff/xorg-xset.desktop	Sun Oct 25 03:23:44 2015 +0100
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Name=Set screensaver timeout
-Comment=0(always on)
+Comment=0(always on), Default settings: 10 min (600 sec)
 Name[ru]=Время отключения монитора
-Comment[ru]=0(не выключать)
+Comment[ru]=0(не выключать), По умолчанию: 10 мин.(600 ceк.)
 Icon=preferences-desktop-screensaver
 Exec=xset-screensaver.sh
 Categories=GTK;Settings;HardwareSettings;
diff -r d2dc20032ed1 -r 45dbe89f4307 xorg-xset/stuff/xset-screensaver.sh
--- a/xorg-xset/stuff/xset-screensaver.sh	Sun Oct 25 02:48:19 2015 +0200
+++ b/xorg-xset/stuff/xset-screensaver.sh	Sun Oct 25 03:23:44 2015 +0100
@@ -1,8 +1,12 @@
 #!/bin/sh
 #
+[ -z $(which yad) ] && exec yad && exit 0
+
 case $(id -u) in
 	0) path=/etc/xdg ;;
-	*) path=${XDG_CONFIG_HOME:-$HOME/.config} ;;
+	*) path=${XDG_CONFIG_HOME:-$HOME/.config}
+		[ -f "$path/autostart" ] && mv $path/autostart $path/autostart.bak
+		[ -d "$path/autostart" ] || mkdir -p $path/autostart ;;
 esac
 
 AutostartFile="$path/autostart/xset-screensaver.desktop"
@@ -17,12 +21,15 @@
 
 case $LC_ALL in
 	C|POSIX|en*) lang='=' ;;
-	*) lang='\['${LC_ALL%_*} ;;
+	*) lang='\['${LC_ALL%_*}
+	grep -q '\['${LC_ALL%_*} $launcher || lang='=' ;;
 esac
 
-val=$(yad --title="$(cat $launcher | grep Name$lang | cut -d= -f2)" \
-	--scale --max-value=18000 --mark=1h.:3600 \
-	--mark="$(cat $launcher | grep Comment$lang | cut -d= -f2)":0 \
+
+
+val=$(yad --title="$(cat $launcher | grep Name$lang | cut -d'=' -f2)" \
+	--scale --max-value=18000 --mark="1h.":3600 --buttons-layout=spread \
+	--mark="$(cat $launcher | grep Comment$lang | cut -d'=' -f2 | cut -d',' -f1)":0 \
 	--mark="120min.(2h.)":7200 --mark="180min.(3h.)":10800 \
 	--mark="240min.(4h.)":14400 --mark="300min.(5h.)":18000 \
 	--page=1800 --step=60 --geometry=630x42+10+100 \
@@ -39,4 +46,4 @@
 exec_d
 
 # Notes: 'xset s' max val is 32767, 'xset dpms' limit is unknown
-exit 0
\ No newline at end of file
+exit 0