X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=ba9c23d2b4c416d0d5233231e3b86e763bbc3819;hb=c9b9c556114f33d5b515b83652ee48961d9a6856;hp=2a91157a2a821551b219784b383cda1db3664119;hpb=44397c29522a9baf963a63fdf149b06f72e92cf5;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 2a91157..ba9c23d 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,6 +47,37 @@ gct ()
 	fi
 }
 
+laptop_detect ()
+{
+	if [ -x /root/usr/bin/orca ]
+	then
+		if chroot /root /usr/sbin/laptop-detect
+		then
+			mkdir -p /root/home/$USERNAME/.orca
+			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
+	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
@@ -68,7 +99,10 @@ case ${ACCESS} in
 		# 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
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		if [ -x /root/usr/bin/orca ]
 		then
@@ -76,6 +110,7 @@ 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
 		fi
 		;;
@@ -86,16 +121,27 @@ case ${ACCESS} in
 		#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
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
+
+		remove_applet fast_user_switch
+		laptop_detect
+		touch /root/etc/pulse/a11y_nostart
+		sed -i -e 's/autospawn = yes/autospawn = no/g' /root/etc/pulse/client.conf
+		mkdir -p /root/home/$USERNAME/.orca
+		chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
 		;;
 
 	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
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		if [ -x /root/usr/bin/orca ]
 		then
@@ -103,8 +149,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
 		fi
+
+		remove_applet fast_user_switch
 		;;
 
 	access=m1)