[repo.or.cz] wmaker-crm.git branch next updated: wmaker-0.95.3-180-g2dc97e4
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project wmaker-crm.git. The branch, next has been updated via 2dc97e4f153f3ebd7de598987a5e82eaef37d3b7 (commit) via 141b046c33982e09c3bbf3b00800a743a90c1597 (commit) via 49922831e8bb5e846100b4dd4f47015f7e2a8518 (commit) from f846b7cdd39749b5291d4559185a229b752b4fed (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://repo.or.cz/w/wmaker-crm.git/commit/2dc97e4f153f3ebd7de598987a5e82eaef37d3b7 commit 2dc97e4f153f3ebd7de598987a5e82eaef37d3b7 Author: Carlos R. Mafra crma...@gmail.com Date: Mon Nov 12 22:50:23 2012 + WPrefs: Remove pointless 'this is annoying' warning Is it annoying to whom? diff --git a/WPrefs.app/MenuPreferences.c b/WPrefs.app/MenuPreferences.c index b56e8e2..c93ee30 100644 --- a/WPrefs.app/MenuPreferences.c +++ b/WPrefs.app/MenuPreferences.c @@ -194,9 +194,7 @@ static void createPanel(Panel * p) panel-wrapB = WMCreateSwitchButton(panel-optF); WMResizeWidget(panel-wrapB, 440, 32); WMMoveWidget(panel-wrapB, 25, 8); - WMSetButtonText(panel-wrapB, - _ - (Always open submenus inside the screen, instead of scrolling.nNote: this is annoying.)); + WMSetButtonText(panel-wrapB, _(Always open submenus inside the screen, instead of scrolling.)); panel-autoB = WMCreateSwitchButton(panel-optF); WMResizeWidget(panel-autoB, 440, 32); http://repo.or.cz/w/wmaker-crm.git/commit/141b046c33982e09c3bbf3b00800a743a90c1597 commit 141b046c33982e09c3bbf3b00800a743a90c1597 Author: Carlos R. Mafra crma...@gmail.com Date: Mon Nov 12 22:44:03 2012 + Remove last QUIET hack from Makefiles They somehow were missed in 5c8eb580b34cc (configure: Remove --disable-verbose-compile hack) diff --git a/WINGs/Examples/Makefile.am b/WINGs/Examples/Makefile.am index 42519cb..877f233 100644 --- a/WINGs/Examples/Makefile.am +++ b/WINGs/Examples/Makefile.am @@ -27,14 +27,3 @@ server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -DRESOURCE_PATH=$(datadir)/WINGs @HEADER_SEARCH_PATH@ -DDEBUG - -LIBTOOL = $(QUIET) $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG) - -.c.o: - $(QUIET)$(COMPILE) -c $ - -.c.obj: - $(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$'` - -.c.lo: - $(QUIET)$(LTCOMPILE) -c -o $@ $ diff --git a/test/Makefile.am b/test/Makefile.am index be4f5d5..2f80174 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -10,16 +10,4 @@ wtest_SOURCES = wtest.c wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ - -INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib - -LIBTOOL = $(QUIET) $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG) - -.c.o: - $(QUIET)$(COMPILE) -c $ - -.c.obj: - $(QUIET)$(COMPILE) -c `$(CYGPATH_W) '$'` - -.c.lo: - $(QUIET)$(LTCOMPILE) -c -o $@ $ +INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am index 0f8201f..4d7c521 100644 --- a/wmlib/Makefile.am +++ b/wmlib/Makefile.am @@ -8,8 +8,6 @@ include_HEADERS = WMaker.h INCLUDES = $(DFLAGS) @XCFLAGS@ -libWMaker_a_AR = $(QUIET_AR) $(AR) $(ARFLAGS) - libWMaker_la_SOURCES = menu.c app.c http://repo.or.cz/w/wmaker-crm.git/commit/49922831e8bb5e846100b4dd4f47015f7e2a8518 commit 49922831e8bb5e846100b4dd4f47015f7e2a8518 Author: BALATON Zoltan bala...@eik.bme.hu Date: Mon Nov 12 21:44:25 2012 +0100 Fixed out of source dir build diff --git a/test/Makefile.am b/test/Makefile.am index b1fd47a..be4f5d5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -13,7 +13,7 @@ wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib -LIBTOOL = $(QUIET) $(SHELL) $(top_srcdir)/libtool $(LIBTOOL_ARG) +LIBTOOL = $(QUIET) $(SHELL) $(top_builddir)/libtool $(LIBTOOL_ARG) .c.o: $(QUIET)$(COMPILE) -c $ --- Summary of changes: WINGs/Examples/Makefile.am | 11 --- WPrefs.app/MenuPreferences.c |4 +--- test/Makefile.am | 14 +- wmlib/Makefile.am|2 -- 4 files changed, 2 insertions(+), 29 deletions(-) repo.or.cz automatic notification. Contact project admin crma...@gmail.com if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive no reply. -- wmaker-crm.git (The Window Maker window manager) -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
List Down Temporarily
Hi all. You may have noticed the list was down temporarily over the weekend. The size of the web archives are getting larger than the /var partition was happy with. I've enlarged /var and I am hoping that it will hold out long enough to get a more permanent fix in place. That said, I'm looking to move from Enemies of Carlotta + mhonarc to something else; probably Mailman. If anyone has strong opinions and reasoned arguments, I'm all ears for replacement solutions. Desired features: *) web archive *) suspend list delivery / post only mail address (git hooks/post-receive uses this) *) multiple moderators *) efficient use of space (this is where mhonarc seems to fail) *) relatively easy to port current archives over Thanks! -john
(fwd) Re: Call for testing before 0.95.4
I didn't see this mail in the mail list archives. Was sent ok?
if is ok for you I will sent the patch. I will work today in the xfig problem.
Cheers,
kix
--
||// //\\// Rodolfo kix Garcia
||\\// //\\ http://www.kix.es/
---BeginMessage---
On Mon, 12 Nov 2012, BALATON Zoltan escribió:
On Mon, 12 Nov 2012, Carlos R. Mafra wrote:
Please do test the #next branch and report any problems (if any).
There has been a lot of code churn related to icons. Even though they
look relative safe, regressions might be hiding somewhere.
I'm not sure if the Ignore client supplied icon option in the Icon
and Initial Workspace inspector is still working. At least Xfig now
has the icon I set in the app icon but displays its own icon in the
miniwindow (which is obscuring the tile completely).
Can you try this:
kix@osaka:~/src/wmaker/wmaker-crm/src$ git diff
diff --git a/src/icon.c b/src/icon.c
index ba059ad..39e4b48 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -359,10 +359,15 @@ RImage *wIconValidateIconSize(RImage *icon, int max_size)
return NULL;
/* We should hold ICON_BORDER (~2) pixels to include the icon border
*/
- if ((icon-width - max_size) -ICON_BORDER ||
- (icon-height - max_size) -ICON_BORDER) {
- nimage = RScaleImage(icon, max_size - ICON_BORDER,
-(icon-height * (max_size - ICON_BORDER) /
icon-width));
+ if (((max_size - ICON_BORDER) icon-width) ||
+ ((max_size - ICON_BORDER) icon-height)) {
+ if (icon-width icon-height)
+ nimage = RScaleImage(icon, max_size - ICON_BORDER,
+(icon-height * (max_size -
ICON_BORDER) / icon-width));
+ else
+ nimage = RScaleImage(icon, icon-width * (max_size -
ICON_BORDER) / icon-height,
+max_size - ICON_BORDER);
+
RReleaseImage(icon);
icon = nimage;
}
Thanks,
kix
Related to this, if the client supplied icon is too big (like for
gtk-demo for example) it is simply clipped and not resized. An
improvement though that it now seems to be centered at least. Could
the icon be resized (maybe before being cached) to improve this.
Some other things in Wprefs.app which have been there before but I found
them now:
In Menu Preferences the Note: this is annoying text appears clipped
which is well... annoying. Could this line be removed and just let the
users decide what they prefer? (I could make a patch if you want, it's
localised in one file and some translations.)
Also in Expert User Preferences there are two options:
Bounce Appicons when the application wants attention.
and then a few lines further
Do not make Appicons bounce.
This is confusing and I'm not even sure what these mean and why we have
two seemingly overlapping options without looking up the code.
Other than these minor things it seems to work well so far and has some
nice improvements like the fix for the few pixel offset of maximised
windows due to borders. Thanks for the great work on Window Maker.
Regards,
BALATON Zoltan
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.info.
--
||// //\\// Rodolfo kix Garcia
||\\// //\\ http://www.kix.es/
---End Message---
[PATCH] WPrefs: Move around some options between pages
Move bounce options from expert prefs to its own box on ergonomic
prefs to have them at one place which makes them somewhat more clear.
The options previously occupying this place have been moved to other
pages where they better belong.
---
WPrefs.app/Expert.c | 39
WPrefs.app/Focus.c | 12 ++--
WPrefs.app/Preferences.c | 49 +++---
3 files changed, 57 insertions(+), 43 deletions(-)
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index b14f549..5d539fc 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -21,6 +21,12 @@
#include WPrefs.h
+#ifdef XKB_MODELOCK
+#define NUMITEMS 12
+#else
+#define NUMITEMS 11
+#endif
+
typedef struct _Panel {
WMBox *box;
char *sectionName;
@@ -31,7 +37,7 @@ typedef struct _Panel {
WMWidget *parent;
- WMButton *swi[14];
+ WMButton *swi[NUMITEMS];
} _Panel;
@@ -51,10 +57,10 @@ static void showData(_Panel * panel)
WMSetButtonSelected(panel-swi[7], GetBoolForKey(SingleClickLaunch));
WMSetButtonSelected(panel-swi[8],
GetBoolForKey(CycleActiveHeadOnly));
WMSetButtonSelected(panel-swi[9], GetBoolForKey(ShowClipTitle));
- WMSetButtonSelected(panel-swi[10],
GetBoolForKey(BounceAppIconsWhenUrgent));
- WMSetButtonSelected(panel-swi[11],
GetBoolForKey(RaiseAppIconsWhenBouncing));
- WMSetButtonSelected(panel-swi[12],
GetBoolForKey(OpaqueMoveResizeKeyboard));
- WMSetButtonSelected(panel-swi[13],
GetBoolForKey(DoNotMakeAppIconsBounce));
+ WMSetButtonSelected(panel-swi[10],
GetBoolForKey(OpaqueMoveResizeKeyboard));
+#ifdef XKB_MODELOCK
+ WMSetButtonSelected(panel-swi[11], GetBoolForKey(KbdModeLock));
+#endif /* XKB_MODELOCK */
}
static void createPanel(Panel * p)
@@ -75,10 +81,10 @@ static void createPanel(Panel * p)
WMSetScrollViewHasHorizontalScroller(sv, False);
f = WMCreateFrame(panel-box);
- WMResizeWidget(f, 495, sizeof(panel-swi) / sizeof(char *) * 25 + 8);
+ WMResizeWidget(f, 495, NUMITEMS * 25 + 8);
WMSetFrameRelief(f, WRFlat);
- for (i = 0; i sizeof(panel-swi) / sizeof(char *); i++) {
+ for (i = 0; i NUMITEMS; i++) {
panel-swi[i] = WMCreateSwitchButton(f);
WMResizeWidget(panel-swi[i], FRAME_WIDTH - 40, 25);
WMMoveWidget(panel-swi[i], 5, 5 + i * 25);
@@ -95,15 +101,14 @@ static void createPanel(Panel * p)
WMSetButtonText(panel-swi[7], _(Launch applications and restore
windows with a single click.));
WMSetButtonText(panel-swi[8], _(Cycle windows only on the active
head.));
WMSetButtonText(panel-swi[9], _(Show workspace title on Clip.));
- WMSetButtonText(panel-swi[10], _(Bounce AppIcons when the application
wants attention.));
- WMSetButtonText(panel-swi[11], _(Raise AppIcons when bouncing.));
- WMSetButtonText(panel-swi[12], _(Opaque Move,Resize with keyboard.));
- WMSetButtonText(panel-swi[13], _(Do not make AppIcons bounce.));
+ WMSetButtonText(panel-swi[10], _(Opaque Move,Resize with keyboard.));
+#ifdef XKB_MODELOCK
+ WMSetButtonText(panel-swi[11], _(Enable keyboard language switch
button in window titlebars.));
+#endif /* XKB_MODELOCK */
/* If the item is default true, enable the button here */
WMSetButtonEnabled(panel-swi[6], True);
WMSetButtonEnabled(panel-swi[9], True);
- WMSetButtonEnabled(panel-swi[10], True);
WMMapSubwidgets(panel-box);
WMSetScrollViewContentView(sv, WMWidgetView(f));
@@ -128,10 +133,10 @@ static void storeDefaults(_Panel * panel)
SetBoolForKey(WMGetButtonSelected(panel-swi[7]), SingleClickLaunch);
SetBoolForKey(WMGetButtonSelected(panel-swi[8]),
CycleActiveHeadOnly);
SetBoolForKey(WMGetButtonSelected(panel-swi[9]), ShowClipTitle);
- SetBoolForKey(WMGetButtonSelected(panel-swi[10]),
BounceAppIconsWhenUrgent);
- SetBoolForKey(WMGetButtonSelected(panel-swi[11]),
RaiseAppIconsWhenBouncing);
- SetBoolForKey(WMGetButtonSelected(panel-swi[12]),
OpaqueMoveResizeKeyboard);
- SetBoolForKey(WMGetButtonSelected(panel-swi[13]),
DoNotMakeAppIconsBounce);
+ SetBoolForKey(WMGetButtonSelected(panel-swi[10]),
OpaqueMoveResizeKeyboard);
+#ifdef XKB_MODELOCK
+ SetBoolForKey(WMGetButtonSelected(panel-swi[11]), KbdModeLock);
+#endif /* XKB_MODELOCK */
}
Panel *InitExpert(WMScreen * scr, WMWidget * parent)
@@ -143,7 +148,7 @@ Panel *InitExpert(WMScreen * scr, WMWidget * parent)
panel-sectionName = _(Expert User Preferences);
panel-description = _(Options for people who know what they're
doing...\n
- Also have some other misc. options.);
+ Also has some other misc. options.);
panel-parent = parent;
diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c
index
Re: Call for testing before 0.95.4
On Wed, 14 Nov 2012, Rodolfo García Peñas wrote: Anyway, I am so happy with the new code, because as you can see, is more easy, but yes, some things could be better. Alt+tab show a correct icon too. Thanks A LOT for your report. I'm happy with the improvements too and the problems I've sent are not that serious indeed but fixing them could make it even better. PS2. I will reply your other questions tomorrow. Don't rush it. I think we don't have a hard deadline and we can make the release a few days or weeks later if that allows us to fix more bugs and make a better release. So take your time to think about it and sleep when you need. :-) Regards, BALATON Zoltan
