retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Moved skin files in their own directory. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@478 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2005-08-14 23:54:16 +00:00
parent afa2668827
commit 48a72ff093
8 changed files with 56 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -475,6 +475,7 @@ AC_CONFIG_FILES([yate.spec
Makefile
engine/Makefile
modules/Makefile
modules/skin/Makefile
clients/Makefile
scripts/Makefile
conf.d/Makefile

6
contrib/gtk2/gtk2client.cpp
View File

@ -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");

2
modules/Makefile.in
View File

@ -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 \

5
modules/skin/.cvsignore Normal file
View File

@ -0,0 +1,5 @@
Makefile
core*
*.orig
*~
.*.swp

39
modules/skin/Makefile.in Normal file
View File

@ -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

4
modules/skin/default/.cvsignore Normal file
View File

@ -0,0 +1,4 @@
core*
*.orig
*~
.*.swp

2
modules/skin/default/gtk2client.rc
View File

@ -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>"

2
modules/skin/default/gtk2client.ui
View File

@ -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