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
discards 28162d769d4f37ede1f3f3facdd4ded0d2be1c52 (commit)
via 799134f59bd764230cbde5c4d376e6faed404f76 (commit)
via 2075881f2d18e7bad9fcc7c6a03f1a39505ebe35 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (28162d769d4f37ede1f3f3facdd4ded0d2be1c52)
N -- N -- N (799134f59bd764230cbde5c4d376e6faed404f76)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/799134f59bd764230cbde5c4d376e6faed404f76
commit 799134f59bd764230cbde5c4d376e6faed404f76
Author: Carlos R. Mafra <crma...@gmail.com>
Date: Sun Feb 19 01:29:18 2012 +0000
Remove wShowGNUstepPanel() etc
The only place where this function is called is from a double click
in the first icon of the dock, and only if there's no program already
associated with it.
This is a bit superfluous and most people have defined the first
icon to call WPrefs instead and end up never seeing that panel.
And since the last commit ("Change behaviour of the GNUstep dockapp"),
this is now also the default behaviour of Window Maker.
Furthermore, the panel itself is not accurate. Window Maker is not part
of the GNUstep project.
diff --git a/src/dialog.c b/src/dialog.c
index acfb777..e4c8f34 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1631,169 +1631,3 @@ int wShowCrashingDialogPanel(int whatSig)
return action;
}
-
-/*****************************************************************************
- * About GNUstep Panel
- *****************************************************************************/
-
-static void
-drawGNUstepLogo(Display * dpy, Drawable d, int width, int height,
- unsigned long blackPixel, unsigned long whitePixel)
-{
- GC gc;
- XGCValues gcv;
- XRectangle rects[3];
-
- gcv.foreground = blackPixel;
- gc = XCreateGC(dpy, d, GCForeground, &gcv);
-
- XFillArc(dpy, d, gc, width / 45, height / 45,
- width - 2 * width / 45, height - 2 * height / 45, 0, 360 * 64);
-
- rects[0].x = 0;
- rects[0].y = 37 * height / 45;
- rects[0].width = width / 3;
- rects[0].height = height - rects[0].y;
-
- rects[1].x = rects[0].width;
- rects[1].y = height / 2;
- rects[1].width = width - 2 * width / 3;
- rects[1].height = height - rects[1].y;
-
- rects[2].x = 2 * width / 3;
- rects[2].y = height - 37 * height / 45;
- rects[2].width = width / 3;
- rects[2].height = height - rects[2].y;
-
- XSetClipRectangles(dpy, gc, 0, 0, rects, 3, Unsorted);
- XFillRectangle(dpy, d, gc, 0, 0, width, height);
-
- XSetForeground(dpy, gc, whitePixel);
- XFillArc(dpy, d, gc, width / 45, height / 45,
- width - 2 * width / 45, height - 2 * height / 45, 0, 360 * 64);
-
- XFreeGC(dpy, gc);
-}
-
-typedef struct {
- WScreen *scr;
-
- WWindow *wwin;
-
- WMWindow *win;
-
- WMLabel *gstepL;
- WMLabel *textL;
-} GNUstepPanel;
-
-static GNUstepPanel *gnustepPanel = NULL;
-
-static void destroyGNUstepPanel(WCoreWindow * foo, void *data, XEvent * event)
-{
- WMUnmapWidget(gnustepPanel->win);
-
- WMDestroyWidget(gnustepPanel->win);
-
- wUnmanageWindow(gnustepPanel->wwin, False, False);
-
- wfree(gnustepPanel);
-
- gnustepPanel = NULL;
-}
-
-void wShowGNUstepPanel(WScreen * scr)
-{
- GNUstepPanel *panel;
- Window parent;
- WWindow *wwin;
- WMPixmap *pixmap;
- WMColor *color;
-
- if (gnustepPanel) {
- if (gnustepPanel->scr == scr) {
- wRaiseFrame(gnustepPanel->wwin->frame->core);
- wSetFocusTo(scr, gnustepPanel->wwin);
- }
- return;
- }
-
- panel = wmalloc(sizeof(GNUstepPanel));
-
- panel->scr = scr;
-
- panel->win = WMCreateWindow(scr->wmscreen, "About GNUstep");
- WMResizeWidget(panel->win, 325, 205);
-
- pixmap = WMCreatePixmap(scr->wmscreen, 130, 130,
WMScreenDepth(scr->wmscreen), True);
-
- color = WMCreateNamedColor(scr->wmscreen, "gray50", True);
-
- drawGNUstepLogo(dpy, WMGetPixmapXID(pixmap), 130, 130,
WMColorPixel(color), scr->white_pixel);
-
- WMReleaseColor(color);
-
- XSetForeground(dpy, scr->mono_gc, 0);
- XFillRectangle(dpy, WMGetPixmapMaskXID(pixmap), scr->mono_gc, 0, 0,
130, 130);
- drawGNUstepLogo(dpy, WMGetPixmapMaskXID(pixmap), 130, 130, 1, 1);
-
- panel->gstepL = WMCreateLabel(panel->win);
- WMResizeWidget(panel->gstepL, 285, 64);
- WMMoveWidget(panel->gstepL, 20, 0);
- WMSetLabelTextAlignment(panel->gstepL, WARight);
- WMSetLabelText(panel->gstepL, "GNUstep");
- {
- WMFont *font = WMBoldSystemFontOfSize(scr->wmscreen, 24);
-
- WMSetLabelFont(panel->gstepL, font);
- WMReleaseFont(font);
- }
-
- panel->textL = WMCreateLabel(panel->win);
- WMResizeWidget(panel->textL, 305, 140);
- WMMoveWidget(panel->textL, 10, 50);
- WMSetLabelTextAlignment(panel->textL, WARight);
- WMSetLabelImagePosition(panel->textL, WIPOverlaps);
- WMSetLabelText(panel->textL,
- _("Window Maker is part of the GNUstep project.n"
- "The GNUstep project aims to create a freen"
- "implementation of the OpenStep(tm) specificationn"
- "which is a object-oriented framework forn"
- "creating advanced graphical, multi-platformn"
- "applications. Additionally, a development andn"
- "user desktop environment will be created on topn"
- "of the framework. For more information aboutn"
- "GNUstep, please visit: www.gnustep.org"));
- WMSetLabelImage(panel->textL, pixmap);
-
- WMReleasePixmap(pixmap);
-
- WMRealizeWidget(panel->win);
- WMMapSubwidgets(panel->win);
-
- parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 325, 200, 0, 0,
0);
-
- XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0);
-
- {
- WMPoint center = getCenter(scr, 325, 200);
-
- wwin = wManageInternalWindow(scr, parent, None, _("About
GNUstep"), center.x, center.y, 325, 200);
- }
-
- WSETUFLAG(wwin, no_closable, 0);
- WSETUFLAG(wwin, no_close_button, 0);
- wWindowUpdateButtonImages(wwin);
- wFrameWindowShowButton(wwin->frame, WFF_RIGHT_BUTTON);
-#ifdef XKB_BUTTON_HINT
- wFrameWindowHideButton(wwin->frame, WFF_LANGUAGE_BUTTON);
-#endif
- wwin->frame->on_click_right = destroyGNUstepPanel;
-
- panel->wwin = wwin;
-
- WMMapWidget(panel->win);
-
- wWindowMap(wwin);
-
- gnustepPanel = panel;
-}
diff --git a/src/dialog.h b/src/dialog.h
index dc4639a..530bd26 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -41,11 +41,7 @@ int wExitDialog(WScreen *scr, char *title, char *message,
char *defBtn,
Bool wIconChooserDialog(WScreen *scr, char **file, char *instance, char
*class);
void wShowInfoPanel(WScreen *scr);
-
void wShowLegalPanel(WScreen *scr);
-
-void wShowGNUstepPanel(WScreen *scr);
-
int wShowCrashingDialogPanel(int whatSig);
diff --git a/src/dock.c b/src/dock.c
index 8a1a21f..71bef02 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -3281,11 +3281,8 @@ static void iconDblClick(WObjDescriptor *desc, XEvent
*event)
else
handleClipChangeWorkspace(dock->screen_ptr, event);
} else if (btn->command) {
- if (!btn->launching && (!btn->running ||
(event->xbutton.state & ControlMask))) {
+ if (!btn->launching && (!btn->running ||
(event->xbutton.state & ControlMask)))
launchDockedApplication(btn, False);
- }
- } else if (btn->xindex == 0 && btn->yindex == 0 &&
btn->dock->type == WM_DOCK) {
- wShowGNUstepPanel(dock->screen_ptr);
}
}
}
http://repo.or.cz/w/wmaker-crm.git/commit/2075881f2d18e7bad9fcc7c6a03f1a39505ebe35
commit 2075881f2d18e7bad9fcc7c6a03f1a39505ebe35
Author: Kamil Rytarowski <n...@gmx.com>
Date: Sat Feb 18 17:54:06 2012 +0100
Change behaviour of the GNUstep dockapp
Make it launch WPrefs instead of displaying GNUstep information.
GNUstep information under a dockbutton is unneeded and it's commonly
replaced
by WPrefs. This also is giving one extra space for another dockapp.
diff --git a/WindowMaker/Defaults/WMState.in b/WindowMaker/Defaults/WMState.in
index bdcef36..aefcfdf 100644
--- a/WindowMaker/Defaults/WMState.in
+++ b/WindowMaker/Defaults/WMState.in
@@ -2,12 +2,12 @@
Dock = {
Applications = (
{
- Command = "-";
+ Command = "#wprefs#";
Name = Logo.WMDock;
AutoLaunch = No;
Forced = No;
Position = "0,0";
- DropCommand = "wmsetbg -u -t %d";
+ Lock = Yes;
},
{
Command = xterm;
@@ -15,14 +15,6 @@
AutoLaunch = No;
Forced = No;
Position = "0,1";
- },
- {
- Command = "#wprefs#";
- Name = groupLeader.WPrefs;
- AutoLaunch = No;
- Forced = No;
- Position = "0,2";
- Lock = Yes;
}
);
Position = "-64,0";
-----------------------------------------------------------------------
Summary of changes:
src/dialog.c | 166 ----------------------------------------------------------
src/dialog.h | 4 --
src/dock.c | 5 +--
3 files changed, 1 insertions(+), 174 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.
