1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-04-02 13:03:34 +02:00

added ws name position in workspace section

This commit is contained in:
kojima
1999-10-23 21:57:52 +00:00
parent 597b04f5f7
commit 8163b93a99
7 changed files with 27 additions and 11 deletions

View File

@@ -61,6 +61,7 @@ typedef struct _Panel {
#define DONT_LINK_FILE "dontlinkworkspaces" #define DONT_LINK_FILE "dontlinkworkspaces"
#define CYCLE_FILE "cycleworkspaces" #define CYCLE_FILE "cycleworkspaces"
#define ADVANCE_FILE "advancetonewworkspace" #define ADVANCE_FILE "advancetonewworkspace"
#define WSNAME_FILE "workspacename"
#define DOCK_FILE "dock" #define DOCK_FILE "dock"
#define CLIP_FILE "clip" #define CLIP_FILE "clip"
@@ -249,12 +250,11 @@ createPanel(Panel *p)
WMSetLabelText(panel->posL, WMSetLabelText(panel->posL,
_("Position of workspace name display")); _("Position of workspace name display"));
#if 0
panel->posiL = WMCreateLabel(panel->navF); panel->posiL = WMCreateLabel(panel->navF);
WMResizeWidget(panel->posiL, 60, 40); WMResizeWidget(panel->posiL, 60, 40);
WMMoveWidget(panel->posiL, 10, 160); WMMoveWidget(panel->posiL, 10, 160);
WMSetLabelImagePosition(panel->posiL, WIPImageOnly); WMSetLabelImagePosition(panel->posiL, WIPImageOnly);
path = LocateImage(ADVANCE_FILE); path = LocateImage(WSNAME_FILE);
if (path) { if (path) {
createImages(scr, rc, xis, path, &icon1, NULL); createImages(scr, rc, xis, path, &icon1, NULL);
if (icon1) { if (icon1) {
@@ -263,7 +263,6 @@ createPanel(Panel *p)
} }
free(path); free(path);
} }
#endif
panel->posP = WMCreatePopUpButton(panel->navF); panel->posP = WMCreatePopUpButton(panel->navF);
WMResizeWidget(panel->posP, 125, 20); WMResizeWidget(panel->posP, 125, 20);

View File

@@ -124,9 +124,9 @@ all: all-redirect
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .mo .po .SUFFIXES: .mo .po
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(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) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -139,6 +139,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/po subdir = WPrefs.app/po
distdir: $(DISTFILES) 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 \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

View File

@@ -66,6 +66,7 @@ tiffdata_DATA = \
whandling.tiff \ whandling.tiff \
windowfocus.tiff \ windowfocus.tiff \
workspace.tiff \ workspace.tiff \
workspacename.tiff \
xis.tiff xis.tiff
EXTRA_DIST = $(tiffdata_DATA) EXTRA_DIST = $(tiffdata_DATA)

View File

@@ -94,7 +94,7 @@ wprefsdir = @wprefsdir@
tiffdatadir = $(wprefsdir)/tiff 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) EXTRA_DIST = $(tiffdata_DATA)
@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(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) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -147,6 +147,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/tiff subdir = WPrefs.app/tiff
distdir: $(DISTFILES) 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 \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \

Binary file not shown.

View File

@@ -66,6 +66,7 @@ xpmdata_DATA = \
whandling.xpm \ whandling.xpm \
windowfocus.xpm \ windowfocus.xpm \
workspace.xpm \ workspace.xpm \
workspacename.xpm \
xis.xpm xis.xpm
EXTRA_DIST = $(xpmdata_DATA) EXTRA_DIST = $(xpmdata_DATA)

View File

@@ -94,7 +94,7 @@ wprefsdir = @wprefsdir@
xpmdatadir = $(wprefsdir)/xpm 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) EXTRA_DIST = $(xpmdata_DATA)
@@ -113,9 +113,9 @@ GZIP_ENV = --best
all: all-redirect all: all-redirect
.SUFFIXES: .SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(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) \ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -147,6 +147,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = WPrefs.app/xpm subdir = WPrefs.app/xpm
distdir: $(DISTFILES) 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 \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \