CLEANFILES = $(CATALOGS) WINGs.pot
--EXTRA_DIST = cs.po de.po sk.po fr.po
-+EXTRA_DIST = cs.po de.po sk.po fr.po pl.po
+-EXTRA_DIST = bg.po ca.po cs.po de.po fr.po sk.po
++EXTRA_DIST = bg.po ca.po cs.po de.po fr.po sk.po pl.po
POTFILES = \
$(top_builddir)/WINGs/connection.c \
--- WindowMaker-0.80.2.orig/WPrefs.app/po/Makefile.am Fri Nov 30 23:38:50 2001
+++ WindowMaker-0.80.2/WPrefs.app/po/Makefile.am Tue Nov 19 19:55:39 2002
@@ -6,7 +6,7 @@
+ CLEANFILES = WPrefs.pot $(CATALOGS)
- EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po\
- zh_CN.po fi.po it.po ru.po de.po hu.po bg.po sk.po\
-- et.po
-+ et.po pl.po
+ EXTRA_DIST = bg.po ca.po cs.po de.po es.po et.po fi.po fr.po hr.po hu.po \
+- it.po ja.po ko.po pt.po ru.po sk.po zh_CN.po zh_TW.Big5.po
++ it.po ja.po ko.po pt.po ru.po sk.po zh_CN.po zh_TW.Big5.po pl.po
POTFILES = \
$(top_builddir)/WPrefs.app/Appearance.c \
diff -Nur WindowMaker-0.80.2.orig/po/pl.po WindowMaker-0.80.2/po/pl.po
--- WindowMaker-0.80.2.orig/po/pl.po Wed Nov 20 23:39:15 2002
+++ WindowMaker-0.80.2/po/pl.po Tue Nov 19 00:16:28 2002
-@@ -1,559 +1,1017 @@
+@@ -1,558 +1,1017 @@
-# Pre-translation has bean done using PePeSza v0.6
-# get your own copy of PePeSza from http://www.ids.pl/~pkollegu/pepesza.html
-#
+# Pre-translation has bean done using PePeSza v0.6
+# get your own copy of PePeSza from http://www.ids.pl/~pkollegu/pepesza.html
#
--#, fuzzy
msgid ""
msgstr ""
--"Project-Id-Version: PACKAGE VERSION\n"
+-"Project-Id-Version: WindowMaker 0.80.2\n"
-"POT-Creation-Date: 1999-01-24 14:05+0100\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+-"PO-Revision-Date: 2003-04-15 20:21+0200\n"
+"Project-Id-Version: WindowMaker 0.80.2\n"
+"POT-Creation-Date: 2002-11-12 20:43+0100\n"
+"PO-Revision-Date: 2002-11-12 20:44+0100\n"
"Last-Translator: Piotr Dembiñski <pdemb@fanthom.math.put.poznan.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=ISO8859-2\n"
--"Content-Transfer-Encoding: ISO8859-2\n"
+-"Content-Type: text/plain; charset=iso-8859-2\n"
+-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8-bit\n"
+#: ../src/main.c:505 ../src/main.c:510
#, c-format
msgid "%s:could not execute initialization script"
--msgstr "#s:nie mo¿na wykonaæ skryptu inicjalizacji"
+-msgstr "%s:nie mo¿na wykonaæ skryptu inicjalizacji"
+msgstr "%s:nie mo¿na wykonaæ skryptu inicjalizuj±cego"
-#: ../src/main.c:314
@@ -245,8 +245,8 @@
dnl List of supported locales
dnl -------------------------
- supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5"
--supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5"
--supported_wings_locales="cs de sk"
-+supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pl pt ru sk zh_CN zh_TW.Big5"
-+supported_wings_locales="cs de pl sk"
+ supported_locales="be bg ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5"
+-supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5"
+-supported_wings_locales="bg ca cs de fr sk"
++supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pl pt ru sk zh_CN zh_TW.Big5"
++supported_wings_locales="bg ca cs de fr pl sk"
for lang in $LINGUAS; do
ok=0
noinst_PROGRAMS = connect server fontl puzzle
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
-+ $(INTLIBS)
++ $(XFTLIBS) $(INTLIBS)
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
-- @INTLIBS@
+- @XFTLIBS@ @INTLIBS@
-
-
-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
+ -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
-- @INTLIBS@
+- @XFTLIBS@ @INTLIBS@
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
-+ $(INTLIBS)
++ $(XFTLIBS) $(INTLIBS)
test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
-
--- WindowMaker-0.70.0.orig/WINGs/Makefile.am Thu Oct 4 05:39:17 2001
+++ WindowMaker-0.70.0/WINGs/Makefile.am Thu Oct 18 16:54:22 2001
-@@ -4,22 +4,18 @@
+@@ -4,24 +4,20 @@
SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
- EXTRA_DIST = BUGS
+ EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
+ python/WINGs.py python/setup.py python/test.py
+
# wbutton.c
-libWINGs_a_SOURCES = \
array.c \
bagtree.c \
configuration.c \
-@@ -80,7 +76,7 @@
+@@ -80,7 +78,7 @@
wwindow.c
noinst_PROGRAMS = wtest wmquery wmfile testmywidget
-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
-- @INTLIBS@
+- @XFTLIBS@ @INTLIBS@
-
+LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
-+ $(INTLIBS)
++ $(XFTLIBS) $(INTLIBS)
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
- $(top_builddir)/WINGs/libWINGs.a\
+ $(top_builddir)/WINGs/libWINGs.la\
$(top_builddir)/wrlib/libwraster.la \
+ @XFTLIBS@ \
@INTLIBS@
-
diff -Nur WindowMaker-0.70.0.orig/src/Makefile.am WindowMaker-0.70.0/src/Makefile.am
--- WindowMaker-0.70.0.orig/src/Makefile.am Thu Oct 4 05:39:18 2001
+++ WindowMaker-0.70.0/src/Makefile.am Thu Oct 18 16:54:22 2001
-@@ -111,7 +111,7 @@
+@@ -113,7 +113,7 @@
wmaker_LDADD = \
- $(top_builddir)/WINGs/libWINGs.a\
+ $(top_builddir)/WINGs/libWINGs.la\
$(top_builddir)/wrlib/libwraster.la\
+ @XFTLIBS@ \
@XLIBS@ \
- @INTLIBS@ \
diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makefile.am
--- WindowMaker-0.70.0.orig/test/Makefile.am Sat Oct 2 23:16:11 1999
+++ WindowMaker-0.70.0/test/Makefile.am Thu Oct 18 16:54:22 2001
bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\
-@@ -12,44 +10,44 @@
+@@ -12,41 +10,41 @@
wkdemenu.pl wmchlocale.in wcopy wpaste
INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+ $(HEADER_SEARCH_PATH) \
+ -DETCDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\"
- # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
- # remove after we require lPL 0.10.2 which automatically resolves its
- # library dependancies using the libPropList.la file
--liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@ @INTLIBS@
-+liblist= $(LIBRARY_SEARCH_PATH) $(X_EXTRA_LIBS) $(INTLIBS)
+-liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
++liblist= $(LIBRARY_SEARCH_PATH) $(INTLIBS)
-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
+wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
- $(top_builddir)/WINGs/libWINGs.a \
+ $(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/wrlib/libwraster.la \
- @INTLIBS@ @DLLIBS@
+ @XFTLIBS@ @INTLIBS@ @DLLIBS@
wmsetup_LDADD = \
- $(top_builddir)/WINGs/libWINGs.a \
+ $(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/wrlib/libwraster.la \
- @INTLIBS@ @DLLIBS@
+ @XFTLIBS@ @INTLIBS@ @DLLIBS@
wmsetbg_LDADD = \
- $(top_builddir)/WINGs/libWINGs.a \
+ $(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/wrlib/libwraster.la \
- @INTLIBS@ @DLLIBS@
+ @XFTLIBS@ @INTLIBS@ @DLLIBS@
--- WindowMaker-0.70.0.orig/wmlib/Makefile.am Mon Apr 10 02:59:35 2000
+++ WindowMaker-0.70.0/wmlib/Makefile.am Thu Oct 18 16:54:22 2001
menu.c \
app.c \
event.c \
-@@ -15,3 +15,4 @@
+@@ -15,6 +15,8 @@
app.h \
menu.h
+libWMaker_la_LDFLAGS = -version-info 1:1:1
++
+ DISTCLEANFILES = wmlib.pc
+
+ install-exec-local:
WMWidget *parent;
- WMButton *swi[8];
-+ WMButton *swi[9];
++ WMButton *swi[10];
} _Panel;
@@ -54,6 +54,7 @@
- WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));
- WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));
-+ WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch"));
+ if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
+ WMSetButtonSelected(panel->swi[7], GetBoolForKey("AntialiasedText"));
++ WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch"));
}
panel->box = WMCreateBox(panel->parent);
WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
-- for (i=0; i<7; i++) {
-+ for (i=0; i<8; i++) {
+- for (i=0; i<8; i++) {
++ for (i=0; i<9; i++) {
panel->swi[i] = WMCreateSwitchButton(panel->box);
WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
WMMoveWidget(panel->swi[i], 20, 20+i*25);
@@ -79,6 +80,7 @@
- WMSetButtonText(panel->swi[4], _("Use Windoze style cycling."));
WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));
WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));
-+ WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click"));
+ WMSetButtonText(panel->swi[7], _("Smooth font edges (needs restart)."));
++ WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click"));
- WMRealizeWidget(panel->box);
- WMMapSubwidgets(panel->box);
+ if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
+ WMSetButtonEnabled(panel->swi[7], False);
@@ -101,6 +103,7 @@
- SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
- SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
-+ SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch");
+ if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
+ SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "AntialiasedText");
++ SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch");
}
+++ WindowMaker-0.64.0.new/src/defaults.c Wed Mar 21 19:59:08 2001
@@ -547,6 +547,9 @@
{"DisableBlinking", "NO", NULL,
- &wPreferences.dont_blink, getBool, NULL
+ &wPreferences.dont_blink, getBool, NULL
},
+ {"SingleClickLaunch", "NO", NULL,
+ &wPreferences.single_click, getBool, NULL
+ },
- /* style options */
+ /* style options */
{"MenuStyle", "normal", seMenuStyles,
- &wPreferences.menu_style, getEnum, setMenuStyle
+ &wPreferences.menu_style, getEnum, setMenuStyle
diff -ur WindowMaker-0.64.0/src/dock.c WindowMaker-0.64.0.new/src/dock.c
--- WindowMaker-0.64.0/src/dock.c Thu Jan 18 02:33:45 2001
+++ WindowMaker-0.64.0.new/src/dock.c Wed Mar 21 19:59:08 2001
---cut here---cut here-----------cut here---cut here----
--- wm/src/actions.c.orig Sat Feb 16 18:46:54 2002
+++ wm/src/actions.c Sat Feb 16 19:07:16 2002
-@@ -432,6 +432,7 @@
- WArea usableArea = wwin->screen_ptr->totalUsableArea;
- WArea totalArea;
+@@ -432,6 +432,8 @@
+ int changed_h, changed_v, shrink_h, shrink_v;
+ WArea usableArea, totalArea;
+ #define CAPTION_HEIGHT ( WMFontHeight(wwin->screen_ptr->clip_title_font) + 3 )
-
++
if (WFLAGP(wwin, no_resizable))
- return;
+ return;
+
@@ -498,6 +499,7 @@
- new_y -= wwin->frame->top_width;
- new_height += wwin->frame->bottom_width - 1;
- }
+ new_y -= wwin->frame->top_width;
+ new_height += wwin->frame->bottom_width - 1;
+ }
+ new_height -= CAPTION_HEIGHT;
- } else {
- new_y = wwin->frame_y;
- new_height = wwin->frame->core->height;
+ } else if (shrink_v) {
+ new_y = wwin->old_geometry.y;
+ new_height = wwin->old_geometry.height;
projects / packages / WindowMaker.git / commitdiff