From 48a72ff093a59a806eacb8cda5bea967463abcaf Mon Sep 17 00:00:00 2001
From: paulc <paulc@acf43c95-373e-0410-b603-e72c3f656dc1>
Date: Sun, 14 Aug 2005 23:54:16 +0000
Subject: [PATCH] Moved skin files in their own directory.

git-svn-id: http://yate.null.ro/svn/yate/trunk@478 acf43c95-373e-0410-b603-e72c3f656dc1
---
 configure.in                       |  1 +
 contrib/gtk2/gtk2client.cpp        |  6 ++++-
 modules/Makefile.in                |  2 +-
 modules/skin/.cvsignore            |  5 ++++
 modules/skin/Makefile.in           | 39 ++++++++++++++++++++++++++++++
 modules/skin/default/.cvsignore    |  4 +++
 modules/skin/default/gtk2client.rc |  2 --
 modules/skin/default/gtk2client.ui |  2 +-
 8 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 modules/skin/.cvsignore
 create mode 100644 modules/skin/Makefile.in
 create mode 100644 modules/skin/default/.cvsignore

diff --git a/configure.in b/configure.in
index fce90349..8501c146 100644
--- a/configure.in
+++ b/configure.in
@@ -475,6 +475,7 @@ AC_CONFIG_FILES([yate.spec
                  Makefile
                  engine/Makefile
                  modules/Makefile
+                 modules/skin/Makefile
                  clients/Makefile
                  scripts/Makefile
                  conf.d/Makefile
diff --git a/contrib/gtk2/gtk2client.cpp b/contrib/gtk2/gtk2client.cpp
index 7a384928..54fd3446 100644
--- a/contrib/gtk2/gtk2client.cpp
+++ b/contrib/gtk2/gtk2client.cpp
@@ -1429,7 +1429,11 @@ void GTKWindow::menu(int x, int y)
 GTKClient::GTKClient()
     : Client("GTKClient")
 {
-    s_skinPath = Engine::configPath() + Engine::pathSeparator();
+    s_skinPath = Engine::modulePath() + Engine::pathSeparator();
+    s_skinPath << "skin" << Engine::pathSeparator();
+    String skin(Engine::config().getValue("client","skin","default"));
+    if (skin)
+	s_skinPath << skin << Engine::pathSeparator();
     s_cfg = s_skinPath + "gtk2client.ui";
     s_cfg.load();
     s_save = Engine::configFile("gtk2client");
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 284830b6..5fc39fe5 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -17,7 +17,7 @@ MODFLAGS:= @MODULE_LDFLAGS@
 MODSTRIP:= @MODULE_SYMBOLS@
 INCFILES := @top_srcdir@/yateclass.h @top_srcdir@/yatengine.h @top_srcdir@/yatephone.h ../yateversn.h
 
-SUBDIRS := gtk2
+SUBDIRS := skin gtk2
 MKDEPS  := ../config.status
 PROGS := cdrbuild.yate cdrfile.yate \
 	regexroute.yate regfile.yate accfile.yate \
diff --git a/modules/skin/.cvsignore b/modules/skin/.cvsignore
new file mode 100644
index 00000000..ac859043
--- /dev/null
+++ b/modules/skin/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+core*
+*.orig
+*~
+.*.swp
diff --git a/modules/skin/Makefile.in b/modules/skin/Makefile.in
new file mode 100644
index 00000000..6962f2ce
--- /dev/null
+++ b/modules/skin/Makefile.in
@@ -0,0 +1,39 @@
+# Makefile
+# This file holds the make rules for the Telephony Engine modules
+
+# override DESTDIR at install time to prefix the install directory
+DESTDIR :=
+
+# override DEBUG at compile time to enable full debug or remove it all
+DEBUG :=
+
+SUBDIRS := gtk2
+MKDEPS  := ../../config.status
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+skindir = @libdir@/yate/skin
+
+.PHONY: all clean install uninstall
+all clean:
+
+install:
+	@lst="`cd @srcdir@; ls -1 -d */* | sed '/CVS\|\.orig/d'`" ; \
+	mkdir -p "$(DESTDIR)$(skindir)/" && \
+	for i in $$lst ; do \
+	    install -D -m 0644 "@srcdir@/$$i" "$(DESTDIR)$(skindir)/$$i" ; \
+	done;
+
+uninstall:
+	@-lst="`cd @srcdir@; ls -1 -d */* | sed '/CVS\|\.orig/d'`" ; \
+	dir="`echo "$$lst" | sed 's,/.*,,' | uniq`" ; \
+	for i in $$lst ; do \
+	    rm "$(DESTDIR)$(skindir)/$$i" ; \
+	done; \
+	for i in $$dir ; do \
+	    rmdir "$(DESTDIR)$(skindir)/$$i" ; \
+	done;
+	@-rmdir "$(DESTDIR)$(skindir)"
+
+Makefile: @srcdir@/Makefile.in $(MKDEPS)
+	cd ../.. && ./config.status
diff --git a/modules/skin/default/.cvsignore b/modules/skin/default/.cvsignore
new file mode 100644
index 00000000..3359fbab
--- /dev/null
+++ b/modules/skin/default/.cvsignore
@@ -0,0 +1,4 @@
+core*
+*.orig
+*~
+.*.swp
diff --git a/modules/skin/default/gtk2client.rc b/modules/skin/default/gtk2client.rc
index 12831667..2d3bd100 100644
--- a/modules/skin/default/gtk2client.rc
+++ b/modules/skin/default/gtk2client.rc
@@ -1,5 +1,3 @@
-pixmap_path "/usr/src/yate09/clients"
-
 # fix a bug in the default style of check and radio buttons
 style "check_button" {
     bg_pixmap[PRELIGHT] = "<parent>"
diff --git a/modules/skin/default/gtk2client.ui b/modules/skin/default/gtk2client.ui
index 2bdee937..dd25222b 100644
--- a/modules/skin/default/gtk2client.ui
+++ b/modules/skin/default/gtk2client.ui
@@ -24,7 +24,7 @@ button=180,85,85,28,hangup,Hangup
 label=10,115,200,20,status,Initializing...
 ;toggle=135,5,20,20,browser,
 ;toggle=155,5,20,20,tools,
-;toggle=5,78,,,settings,"../clients/stock_preferences_24.png" Settings
+;toggle=5,78,,,settings,"stock_preferences_24.png" Settings
 toggle=5,85,75,28,settings,Settings
 tooltip=Show/hide Settings window
 toggle=270,85,75,28,channels,Channels