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 a1a5c5bcd533b291ba4b9da6ee8b74a6cf98b26c (commit)
discards 4c9e0aec299511c070955443ad6ceef1c1ab8481 (commit)
discards adbcdddc509d64b7dfc5368c35de2db71be7f1a1 (commit)
discards a0ac79c160453d73829ee36cb92922fad4b6aa9e (commit)
via 83d8ad6607b47e1c69baf113c7cbca2a66389fae (commit)
via 3b0c284a584c3cf49aeeaf4e33bc432c06b9e380 (commit)
via 0a30d42eaa4034d268c81541d3268714d96cbcc9 (commit)
via 8708b62ceaecdb73f03112de898db2ac76843fcd (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 (a1a5c5bcd533b291ba4b9da6ee8b74a6cf98b26c)
N -- N -- N (83d8ad6607b47e1c69baf113c7cbca2a66389fae)
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/83d8ad6607b47e1c69baf113c7cbca2a66389fae
commit 83d8ad6607b47e1c69baf113c7cbca2a66389fae
Author: Doug Torrance <[email protected]>
Date: Sun May 11 03:34:34 2014 -0500
WINGs: Option for decimal or hexadecimal RGB colors
The RGB panel of the WINGs color panel lists the red, green, and blue
values as
base 10 numbers. However, hexadecimal numbers are very common when dealing
with
RGB colors. This patch adds two radio buttons at the bottom of the RGB
panel
to allow users to choose their preferred number system.
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 29777027..64ce1771 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -161,6 +161,9 @@ typedef struct W_ColorPanel {
WMButton *grayPresetBtn[7];
/* RGB Panel */
+ int rgbState;
+ WMButton *rgbDecB;
+ WMButton *rgbHexB;
WMFrame *rgbFrm;
WMLabel *rgbMinL;
WMLabel *rgbMaxL;
@@ -249,6 +252,11 @@ enum {
CLmenuRemove
} colorListMenuItem;
+enum {
+ RGBdec,
+ RGBhex
+};
+
#define PWIDTH 194
#define PHEIGHT 266
#define colorWheelSize 150
@@ -313,6 +321,7 @@ static void grayBrightnessTextFieldCallback(void
*observerData, WMNotification *
static void rgbSliderCallback(WMWidget * w, void *data);
static void rgbTextFieldCallback(void *observerData, WMNotification *
notification);
+static void rgbDecToHex(WMWidget *w, void *data);
static void cmykSliderCallback(WMWidget * w, void *data);
static void cmykTextFieldCallback(void *observerData, WMNotification *
notification);
@@ -703,6 +712,21 @@ static WMColorPanel *makeColorPanel(WMScreen * scrPtr,
const char *name)
WMMoveWidget(panel->rgbBlueT, 146, 57);
WMSetTextFieldAlignment(panel->rgbBlueT, WALeft);
WMAddNotificationObserver(rgbTextFieldCallback, panel,
WMTextDidEndEditingNotification, panel->rgbBlueT);
+
+ panel->rgbDecB = WMCreateButton(panel->rgbFrm, WBTRadio);
+ WMSetButtonText(panel->rgbDecB, "Decimal");
+ WMSetButtonSelected(panel->rgbDecB, 1);
+ panel->rgbState = RGBdec;
+ WMSetButtonAction(panel->rgbDecB, rgbDecToHex, panel);
+ WMMoveWidget(panel->rgbDecB, 2, 81);
+
+ panel->rgbHexB = WMCreateButton(panel->rgbFrm, WBTRadio);
+ WMSetButtonText(panel->rgbHexB, "Hexadecimal");
+ WMSetButtonAction(panel->rgbHexB, rgbDecToHex, panel);
+ WMMoveWidget(panel->rgbHexB, 2, 104);
+
+ WMGroupButtons(panel->rgbDecB, panel->rgbHexB);
+
/* End of RGB Panel */
/* Widgets for CMYK Panel */
@@ -2348,11 +2372,45 @@ static void grayBrightnessTextFieldCallback(void
*observerData, WMNotification *
/******************* RGB Panel Functions *****************/
+void rgbIntToChar(W_ColorPanel *panel, int *value)
+{
+ char tmp[4];
+ char *format;
+
+ if (panel->rgbState == RGBdec)
+ format = "%d";
+ if (panel->rgbState == RGBhex)
+ format = "%0X";
+
+ sprintf(tmp, format, value[0]);
+ WMSetTextFieldText(panel->rgbRedT, tmp);
+ sprintf(tmp, format, value[1]);
+ WMSetTextFieldText(panel->rgbGreenT, tmp);
+ sprintf(tmp, format, value[2]);
+ WMSetTextFieldText(panel->rgbBlueT, tmp);
+}
+
+int *rgbCharToInt(W_ColorPanel *panel)
+{
+ static int value[3];
+
+ if (panel->rgbState == RGBdec) {
+ value[0] = atoi(WMGetTextFieldText(panel->rgbRedT));
+ value[1] = atoi(WMGetTextFieldText(panel->rgbGreenT));
+ value[2] = atoi(WMGetTextFieldText(panel->rgbBlueT));
+ }
+ if (panel->rgbState == RGBhex) {
+ value[0] = strtol(WMGetTextFieldText(panel->rgbRedT), NULL, 16);
+ value[1] = strtol(WMGetTextFieldText(panel->rgbGreenT), NULL,
16);
+ value[2] = strtol(WMGetTextFieldText(panel->rgbBlueT), NULL,
16);
+ }
+ return value;
+}
+
static void rgbSliderCallback(WMWidget * w, void *data)
{
CPColor cpColor;
int value[3];
- char tmp[4];
W_ColorPanel *panel = (W_ColorPanel *) data;
/* Parameter not used, but tell the compiler that it is ok */
@@ -2362,12 +2420,7 @@ static void rgbSliderCallback(WMWidget * w, void *data)
value[1] = WMGetSliderValue(panel->rgbGreenS);
value[2] = WMGetSliderValue(panel->rgbBlueS);
- sprintf(tmp, "%d", value[0]);
- WMSetTextFieldText(panel->rgbRedT, tmp);
- sprintf(tmp, "%d", value[1]);
- WMSetTextFieldText(panel->rgbGreenT, tmp);
- sprintf(tmp, "%d", value[2]);
- WMSetTextFieldText(panel->rgbBlueT, tmp);
+ rgbIntToChar(panel, value);
cpColor.rgb.red = value[0];
cpColor.rgb.green = value[1];
@@ -2381,17 +2434,14 @@ static void rgbSliderCallback(WMWidget * w, void *data)
static void rgbTextFieldCallback(void *observerData, WMNotification *
notification)
{
CPColor cpColor;
- int value[3];
- char tmp[4];
+ int *value;
int n;
W_ColorPanel *panel = (W_ColorPanel *) observerData;
/* Parameter not used, but tell the compiler that it is ok */
(void) notification;
- value[0] = atoi(WMGetTextFieldText(panel->rgbRedT));
- value[1] = atoi(WMGetTextFieldText(panel->rgbGreenT));
- value[2] = atoi(WMGetTextFieldText(panel->rgbBlueT));
+ value = rgbCharToInt(panel);
for (n = 0; n < 3; n++) {
if (value[n] > 255)
@@ -2400,12 +2450,7 @@ static void rgbTextFieldCallback(void *observerData,
WMNotification * notificati
value[n] = 0;
}
- sprintf(tmp, "%d", value[0]);
- WMSetTextFieldText(panel->rgbRedT, tmp);
- sprintf(tmp, "%d", value[1]);
- WMSetTextFieldText(panel->rgbGreenT, tmp);
- sprintf(tmp, "%d", value[2]);
- WMSetTextFieldText(panel->rgbBlueT, tmp);
+ rgbIntToChar(panel, value);
WMSetSliderValue(panel->rgbRedS, value[0]);
WMSetSliderValue(panel->rgbGreenS, value[1]);
@@ -2420,6 +2465,28 @@ static void rgbTextFieldCallback(void *observerData,
WMNotification * notificati
panel->lastChanged = WMRGBModeColorPanel;
}
+static void rgbDecToHex(WMWidget *w, void *data)
+{
+ W_ColorPanel *panel = (W_ColorPanel *) data;
+ (void) w;
+ int *value;
+
+ if (WMGetButtonSelected(panel->rgbDecB) && panel->rgbState == RGBhex) {
+ WMSetLabelText(panel->rgbMaxL, "255");
+ WMRedisplayWidget(panel->rgbMaxL);
+ value = rgbCharToInt(panel);
+ panel->rgbState = RGBdec;
+ rgbIntToChar(panel, value);
+ }
+ if (WMGetButtonSelected(panel->rgbHexB) && panel->rgbState == RGBdec) {
+ WMSetLabelText(panel->rgbMaxL, "FF");
+ WMRedisplayWidget(panel->rgbMaxL);
+ value = rgbCharToInt(panel);
+ panel->rgbState = RGBhex;
+ rgbIntToChar(panel, value);
+ }
+}
+
/******************* CMYK Panel Functions *****************/
static void cmykSliderCallback(WMWidget * w, void *data)
http://repo.or.cz/w/wmaker-crm.git/commit/3b0c284a584c3cf49aeeaf4e33bc432c06b9e380
commit 3b0c284a584c3cf49aeeaf4e33bc432c06b9e380
Author: Doug Torrance <[email protected]>
Date: Sat May 10 23:42:51 2014 -0500
WPrefs: WINGs font configuration
This patch allows users to edit the two fonts (SystemFont and
BoldSystemFont)
used in WINGs widgets using WPrefs. Note that changes will not take effect
for
WINGs applications which are currently running.
diff --git a/WPrefs.app/FontSimple.c b/WPrefs.app/FontSimple.c
index a124a981..ca1feb05 100644
--- a/WPrefs.app/FontSimple.c
+++ b/WPrefs.app/FontSimple.c
@@ -102,6 +102,8 @@ static const struct {
"IconTitleFont", N_("Icon Title")}, {
"ClipTitleFont", N_("Clip Title")}, {
"LargeDisplayFont", N_("Desktop Caption")}, {
+ "SystemFont", N_("System Font")}, {
+ "BoldSystemFont", N_("Bold System Font")}, {
NULL, NULL},};
static const char *standardSizes[] = {
@@ -587,7 +589,19 @@ static void showData(_Panel * panel)
if (ofont)
wfree(ofont);
- font = GetStringForKey(fontOptions[i].option);
+ if (strcmp(fontOptions[i].option,"SystemFont")==0 ||
+ strcmp(fontOptions[i].option,"BoldSystemFont")==0) {
+ char *path;
+ WMUserDefaults *defaults;
+ path = wdefaultspathfordomain("WMGLOBAL");
+ defaults = WMGetDefaultsFromPath(path);
+ wfree(path);
+ font = WMGetUDStringForKey(defaults,
+ fontOptions[i].option);
+ }
+ else {
+ font = GetStringForKey(fontOptions[i].option);
+ }
if (font)
font = wstrdup(font);
WMSetMenuItemRepresentedObject(item, font);
@@ -608,7 +622,21 @@ static void storeData(_Panel * panel)
font = WMGetMenuItemRepresentedObject(item);
if (font && *font) {
- SetStringForKey(font, fontOptions[i].option);
+ if (strcmp(fontOptions[i].option,"SystemFont")==0 ||
+ strcmp(fontOptions[i].option,"BoldSystemFont")==0) {
+ char *path;
+ WMUserDefaults *defaults;
+ path = wdefaultspathfordomain("WMGLOBAL");
+ defaults = WMGetDefaultsFromPath(path);
+ wfree(path);
+ WMSetUDStringForKey(defaults,
+ font,
+ fontOptions[i].option);
+ WMSaveUserDefaults(defaults);
+ }
+ else {
+ SetStringForKey(font, fontOptions[i].option);
+ }
}
}
}
http://repo.or.cz/w/wmaker-crm.git/commit/0a30d42eaa4034d268c81541d3268714d96cbcc9
commit 0a30d42eaa4034d268c81541d3268714d96cbcc9
Author: Doug Torrance <[email protected]>
Date: Sat May 10 19:33:57 2014 -0500
Restore wprogressindicator.c declarations to WINGs/WINGs.h
In commit b4cb488, wprogressindicator.c was removed. It was restored in
commit
d435ea7, but the corresponding declarations in WINGs/WINGs.h were not. This
patch fixes this oversight.
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index dd3fac54..51252f52 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -1450,6 +1450,22 @@ void WMSetPopUpButtonEnabled(WMPopUpButton *bPtr, Bool
flag);
Bool WMGetPopUpButtonEnabled(WMPopUpButton *bPtr);
+/* ---[ WINGs/wprogressindicator.c ]------------------------------------- */
+
+WMProgressIndicator* WMCreateProgressIndicator(WMWidget *parent);
+
+void WMSetProgressIndicatorMinValue(WMProgressIndicator *progressindicator,
int value);
+
+void WMSetProgressIndicatorMaxValue(WMProgressIndicator *progressindicator,
int value);
+
+void WMSetProgressIndicatorValue(WMProgressIndicator *progressindicator, int
value);
+
+int WMGetProgressIndicatorMinValue(WMProgressIndicator *progressindicator);
+
+int WMGetProgressIndicatorMaxValue(WMProgressIndicator *progressindicator);
+
+int WMGetProgressIndicatorValue(WMProgressIndicator *progressindicator);
+
/* ---[ WINGs/wcolorpanel.c ]--------------------------------------------- */
WMColorPanel* WMGetColorPanel(WMScreen *scrPtr);
http://repo.or.cz/w/wmaker-crm.git/commit/8708b62ceaecdb73f03112de898db2ac76843fcd
commit 8708b62ceaecdb73f03112de898db2ac76843fcd
Author: David Maciejak <[email protected]>
Date: Sat May 10 19:26:47 2014 +0800
wrlib: add a function to draw rectangles
it appears that such kind of function was missing from the lib
diff --git a/wrlib/draw.c b/wrlib/draw.c
index 350837c6..a9a96260 100644
--- a/wrlib/draw.c
+++ b/wrlib/draw.c
@@ -463,6 +463,15 @@ void ROperateLines(RImage * image, int operation, const
RPoint * points, int npo
genericLine(image, x1, y1, x2, y2, color, operation, i);
}
+void ROperateRectangle(RImage *image, int operation, int x0, int y0, int x1,
int y1, const RColor *color)
+{
+ int y;
+
+ for (y = y0; y <= y1; y++) {
+ genericLine(image, x0, y, x1, y, color, operation, False);
+ }
+}
+
void RDrawSegments(RImage * image, const RSegment * segs, int nsegs, const
RColor * color)
{
register int i;
diff --git a/wrlib/libwraster.map b/wrlib/libwraster.map
index 422af756..062dcd95 100644
--- a/wrlib/libwraster.map
+++ b/wrlib/libwraster.map
@@ -60,6 +60,7 @@ LIBWRASTER3
ROperateLines;
ROperatePixel;
ROperatePixels;
+ ROperateRectangle;
ROperateSegments;
RPutPixel;
RPutPixels;
diff --git a/wrlib/wraster.h b/wrlib/wraster.h
index 88f3a72a..20038690 100644
--- a/wrlib/wraster.h
+++ b/wrlib/wraster.h
@@ -403,6 +403,8 @@ void RDrawLines(RImage *image, const RPoint *points, int
npoints, int mode,
void ROperateLines(RImage *image, int operation, const RPoint *points, int
npoints,
int mode, const RColor *color);
+void ROperateRectangle(RImage *image, int operation, int x0, int y0, int x1,
int y1, const RColor *color);
+
void RDrawSegments(RImage *image, const RSegment *segs, int nsegs, const
RColor *color);
void ROperateSegments(RImage *image, int operation, const RSegment *segs, int
nsegs,
-----------------------------------------------------------------------
Summary of changes:
WINGs/wcolorpanel.c | 103 ++++-
util/Makefile.am | 9 +-
util/wmiv.c | 805 -------------------------------
util/wmiv.h | 1279 --------------------------------------------------
wrlib/draw.c | 4 +-
wrlib/libwraster.map | 2 +-
6 files changed, 90 insertions(+), 2112 deletions(-)
delete mode 100755 util/wmiv.c
delete mode 100644 util/wmiv.h
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].
