[dia] Autotools support for new Mac OS X theme.

From: Steffen Macke <sdteffen src gnome org>
To: commits-list gnome org
Cc:
Subject: [dia] Autotools support for new Mac OS X theme.
Date: Tue, 20 Mar 2012 20:48:20 +0000 (UTC)
commit 8813c5f70bb181c563fcbc58f163f7e5e6739486
Author: Steffen Macke <sdteffen sdteffen de>
Date:   Tue Mar 20 21:47:23 2012 +0100

    Autotools support for new Mac OS X theme.

 configure.in                                       |    9 +++++++++
 installer/macosx/Makefile.am                       |    4 +++-
 installer/macosx/Resources/Makefile.am             |    3 +++
 installer/macosx/Resources/etc/Makefile.am         |    1 +
 installer/macosx/Resources/etc/fonts/Makefile.am   |    1 +
 installer/macosx/Resources/themes/CL/Makefile.am   |    1 +
 .../macosx/Resources/themes/CL/gtk-2.0/Makefile.am |    3 +++
 .../themes/CL/gtk-2.0/Scrollbars/Makefile.am       |    2 ++
 .../gtk-2.0/Scrollbars/stepper-down.png            |  Bin 465 -> 465 bytes
 .../gtk-2.0/Scrollbars/stepper-left.png            |  Bin 497 -> 497 bytes
 .../gtk-2.0/Scrollbars/stepper-right.png           |  Bin 498 -> 498 bytes
 .../gtk-2.0/Scrollbars/stepper-up.png              |  Bin 463 -> 463 bytes
 .../gtk-2.0/Scrollbars/trough-scrollbar-horiz.png  |  Bin 1014 -> 1014 bytes
 .../gtk-2.0/Scrollbars/trough-scrollbar-vert.png   |  Bin 905 -> 905 bytes
 .../themes/CL/gtk-2.0/Scrollbars_1/Makefile.am     |    2 ++
 .../gtk-2.0/Scrollbars_1/copy-slider.sh            |    0
 .../gtk-2.0/Scrollbars_1/slider-horiz-prelight.png |  Bin 5940 -> 5940 bytes
 .../gtk-2.0/Scrollbars_1/slider-horiz.png          |  Bin 5940 -> 5940 bytes
 .../gtk-2.0/Scrollbars_1/slider-vert-prelight.png  |  Bin 5409 -> 5409 bytes
 .../gtk-2.0/Scrollbars_1/slider-vert.png           |  Bin 5409 -> 5409 bytes
 .../themes/CL/gtk-2.0/Scrollbars_6/Makefile.am     |    2 ++
 .../gtk-2.0/Scrollbars_6/copy-slider.sh            |    0
 .../gtk-2.0/Scrollbars_6/slider-horiz-prelight.png |  Bin 5864 -> 5864 bytes
 .../gtk-2.0/Scrollbars_6/slider-horiz.png          |  Bin 5864 -> 5864 bytes
 .../gtk-2.0/Scrollbars_6/slider-vert-prelight.png  |  Bin 5412 -> 5412 bytes
 .../gtk-2.0/Scrollbars_6/slider-vert.png           |  Bin 5412 -> 5412 bytes
 .../gtk-2.0/pre_gtkrc                              |    0
 installer/macosx/Resources/themes/Makefile.am      |    1 +
 installer/macosx/dia                               |    2 +-
 29 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 61beb8a..0aff97d 100644
--- a/configure.in
+++ b/configure.in
@@ -711,6 +711,15 @@ doc/pl/Makefile
 doc/fr/Makefile
 installer/Makefile
 installer/macosx/Makefile
+installer/macosx/Resources/Makefile
+installer/macosx/Resources/etc/Makefile
+installer/macosx/Resources/etc/fonts/Makefile
+installer/macosx/Resources/themes/Makefile
+installer/macosx/Resources/themes/CL/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/Makefile
+installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/Makefile
 installer/win32/Makefile
 installer/win32/locale/Makefile
 dia.keys
diff --git a/installer/macosx/Makefile.am b/installer/macosx/Makefile.am
index d27239a..e08a580 100644
--- a/installer/macosx/Makefile.am
+++ b/installer/macosx/Makefile.am
@@ -1,6 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = dia Dia.icns osx-app.sh osx-dmg.sh
+SUBDIRS = Resources
+
+EXTRA_DIST = dia osx-app.sh osx-dmg.sh
 
 Info.plist: Info.plist.in
 	sed -e 's/@VERSION/'$(VERSION)'/;' < $< > $@
diff --git a/installer/macosx/Resources/Makefile.am b/installer/macosx/Resources/Makefile.am
new file mode 100644
index 0000000..5edcb2f
--- /dev/null
+++ b/installer/macosx/Resources/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = etc themes
+
+EXTRA_DIST = Dia.icns 
diff --git a/installer/macosx/Resources/etc/Makefile.am b/installer/macosx/Resources/etc/Makefile.am
new file mode 100644
index 0000000..71ee79a
--- /dev/null
+++ b/installer/macosx/Resources/etc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = fonts
diff --git a/installer/macosx/Resources/etc/fonts/Makefile.am b/installer/macosx/Resources/etc/fonts/Makefile.am
new file mode 100644
index 0000000..46f4aab
--- /dev/null
+++ b/installer/macosx/Resources/etc/fonts/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = fonts.conf
diff --git a/installer/macosx/Resources/themes/CL/Makefile.am b/installer/macosx/Resources/themes/CL/Makefile.am
new file mode 100644
index 0000000..5c631fb
--- /dev/null
+++ b/installer/macosx/Resources/themes/CL/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = gtk-2.0
diff --git a/installer/macosx/Resources/themes/CL/gtk-2.0/Makefile.am b/installer/macosx/Resources/themes/CL/gtk-2.0/Makefile.am
new file mode 100644
index 0000000..791a86e
--- /dev/null
+++ b/installer/macosx/Resources/themes/CL/gtk-2.0/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = Scrollbars Scrollbars_1 Scrollbars_6
+
+EXTRA_DIST = pre_gtkrc
diff --git a/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/Makefile.am b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/Makefile.am
new file mode 100644
index 0000000..b80d9d5
--- /dev/null
+++ b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = stepper-down.png stepper-right.png trough-scrollbar-horiz.png \
+	stepper-left.png  stepper-up.png trough-scrollbar-vert.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-down.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-down.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-left.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-left.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-right.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-right.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-up.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/stepper-up.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
diff --git a/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/Makefile.am b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/Makefile.am
new file mode 100644
index 0000000..65ff999
--- /dev/null
+++ b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = copy-slider.sh slider-horiz-prelight.png \
+	slider-vert-prelight.png slider-horiz.png slider-vert.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/copy-slider.sh
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/copy-slider.sh
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-horiz.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-horiz.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-vert-prelight.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-vert-prelight.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-vert.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_1/slider-vert.png
diff --git a/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/Makefile.am b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/Makefile.am
new file mode 100644
index 0000000..65ff999
--- /dev/null
+++ b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = copy-slider.sh slider-horiz-prelight.png \
+	slider-vert-prelight.png slider-horiz.png slider-vert.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/copy-slider.sh
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/copy-slider.sh
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-horiz.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-horiz.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-vert-prelight.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-vert-prelight.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png b/installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-vert.png
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png
rename to installer/macosx/Resources/themes/CL/gtk-2.0/Scrollbars_6/slider-vert.png
diff --git a/installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/installer/macosx/Resources/themes/CL/gtk-2.0/pre_gtkrc
similarity index 100%
rename from installer/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc
rename to installer/macosx/Resources/themes/CL/gtk-2.0/pre_gtkrc
diff --git a/installer/macosx/Resources/themes/Makefile.am b/installer/macosx/Resources/themes/Makefile.am
new file mode 100644
index 0000000..6ef46f4
--- /dev/null
+++ b/installer/macosx/Resources/themes/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = CL
diff --git a/installer/macosx/dia b/installer/macosx/dia
index 6b7bd42..384876f 100755
--- a/installer/macosx/dia
+++ b/installer/macosx/dia
@@ -86,7 +86,7 @@ if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
 	# Modify the gtkrc
 	#	- with the correct colors
 	#	- to point to the correct scrollbars folder
-	sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' "$DIA_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}|'"$ESCAPEDTOP/themes/Clearlooks-Quicksilver-OSX/gtk-2.0|g" > "${HOME}/.dia-etc/gtkrc"
+	sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' "$DIA_SHAREDIR/themes/CL/gtk-2.0/pre_gtkrc" | sed 's/OSX_MENU_COLOR_PLACEHOLDER/\"'$menuColor'\"/g' | sed 's/AQUASTYLE_PLACEHOLDER/'$aquaStyle'/g' | sed 's|${THEMEDIR}|'"$ESCAPEDTOP/themes/CL/gtk-2.0|g" > "${HOME}/.dia-etc/gtkrc"
 
 	export GTK2_RC_FILES="$HOME/.dia-etc/gtkrc"
 fi
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]