[Debian-hebrew-package] [svn] r559 - pkg/user-he/trunk/scripts
Yaacov Zamir
kzamir-guest at alioth.debian.org
Wed Apr 25 06:28:28 UTC 2007
Author: kzamir-guest
Date: Wed Apr 25 06:28:28 2007
New Revision: 559
Modified:
pkg/user-he/trunk/scripts/hebrew-settings
Log:
adjust hebrew-settings script to gnome-panel >= 2.18
Modified: pkg/user-he/trunk/scripts/hebrew-settings
==============================================================================
--- pkg/user-he/trunk/scripts/hebrew-settings (original)
+++ pkg/user-he/trunk/scripts/hebrew-settings Wed Apr 25 06:28:28 2007
@@ -212,70 +212,29 @@
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
--type boolean --set /apps/panel/default_setup/applets/kbd/use_menu_path false
- # Check if gnome-panel has auto direction change for LTR languages.
- # ver. 2.18.1 and above align the panel to the right for LTR languages automatically
- # for versions below 2.18.x use manual settings
- gnome_panel_has_auto_dir=0
-
- if [ -x /usr/bin/gnome-panel ]; then
- big_v=`gnome-panel --version | cut -d' ' -f3 | cut -d. -f1`
- sub_v=`gnome-panel --version | cut -d' ' -f3 | cut -d. -f2`
-
- if (( $big_v > 2 )); then
- gnome_panel_has_auto_dir=1
- fi
-
- if (( (( $big_v == 2 )) && (( $sub_v >= 18 )) )); then
- gnome_panel_has_auto_dir=1
- fi
- fi
-
- # On a Hebrew desktop set panel to rtl view
- # If enabled flag is on make sure desktop is set for english !
- # FIXME: this only work if the user did not set up his desktop, and he use the defaults.
- # FIXME II: remove the manual direction settings of gnome-panel when all debian versions will use
- # gnome-panel >= 2.18.x
- if [[ $enabled == 1 || $gnome_panel_has_auto_dir == 1 ]]; then
- # this is for latin interface
- # we _need_ this to set an enabled system after hebrew install
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/clock/panel_right_stick true
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/mixer/panel_right_stick true
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/notification/panel_right_stick true
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/window_menu/panel_right_stick true
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/objects/menu_bar/panel_right_stick false
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/objects/nautilus_launcher/panel_right_stick false
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/objects/terminal_launcher/panel_right_stick false
-
- gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ # gnome-panel >= 2.18.x automatically set the panel direction to RTL for RTL locales.
+ # we do not need to set the direction manually
+ # FIXME: do we need this to re-set the system after an old hebrew-settings run ?
+
+ # start of manual direction re-set
+ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ --type boolean --set /apps/panel/default_setup/applets/clock/panel_right_stick true
+ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ --type boolean --set /apps/panel/default_setup/applets/mixer/panel_right_stick true
+ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ --type boolean --set /apps/panel/default_setup/applets/notification/panel_right_stick true
+ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ --type boolean --set /apps/panel/default_setup/applets/window_menu/panel_right_stick true
+ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ --type boolean --set /apps/panel/default_setup/objects/menu_bar/panel_right_stick false
+ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ --type boolean --set /apps/panel/default_setup/objects/nautilus_launcher/panel_right_stick false
+ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
+ --type boolean --set /apps/panel/default_setup/objects/terminal_launcher/panel_right_stick false
+ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
--type boolean --set /apps/panel/default_setup/applets/hdate/panel_right_stick true
+ # end of manual direction re-set
- else
- # this is for full hebrew desktop
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/clock/panel_right_stick false
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/mixer/panel_right_stick false
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/notification/panel_right_stick false
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/window_menu/panel_right_stick false
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/objects/menu_bar/panel_right_stick true
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/objects/nautilus_launcher/panel_right_stick true
- gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/objects/terminal_launcher/panel_right_stick true
-
- gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type boolean --set /apps/panel/default_setup/applets/hdate/panel_right_stick false
- fi
fi
echo "Done."
More information about the Debian-hebrew-package
mailing list