From 9d88b14f599a859930233c04427610dbb2f70834 Mon Sep 17 00:00:00 2001 From: kojima Date: Thu, 8 Feb 2001 22:43:00 +0000 Subject: [PATCH] tomka's i18n fixes --- ChangeLog | 1 + WPrefs.app/MenuPreferences.c | 2 +- WPrefs.app/MouseSettings.c | 42 +++++++++++----------- WPrefs.app/Preferences.c | 21 ++++++----- WPrefs.app/TexturePanel.c | 6 ++-- WPrefs.app/WindowHandling.c | 6 ++-- WPrefs.app/po/Makefile.am | 2 -- WPrefs.app/po/README | 2 +- WindowMaker/Makefile.am | 2 ++ WindowMaker/README | 3 +- configure.in | 2 +- src/WindowMaker.h | 2 +- src/dialog.c | 86 ++++++++++++++++++++------------------------ src/menu.c | 2 +- src/wconfig.h.in | 2 +- src/winspector.c | 25 ++++++------- util/Makefile.am | 15 +++++--- util/README | 4 +++ util/wmaker.inst.in | 14 ++++++-- util/wsetfont | 8 +++++ 20 files changed, 135 insertions(+), 112 deletions(-) diff --git a/ChangeLog b/ChangeLog index a53ef7ad..a8d00714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Changes since version 0.63.1: - new updated Slovak translations (Jan Tomka/judas@hell ) - integrated the 'no polling' patch from Jim Knoble . - new wsetfont script (Anton Zinoviev ) +- lots of i18n fixes (Jan Tomka/judas@hell ) Changes since version 0.63.0: diff --git a/WPrefs.app/MenuPreferences.c b/WPrefs.app/MenuPreferences.c index b5f8cdd2..6e461eac 100644 --- a/WPrefs.app/MenuPreferences.c +++ b/WPrefs.app/MenuPreferences.c @@ -205,7 +205,7 @@ createPanel(Panel *p) WMSetButtonText(panel->wrapB, _("Always open submenus inside the screen, instead of scrolling.\nNote: this is annoying.")); panel->autoB = WMCreateSwitchButton(panel->optF); - WMResizeWidget(panel->autoB, 440, 20); + WMResizeWidget(panel->autoB, 440, 32); WMMoveWidget(panel->autoB, 25, 45); WMSetButtonText(panel->autoB, _("Scroll off-screen menus when pointer is moved over them.")); diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c index 58449f35..db3c0a4b 100644 --- a/WPrefs.app/MouseSettings.c +++ b/WPrefs.app/MouseSettings.c @@ -94,26 +94,10 @@ typedef struct _Panel { -static char *modifierNames[] = { - "Shift", - "Lock", - "Control", - "Mod1", - "Mod2", - "Mod3", - "Mod4", - "Mod5" -}; - - -static char *buttonNames[] = { - "None", - "Btn1 (left)", - "Btn2 (middle)", - "Btn3 (right)", - "Btn4", - "Btn5" -}; +static char *modifierNames[8]; + + +static char *buttonNames[6]; #define DELAY(i) ((i)*75+170) @@ -599,7 +583,7 @@ createPanel(Panel *p) WMReleaseFont(font); WMReleaseColor(color); } - WMSetLabelText(panel->ddelaL, "msec"); + WMSetLabelText(panel->ddelaL, _("msec")); WMMapSubwidgets(panel->ddelaF); @@ -810,6 +794,22 @@ Panel* InitMouseSettings(WMScreen *scr, WMWidget *parent) { _Panel *panel; + + modifierNames[0] = wstrdup(_("Shift")); + modifierNames[1] = wstrdup(_("Lock")); + modifierNames[2] = wstrdup(_("Control")); + modifierNames[3] = wstrdup(_("Mod1")); + modifierNames[4] = wstrdup(_("Mod2")); + modifierNames[5] = wstrdup(_("Mod3")); + modifierNames[6] = wstrdup(_("Mod4")); + modifierNames[7] = wstrdup(_("Mod5")); + + buttonNames[0] = wstrdup(_("None")); + buttonNames[1] = wstrdup(_("Btn1 (left)")); + buttonNames[2] = wstrdup(_("Btn2 (middle)")); + buttonNames[3] = wstrdup(_("Btn3 (right)")); + buttonNames[4] = wstrdup(_("Btn4")); + buttonNames[5] = wstrdup(_("Btn5")); panel = wmalloc(sizeof(_Panel)); memset(panel, 0, sizeof(_Panel)); diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c index 3ea7423d..c22f391b 100644 --- a/WPrefs.app/Preferences.c +++ b/WPrefs.app/Preferences.c @@ -72,11 +72,16 @@ borderCallback(WMWidget *w, void *data) i = WMGetSliderValue(panel->borderS); if (i == 0) - WMSetLabelText(panel->borderL, "OFF"); - else { - sprintf(buffer, "%i pixel%s", i, i>1 ? "s" : ""); - WMSetLabelText(panel->borderL, buffer); - } + sprintf(buffer, _("OFF")); + else if (i == 1) + sprintf(buffer, _("1 pixel")); + else if (i <= 4) + /* 2-4 */ + sprintf(buffer, _("%i pixels"), i); + else + /* >4 */ + sprintf(buffer, _("%i pixels "), i); /* note space! */ + WMSetLabelText(panel->borderL, buffer); } @@ -297,17 +302,17 @@ createPanel(Panel *p) WMSetSliderAction(panel->borderS, borderCallback, panel); panel->borderL = WMCreateLabel(panel->borderF); - WMResizeWidget(panel->borderL, 50, 15); + WMResizeWidget(panel->borderL, 100, 15); WMMoveWidget(panel->borderL, 105, 20); panel->lrB = WMCreateSwitchButton(panel->borderF); WMMoveWidget(panel->lrB, 20, 40); - WMResizeWidget(panel->lrB, 90, 30); + WMResizeWidget(panel->lrB, 100, 30); WMSetButtonText(panel->lrB, _("Left/Right")); panel->tbB = WMCreateSwitchButton(panel->borderF); WMMoveWidget(panel->tbB, 120, 40); - WMResizeWidget(panel->tbB, 90, 30); + WMResizeWidget(panel->tbB, 100, 30); WMSetButtonText(panel->tbB, _("Top/Bottom")); diff --git a/WPrefs.app/TexturePanel.c b/WPrefs.app/TexturePanel.c index cf2d9740..04e652d8 100644 --- a/WPrefs.app/TexturePanel.c +++ b/WPrefs.app/TexturePanel.c @@ -654,7 +654,7 @@ browseImageCallback(WMWidget *w, void *data) ipath = wstrdup(wgethomedir()); if (WMRunModalFilePanelForDirectory(opanel, panel->win, ipath, - "Open Image", NULL)) { + _("Open Image"), NULL)) { char *path, *fullpath; char *tmp, *tmp2; @@ -935,7 +935,7 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) updateTGradImage(panel); updateSGradButtons(panel); - } else wwarning("could not load file '%s': %s", panel->imageFile, + } else wwarning(_("could not load file '%s': %s"), panel->imageFile, RMessageForError(RErrorCode)); /*...............................................*/ @@ -1054,7 +1054,7 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture) bad_texture: str = PLGetDescription(texture); - wwarning("error creating texture %s", str); + wwarning(_("error creating texture %s"), str); wfree(str); } diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c index 09d7c168..4e2ff0d0 100644 --- a/WPrefs.app/WindowHandling.c +++ b/WPrefs.app/WindowHandling.c @@ -397,8 +397,8 @@ createPanel(Panel *p) WMMoveWidget(panel->resL, 95, 20); panel->resaB = WMCreateRadioButton(panel->resF); - WMMoveWidget(panel->resaB, 130, 12); - WMResizeWidget(panel->resaB, 70, 30); + WMMoveWidget(panel->resaB, 130, 14); + WMResizeWidget(panel->resaB, 70, 26); WMSetButtonText(panel->resaB, _("Resist")); panel->resrB = WMCreateRadioButton(panel->resF); @@ -420,7 +420,7 @@ createPanel(Panel *p) panel->tranB = WMCreateSwitchButton(panel->tranF); WMMoveWidget(panel->tranB, 10, 5); WMResizeWidget(panel->tranB, 250, 30); - WMSetButtonText(panel->tranB, _("Open dialogs in same workspace as their owners")); + WMSetButtonText(panel->tranB, _("Open dialogs in same workspace\nas their owners")); WMMapSubwidgets(panel->tranF); diff --git a/WPrefs.app/po/Makefile.am b/WPrefs.app/po/Makefile.am index 8419f449..04482a66 100644 --- a/WPrefs.app/po/Makefile.am +++ b/WPrefs.app/po/Makefile.am @@ -21,7 +21,6 @@ POTFILES = \ $(top_builddir)/WPrefs.app/Menu.c \ $(top_builddir)/WPrefs.app/MenuPreferences.c \ $(top_builddir)/WPrefs.app/MouseSettings.c \ - $(top_builddir)/WPrefs.app/NoMenuAlert.c \ $(top_builddir)/WPrefs.app/Paths.c \ $(top_builddir)/WPrefs.app/Preferences.c \ $(top_builddir)/WPrefs.app/TexturePanel.c \ @@ -30,7 +29,6 @@ POTFILES = \ $(top_builddir)/WPrefs.app/Workspace.c \ $(top_builddir)/WPrefs.app/double.c \ $(top_builddir)/WPrefs.app/editmenu.c \ - $(top_builddir)/WPrefs.app/MenuGuru.c \ $(top_builddir)/WPrefs.app/xmodifier.c SUFFIXES = .po .mo diff --git a/WPrefs.app/po/README b/WPrefs.app/po/README index 199008f5..4d92cf83 100644 --- a/WPrefs.app/po/README +++ b/WPrefs.app/po/README @@ -20,5 +20,5 @@ ru.po Russian Igor P. Roboul de.po German Bernd Eggert hu.po Hungarian Horvath Szabolcs bg.po Bulgarian Slavei Karadjov -menu.sk Slovak judas@hell +sk.po Slovak judas@hell diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am index d88f2b80..cb7956e9 100644 --- a/WindowMaker/Makefile.am +++ b/WindowMaker/Makefile.am @@ -31,6 +31,7 @@ prefsdata_DATA =\ menu.ro\ menu.ru\ menu.se\ + menu.sk\ menu.sl\ menu.tr\ menu.zh_CN\ @@ -47,6 +48,7 @@ prefsdata_DATA =\ plmenu.ko\ plmenu.pl\ plmenu.ro\ + plmenu.sk\ plmenu.zh_CN\ wmmacros\ xtree.dat diff --git a/WindowMaker/README b/WindowMaker/README index 0477a2de..258cc570 100644 --- a/WindowMaker/README +++ b/WindowMaker/README @@ -62,7 +62,7 @@ menu.zh_TW.Big5 Chinese Li Wei Jih menu.zh_CN Chinese Wang Jian menu.pl Polish Maciej Friedel menu.bg Bulgarian Slavei Karadjov -menu.sk Slovak judas@hell +menu.sk Slovak judas@hell @@ -75,3 +75,4 @@ plmenu.pl Polish Maciej Friedel plmenu.ko Korean Byeong-Chan Kim plemnu.es Spanish David A. Schekaiban plmenu.bg Bulgarian Slavei Karadjov +plmenu.sk Slovak judas@hell diff --git a/configure.in b/configure.in index 8c5a6736..4b5e1073 100644 --- a/configure.in +++ b/configure.in @@ -259,7 +259,7 @@ dnl ================== dnl List of supported locales dnl ------------------------- supported_locales="cs de es fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu" -supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de bg hu" +supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de bg hu sk" for lang in $LINGUAS; do ok=0 diff --git a/src/WindowMaker.h b/src/WindowMaker.h index d4864ed1..de600d17 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -28,7 +28,7 @@ #include -#if HAVE_LIBINTL_H && I18N +#if defined(HAVE_LIBINTL_H) && defined(I18N) # include # define _(text) gettext(text) #else diff --git a/src/dialog.c b/src/dialog.c index 9a32ad0b..4d520337 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1031,7 +1031,7 @@ handleLogoPush(XEvent *event, void *data) WMDeleteTimerHandler(panel->timer); panel->timer = NULL; - sprintf(version, "Version %s", VERSION); + sprintf(version, _("Version %s"), VERSION); WMSetLabelText(panel->versionL, version); } @@ -1133,10 +1133,10 @@ wShowInfoPanel(WScreen *scr) font = NULL; } WMSetLabelTextAlignment(panel->name2L, WACenter); - WMSetLabelText(panel->name2L, "Window Manager for X"); + WMSetLabelText(panel->name2L, _("Window Manager for X")); - sprintf(version, "Version %s", VERSION); + sprintf(version, _("Version %s"), VERSION); panel->versionL = WMCreateLabel(panel->win); WMResizeWidget(panel->versionL, 310, 16); WMMoveWidget(panel->versionL, 30, 95); @@ -1157,21 +1157,21 @@ wShowInfoPanel(WScreen *scr) switch (scr->w_depth) { case 15: - strcpy(version, "32 thousand"); + strcpy(version, _("32 thousand")); break; case 16: - strcpy(version, "64 thousand"); + strcpy(version, _("64 thousand")); break; case 24: case 32: - strcpy(version, "16 million"); + strcpy(version, _("16 million")); break; default: sprintf(version, "%d", 1<w_depth); break; } - sprintf(buffer, "Using visual 0x%x: %s %ibpp (%s colors)\n", + sprintf(buffer, _("Using visual 0x%x: %s %ibpp (%s colors)\n"), (unsigned)scr->w_visual->visualid, visuals[scr->w_visual->class], scr->w_depth, version); @@ -1179,20 +1179,20 @@ wShowInfoPanel(WScreen *scr) { struct mallinfo ma = mallinfo(); sprintf(buffer+strlen(buffer), - "Total allocated memory: %i kB. Total memory in use: %i kB.\n", + _("Total allocated memory: %i kB. Total memory in use: %i kB.\n"), (ma.arena+ma.hblkhd)/1024, (ma.uordblks+ma.hblkhd)/1024); } #endif - strcat(buffer, "Supported image formats: "); + strcat(buffer, _("Supported image formats: ")); strl = RSupportedFileFormats(); for (i=0; strl[i]!=NULL; i++) { strcat(buffer, strl[i]); strcat(buffer, " "); } - strcat(buffer, "\nAdditional Support For: "); + strcat(buffer, _("\nAdditional Support For: ")); { char *list[8]; char buf[80]; @@ -1211,14 +1211,14 @@ wShowInfoPanel(WScreen *scr) list[j++] = "OLWM"; #endif #ifdef WSOUND - list[j++] = "Sound"; + list[j++] = _("Sound"); #endif buf[0] = 0; for (i = 0; i < j; i++) { if (i > 0) { if (i == j - 1) - strcat(buf, " and "); + strcat(buf, _(" and ")); else strcat(buf, ", "); } @@ -1247,7 +1247,7 @@ wShowInfoPanel(WScreen *scr) WMMapWidget(panel->win); - wwin = wManageInternalWindow(scr, parent, None, "Info", + wwin = wManageInternalWindow(scr, parent, None, _("Info"), (scr->scr_width - 382)/2, (scr->scr_height - 230)/2, 382, 230); @@ -1270,7 +1270,7 @@ wShowInfoPanel(WScreen *scr) panel->timer = WMAddTimerHandler(100, logoPushCallback, panel); panel->cycle = 0; panel->x = 1; - panel->str = "Merry Christmas!"; + panel->str = _("Merry X'mas!"); panel->oldPix = WMRetainPixmap(WMGetLabelImage(panel->logoL)); } #endif @@ -1294,22 +1294,6 @@ typedef struct { } LegalPanel; - -#define LICENSE_TEXT \ - " Window Maker is free software; you can redistribute it and/or modify "\ - "it under the terms of the GNU General Public License as published "\ - "by the Free Software Foundation; either version 2 of the License, "\ - "or (at your option) any later version.\n\n\n"\ - " Window Maker is distributed in the hope that it will be useful, but "\ - "WITHOUT ANY WARRANTY; without even the implied warranty of "\ - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU "\ - "General Public License for more details.\n\n\n"\ - " You should have received a copy of the GNU General Public License "\ - "along with this program; if not, write to the Free Software "\ - "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "\ - "02111-1307, USA." - - static LegalPanel *legalPanel = NULL; static void @@ -1355,7 +1339,19 @@ wShowLegalPanel(WScreen *scr) WMResizeWidget(panel->licenseL, 400, 230); WMMoveWidget(panel->licenseL, 10, 10); WMSetLabelTextAlignment(panel->licenseL, WALeft); - WMSetLabelText(panel->licenseL, LICENSE_TEXT); + WMSetLabelText(panel->licenseL, + _(" Window Maker is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU General Public License as\n" + "published by the Free Software Foundation; either version 2 of the\n" + "License, or (at your option) any later version.\n\n\n" + " Window Maker is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty\n" + "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" + "See the GNU General Public License for more details.\n\n\n" + " You should have received a copy of the GNU General Public\n" + "License along with this program; if not, write to the Free Software\n" + "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" + "02111-1307, USA.")); WMSetLabelRelief(panel->licenseL, WRGroove); WMRealizeWidget(panel->win); @@ -1365,7 +1361,7 @@ wShowLegalPanel(WScreen *scr) XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0); - wwin = wManageInternalWindow(scr, parent, None, "Legal", + wwin = wManageInternalWindow(scr, parent, None, _("Legal"), (scr->scr_width - 420)/2, (scr->scr_height - 250)/2, 420, 250); @@ -1675,19 +1671,6 @@ drawGNUstepLogo(Display *dpy, Drawable d, int width, int height, } - -#define GNUSTEP_TEXT \ - "Window Maker is part of the GNUstep project.\n"\ - "The GNUstep project aims to create a free\n"\ - "implementation of the OpenStep(tm) specification\n"\ - "which is a object-oriented framework for\n"\ - "creating advanced graphical, multi-platform\n"\ - "applications. Additionally, a development and\n"\ - "user desktop enviroment will be created on top\n"\ - "of the framework. For more information about\n"\ - "GNUstep, please visit: www.gnustep.org" - - typedef struct { WScreen *scr; @@ -1773,7 +1756,16 @@ wShowGNUstepPanel(WScreen *scr) WMMoveWidget(panel->textL, 30, 50); WMSetLabelTextAlignment(panel->textL, WARight); WMSetLabelImagePosition(panel->textL, WIPOverlaps); - WMSetLabelText(panel->textL, GNUSTEP_TEXT); + WMSetLabelText(panel->textL, + _("Window Maker is part of the GNUstep project.\n"\ + "The GNUstep project aims to create a free\n"\ + "implementation of the OpenStep(tm) specification\n"\ + "which is a object-oriented framework for\n"\ + "creating advanced graphical, multi-platform\n"\ + "applications. Additionally, a development and\n"\ + "user desktop enviroment will be created on top\n"\ + "of the framework. For more information about\n"\ + "GNUstep, please visit: www.gnustep.org")); WMSetLabelImage(panel->textL, pixmap); WMReleasePixmap(pixmap); @@ -1785,7 +1777,7 @@ wShowGNUstepPanel(WScreen *scr) XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0); - wwin = wManageInternalWindow(scr, parent, None, "About GNUstep", + wwin = wManageInternalWindow(scr, parent, None, _("About GNUstep"), (scr->scr_width - 325)/2, (scr->scr_height - 200)/2, 325, 200); diff --git a/src/menu.c b/src/menu.c index af512960..e3d896af 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1252,7 +1252,7 @@ editEntry(WMenu *menu, WMenuEntry *entry) if (XGrabKeyboard(dpy, text->core->window, True, GrabModeAsync, GrabModeAsync, CurrentTime)!=GrabSuccess) { - wwarning("could not grab keyboard"); + wwarning(_("could not grab keyboard")); wTextDestroy(text); wSetFocusTo(menu->frame->screen_ptr, diff --git a/src/wconfig.h.in b/src/wconfig.h.in index e0e45e51..9e703548 100644 --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -599,7 +599,7 @@ # define NORMAL_ICON_KABOOM #endif -#if HAVE_LIBINTL_H && I18N +#if defined(HAVE_LIBINTL_H) && defined(I18N) # include # define _(text) gettext(text) #else diff --git a/src/winspector.c b/src/winspector.c index e8cbb005..139381b2 100644 --- a/src/winspector.c +++ b/src/winspector.c @@ -175,6 +175,8 @@ static proplist_t Yes, No; +static char *spec_text; + static void applySettings(WMButton *button, InspectorPanel *panel); @@ -1117,7 +1119,7 @@ selectSpecification(WMWidget *bPtr, void *data) str = wmalloc(16 + strlen(wwin->wm_instance ? wwin->wm_instance : "?") + strlen(wwin->wm_class ? wwin->wm_class : "?")); - sprintf(str, "Inspecting %s.%s", + sprintf(str, _("Inspecting %s.%s"), wwin->wm_instance ? wwin->wm_instance : "?", wwin->wm_class ? wwin->wm_class : "?"); @@ -1127,17 +1129,6 @@ selectSpecification(WMWidget *bPtr, void *data) } - - -#define SPEC_TEXT "The configuration will apply to all\n"\ - "windows that have their WM_CLASS property"\ - " set to the above selected\nname, when saved." - - -#define SELEC_TEXT "Click in the window you wish to inspect." - - - static void selectWindow(WMWidget *bPtr, void *data) { @@ -1154,7 +1145,7 @@ selectWindow(WMWidget *bPtr, void *data) return; } - WMSetLabelText(panel->specLbl, _(SELEC_TEXT)); + WMSetLabelText(panel->specLbl, _("Click in the window you wish to inspect.")); WMMaskEvent(dpy, ButtonPressMask, &event); @@ -1172,7 +1163,7 @@ selectWindow(WMWidget *bPtr, void *data) True); wCloseInspectorForWindow(wwin); } else { - WMSetLabelText(panel->specLbl, _(SPEC_TEXT)); + WMSetLabelText(panel->specLbl, spec_text); } } @@ -1193,6 +1184,10 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos, WMPixmap *pixmap; #endif + spec_text = _("The configuration will apply to all\n" + "windows that have their WM_CLASS\n" + "property set to the above selected\n" + "name, when saved."); panel = wmalloc(sizeof(InspectorPanel)); memset(panel, 0, sizeof(InspectorPanel)); @@ -1320,7 +1315,7 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos, panel->specLbl = WMCreateLabel(panel->win); WMMoveWidget(panel->specLbl, 15, 210); WMResizeWidget(panel->specLbl, frame_width, 100); - WMSetLabelText(panel->specLbl, _(SPEC_TEXT)); + WMSetLabelText(panel->specLbl, spec_text); WMSetLabelWraps(panel->specLbl, True); WMSetLabelTextAlignment(panel->specLbl, WALeft); diff --git a/util/Makefile.am b/util/Makefile.am index 63f5fbbf..82e4831c 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -3,12 +3,12 @@ AUTOMAKE_OPTIONS = no-dependencies pkgdatadir = $(datadir)/@PACKAGE@ -bin_PROGRAMS = wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify +bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify -bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl +bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \ - wkdemenu.pl + wkdemenu.pl wmchlocale.in INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \ @HEADER_SEARCH_PATH@ \ @@ -21,6 +21,8 @@ liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@ wdwrite_LDADD = $(liblist) +wdread_LDADD = $(liblist) + wxcopy_LDADD = @XLFLAGS@ @XLIBS@ wxpaste_LDADD = @XLFLAGS@ @XLIBS@ @@ -51,7 +53,7 @@ wmsetbg_LDADD = \ @LIBPL@ \ @DLLIBS@ -CLEANFILES = wmaker.inst +CLEANFILES = wmaker.inst wmchlocale wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile -rm -f wmaker.inst @@ -64,4 +66,9 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile chmod 755 wmaker.inst +wmchlocale: $(srcdir)/wmchlocale.in ./Makefile + -rm -f wmchlocale + sed -e "s|#pkgdatadir#|$(pkgdatadir)|" $(srcdir)/wmchlocale.in >wmchlocale + + chmod 755 wmchlocale diff --git a/util/README b/util/README index 178442ca..c57a5c8b 100644 --- a/util/README +++ b/util/README @@ -27,6 +27,10 @@ wmsetbg- set the workspace background into a image and make it persist between wdwrite- write data into the defaults database (configuration files). +wdread- read Simple data from defaults database (for use in scripts for example) + +wmchlocale- change locale dependent settings of Window Maker (menu & fonts) + wsetfont- set locale the fonts needed for a specific locale for Window Maker wmagnify- a program to magnify the area near the mouse pointer, diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in index d0678038..8fd29fdc 100644 --- a/util/wmaker.inst.in +++ b/util/wmaker.inst.in @@ -4,13 +4,15 @@ # # xx herbert -if test x"$1" = x"--batch" ; then +if test "x$1" = "x--batch" ; then BATCH="1" else BATCH="" fi # /xx herbert +# name of menu file we install (menu, plmenu) +inst_menu="" LOCALE=$LANG if [ -z "$LOCALE" ]; then @@ -264,6 +266,8 @@ test -f ~$GSDIR/Library/WindowMaker/exitscript || \ cp $GLOBALDIR/exitscript.sh $GSDIR/Library/WindowMaker/exitscript chmod +rx $GSDIR/Library/WindowMaker/exitscript +wsetfont --auto + # xx herbert if test -n "$BATCH" ; then echo "Installation Finished" @@ -287,7 +291,13 @@ if test -z "#LITE#" ; then echo "the property list format. The plain text format is more flexible, but" echo "the menu in the property list format can be edited graphically. The" echo "menu that will be used by default is the property list one. Read" - echo "$GSDIR/Library/WindowMaker/README for information on how to change it." + echo " $GSDIR/Library/WindowMaker/README" + echo "for information on how to change it." + if [ "${inst_menu%.*}" == "menu" ]; then + echo "However, since you have locale set to $LOCALE and plmenu for such locale" + echo "was not found, your WMRootMenu contains path to text formated menu:" + echo " $GSDIR/Library/WindowMaker/$inst_menu" + fi else echo "Your copy of Window Maker is configured especially for KDE." echo "Window Maker application menus are not available." diff --git a/util/wsetfont b/util/wsetfont index 1bd6109f..4de34be0 100755 --- a/util/wsetfont +++ b/util/wsetfont @@ -3,6 +3,14 @@ # language/font setting script for Window Maker # # by MANOME Tomonori +# (rewriten slightly by judas@hell on Jan 27 2001 +# -argument --nodef tries to change only font coding (limited!) +# -much easier to add new font codings +# -much harder to read code... +# -argument --auto gets locale by itself, but does not override if some +# coding is also given +# -argument --locale=?? takes locale code (ja, sk, ...) +# ) # # [Special Thanks To] # Korean fontset info from: -- 2.11.4.GIT