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 246068a634bad42cccbd11d4f9a74901e58a434c (commit)
via 415ac91afc4fd46cf70f446a6e2ebd943a1e2d07 (commit)
via 5ed02b58be9009f3f73eccf06d4d6d3567f132a8 (commit)
from b565b48b92f7ad770158b88213dc18ba71659ac5 (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/246068a634bad42cccbd11d4f9a74901e58a434c
commit 246068a634bad42cccbd11d4f9a74901e58a434c
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sat Nov 2 20:02:27 2013 +0100
Legal Panel size with variables
This patch uses two variables to set the width and the height for the
Info Panel. It also includes a margin space.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/dialog.c b/src/dialog.c
index adf19e3..3a019cf 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1364,11 +1364,8 @@ void wShowInfoPanel(WScreen *scr)
typedef struct {
WScreen *scr;
-
WWindow *wwin;
-
WMWindow *win;
-
WMLabel *licenseL;
} LegalPanel;
@@ -1382,21 +1379,21 @@ static void destroyLegalPanel(WCoreWindow * foo, void
*data, XEvent * event)
(void) event;
WMUnmapWidget(legalPanel->win);
-
WMDestroyWidget(legalPanel->win);
-
wUnmanageWindow(legalPanel->wwin, False, False);
-
wfree(legalPanel);
-
legalPanel = NULL;
}
-void wShowLegalPanel(WScreen * scr)
+void wShowLegalPanel(WScreen *scr)
{
+ const int win_width = 420;
+ const int win_height = 250;
+ const int margin = 10;
LegalPanel *panel;
Window parent;
WWindow *wwin;
+ WMPoint center;
if (legalPanel) {
if (legalPanel->scr == scr) {
@@ -1407,16 +1404,14 @@ void wShowLegalPanel(WScreen * scr)
}
panel = wmalloc(sizeof(LegalPanel));
-
panel->scr = scr;
-
panel->win = WMCreateWindow(scr->wmscreen, "legal");
- WMResizeWidget(panel->win, 420, 250);
+ WMResizeWidget(panel->win, win_width, win_height);
panel->licenseL = WMCreateLabel(panel->win);
WMSetLabelWraps(panel->licenseL, True);
- WMResizeWidget(panel->licenseL, 400, 230);
- WMMoveWidget(panel->licenseL, 10, 10);
+ WMResizeWidget(panel->licenseL, win_width - (2 * margin), win_height -
(2 * margin));
+ WMMoveWidget(panel->licenseL, margin, margin);
WMSetLabelTextAlignment(panel->licenseL, WALeft);
WMSetLabelText(panel->licenseL,
_(" Window Maker is free software; you can
redistribute it and/or "
@@ -1436,15 +1431,10 @@ void wShowLegalPanel(WScreen * scr)
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
- parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 420, 250, 0, 0,
0);
-
+ parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, win_width,
win_height, 0, 0, 0);
XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0);
-
- {
- WMPoint center = getCenter(scr, 420, 250);
-
- wwin = wManageInternalWindow(scr, parent, None, _("Legal"),
center.x, center.y, 420, 250);
- }
+ center = getCenter(scr, win_width, win_height);
+ wwin = wManageInternalWindow(scr, parent, None, _("Legal"), center.x,
center.y, win_width, win_height);
WSETUFLAG(wwin, no_closable, 0);
WSETUFLAG(wwin, no_close_button, 0);
@@ -1454,13 +1444,10 @@ void wShowLegalPanel(WScreen * scr)
wFrameWindowHideButton(wwin->frame, WFF_LANGUAGE_BUTTON);
#endif
wwin->frame->on_click_right = destroyLegalPanel;
-
panel->wwin = wwin;
WMMapWidget(panel->win);
-
wWindowMap(wwin);
-
legalPanel = panel;
}
http://repo.or.cz/w/wmaker-crm.git/commit/415ac91afc4fd46cf70f446a6e2ebd943a1e2d07
commit 415ac91afc4fd46cf70f446a6e2ebd943a1e2d07
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sat Nov 2 20:02:26 2013 +0100
Window Maker Developers Team Copyright
This patch includes the Dev Team Copyright in the info panel.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/dialog.c b/src/dialog.c
index 5655cd5..adf19e3 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1105,7 +1105,8 @@ typedef struct {
#define COPYRIGHT_TEXT "Copyright xc2xa9 1997-2006 Alfredo K. Kojiman"-
"Copyright xc2xa9 1998-2006 Dan Pascu"
+ "Copyright xc2xa9 1998-2006 Dan Pascun"+ "Copyright xc2xa9 2013 Window
Maker Developers Team"
static InfoPanel *thePanel = NULL;
@@ -1126,7 +1127,7 @@ static void destroyInfoPanel(WCoreWindow *foo, void
*data, XEvent *event)
void wShowInfoPanel(WScreen *scr)
{
const int win_width = 382;
- const int win_height = 230;
+ const int win_height = 250;
InfoPanel *panel;
WMPixmap *logo;
WMFont *font;
@@ -1219,7 +1220,7 @@ void wShowInfoPanel(WScreen *scr)
WMSetLabelWraps(panel->versionL, False);
panel->copyrL = WMCreateLabel(panel->win);
- WMResizeWidget(panel->copyrL, 360, 40);
+ WMResizeWidget(panel->copyrL, 360, 60);
WMMoveWidget(panel->copyrL, 15, 185);
WMSetLabelTextAlignment(panel->copyrL, WALeft);
WMSetLabelText(panel->copyrL, COPYRIGHT_TEXT);
http://repo.or.cz/w/wmaker-crm.git/commit/5ed02b58be9009f3f73eccf06d4d6d3567f132a8
commit 5ed02b58be9009f3f73eccf06d4d6d3567f132a8
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sat Nov 2 20:02:25 2013 +0100
Info Panel size with variables
This patch uses two variables to set the width and the height for the
Info Panel.
Now the panel has the same size than the window.
Finally, this patch moves the center definition to the beginning, and
removes the curly brackets.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/dialog.c b/src/dialog.c
index 3dcf31b..5655cd5 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1123,17 +1123,19 @@ static void destroyInfoPanel(WCoreWindow *foo, void
*data, XEvent *event)
thePanel = NULL;
}
-void wShowInfoPanel(WScreen * scr)
+void wShowInfoPanel(WScreen *scr)
{
+ const int win_width = 382;
+ const int win_height = 230;
InfoPanel *panel;
WMPixmap *logo;
WMFont *font;
- char *strbuf = NULL;
+ char *name, *strbuf = NULL;
const char *separator;
char buffer[256];
- const char *name;
Window parent;
WWindow *wwin;
+ WMPoint center;
char **strl;
int i, width = 50, sepHeight;
char *visuals[] = {
@@ -1158,7 +1160,7 @@ void wShowInfoPanel(WScreen * scr)
panel->scr = scr;
panel->win = WMCreateWindow(scr->wmscreen, "info");
- WMResizeWidget(panel->win, 390, 230);
+ WMResizeWidget(panel->win, win_width, win_height);
logo = WMCreateApplicationIconBlendedPixmap(scr->wmscreen, (RColor *)
NULL);
if (!logo) {
@@ -1329,17 +1331,14 @@ void wShowInfoPanel(WScreen * scr)
WMRealizeWidget(panel->win);
WMMapSubwidgets(panel->win);
- parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 382, 230, 0, 0,
0);
+ parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, win_width,
win_height, 0, 0, 0);
XReparentWindow(dpy, WMWidgetXID(panel->win), parent, 0, 0);
WMMapWidget(panel->win);
- {
- WMPoint center = getCenter(scr, 382, 230);
-
- wwin = wManageInternalWindow(scr, parent, None, _("Info"),
center.x, center.y, 382, 230);
- }
+ center = getCenter(scr, win_width, win_height);
+ wwin = wManageInternalWindow(scr, parent, None, _("Info"), center.x,
center.y, win_width, win_height);
WSETUFLAG(wwin, no_closable, 0);
WSETUFLAG(wwin, no_close_button, 0);
-----------------------------------------------------------------------
Summary of changes:
src/dialog.c | 59 ++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 36 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
