- Check that poppler iis included in the App bundle.

[inkscape.git] / packaging / macosx / Resources / bin / inkscape

diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape
index f3686511793ec3a7e93944ae9de91c12cf623634..83c46536d3b84498d09d6168a49fa52a2bb9d31d 100755 (executable)
--- a/packaging/macosx/Resources/bin/inkscape
+++ b/packaging/macosx/Resources/bin/inkscape
@@ -32,6 +32,7 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS"
 # No longer required if path rewriting has been conducted.
 # export DYLD_LIBRARY_PATH="$TOP/lib"
 
+mkdir -p "${HOME}/.inkscape-etc"
 
 export FONTCONFIG_PATH="$TOP/etc/fonts"
 export PANGO_RC_FILE="$HOME/.inkscape-etc/pangorc"
@@ -45,14 +46,14 @@ export XDG_DATA_DIRS="$TOP/share"
 export ASPELL_CONF="prefix $TOP;"
 
 # Note: This requires the path with the exact ImageMagic version number.
-# FIXME: Make the osx-app.sh script write the version into this file when 
-#        building the package.  Note, that ImageMagick will only work if 
-#        it does not find a version installed into the same PREFIX as it
-#        was originally installed.  Luckily, this is very unlikely given
-#        the extra long and strangely named install prefix we use.
-export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-6.5.5/config:$TOP/share/ImageMagick-6.5.5/config"
-export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-6.5.5/modules-Q16/filters"
-export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-6.5.5/modules-Q16/coders"
+#        Also, that ImageMagick will only work if it does not find a 
+#        version installed into the same PREFIX as it was originally 
+#        installed.  Luckily, this is very unlikely given the extra long 
+#        and strangely named install prefix we use.
+#        The actual version is inserted by the packaging script.
+export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER/config"
+export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
+export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
 
 export INKSCAPE_SHAREDIR="$TOP"
 # TODO: move the share directory to a its own folder to make things a bit cleaner in the app bundle
@@ -61,13 +62,38 @@ export INKSCAPE_LOCALEDIR="$TOP/locale"
 
 # Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
 if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
-       # prepare the theme depending on OS X appearance settings
-       (
-               cd "$INKSCAPE_SHAREDIR/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/"
-               ./sync_osx_look.sh
-               # TODO: make this more robust, probably by integrating this script directly inline here
-       )
-       export GTK2_RC_FILES="$INKSCAPE_SHAREDIR/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/gtkrc"
+       # Appearance setting
+       aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant 2>/dev/null`
+       # 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 2>/dev/null`
+       # 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"     # blue
+       else
+               menuColor="#7c8da4"     # graphite
+       fi
+       # Format highlight color as a GTK rgb value
+       hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'`
+
+       # echo $menuColor
+       # echo $hiliColorFormated
+
+       # Modify the gtkrc
+       #       - with the correct colors
+       #       - to point to the correct scrollbars folder
+       sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' "$INKSCAPE_SHAREDIR/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc" | sed 's/OSX_MENU_COLOR_PLACEHOLDER/\"'$menuColor'\"/g' | sed 's/AQUASTYLE_PLACEHOLDER/'$aquaStyle'/g' | sed 's|${THEMEDIR}|'"$TOP/themes/Clearlooks-Quicksilver-OSX/gtk-2.0|g" > "${HOME}/.inkscape-etc/gtkrc"
+
+       export GTK2_RC_FILES="$HOME/.inkscape-etc/gtkrc"
 fi
 
 # If the AppleCollationOrder preference doesn't exist, we fall back to using
@@ -90,7 +116,6 @@ echo "Setting Language: $LANG"
 # This '#' needs to be escaped in pango.modules for Pango to work properly.
 ESCAPEDTOP=`echo $TOP | sed 's/#/\\\\\\\\#/'`
 
-mkdir -p "${HOME}/.inkscape-etc"
 sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc"
 sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \
     > "${HOME}/.inkscape-etc/pango.modules"