gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

updated Makefiles files for po dirs

Browse Source
This commit is contained in:
kojima
2004-10-26 01:11:15 +00:00
parent b89f3e6df5
commit 087a16400f
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WPrefs.app/po/Makefile.am
View File

@@ -12,7 +12,7 @@ POTFILES = \
$(top_builddir)/WPrefs.app/Configurations.c \ $(top_builddir)/WPrefs.app/Configurations.c \
$(top_builddir)/WPrefs.app/Expert.c \ $(top_builddir)/WPrefs.app/Expert.c \
$(top_builddir)/WPrefs.app/Focus.c \ $(top_builddir)/WPrefs.app/Focus.c \
$(top_builddir)/WPrefs.app/Font.c \ $(top_builddir)/WPrefs.app/FontSimple.c \
$(top_builddir)/WPrefs.app/Icons.c \ $(top_builddir)/WPrefs.app/Icons.c \
$(top_builddir)/WPrefs.app/KeyboardSettings.c \ $(top_builddir)/WPrefs.app/KeyboardSettings.c \
$(top_builddir)/WPrefs.app/KeyboardShortcuts.c \ $(top_builddir)/WPrefs.app/KeyboardShortcuts.c \

2
WindowMaker/Defaults/WMGLOBAL
View File

@@ -1,7 +1,7 @@
{ {
SystemFont = "Trebuchet MS,Luxi Sans"; SystemFont = "Trebuchet MS,Luxi Sans";
BoldSystemFont = "Trebuchet MS,Luxi Sans:bold"; BoldSystemFont = "Trebuchet MS,Luxi Sans:bold";
DefaultFontSize = 12; DefaultFontSize = 11;
AntialiasedText = Yes; AntialiasedText = Yes;
FloppyPath = "/floppy"; FloppyPath = "/floppy";
DoubleClickTime = 250; DoubleClickTime = 250;

2
po/Makefile.am
View File

@@ -20,7 +20,6 @@ POTFILES = \
$(top_builddir)/src/icon.c \ $(top_builddir)/src/icon.c \
$(top_builddir)/src/main.c \ $(top_builddir)/src/main.c \
$(top_builddir)/src/menu.c \ $(top_builddir)/src/menu.c \
$(top_builddir)/src/menureader.c \
$(top_builddir)/src/misc.c \ $(top_builddir)/src/misc.c \
$(top_builddir)/src/pixmap.c \ $(top_builddir)/src/pixmap.c \
$(top_builddir)/src/resources.c \ $(top_builddir)/src/resources.c \
@@ -30,6 +29,7 @@ POTFILES = \
$(top_builddir)/src/stacking.c \ $(top_builddir)/src/stacking.c \
$(top_builddir)/src/startup.c \ $(top_builddir)/src/startup.c \
$(top_builddir)/src/switchmenu.c \ $(top_builddir)/src/switchmenu.c \
$(top_builddir)/src/switchpanel.c \
$(top_builddir)/src/texture.c \ $(top_builddir)/src/texture.c \
$(top_builddir)/src/wdefaults.c \ $(top_builddir)/src/wdefaults.c \
$(top_builddir)/src/window.c \ $(top_builddir)/src/window.c \

12
src/defaults.c
View File

@@ -3538,7 +3538,13 @@ setSwPOptions(WScreen *scr, WDefaultEntry *entry, WMPropList *array, void *foo)
switch (WMGetPropListItemCount(array)) switch (WMGetPropListItemCount(array))
{ {
case 4: case 4:
if (!WMIsPLString(WMGetFromPLArray(array, 1))) {
wwarning(_("Invalid arguments for option \"%s\""),
entry->key);
break;
} else
path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 1))); path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 1)));
if (!path) { if (!path) {
wwarning(_("Could not find image \"%s\" for option \"%s\""), wwarning(_("Could not find image \"%s\" for option \"%s\""),
WMGetFromPLString(WMGetFromPLArray(array, 1)), WMGetFromPLString(WMGetFromPLArray(array, 1)),
@@ -3607,7 +3613,13 @@ setSwPOptions(WScreen *scr, WDefaultEntry *entry, WMPropList *array, void *foo)
} }
case 1: case 1:
if (!WMIsPLString(WMGetFromPLArray(array, 0))) {
wwarning(_("Invalid arguments for option \"%s\""),
entry->key);
break;
} else
path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 0))); path= FindImage(wPreferences.pixmap_path, WMGetFromPLString(WMGetFromPLArray(array, 0)));
if (!path) { if (!path) {
wwarning(_("Could not find image \"%s\" for option \"%s\""), wwarning(_("Could not find image \"%s\" for option \"%s\""),
WMGetFromPLString(WMGetFromPLArray(array, 0)), WMGetFromPLString(WMGetFromPLArray(array, 0)),

4
src/switchpanel.c
View File

@@ -432,6 +432,8 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
int width, height; int width, height;
int iconsThatFitCount; int iconsThatFitCount;
int count; int count;
WMRect rect;
rect= wGetRectForHead(scr, wGetHeadForPointerLocation(scr));
memset(panel, 0, sizeof(WSwitchPanel)); memset(panel, 0, sizeof(WSwitchPanel));
@@ -449,7 +451,7 @@ WSwitchPanel *wInitSwitchPanel(WScreen *scr, WWindow *curwin, int workspace)
width= ICON_TILE_SIZE*count; width= ICON_TILE_SIZE*count;
iconsThatFitCount= count; iconsThatFitCount= count;
if (width > WMScreenWidth(scr->wmscreen)) { if (width > rect.size.width) {
iconsThatFitCount = (WMScreenWidth(scr->wmscreen)-SCREEN_BORDER_SPACING)/ICON_TILE_SIZE; iconsThatFitCount = (WMScreenWidth(scr->wmscreen)-SCREEN_BORDER_SPACING)/ICON_TILE_SIZE;
width= iconsThatFitCount*ICON_TILE_SIZE; width= iconsThatFitCount*ICON_TILE_SIZE;
} }