From: jiho-sf <jiho-sf@users.sourceforge.net>
Date: Sat, 16 Feb 2008 21:15:14 +0000 (+0000)
Subject: When the appearance settings on OS X are not changed from the default, the properties... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8259c9f7041164b306ade36e144cb9847534f8d1;p=inkscape.git

When the appearance settings on OS X are not changed from the default, the properties AppleAquaColorVariant and AppleHighlightColor do not exist. Add defaults which correspond to Aqua and blue, the default, flashy, appearance of OS X.
Fixes bug #175967.
---

diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh
index b94ab67df..f809e4c50 100755
--- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh
+++ b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/sync_osx_look.sh
@@ -8,17 +8,23 @@
 
 # Appearance setting
 aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant`
-# 1 for aqua, 6 for graphite
+# 1 for aqua, 6 for graphite, inexistant if the default color was never changed
+if [[ "$aquaStyle" == "" ]]; then
+	aquaStyle=1		# set aqua as default
+fi
 
 # Highlight Color setting
 hiliColor=`defaults read "Apple Global Domain" AppleHighlightColor`
-# a RGB value, with components between 0 and 1
+# a RGB value, with components between 0 and 1, also inexistant if it was not changed
+if [[ "$hiliColor" == "" ]]; then
+	hiliColor="0.709800 0.835300 1.000000"	# set blue as default
+fi
 
 # Menu items color
 if [[ aquaStyle -eq 1 ]]; then
-	menuColor="#4a76cd"
+	menuColor="#4a76cd"	# blue
 else
-	menuColor="#7c8da4"
+	menuColor="#7c8da4"	# graphite
 fi
 # Format highlight color as a GTK rgb value
 hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'`