X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=3ff3fda0d8235db41ed3b97b2ec27ef349291b4b;hb=45dc5f16b790ce5b8b46a48ca582c8da2a881dff;hp=d838d76898b54ef4acaeecaca4db60b29069fa31;hpb=51bcd807500eb90c674974023d5d7ed7bdb89e9f;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index d838d76..3ff3fda 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,6 +47,33 @@ gct ()
 	fi
 }
 
+laptop_detect ()
+{
+	if chroot /root /usr/sbin/laptop-detect
+	then
+		echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
+		echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
+	fi
+}
+
+remove_applet ()
+{
+	# Code to remove an applet from the default panel setup
+	# This is rather hacky, but I can't think of a one or two line regular
+	# expression to do this any more efficiently. Patches welcome. In
+	# addition, setting these via gconf also doesn't work for some reason.
+
+	local line_no prior_line next_line
+
+	line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
+	prior_line="$((line_no-1))"
+	next_line="$((line_no+1))"
+
+	sed -i -n "${prior_line},${next_line}!p" /root/usr/share/gconf/defaults/05_panel-default-setup.entries
+
+	chroot /root update-gconf-defaults
+}
+
 case ${ACCESS} in
 	access=v1)
 		# Lesser Visual Impairment
@@ -67,6 +94,8 @@ case ${ACCESS} in
 	access=v2)
 		# Moderate Visual Impairment
 		gct -s -t bool /desktop/gnome/interface/accessibility true
+		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
@@ -76,11 +105,8 @@ case ${ACCESS} in
 			echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
 			echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
 			echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+			laptop_detect
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
-
-			mkdir -p /root/home/${USERNAME}/.config/autostart
-			cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-			chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
 		fi
 		;;
 
@@ -89,20 +115,19 @@ case ${ACCESS} in
 		# Disabled for now, until we know eSpeak works.
 		#gct -s -t bool /desktop/gnome/sound/enable_esd false
 		gct -s -t bool /desktop/gnome/interface/accessibility true
+		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
-		if [ -x /root/usr/bin/orca ]
-		then
-			mkdir -p /root/home/${USERNAME}/.config/autostart
-			cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-			chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
-		fi
+		remove_applet fast_user_switch
 		;;
 
 	braille=ask)
 		# Braille
 		gct -s -t bool /desktop/gnome/interface/accessibility true
+		gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
@@ -112,12 +137,11 @@ case ${ACCESS} in
 			echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
 			echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
 			echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+			laptop_detect
 			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
-
-			mkdir -p /root/home/${USERNAME}/.config/autostart
-			cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-			chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
 		fi
+
+		remove_applet fast_user_switch
 		;;
 
 	access=m1)