merge from trunk (r11787)

(bzr r11668.1.28)

3 files changed, 72 insertions, 25 deletions

diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape
index f18948aff..486877fa4 100755
--- a/packaging/macosx/Resources/bin/inkscape
+++ b/packaging/macosx/Resources/bin/inkscape
@@ -114,17 +114,36 @@ fi
 # If the AppleCollationOrder preference doesn't exist, we fall back to using
 # the AppleLocale preference.
 LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
-if [ "x$LANGSTR" == "x" ]
+if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
 then
     echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2
     LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
             sed 's/_.*//'`
+	echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2
+else
+	echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2
 fi
 
 # NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
 #       to crash on startup in locale_from_utf8().
-export LANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
-	tail -n1 | sed 's/\./ /' | awk '{print $2}'`.UTF-8"
+if [ "x$LANGSTR" == "x" ]
+then 
+	# override broken script
+	echo "Overriding empty LANGSTR" 1>&2
+	export LANG="en_US.UTF-8"
+else
+	tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
+		tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
+	if [ "x$tmpLANG" == "x" ]
+	then
+		# override broken script
+		echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
+		export LANG="en_US.UTF-8"
+	else
+		echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2
+		export LANG="$tmpLANG.UTF-8"
+	fi
+fi
 echo "Setting Language: $LANG" 1>&2
 
 sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc"
diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
index a8b3d4c4c..171e73626 100644
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
@@ -13,36 +13,38 @@ pixmap_path "${THEMEDIR}"
 style "clearlooks-default"
 {
 	GtkButton		::default_border	 = { 0, 0, 0, 0 }
-	GtkRange			::trough_border	 = 0
-	GtkPaned			::handle_size		 = 6
-	GtkRange			::slider_width		 = 15
-	GtkRange			::stepper_size		 = 15
-	GtkScrollbar	::min_slider_length = 30
-	GtkCheckButton	::indicator_size	 = 12
+	GtkRange		::trough_border 	 = 0
+	GtkPaned		::handle_size		 = 6
+	GtkRange		::slider_width		 = 15
+	GtkRange		::stepper_size		 = 15
+	GtkScale		::slider-length		 = 23
+	GtkScale		::trough-side-details	 = 1
+	GtkScrollbar		::min_slider_length	 = 30
+	GtkCheckButton		::indicator_size	 = 12
 	GtkMenuBar		::internal-padding	 = 0
-	GtkTreeView		::expander_size	 = 14
-	GtkExpander		::expander_size	 = 16
+	GtkTreeView		::expander_size		 = 14
+	GtkExpander		::expander_size		 = 16
 
 	xthickness = 1
 	ythickness = 1
 
-	fg[NORMAL]			= "#000000" # black
+	fg[NORMAL]		= "#000000" # black
 	fg[PRELIGHT]		= "#000000" # black
 	fg[SELECTED]		= "#ffffff" # white 
-	fg[ACTIVE]			= "#000000" # black
-	fg[INSENSITIVE]	= {0.6, 0.6, 0.6} # dark gray
+	fg[ACTIVE]		= "#000000" # black
+	fg[INSENSITIVE]		= {0.6, 0.6, 0.6} # dark gray
 
-	bg[NORMAL]			= {0.95, 0.95, 0.95} # very light gray
+	bg[NORMAL]		= {0.95, 0.95, 0.95} # very light gray
 	bg[PRELIGHT]		= "#ffffff" # white
 	bg[SELECTED]		= OSX_MENU_COLOR_PLACEHOLDER	# menu color
-	bg[INSENSITIVE]	= {0.9, 0.9, 0.9} # light gray
-	bg[ACTIVE]			= {0.85, 0.85, 0.85} # gray
+	bg[INSENSITIVE]		= {0.9, 0.9, 0.9} # light gray
+	bg[ACTIVE]		= {0.85, 0.85, 0.85} # gray
 
 	base[NORMAL]		= "#ffffff" # white 
 	base[PRELIGHT]		= OSX_MENU_COLOR_PLACEHOLDER # menu color
 	base[ACTIVE]		= {0.6, 0.6, 0.6} # dark gray
 	base[SELECTED]		= OSX_HILI_COLOR_PLACEHOLDER # highlight color
-	base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray
+	base[INSENSITIVE] 	= {0.9, 0.9, 0.9} # light gray
 
 	text[NORMAL]		= "#000000" # black
 	text[PRELIGHT]		= "#000000" # black
@@ -52,10 +54,13 @@ style "clearlooks-default"
 
 	engine "clearlooks" 
 	{
-	menubarstyle		= 1		# 0 = flat, 1 = sunken, 2 = flat gradient
-	menuitemstyle		= 0		# 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button)
-	listviewitemstyle	= 0		# 0 = flat, 1 = 3d-ish (gradient)
-	progressbarstyle	= 0		# 0 = candy bar, 1 = flat
+		colorize_scrollbar	 = FALSE	#TRUE
+		reliefstyle		 = 1
+		menubarstyle		 = 0		# 0 = flat, 1 = sunken, 2 = flat gradient
+		toolbarstyle		 = 0		# 0 = flat, 1 = enable effects
+		animation		 = FALSE
+		radius			 = 3.0		# 3.0 = default, 0.0 = sharp corners
+		style			 = GUMMY	# CLASSIC, GUMMY, GLOSSY
 	}
 }
 	
@@ -72,6 +77,10 @@ style "clearlooks-button" = "clearlooks-default"
 	ythickness = 3
 
 	bg[NORMAL] = "#f0f1f2" # a hint of blue...
+
+	engine "clearlooks" {
+		style = CLASSIC
+	}
 }
 
 style "clearlooks-notebook" = "clearlooks-wide"
@@ -95,13 +104,18 @@ style "clearlooks-menu" = "clearlooks-default"
 
 style "clearlooks-menu-item" = "clearlooks-default"
 {
-	xthickness = 2
-	ythickness = 3
+	xthickness = 0
+	ythickness = 2
+
 	fg[PRELIGHT] = "#ffffff"
 	text[PRELIGHT] = "#ffffff"
 	# We want PRELIGHT to be white for widgets, but coloured for the menu.
 	bg[PRELIGHT]		= OSX_MENU_COLOR_PLACEHOLDER
 
+	# Radius of the menu items (inside menus)
+	engine "clearlooks" {
+		radius = 0.0
+	}
 }
 
 style "clearlooks-menu-itembar" = "clearlooks-default"
@@ -517,7 +531,17 @@ gtk-font-name="Lucida Grande 10"
 #
 # insckape-decoration	layers lock, "affect" icons, etc.
 #
-gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=22,22:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=16,16"
+#gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=22,22:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=16,16"
+gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12"
 
 # use OS X default pdf-viewer for print preview
 gtk-print-preview-command="/usr/bin/open %f"
+
+# Whether images should be shown on buttons.
+# Default value: TRUE
+gtk-button-images = 0
+
+# Whether images should be shown in menus.
+gtk-menu-images = 0
+
+
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index c413e2d0f..ef4301c17 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -270,6 +270,10 @@ rsync -av "$binary_dir/../share/locale"/* "$pkgresources/locale"
 mkdir -p "$pkgresources/share"
 cp -rp "$LIBPREFIX/share/mime" "$pkgresources/share/"
 
+# Copy GTK hicolor icon theme index file
+mkdir -p "$pkgresources/share/icons/hicolor"
+cp "$LIBPREFIX/share/icons/hicolor/index.theme"  "$pkgresources/share/icons/hicolor"
+
 # Icons and the rest of the script framework
 rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/"