From 8163b93a999cadc9cdd3f793807d327774059af8 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Sat, 23 Oct 1999 21:57:52 +0000
Subject: [PATCH] added ws name position in workspace section

---
 WPrefs.app/Workspace.c             |   5 ++---
 WPrefs.app/po/Makefile.in          |   9 +++++++--
 WPrefs.app/tiff/Makefile.am        |   1 +
 WPrefs.app/tiff/Makefile.in        |  11 ++++++++---
 WPrefs.app/tiff/workspacename.tiff | Bin 0 -> 1326 bytes
 WPrefs.app/xpm/Makefile.am         |   1 +
 WPrefs.app/xpm/Makefile.in         |  11 ++++++++---
 7 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 WPrefs.app/tiff/workspacename.tiff

diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index efd51971..f5f306e2 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -61,6 +61,7 @@ typedef struct _Panel {
 #define DONT_LINK_FILE	"dontlinkworkspaces"
 #define CYCLE_FILE	"cycleworkspaces"
 #define ADVANCE_FILE	"advancetonewworkspace"
+#define WSNAME_FILE 	"workspacename"
 #define DOCK_FILE	"dock"
 #define CLIP_FILE	"clip"
 
@@ -249,12 +250,11 @@ createPanel(Panel *p)
     WMSetLabelText(panel->posL, 
 		   _("Position of workspace name display"));
     
-#if 0
     panel->posiL = WMCreateLabel(panel->navF);
     WMResizeWidget(panel->posiL, 60, 40);
     WMMoveWidget(panel->posiL, 10, 160);
     WMSetLabelImagePosition(panel->posiL, WIPImageOnly);
-    path = LocateImage(ADVANCE_FILE);
+    path = LocateImage(WSNAME_FILE);
     if (path) {
 	createImages(scr, rc, xis, path, &icon1, NULL);
 	if (icon1) {
@@ -263,7 +263,6 @@ createPanel(Panel *p)
 	}
 	free(path);
     }
-#endif
     
     panel->posP = WMCreatePopUpButton(panel->navF);
     WMResizeWidget(panel->posP, 125, 20);
diff --git a/WPrefs.app/po/Makefile.in b/WPrefs.app/po/Makefile.in
index f0cb66b0..b94869e6 100644
--- a/WPrefs.app/po/Makefile.in
+++ b/WPrefs.app/po/Makefile.in
@@ -124,9 +124,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .mo .po
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/po/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/po/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -139,6 +139,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/po
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/po/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WPrefs.app/tiff/Makefile.am b/WPrefs.app/tiff/Makefile.am
index bbfc64a2..64c78931 100644
--- a/WPrefs.app/tiff/Makefile.am
+++ b/WPrefs.app/tiff/Makefile.am
@@ -66,6 +66,7 @@ tiffdata_DATA = \
 	whandling.tiff \
 	windowfocus.tiff \
 	workspace.tiff \
+	workspacename.tiff \
 	xis.tiff 
 
 EXTRA_DIST = $(tiffdata_DATA)
diff --git a/WPrefs.app/tiff/Makefile.in b/WPrefs.app/tiff/Makefile.in
index 276a00a9..116ce90d 100644
--- a/WPrefs.app/tiff/Makefile.in
+++ b/WPrefs.app/tiff/Makefile.in
@@ -94,7 +94,7 @@ wprefsdir = @wprefsdir@
 
 tiffdatadir = $(wprefsdir)/tiff
 
-tiffdata_DATA =  	advancetonewworkspace.tiff 	animations.tiff 	appearance.tiff 	clip.tiff 	configs.tiff 	cycleworkspaces.tiff 	dock.tiff 	dontlinkworkspaces.tiff 	ergonomic.tiff 	ergowood.tiff 	expert.tiff 	fonts.tiff 	iconprefs.tiff 	keyboard.tiff 	keyboardprefs.tiff 	keyshortcuts.tiff 	menualign1.tiff 	menualign2.tiff 	menuprefs.tiff 	menus.tiff 	miscprefs2.tiff 	moreanim.tiff 	mousesettings.tiff 	mousespeed.tiff 	msty1.tiff 	msty2.tiff 	msty3.tiff 	newstyle.tiff 	nonopaque.tiff 	oldstyle.tiff 	opaque.tiff 	paths.tiff 	smooth.tiff 	sound.tiff 	speed0.tiff 	speed0s.tiff 	speed1.tiff 	speed1s.tiff 	speed2.tiff 	speed2s.tiff 	speed3.tiff 	speed3s.tiff 	speed4.tiff 	speed4s.tiff 	tdel.tiff 	tedit.tiff 	temp.tiff 	textr.tiff 	theme.tiff 	timer0.tiff 	timer0s.tiff 	timer1.tiff 	timer1s.tiff 	timer2.tiff 	timer2s.tiff 	timer3.tiff 	timer3s.tiff 	timer4.tiff 	timer4s.tiff 	timer5.tiff 	timer5s.tiff 	tnew.tiff 	whandling.tiff 	windowfocus.tiff 	workspace.tiff 	xis.tiff 
+tiffdata_DATA =  	advancetonewworkspace.tiff 	animations.tiff 	appearance.tiff 	clip.tiff 	configs.tiff 	cycleworkspaces.tiff 	dock.tiff 	dontlinkworkspaces.tiff 	ergonomic.tiff 	ergowood.tiff 	expert.tiff 	fonts.tiff 	iconprefs.tiff 	keyboard.tiff 	keyboardprefs.tiff 	keyshortcuts.tiff 	menualign1.tiff 	menualign2.tiff 	menuprefs.tiff 	menus.tiff 	miscprefs2.tiff 	moreanim.tiff 	mousesettings.tiff 	mousespeed.tiff 	msty1.tiff 	msty2.tiff 	msty3.tiff 	newstyle.tiff 	nonopaque.tiff 	oldstyle.tiff 	opaque.tiff 	paths.tiff 	smooth.tiff 	sound.tiff 	speed0.tiff 	speed0s.tiff 	speed1.tiff 	speed1s.tiff 	speed2.tiff 	speed2s.tiff 	speed3.tiff 	speed3s.tiff 	speed4.tiff 	speed4s.tiff 	tdel.tiff 	tedit.tiff 	temp.tiff 	textr.tiff 	theme.tiff 	timer0.tiff 	timer0s.tiff 	timer1.tiff 	timer1s.tiff 	timer2.tiff 	timer2s.tiff 	timer3.tiff 	timer3s.tiff 	timer4.tiff 	timer4s.tiff 	timer5.tiff 	timer5s.tiff 	tnew.tiff 	whandling.tiff 	windowfocus.tiff 	workspace.tiff 	workspacename.tiff 	xis.tiff 
 
 
 EXTRA_DIST = $(tiffdata_DATA)
@@ -113,9 +113,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/tiff/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/tiff/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -147,6 +147,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/tiff
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/tiff/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WPrefs.app/tiff/workspacename.tiff b/WPrefs.app/tiff/workspacename.tiff
new file mode 100644
index 0000000000000000000000000000000000000000..bc2133e34312b0918f8fe1f0bc37e8f09439bd1c
GIT binary patch
literal 1326
zcmebD)M5x@VPIgqz{Vt?lCj}|qEj1}tXj^F4}wZ=TuZI96t+lgnA9($p10=*XH%Eh
zF}1ocGd2n@^O~zxmt?l9<R#lIRqhFI95$^wqpOwwDI$|wOiM;-Z{1(E7Z(>xU&*x;
z7M&7uN?WV`l#*$dnn(T?z209>?}QmJu35R~S?H>(S$EZvejRJEGE=+l>TiD2Hj2&b
z;<o(#i#*TpWpU|fKX~Z8r0<pJVu$}9YcChimMQd^&uN^s)c;!boijgMFQuQEBbw1S
zC$ebu9JBm`yFy-?uDH%|LB3#r-Jf5qPk4Xs^YXeD5?`+pSM~H%NM*t6lkyDm0t!xt
zdRT*tE8F|-b<K`zWNLL_XkuXz=n%i3$N5P4g7detx8;?VTwmeK%yfgJ_TQ$T?Dy>#
zdwjijyrI?Xq=+CBmx{*0Gh+VQYc<vS1r}aB$}wNSSxhUWhUIBn_PLDZGi?+PT|1^U
zQ)jCW-_9o!&&RZ1T`-MHC|S`j;LM{2S-mAQ5~hSD2{Y&^`UrQ1OfX=1s-dZ|pg}6t
zWJAA?kkLsMd7~2#m_-a0L?q1f{I5`?a6%$Et(iCM;F+MXn~cu#wIwG{1_m$`3-*1v
zQ+Q0${NV$4iO>KCR&OiM9;JSLy9QR?k`p_h%}Q38&~oEzk7#G-kuwpj+jV?SEu7%g
zwexYGbb_{^NZ=6x_5PS57S}~A77tsP|IgxFvo-C{&Q-!&cCB_0a%gC1V=X(vb*wGr
zQ6?Lsf!)lMnW`HOwo8eIBz)Q?((0|v+_EjXzj@6!ZN{*GC)SDWvSrDN2klO*d?$AG
z-R`AQ%jYG&6@7ef;yd9z`-F?#g=#)1PD_{j`Dk+fxe3m4nkyDIX*FCE%`z@N=f+rT
z5_Y^HPsi%GCcAL+3}0EJEH%fJO>(>4OS|6vX45af^xLKCR^3rfo%afhjLq7DjAbiD
zrists5xo1tlO_1y^am9yt#+=GHgQ}&Z`JP1U-RmY&2-MbGH2%&$<9#6gZC#K?p-cg
z!ujv`>b+JfFBdd_i{e}(yL9f#+oe%1TI;*!m>w$h5fbW9p3be;$R^|=_rRT@i*K!z
z<3SasnXV}>B@Z+gSnWub3^}oYjVt59gEr}ZJ<m*RUz}!~FfX-<BdOEhZ-FB#huTcG
z`}Rw`_g%TA%`|bI(;?31Q}g2%G|sR8X2~F~w?iQF?Yf=sKRW*6<S{(M;oDyS@92Vb
z<F9MC+Y7|~dSL%2WJUkt|8KOJHwfAqo4K_7Rd<~EC)CB{!qLCkt@|6kRVzhxED-y+
z+y3uar%3{HSG-6Qj=ph>uWY0H^%eX^Oif)?R~9y|%}H0^ee-mk)<b!P1Kbj<f2B42
z3c8HvJZ74{<B)081apx&&vc&eJdwJt$hJk1k2BNBE#%$D26vl>lKK@#rK={HGub>b
z^shYU9rxKR<{@Xk0*8pkz7M_fe-5eFZ#ZfHp;9>T;sa~@pJ(I$8Ebh3ra6Z=N^7Xi
zp8FxBlUXoXG&^fDi}=T`>H{1ce82*QnSqgkfx!rf8KG<qAe#xuW(LwMtPBjyP;nrW
zfep%L0<yV~*u0EP3@RWopdvv=7O<HdK)w)E4ag2rC>vz17?f=WWQ#-9`vJ>086@?#
wP&UXe5a0kq{fzwFRQ<%V#FE4!{gmWn{qp>x?BasN<kY;x+*G}i%(OHH0E{C5ivR!s

literal 0
HcmV?d00001

diff --git a/WPrefs.app/xpm/Makefile.am b/WPrefs.app/xpm/Makefile.am
index be32a473..c51c35f2 100644
--- a/WPrefs.app/xpm/Makefile.am
+++ b/WPrefs.app/xpm/Makefile.am
@@ -66,6 +66,7 @@ xpmdata_DATA = \
 	whandling.xpm \
 	windowfocus.xpm \
 	workspace.xpm \
+	workspacename.xpm \
 	xis.xpm 
 
 EXTRA_DIST = $(xpmdata_DATA)
diff --git a/WPrefs.app/xpm/Makefile.in b/WPrefs.app/xpm/Makefile.in
index ee435710..289086cc 100644
--- a/WPrefs.app/xpm/Makefile.in
+++ b/WPrefs.app/xpm/Makefile.in
@@ -94,7 +94,7 @@ wprefsdir = @wprefsdir@
 
 xpmdatadir = $(wprefsdir)/xpm
 
-xpmdata_DATA =  	advancetonewworkspace.xpm 	animations.xpm 	appearance.xpm 	clip.xpm 	configs.xpm 	cycleworkspaces.xpm 	dock.xpm 	dontlinkworkspaces.xpm 	ergonomic.xpm 	ergowood.xpm 	expert.xpm 	fonts.xpm 	iconprefs.xpm 	keyboard.xpm 	keyboardprefs.xpm 	keyshortcuts.xpm 	menualign1.xpm 	menualign2.xpm 	menuprefs.xpm 	menus.xpm 	miscprefs2.xpm 	moreanim.xpm 	mousesettings.xpm 	mousespeed.xpm 	msty1.xpm 	msty2.xpm 	msty3.xpm 	newstyle.xpm 	nonopaque.xpm 	oldstyle.xpm 	opaque.xpm 	paths.xpm 	smooth.xpm 	sound.xpm 	speed0.xpm 	speed0s.xpm 	speed1.xpm 	speed1s.xpm 	speed2.xpm 	speed2s.xpm 	speed3.xpm 	speed3s.xpm 	speed4.xpm 	speed4s.xpm 	tdel.xpm 	tedit.xpm 	temp.xpm 	textr.xpm 	theme.xpm 	timer0.xpm 	timer0s.xpm 	timer1.xpm 	timer1s.xpm 	timer2.xpm 	timer2s.xpm 	timer3.xpm 	timer3s.xpm 	timer4.xpm 	timer4s.xpm 	timer5.xpm 	timer5s.xpm 	tnew.xpm 	whandling.xpm 	windowfocus.xpm 	workspace.xpm 	xis.xpm 
+xpmdata_DATA =  	advancetonewworkspace.xpm 	animations.xpm 	appearance.xpm 	clip.xpm 	configs.xpm 	cycleworkspaces.xpm 	dock.xpm 	dontlinkworkspaces.xpm 	ergonomic.xpm 	ergowood.xpm 	expert.xpm 	fonts.xpm 	iconprefs.xpm 	keyboard.xpm 	keyboardprefs.xpm 	keyshortcuts.xpm 	menualign1.xpm 	menualign2.xpm 	menuprefs.xpm 	menus.xpm 	miscprefs2.xpm 	moreanim.xpm 	mousesettings.xpm 	mousespeed.xpm 	msty1.xpm 	msty2.xpm 	msty3.xpm 	newstyle.xpm 	nonopaque.xpm 	oldstyle.xpm 	opaque.xpm 	paths.xpm 	smooth.xpm 	sound.xpm 	speed0.xpm 	speed0s.xpm 	speed1.xpm 	speed1s.xpm 	speed2.xpm 	speed2s.xpm 	speed3.xpm 	speed3s.xpm 	speed4.xpm 	speed4s.xpm 	tdel.xpm 	tedit.xpm 	temp.xpm 	textr.xpm 	theme.xpm 	timer0.xpm 	timer0s.xpm 	timer1.xpm 	timer1s.xpm 	timer2.xpm 	timer2s.xpm 	timer3.xpm 	timer3s.xpm 	timer4.xpm 	timer4s.xpm 	timer5.xpm 	timer5s.xpm 	tnew.xpm 	whandling.xpm 	windowfocus.xpm 	workspace.xpm 	workspacename.xpm 	xis.xpm 
 
 
 EXTRA_DIST = $(xpmdata_DATA)
@@ -113,9 +113,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/xpm/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/xpm/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -147,6 +147,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/xpm
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/xpm/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \