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  1fd88168561ef3b9b33bca2da4c1f51d9be06332 (commit)
       via  2c41d871b124df26e371a995ed89e44d74eaddc9 (commit)
       via  810d17e47a13cb8e02dcb1684380a489a004de62 (commit)
       via  eb977fb87c921406f0405659c1594ed8860355e4 (commit)
       via  018cf40c83038a515090da02588a5fb6023f7383 (commit)
       via  31c74ac4e1cf6b440ab439f31ef2eee29963bf34 (commit)
       via  034edb19e3472bfcc44818ed404c2cff80ba9367 (commit)
      from  9b67b36276e6a6db567d24c7f3c76e3769276b89 (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/1fd88168561ef3b9b33bca2da4c1f51d9be06332

commit 1fd88168561ef3b9b33bca2da4c1f51d9be06332
Author: Christophe CURIS <christophe.cu...@free.fr>
Date:   Sun Dec 21 18:13:19 2014 +0100

    WPrefs: add possibility to configure the size of the aperçu
    
    The Icon preference panel have been rearranged to include a slider which
    controls the size of the Aperçu. This slider is also used to turn off the
    feature, so the related checkbox have been removed from the Misc preference
    panel, because it is more convenient to have the related settings at the
    same place.
    
    Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>

diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c
index 0faaa5f5..f50c36e5 100644
--- a/WPrefs.app/Icons.c
+++ b/WPrefs.app/Icons.c
@@ -66,6 +66,10 @@ typedef struct _Panel {
        WMFrame *posVF;
        WMFrame *posV;
 
+       struct {
+               int width, height;
+       } icon_position;
+
        WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
 
        WMFrame *animF;
@@ -76,12 +80,28 @@ typedef struct _Panel {
        WMButton *omnB;
        WMButton *sclB;
 
+       struct {
+               WMFrame *frame;
+               WMSlider *slider;
+               WMLabel *label;
+       } apercu;
+
        WMFrame *sizeF;
        WMPopUpButton *sizeP;
 
        int iconPos;
 } _Panel;
 
+/*
+ * Minimum size for an Apercu:
+ * This value is actually twice the size of the minimum icon size choosable.
+ * We set the slider min to taht number minus one, because when set to this
+ * value WPrefs will consider that the user wants the feature turned off.
+ */
+static const int apercu_minimum_size = 2 * 24 - 1;
+
+static const int apercu_maximum_size = 512;    /* Arbitrary limit for the 
slider */
+
 #define ICON_FILE      "iconprefs"
 
 static void showIconLayout(WMWidget * widget, void *data)
@@ -111,21 +131,44 @@ static void showIconLayout(WMWidget * widget, void *data)
                WMMoveWidget(panel->posV, 2, 2);
                break;
        case 2:
-               WMMoveWidget(panel->posV, 95 - 2 - w, 2);
+               WMMoveWidget(panel->posV, panel->icon_position.width - 2 - w, 
2);
                break;
        case 4:
-               WMMoveWidget(panel->posV, 2, 70 - 2 - h);
+               WMMoveWidget(panel->posV, 2, panel->icon_position.height - 2 - 
h);
                break;
        default:
-               WMMoveWidget(panel->posV, 95 - 2 - w, 70 - 2 - h);
+               WMMoveWidget(panel->posV, panel->icon_position.width - 2 - w, 
panel->icon_position.height - 2 - h);
                break;
        }
 }
 
+static void apercu_slider_changed(WMWidget *w, void *data)
+{
+       _Panel *panel = (_Panel *) data;
+       char buffer[64];
+       int value;
+
+       /* Parameter is not used, but tell the compiler that it is ok */
+       (void) w;
+
+       value = WMGetSliderValue(panel->apercu.slider);
+
+       /* Round the value to a multiple of 8 because it makes the displayed 
value look better */
+       value &= ~7;
+
+       if (value <= apercu_minimum_size)
+               sprintf(buffer, _("OFF"));
+       else
+               sprintf(buffer, "%i", value);
+
+       WMSetLabelText(panel->apercu.label, buffer);
+}
+
 static void showData(_Panel * panel)
 {
        int i;
        char *str;
+       Bool b;
 
        WMSetButtonSelected(panel->arrB, GetBoolForKey("AutoArrangeIcons"));
        WMSetButtonSelected(panel->omnB, GetBoolForKey("StickyIcons"));
@@ -154,6 +197,19 @@ static void showData(_Panel * panel)
                i = 9;
        WMSetPopUpButtonSelectedItem(panel->sizeP, i);
 
+       /* Apercu */
+       b = GetBoolForKey("MiniwindowApercuBalloons");
+       if (b) {
+               i = GetIntegerForKey("ApercuSize");
+               if (i <= apercu_minimum_size)
+                       i = apercu_minimum_size;
+       } else {
+               i = apercu_minimum_size;
+       }
+       WMSetSliderValue(panel->apercu.slider, i);
+       apercu_slider_changed(panel->apercu.slider, panel);
+
+       /* Animation */
        str = GetStringForKey("IconificationStyle");
        if (str != NULL) {
                for (i = 0; i < wlengthof(icon_animation); i++) {
@@ -174,50 +230,87 @@ static void showData(_Panel * panel)
 static void createPanel(Panel * p)
 {
        _Panel *panel = (_Panel *) p;
+       WMScreen *scr;
        WMColor *color;
        int i;
        char buf[16];
+       int swidth, sheight;
+       int width, height;
+       int startx, starty;
 
        panel->box = WMCreateBox(panel->parent);
        WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
     /***************** Positioning of Icons *****************/
        panel->posF = WMCreateFrame(panel->box);
-       WMResizeWidget(panel->posF, 210, 140);
-       WMMoveWidget(panel->posF, 20, 10);
+       WMResizeWidget(panel->posF, 268, 155);
+       WMMoveWidget(panel->posF, 12, 6);
        WMSetFrameTitle(panel->posF, _("Icon Positioning"));
 
+       /*
+        * There is an available area of 240 x 122, starting at x=14 y=20
+        * We have to keep 14 pixels on each side for the buttons,
+        * and an extra pixel for spacing. We also want the final dimension
+        * to be an even number so we can have the 2 buttons per side of
+        * the same size.
+        * In this area, we want to have a rectangle with the same aspect
+        * ratio as the screen.
+        */
+       scr = WMWidgetScreen(panel->parent);
+       swidth = WidthOfScreen(DefaultScreenOfDisplay(WMScreenDisplay(scr)));
+       sheight = HeightOfScreen(DefaultScreenOfDisplay(WMScreenDisplay(scr)));
+
+       width = swidth * (122 - 15 * 2) / sheight;
+       if (width <= (240 - 15 * 2)) {
+               height = 122 - 15 * 2;
+       } else {
+               width = 240 - 15 * 2;
+               height = sheight * (240 - 15 * 2) / swidth;
+       }
+
+       panel->icon_position.width  = width;
+       panel->icon_position.height = height;
+
+       startx = 14 + (240 - 15 * 2 - width) / 2;
+       starty = 20 + (122 - 15 * 2 - height) / 2;
+
        for (i = 0; i < wlengthof(icon_position_dbvalue); i++) {
+               int x, y, w, h;
+
                panel->posB[i] = WMCreateButton(panel->posF, WBTOnOff);
                WMSetButtonAction(panel->posB[i], showIconLayout, panel);
 
                if (i > 0)
                        WMGroupButtons(panel->posB[0], panel->posB[i]);
+
+               if (i & 1) { /* 0=Vertical, 1=Horizontal */
+                       w = width / 2;
+                       h = 14;
+               } else {
+                       w = 14;
+                       h = height / 2;
+               }
+               WMResizeWidget(panel->posB[i], w, h);
+
+               x = startx;
+               y = starty;
+               switch (i) {
+               case 0: x +=  0;         y += 15;          break;
+               case 1: x += 15;         y +=  0;          break;
+               case 2: x += 15 + width; y += 15;          break;
+               case 3: x += 15 + w;     y +=  0;          break;
+               case 4: x +=  0;         y += 15 + h;      break;
+               case 5: x += 15;         y += 15 + height; break;
+               case 6: x += 15 + width; y += 15 + h;      break;
+               case 7: x += 15 + w;     y += 15 + height; break;
+               }
+               WMMoveWidget(panel->posB[i], x, y);
        }
-       WMMoveWidget(panel->posB[1], 58, 25);
-       WMResizeWidget(panel->posB[1], 47, 15);
-       WMMoveWidget(panel->posB[3], 58 + 47, 25);
-       WMResizeWidget(panel->posB[3], 47, 15);
-
-       WMMoveWidget(panel->posB[0], 43, 40);
-       WMResizeWidget(panel->posB[0], 15, 35);
-       WMMoveWidget(panel->posB[4], 43, 40 + 35);
-       WMResizeWidget(panel->posB[4], 15, 35);
-
-       WMMoveWidget(panel->posB[5], 58, 40 + 70);
-       WMResizeWidget(panel->posB[5], 47, 15);
-       WMMoveWidget(panel->posB[7], 58 + 47, 40 + 70);
-       WMResizeWidget(panel->posB[7], 47, 15);
-
-       WMMoveWidget(panel->posB[2], 58 + 95, 40);
-       WMResizeWidget(panel->posB[2], 15, 35);
-       WMMoveWidget(panel->posB[6], 58 + 95, 40 + 35);
-       WMResizeWidget(panel->posB[6], 15, 35);
 
        color = WMCreateRGBColor(WMWidgetScreen(panel->parent), 0x5100, 0x5100, 
0x7100, True);
        panel->posVF = WMCreateFrame(panel->posF);
-       WMResizeWidget(panel->posVF, 95, 70);
-       WMMoveWidget(panel->posVF, 58, 40);
+       WMResizeWidget(panel->posVF, width, height);
+       WMMoveWidget(panel->posVF, startx + 15, starty + 15);
        WMSetFrameRelief(panel->posVF, WRSunken);
        WMSetWidgetBackgroundColor(panel->posVF, color);
        WMReleaseColor(color);
@@ -229,16 +322,16 @@ static void createPanel(Panel * p)
 
     /***************** Icon Size ****************/
        panel->sizeF = WMCreateFrame(panel->box);
-       WMResizeWidget(panel->sizeF, 210, 70);
-       WMMoveWidget(panel->sizeF, 20, 155);
+       WMResizeWidget(panel->sizeF, 100, 52);
+       WMMoveWidget(panel->sizeF, 12, 168);
        WMSetFrameTitle(panel->sizeF, _("Icon Size"));
 
        WMSetBalloonTextForView(_("The size of the dock/application icon and 
miniwindows"),
                                WMWidgetView(panel->sizeF));
 
        panel->sizeP = WMCreatePopUpButton(panel->sizeF);
-       WMResizeWidget(panel->sizeP, 161, 20);
-       WMMoveWidget(panel->sizeP, 25, 30);
+       WMResizeWidget(panel->sizeP, 80, 20);
+       WMMoveWidget(panel->sizeP, 10, 19);
        for (i = 24; i <= 96; i += 8) {
                sprintf(buf, "%ix%i", i, i);
                WMAddPopUpButtonItem(panel->sizeP, buf);
@@ -246,16 +339,40 @@ static void createPanel(Panel * p)
 
        WMMapSubwidgets(panel->sizeF);
 
+       /***************** Apercu ****************/
+       panel->apercu.frame = WMCreateFrame(panel->box);
+       WMResizeWidget(panel->apercu.frame, 156, 52);
+       WMMoveWidget(panel->apercu.frame, 124, 168);
+       WMSetFrameTitle(panel->apercu.frame, _("Miniwindow aperçus"));
+
+       WMSetBalloonTextForView(_("The Aperçu provides a small view of the 
content of then"
+                                 "window when the mouse is placed over the 
icon."),
+                               WMWidgetView(panel->apercu.frame));
+
+       panel->apercu.slider = WMCreateSlider(panel->apercu.frame);
+       WMResizeWidget(panel->apercu.slider, 109, 15);
+       WMMoveWidget(panel->apercu.slider, 11, 23);
+       WMSetSliderMinValue(panel->apercu.slider, apercu_minimum_size);
+       WMSetSliderMaxValue(panel->apercu.slider, apercu_maximum_size);
+       WMSetSliderAction(panel->apercu.slider, apercu_slider_changed, panel);
+
+       panel->apercu.label = WMCreateLabel(panel->apercu.frame);
+       WMResizeWidget(panel->apercu.label, 33, 15);
+       WMMoveWidget(panel->apercu.label, 120, 23);
+       WMSetLabelText(panel->apercu.label, _("OFF"));
+
+       WMMapSubwidgets(panel->apercu.frame);
+
     /***************** Animation ****************/
        panel->animF = WMCreateFrame(panel->box);
-       WMResizeWidget(panel->animF, 260, 110);
-       WMMoveWidget(panel->animF, 240, 10);
+       WMResizeWidget(panel->animF, 215, 110);
+       WMMoveWidget(panel->animF, 292, 6);
        WMSetFrameTitle(panel->animF, _("Iconification Animation"));
 
        for (i = 0; i < wlengthof(icon_animation); i++) {
                panel->animB[i] = WMCreateRadioButton(panel->animF);
-               WMResizeWidget(panel->animB[i], 145, 20);
-               WMMoveWidget(panel->animB[i], 15, 18 + i * 22);
+               WMResizeWidget(panel->animB[i], 192, 20);
+               WMMoveWidget(panel->animB[i], 12, 16 + i * 22);
 
                if (i > 0)
                        WMGroupButtons(panel->animB[0], panel->animB[i]);
@@ -267,27 +384,27 @@ static void createPanel(Panel * p)
 
     /***************** Options ****************/
        panel->optF = WMCreateFrame(panel->box);
-       WMResizeWidget(panel->optF, 260, 95);
-       WMMoveWidget(panel->optF, 240, 130);
+       WMResizeWidget(panel->optF, 215, 90);
+       WMMoveWidget(panel->optF, 292, 130);
        /*    WMSetFrameTitle(panel->optF, _("Icon Display")); */
 
        panel->arrB = WMCreateSwitchButton(panel->optF);
-       WMResizeWidget(panel->arrB, 235, 20);
-       WMMoveWidget(panel->arrB, 15, 10);
+       WMResizeWidget(panel->arrB, 198, 20);
+       WMMoveWidget(panel->arrB, 12, 10);
        WMSetButtonText(panel->arrB, _("Auto-arrange icons"));
 
        WMSetBalloonTextForView(_("Keep icons and miniwindows arranged all the 
time."), WMWidgetView(panel->arrB));
 
        panel->omnB = WMCreateSwitchButton(panel->optF);
-       WMResizeWidget(panel->omnB, 235, 20);
-       WMMoveWidget(panel->omnB, 15, 37);
+       WMResizeWidget(panel->omnB, 198, 20);
+       WMMoveWidget(panel->omnB, 12, 35);
        WMSetButtonText(panel->omnB, _("Omnipresent miniwindows"));
 
        WMSetBalloonTextForView(_("Make miniwindows be present in all 
workspaces."), WMWidgetView(panel->omnB));
 
        panel->sclB = WMCreateSwitchButton(panel->optF);
-       WMResizeWidget(panel->sclB, 235, 28);
-       WMMoveWidget(panel->sclB, 15, 60);
+       WMResizeWidget(panel->sclB, 198, 28);
+       WMMoveWidget(panel->sclB, 12, 56);
        WMSetButtonText(panel->sclB, _("Single click activation"));
 
        WMSetBalloonTextForView(_("Launch applications and restore windows with 
a single click."), WMWidgetView(panel->sclB));
@@ -312,6 +429,22 @@ static void storeData(_Panel * panel)
 
        SetStringForKey(icon_position_dbvalue[panel->iconPos], "IconPosition");
 
+       i = WMGetSliderValue(panel->apercu.slider);
+       if (i <= apercu_minimum_size) {
+               SetBoolForKey(False, "MiniwindowApercuBalloons");
+       } else {
+               SetBoolForKey(True, "MiniwindowApercuBalloons");
+               if (i < apercu_maximum_size) {
+                       /*
+                        * If the value is bigger, it means it was edited by 
the user manually
+                        * so we keep as-is. Otherwise, we round it to a 
multiple of 8 like it
+                        * was done for display
+                        */
+                       i &= ~7;
+               }
+               SetIntegerForKey(i, "ApercuSize");
+       }
+
        for (i = 0; i < wlengthof(icon_animation); i++) {
                if (WMGetButtonSelected(panel->animB[i])) {
                        SetStringForKey(icon_animation[i].db_value, 
"IconificationStyle");
diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index dfa04272..57f94461 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -52,7 +52,6 @@ static const struct {
 } balloon_choices[] = {
        { "WindowTitleBalloons",       N_("incomplete window titles"), },
        { "MiniwindowTitleBalloons",   N_("miniwindow titles"), },
-       { "MiniwindowApercuBalloons",  N_("miniwindow apercus"), },
        { "AppIconBalloons",           N_("application/dock icons"), },
        { "HelpBalloons",              N_("internal help"), }
 };
@@ -266,14 +265,14 @@ static void createPanel(Panel * p)
 
     /***************** Balloon Text ****************/
        panel->ballF = WMCreateFrame(panel->box);
-       WMResizeWidget(panel->ballF, 220, 132);
+       WMResizeWidget(panel->ballF, 220, 130);
        WMMoveWidget(panel->ballF, 285, 7);
        WMSetFrameTitle(panel->ballF, _("Show balloon for..."));
 
        for (i = 0; i < wlengthof(balloon_choices); i++) {
                panel->ballB[i] = WMCreateSwitchButton(panel->ballF);
                WMResizeWidget(panel->ballB[i], 198, 20);
-               WMMoveWidget(panel->ballB[i], 11, 16 + i * 22);
+               WMMoveWidget(panel->ballB[i], 11, 20 + i * 26);
                WMSetButtonText(panel->ballB[i], _(balloon_choices[i].label));
        }
 
diff --git a/WPrefs.app/po/nl.po b/WPrefs.app/po/nl.po
index 1723ea55..25ceb801 100644
--- a/WPrefs.app/po/nl.po
+++ b/WPrefs.app/po/nl.po
@@ -1892,8 +1892,8 @@ msgid "miniwindow titles"
 msgstr "minivenster-titels"
 
 #: ../../WPrefs.app/Preferences.c:31
-msgid "miniwindow apercus"
-msgstr "minivenster-voorbeelden"
+msgid "Miniwindow aperçus"
+msgstr "Minivenster-voorbeelden"
 
 #: ../../WPrefs.app/Preferences.c:32
 msgid "application/dock icons"

http://repo.or.cz/w/wmaker-crm.git/commit/2c41d871b124df26e371a995ed89e44d74eaddc9

commit 2c41d871b124df26e371a995ed89e44d74eaddc9
Author: Christophe CURIS <christophe.cu...@free.fr>
Date:   Sun Dec 21 18:13:18 2014 +0100

    WPrefs: add an image to represent the window in the Window Placement frame
    
    The original square box did not look like anything, by using an image that
    looks like a small window it is more clear to users what it represents.
    
    The image was drawn as an XPM keeping a style consistent with everything
    else; it was then converted to TIFF using ImageMagick:
      convert -depth 8 -compress lzw xpm/smallwindow.xpm tiff/smallwindow.tiff
    
    Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>

diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c
index 7f801f7e..628278ea 100644
--- a/WPrefs.app/WindowHandling.c
+++ b/WPrefs.app/WindowHandling.c
@@ -77,6 +77,8 @@ typedef struct _Panel {
 
 #define NON_OPAQUE_RESIZE_PIXMAP "noopaqueresize"
 
+#define PLACEMENT_WINDOW_PIXMAP "smallwindow"
+
 #define THUMB_SIZE     16
 
 static const struct {
@@ -354,9 +356,29 @@ static void createPanel(Panel * p)
        WMMoveWidget(panel->porigF, 9 + (204 - 13 - width) / 2, 45 + (109 - 13 
- height) / 2);
 
        panel->porigW = WMCreateLabel(panel->porigF);
-       WMResizeWidget(panel->porigW, THUMB_SIZE, THUMB_SIZE);
        WMMoveWidget(panel->porigW, 2, 2);
-       WMSetLabelRelief(panel->porigW, WRRaised);
+       path = LocateImage(PLACEMENT_WINDOW_PIXMAP);
+       if (path) {
+               pixmap = WMCreatePixmapFromFile(scr, path);
+               if (pixmap) {
+                       WMSize size;
+
+                       WMSetLabelImagePosition(panel->porigW, WIPImageOnly);
+                       size = WMGetPixmapSize(pixmap);
+                       WMSetLabelImage(panel->porigW, pixmap);
+                       WMResizeWidget(panel->porigW, size.width, size.height);
+                       WMReleasePixmap(pixmap);
+               } else {
+                       wwarning(_("could not load icon %s"), path);
+               }
+               wfree(path);
+               if (!pixmap)
+                       goto use_old_window_representation;
+       } else {
+       use_old_window_representation:
+               WMResizeWidget(panel->porigW, THUMB_SIZE, THUMB_SIZE);
+               WMSetLabelRelief(panel->porigW, WRRaised);
+       }
 
        panel->hsli = WMCreateSlider(panel->placF);
        WMResizeWidget(panel->hsli, width, 12);
diff --git a/WPrefs.app/tiff/Makefile.am b/WPrefs.app/tiff/Makefile.am
index 50c75fff..3a243853 100644
--- a/WPrefs.app/tiff/Makefile.am
+++ b/WPrefs.app/tiff/Makefile.am
@@ -38,6 +38,7 @@ dist_tiffdata_DATA =          opaque.tiff     
opaqueresize.tiff       paths.tiff +    smallwindow.tiff        smooth.tiff     
sound.tiff      speed0.tiff diff --git a/WPrefs.app/tiff/smallwindow.tiff 
b/WPrefs.app/tiff/smallwindow.tiff
new file mode 100644
index 00000000..a4a86dda
Binary files /dev/null and b/WPrefs.app/tiff/smallwindow.tiff differ
diff --git a/WPrefs.app/xpm/Makefile.am b/WPrefs.app/xpm/Makefile.am
index c491a7fc..9064db6f 100644
--- a/WPrefs.app/xpm/Makefile.am
+++ b/WPrefs.app/xpm/Makefile.am
@@ -37,6 +37,7 @@ dist_xpmdata_DATA =   opaque.xpm      opaqueresize.xpm        
paths.xpm +     smallwindow.xpm         smooth.xpm      sound.xpm       
speed0.xpm diff --git a/WPrefs.app/xpm/smallwindow.xpm 
b/WPrefs.app/xpm/smallwindow.xpm
new file mode 100644
index 00000000..9cfbb03e
--- /dev/null
+++ b/WPrefs.app/xpm/smallwindow.xpm
@@ -0,0 +1,135 @@
+/* XPM */
+static char * image_name[] = {
+"31 27 105 2",
+"          c None",
+".         c #000000000000",
+"X         c #9CE69CE69CE6",
+"o         c #B5ACB5ACB5AC",
+"O         c #FFFFFFFFFFFF",
+"+         c #5AD65AD65AD6",
+"@         c #108400000000",
+"#         c #39CE00000000",
+"$         c #6B5A00000000",
+"%         c #739C00000000",
+"&         c #18C600000000",
+"*         c #B5AC00000000",
+"=         c #18C600000842",
+"-         c #4A5200000000",
+";         c #4A52294A294A",
+":         c #318C00000000",
+">         c #084208420842",
+",         c #9CE6318C318C",
+"<         c #E738318C318C",
+"1         c #B5AC318C318C",
+"2         c #421039CE4210",
+"3         c #7BDE7BDE7BDE",
+"4         c #39CE39CE39CE",
+"5         c #A528A528A528",
+"6         c #210800000000",
+"7         c #5AD6294A294A",
+"8         c #18C618C618C6",
+"9         c #108410841084",
+"0         c #B5AC4A524A52",
+"q         c #FFFF4A524A52",
+"w         c #842000000000",
+"e         c #318C318C318C",
+"r         c #210821082108",
+"t         c #9CE600000000",
+"y         c #8C6200000000",
+"u         c #4A524A524A52",
+"i         c #AD6A00000000",
+"p         c #294A00000000",
+"a         c #EF7A4A524A52",
+"s         c #C6304A524A52",
+"d         c #421000000000",
+"f         c #084200000000",
+"g         c #A52800000000",
+"h         c #421042104210",
+"j         c #8C628C628C62",
+"k         c #8420318C318C",
+"l         c #6B5A6B5A6B5A",
+"z         c #D6B4318C318C",
+"x         c #94A4318C318C",
+"c         c #4A52318C318C",
+"v         c #A528318C318C",
+"b         c #5294318C318C",
+"n         c #529452945294",
+"m         c #94A494A494A4",
+"M         c #6B5A63186B5A",
+"N         c #DEF6294A294A",
+"B         c #210818C62108",
+"V         c #108408421084",
+"C         c #529400000000",
+"Z         c #842084208420",
+"A         c #E7384A524A52",
+"S         c #631800000000",
+"D         c #9CE64A524A52",
+"F         c #5AD600000000",
+"G         c #8C62294A294A",
+"H         c #318C00000842",
+"J         c #C630C630C630",
+"K         c #318C08420842",
+"L         c #39CE294A294A",
+"P         c #DEF6DEF6DEF6",
+"I         c #39CE318C318C",
+"U         c #CE72318C318C",
+"Y         c #631863186318",
+"T         c #4210318C318C",
+"R         c #5AD652945AD6",
+"E         c #210818C618C6",
+"W         c #5AD64A524A52",
+"Q         c #63184A524A52",
+"!         c #AD6A4A524A52",
+"~         c #D6B44A524A52",
+"^         c #94A484208420",
+"/         c #D6B4D6B4D6B4",
+"(         c #52944A524A52",
+")         c #CE724A524A52",
+"_         c #6B5A52945294",
+"`         c #EF7AF7BCEF7A",
+"'         c #E738EF7AE738",
+"]         c #AD6AAD6AAD6A",
+"[         c #7BDE4A524A52",
+"{         c #F7BCFFFFF7BC",
+"}         c #EF7AEF7AEF7A",
+"|         c #739C739C739C",
+" .        c #8C6284208420",
+"..        c #E738E738E738",
+"X.        c #DEF64A524A52",
+"o.        c #A5284A524A52",
+"O.        c #CE72D6B4CE72",
+"+.        c #8C624A524A52",
+"@.        c #F7BC4A524A52",
+"#.        c #BDEE4A524A52",
+"$.        c #6B5A4A524A52",
+"%.        c #739C5AD65AD6",
+"&.        c #7BDE63186318",
+"*.        c #9CE663186318",
+"=.        c #CE72CE72CE72",
+". . . . . X . . . . . . . . . . . . . . . . . . . X . . . . . ",
+". o o o . X . . . . . . . . . . . . . . . . . . . X . O . O . ",
+". o . o . X . . . . . . . . . . . . . . . . . . . X . . O . . ",
+". o o o . X . . . . . . . . . . . . . . . . . . . X . O . O . ",
+". . . . . X . . . . . . . . . . . . . . . . . . . X . . . . . ",
+"o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+"o o o o e o o o o o o o o o o o o o o o o o o o o e o o o o e ",
+"o e e e e o e e e e e e e e e e e e e e e e e e e e o e e e e "};

http://repo.or.cz/w/wmaker-crm.git/commit/810d17e47a13cb8e02dcb1684380a489a004de62

commit 810d17e47a13cb8e02dcb1684380a489a004de62
Author: Christophe CURIS <christophe.cu...@free.fr>
Date:   Sun Dec 21 18:13:17 2014 +0100

    WPrefs: grouped the choices for Window Move Display in a single place
    
    By having an array, it makes the code simpler in many places, thus easier
    to maintain and to implement new possibilities.
    
    It is the opportunity to log an error message to user instead of silently
    accepting invalid values.
    
    Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>

diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index f73db3d2..dfa04272 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -34,6 +34,17 @@ static const struct {
        { "none",     N_("Disabled") }
 };
 
+/* Possible choices to display window information while a window is being 
moved */
+static const struct {
+       const char *db_value;
+       const char *label;
+} move_display[] = {
+       { "corner",   N_("Corner of screen") },
+       { "center",   N_("Center of screen") },
+       { "floating", N_("Center of resized window") },
+       { "none",     N_("Disabled") }
+};
+
 /* All the places where a balloon can be used to display more stuff to user */
 static const struct {
        const char *db_key;
@@ -139,16 +150,18 @@ static void showData(_Panel * panel)
  found_valid_resize_display:
 
        str = GetStringForKey("MoveDisplay");
-       if (!str)
-               str = "corner";
-       if (strcasecmp(str, "corner") == 0)
-               WMSetPopUpButtonSelectedItem(panel->posiP, 0);
-       else if (strcasecmp(str, "center") == 0)
-               WMSetPopUpButtonSelectedItem(panel->posiP, 1);
-       else if (strcasecmp(str, "floating") == 0)
-               WMSetPopUpButtonSelectedItem(panel->posiP, 2);
-       else if (strcasecmp(str, "none") == 0)
-               WMSetPopUpButtonSelectedItem(panel->posiP, 3);
+       if (str != NULL) {
+               for (x = 0; x < wlengthof(move_display); x++) {
+                       if (strcasecmp(str, move_display[x].db_value) == 0) {
+                               WMSetPopUpButtonSelectedItem(panel->posiP, x);
+                               goto found_valid_move_display;
+                       }
+               }
+               wwarning(_("bad value "%s" for option %s, using default "%s""),
+                        str, "MoveDisplay", move_display[0].db_value);
+       }
+       WMSetPopUpButtonSelectedItem(panel->posiP, 0);
+ found_valid_move_display:
 
        x = GetIntegerForKey("WorkspaceBorderSize");
        x = x < 0 ? 0 : x;
@@ -186,21 +199,8 @@ static void storeData(_Panel * panel)
        i = WMGetPopUpButtonSelectedItem(panel->sizeP);
        SetStringForKey(resize_display[i].db_value, "ResizeDisplay");
 
-       switch (WMGetPopUpButtonSelectedItem(panel->posiP)) {
-       case 0:
-               str = "corner";
-               break;
-       case 1:
-               str = "center";
-               break;
-       case 3:
-               str = "none";
-               break;
-       default:
-               str = "floating";
-               break;
-       }
-       SetStringForKey(str, "MoveDisplay");
+       i = WMGetPopUpButtonSelectedItem(panel->posiP);
+       SetStringForKey(move_display[i].db_value, "MoveDisplay");
 
        lr = WMGetButtonSelected(panel->lrB);
        tb = WMGetButtonSelected(panel->tbB);
@@ -259,10 +259,8 @@ static void createPanel(Panel * p)
        panel->posiP = WMCreatePopUpButton(panel->posiF);
        WMResizeWidget(panel->posiP, 227, 20);
        WMMoveWidget(panel->posiP, 14, 20);
-       WMAddPopUpButtonItem(panel->posiP, _("Corner of screen"));
-       WMAddPopUpButtonItem(panel->posiP, _("Center of screen"));
-       WMAddPopUpButtonItem(panel->posiP, _("Center of resized window"));
-       WMAddPopUpButtonItem(panel->posiP, _("Disabled"));
+       for (i = 0; i < wlengthof(move_display); i++)
+               WMAddPopUpButtonItem(panel->posiP, _(move_display[i].label));
 
        WMMapSubwidgets(panel->posiF);
 

http://repo.or.cz/w/wmaker-crm.git/commit/eb977fb87c921406f0405659c1594ed8860355e4

commit eb977fb87c921406f0405659c1594ed8860355e4
Author: Christophe CURIS <christophe.cu...@free.fr>
Date:   Sun Dec 21 18:13:16 2014 +0100

    WPrefs: grouped the choices for Window Resize Display in a single place
    
    By having an array, it makes the code simpler in many places, thus easier
    to maintain and to implement new possibilities.
    
    It is the opportunity to log an error message to user instead of silently
    accepting invalid values.
    
    Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>

diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index 5a7f752c..f73db3d2 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -22,6 +22,19 @@
 #include "WPrefs.h"
 
 
+/* Possible choices to display window information during a resize */
+static const struct {
+       const char *db_value;
+       const char *label;
+} resize_display[] = {
+       { "corner",   N_("Corner of screen") },
+       { "center",   N_("Center of screen") },
+       { "floating", N_("Center of resized window") },
+       { "line",     N_("Technical drawing-like") },
+       { "none",     N_("Disabled") }
+};
+
+/* All the places where a balloon can be used to display more stuff to user */
 static const struct {
        const char *db_key;
        const char *label;
@@ -112,18 +125,18 @@ static void showData(_Panel * panel)
        int x;
 
        str = GetStringForKey("ResizeDisplay");
-       if (!str)
-               str = "corner";
-       if (strcasecmp(str, "corner") == 0)
-               WMSetPopUpButtonSelectedItem(panel->sizeP, 0);
-       else if (strcasecmp(str, "center") == 0)
-               WMSetPopUpButtonSelectedItem(panel->sizeP, 1);
-       else if (strcasecmp(str, "floating") == 0)
-               WMSetPopUpButtonSelectedItem(panel->sizeP, 2);
-       else if (strcasecmp(str, "line") == 0)
-               WMSetPopUpButtonSelectedItem(panel->sizeP, 3);
-       else if (strcasecmp(str, "none") == 0)
-               WMSetPopUpButtonSelectedItem(panel->sizeP, 4);
+       if (str != NULL) {
+               for (x = 0; x < wlengthof(resize_display); x++) {
+                       if (strcasecmp(str, resize_display[x].db_value) == 0) {
+                               WMSetPopUpButtonSelectedItem(panel->sizeP, x);
+                               goto found_valid_resize_display;
+                       }
+               }
+               wwarning(_("bad value "%s" for option %s, using default "%s""),
+                        str, "ResizeDisplay", resize_display[0].db_value);
+       }
+       WMSetPopUpButtonSelectedItem(panel->sizeP, 0);
+ found_valid_resize_display:
 
        str = GetStringForKey("MoveDisplay");
        if (!str)
@@ -170,24 +183,8 @@ static void storeData(_Panel * panel)
        Bool lr, tb;
        int i;
 
-       switch (WMGetPopUpButtonSelectedItem(panel->sizeP)) {
-       case 0:
-               str = "corner";
-               break;
-       case 1:
-               str = "center";
-               break;
-       case 2:
-               str = "floating";
-               break;
-       case 4:
-               str = "none";
-               break;
-       default:
-               str = "line";
-               break;
-       }
-       SetStringForKey(str, "ResizeDisplay");
+       i = WMGetPopUpButtonSelectedItem(panel->sizeP);
+       SetStringForKey(resize_display[i].db_value, "ResizeDisplay");
 
        switch (WMGetPopUpButtonSelectedItem(panel->posiP)) {
        case 0:
@@ -245,11 +242,8 @@ static void createPanel(Panel * p)
        panel->sizeP = WMCreatePopUpButton(panel->sizeF);
        WMResizeWidget(panel->sizeP, 227, 20);
        WMMoveWidget(panel->sizeP, 14, 20);
-       WMAddPopUpButtonItem(panel->sizeP, _("Corner of screen"));
-       WMAddPopUpButtonItem(panel->sizeP, _("Center of screen"));
-       WMAddPopUpButtonItem(panel->sizeP, _("Center of resized window"));
-       WMAddPopUpButtonItem(panel->sizeP, _("Technical drawing-like"));
-       WMAddPopUpButtonItem(panel->sizeP, _("Disabled"));
+       for (i = 0; i < wlengthof(resize_display); i++)
+               WMAddPopUpButtonItem(panel->sizeP, _(resize_display[i].label));
 
        WMMapSubwidgets(panel->sizeF);
 

http://repo.or.cz/w/wmaker-crm.git/commit/018cf40c83038a515090da02588a5fb6023f7383

commit 018cf40c83038a515090da02588a5fb6023f7383
Author: Christophe CURIS <christophe.cu...@free.fr>
Date:   Sun Dec 21 18:13:15 2014 +0100

    WPrefs: created an array to store the database values for the Icon Position 
setting
    
    By having an array, it makes the code simpler in many places, thus easier
    to maintain. Took opportunity to include a comment about the trick used to
    have a value convenient for use.
    
    It is the opportunity to log an error message to user instead of silently
    accepting invalid values.
    
    Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>

diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c
index 764405f6..0faaa5f5 100644
--- a/WPrefs.app/Icons.c
+++ b/WPrefs.app/Icons.c
@@ -32,6 +32,25 @@ static const struct {
        { "none",  N_("None") }
 };
 
+/*
+ * The code is using a convenient trick to make the link between the icon
+ * position and its representing number:
+ *   bit[0] tell if the icon are arranged horizontally or vertically
+ *   bit[2:1] tell the corner to which they are starting from:
+ *     bit[2] is for Top or Bottom choice
+ *     bit[1] is for Left or Right choice
+ */
+static const char icon_position_dbvalue[][4] = {
+       /* 000: */ "tlv",
+       /* 001: */ "tlh",
+       /* 010: */ "trv",
+       /* 011: */ "trh",
+       /* 100: */ "blv",
+       /* 101: */ "blh",
+       /* 110: */ "brv",
+       /* 111: */ "brh"
+};
+
 typedef struct _Panel {
        WMBox *box;
 
@@ -47,7 +66,7 @@ typedef struct _Panel {
        WMFrame *posVF;
        WMFrame *posV;
 
-       WMButton *posB[8];
+       WMButton *posB[wlengthof_nocheck(icon_position_dbvalue)];
 
        WMFrame *animF;
        WMButton *animB[wlengthof_nocheck(icon_animation)];
@@ -71,7 +90,7 @@ static void showIconLayout(WMWidget * widget, void *data)
        int w, h;
        int i;
 
-       for (i = 0; i < 8; i++) {
+       for (i = 0; i < wlengthof(panel->posB); i++) {
                if (panel->posB[i] == widget) {
                        panel->iconPos = i;
                        break;
@@ -107,35 +126,24 @@ static void showData(_Panel * panel)
 {
        int i;
        char *str;
-       char *def = "blh";
 
        WMSetButtonSelected(panel->arrB, GetBoolForKey("AutoArrangeIcons"));
        WMSetButtonSelected(panel->omnB, GetBoolForKey("StickyIcons"));
        WMSetButtonSelected(panel->sclB, GetBoolForKey("SingleClickLaunch"));
 
        str = GetStringForKey("IconPosition");
-       if (!str)
-               str = def;
-       if (strlen(str) != 3) {
-               wwarning("bad value %s for option IconPosition. Using default 
blh", str);
-               str = def;
-       }
-
-       if (str[0] == 't' || str[0] == 'T') {
-               i = 0;
-       } else {
-               i = 4;
-       }
-       if (str[1] == 'r' || str[1] == 'R') {
-               i += 2;
-       }
-       if (str[2] == 'v' || str[2] == 'V') {
-               i += 0;
-       } else {
-               i += 1;
+       if (str != NULL) {
+               for (i = 0; i < wlengthof(icon_position_dbvalue); i++)
+                       if (strcmp(str, icon_position_dbvalue[i]) == 0) {
+                               panel->iconPos = i;
+                               goto found_position_value;
+                       }
+               wwarning(_("bad value "%s" for option %s, using default "%s""),
+                        str, "IconPosition", icon_position_dbvalue[5]);
        }
-       panel->iconPos = i;
-       WMPerformButtonClick(panel->posB[i]);
+       panel->iconPos = 5;
+ found_position_value:
+       WMPerformButtonClick(panel->posB[panel->iconPos]);
 
        i = GetIntegerForKey("IconSize");
        i = (i - 24) / 8;
@@ -179,7 +187,7 @@ static void createPanel(Panel * p)
        WMMoveWidget(panel->posF, 20, 10);
        WMSetFrameTitle(panel->posF, _("Icon Positioning"));
 
-       for (i = 0; i < 8; i++) {
+       for (i = 0; i < wlengthof(icon_position_dbvalue); i++) {
                panel->posB[i] = WMCreateButton(panel->posF, WBTOnOff);
                WMSetButtonAction(panel->posB[i], showIconLayout, panel);
 
@@ -294,7 +302,6 @@ static void createPanel(Panel * p)
 
 static void storeData(_Panel * panel)
 {
-       char buf[8];
        int i;
 
        SetBoolForKey(WMGetButtonSelected(panel->arrB), "AutoArrangeIcons");
@@ -303,24 +310,7 @@ static void storeData(_Panel * panel)
 
        SetIntegerForKey(WMGetPopUpButtonSelectedItem(panel->sizeP) * 8 + 24, 
"IconSize");
 
-       buf[3] = 0;
-
-       if (panel->iconPos < 4) {
-               buf[0] = 't';
-       } else {
-               buf[0] = 'b';
-       }
-       if (panel->iconPos & 2) {
-               buf[1] = 'r';
-       } else {
-               buf[1] = 'l';
-       }
-       if (panel->iconPos & 1) {
-               buf[2] = 'h';
-       } else {
-               buf[2] = 'v';
-       }
-       SetStringForKey(buf, "IconPosition");
+       SetStringForKey(icon_position_dbvalue[panel->iconPos], "IconPosition");
 
        for (i = 0; i < wlengthof(icon_animation); i++) {
                if (WMGetButtonSelected(panel->animB[i])) {

http://repo.or.cz/w/wmaker-crm.git/commit/31c74ac4e1cf6b440ab439f31ef2eee29963bf34

commit 31c74ac4e1cf6b440ab439f31ef2eee29963bf34
Author: Christophe CURIS <christophe.cu...@free.fr>
Date:   Sun Dec 21 18:13:14 2014 +0100

    WPrefs: moved the list of icon animations into an array
    
    By grouping the information together, it makes the code less prone to
    errors and easier to maintain as it links things that are related.
    
    Took opportunity to log a message for the case where an invalid value
    was found to ease user's debug.
    
    Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>

diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c
index 5ebd5868..764405f6 100644
--- a/WPrefs.app/Icons.c
+++ b/WPrefs.app/Icons.c
@@ -21,6 +21,17 @@
 
 #include "WPrefs.h"
 
+
+static const struct {
+       const char *db_value;
+       const char *label;
+} icon_animation[] = {
+       { "zoom",  N_("Shrinking/Zooming") },
+       { "twist", N_("Spinning/Twisting") },
+       { "flip",  N_("3D-flipping") },
+       { "none",  N_("None") }
+};
+
 typedef struct _Panel {
        WMBox *box;
 
@@ -39,7 +50,7 @@ typedef struct _Panel {
        WMButton *posB[8];
 
        WMFrame *animF;
-       WMButton *animB[4];
+       WMButton *animB[wlengthof_nocheck(icon_animation)];
 
        WMFrame *optF;
        WMButton *arrB;
@@ -136,17 +147,20 @@ static void showData(_Panel * panel)
        WMSetPopUpButtonSelectedItem(panel->sizeP, i);
 
        str = GetStringForKey("IconificationStyle");
-       if (!str)
-               str = "zoom";
-       if (strcasecmp(str, "none") == 0)
-               WMPerformButtonClick(panel->animB[3]);
-       else if (strcasecmp(str, "twist") == 0)
-               WMPerformButtonClick(panel->animB[1]);
-       else if (strcasecmp(str, "flip") == 0)
-               WMPerformButtonClick(panel->animB[2]);
-       else {
-               WMPerformButtonClick(panel->animB[0]);
+       if (str != NULL) {
+               for (i = 0; i < wlengthof(icon_animation); i++) {
+                       if (strcasecmp(str, icon_animation[i].db_value) == 0) {
+                               WMPerformButtonClick(panel->animB[i]);
+                               goto found_animation_value;
+                       }
+               }
+               wwarning(_("animation style "%s" is unknow, resetting to "%s""),
+                        str, icon_animation[0].db_value);
        }
+       /* If we're here, no valid value have been found so we fall-back to the 
default */
+       WMPerformButtonClick(panel->animB[0]);
+ found_animation_value:
+       ;
 }
 
 static void createPanel(Panel * p)
@@ -230,19 +244,16 @@ static void createPanel(Panel * p)
        WMMoveWidget(panel->animF, 240, 10);
        WMSetFrameTitle(panel->animF, _("Iconification Animation"));
 
-       for (i = 0; i < 4; i++) {
+       for (i = 0; i < wlengthof(icon_animation); i++) {
                panel->animB[i] = WMCreateRadioButton(panel->animF);
                WMResizeWidget(panel->animB[i], 145, 20);
                WMMoveWidget(panel->animB[i], 15, 18 + i * 22);
-       }
-       WMGroupButtons(panel->animB[0], panel->animB[1]);
-       WMGroupButtons(panel->animB[0], panel->animB[2]);
-       WMGroupButtons(panel->animB[0], panel->animB[3]);
 
-       WMSetButtonText(panel->animB[0], _("Shrinking/Zooming"));
-       WMSetButtonText(panel->animB[1], _("Spinning/Twisting"));
-       WMSetButtonText(panel->animB[2], _("3D-flipping"));
-       WMSetButtonText(panel->animB[3], _("None"));
+               if (i > 0)
+                       WMGroupButtons(panel->animB[0], panel->animB[i]);
+
+               WMSetButtonText(panel->animB[i], icon_animation[i].label);
+       }
 
        WMMapSubwidgets(panel->animF);
 
@@ -284,6 +295,7 @@ static void createPanel(Panel * p)
 static void storeData(_Panel * panel)
 {
        char buf[8];
+       int i;
 
        SetBoolForKey(WMGetButtonSelected(panel->arrB), "AutoArrangeIcons");
        SetBoolForKey(WMGetButtonSelected(panel->omnB), "StickyIcons");
@@ -310,14 +322,12 @@ static void storeData(_Panel * panel)
        }
        SetStringForKey(buf, "IconPosition");
 
-       if (WMGetButtonSelected(panel->animB[0]))
-               SetStringForKey("zoom", "IconificationStyle");
-       else if (WMGetButtonSelected(panel->animB[1]))
-               SetStringForKey("twist", "IconificationStyle");
-       else if (WMGetButtonSelected(panel->animB[2]))
-               SetStringForKey("flip", "IconificationStyle");
-       else
-               SetStringForKey("none", "IconificationStyle");
+       for (i = 0; i < wlengthof(icon_animation); i++) {
+               if (WMGetButtonSelected(panel->animB[i])) {
+                       SetStringForKey(icon_animation[i].db_value, 
"IconificationStyle");
+                       break;
+               }
+       }
 }
 
 Panel *InitIcons(WMWidget *parent)

http://repo.or.cz/w/wmaker-crm.git/commit/034edb19e3472bfcc44818ed404c2cff80ba9367

commit 034edb19e3472bfcc44818ed404c2cff80ba9367
Author: Yury Tarasievich <yury.tarasiev...@gmail.com>
Date:   Sun Dec 21 17:04:12 2014 +0100

    WPrefs: improve texts in the Window Handling panel
    
    Did not update the translations msgid because I think translators may
    wish to get it visible so they can bring similar improvements.
    
    Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>

diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c
index ea4031ba..7f801f7e 100644
--- a/WPrefs.app/WindowHandling.c
+++ b/WPrefs.app/WindowHandling.c
@@ -95,10 +95,10 @@ static const struct {
        const char *db_value;
        const char *label;
 } drag_maximized_window_options[] = {
-       { "Move",            N_("...change position (normal behavior)") },
-       { "RestoreGeometry", N_("...restore unmaximized geometry")      },
-       { "Unmaximize",      N_("...consider the window unmaximized")   },
-       { "NoMove",          N_("...do not move the window")            }
+       { "Move",            N_("...changes its position (normal behavior)") },
+       { "RestoreGeometry", N_("...restores its unmaximized geometry")      },
+       { "Unmaximize",      N_("...considers the window now unmaximized")   },
+       { "NoMove",          N_("...does not move the window")               }
 };
 
 static void sliderCallback(WMWidget * w, void *data)
@@ -544,7 +544,7 @@ static void createPanel(Panel * p)
        panel->dragmaxF = WMCreateFrame(panel->box);
        WMResizeWidget(panel->dragmaxF, 357, 49);
        WMMoveWidget(panel->dragmaxF, 8, 172);
-       WMSetFrameTitle(panel->dragmaxF, _("When dragging a maximized 
window..."));
+       WMSetFrameTitle(panel->dragmaxF, _("Dragging a maximized window..."));
 
        panel->dragmaxP = WMCreatePopUpButton(panel->dragmaxF);
        WMResizeWidget(panel->dragmaxP, 328, 20);

-----------------------------------------------------------------------

Summary of changes:
 WPrefs.app/Icons.c               |  355 ++++++++++++++++++++++++++------------
 WPrefs.app/Preferences.c         |  127 +++++++--------
 WPrefs.app/WindowHandling.c      |   36 +++-
 WPrefs.app/po/nl.po              |    4 +-
 WPrefs.app/tiff/Makefile.am      |    1 +
 WPrefs.app/tiff/smallwindow.tiff |  Bin 0 -> 458 bytes
 WPrefs.app/xpm/Makefile.am       |    1 +
 WPrefs.app/xpm/smallwindow.xpm   |  135 +++++++++++++++
 8 files changed, 471 insertions(+), 188 deletions(-)
 create mode 100644 WPrefs.app/tiff/smallwindow.tiff
 create mode 100644 WPrefs.app/xpm/smallwindow.xpm


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.

Reply via email to