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 c150125a5947228db6b2b7822e26a4e2b049f0fa (commit)
via ca073f698f0b6b05601f75da166f58c36de22560 (commit)
from b1a4f4cf360a3f5e6e58b65e7b33113bac96c69c (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/c150125a5947228db6b2b7822e26a4e2b049f0fa
commit c150125a5947228db6b2b7822e26a4e2b049f0fa
Author: Doug Torrance <dtorra...@monmouthcollege.edu>
Date: Fri May 16 10:11:16 2014 -0500
WPrefs: new enum in Appearances.c for tab identifiers to increase
readability
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 0c0c724a..1db0fb02 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -118,6 +118,12 @@ typedef struct {
unsigned ispixmap:1;
} TextureListItem;
+enum {
+ TAB_TEXTURE,
+ TAB_COLOR,
+ TAB_OPTIONS
+};
+
static void updateColorPreviewBox(_Panel * panel, int elements);
static void showData(_Panel * panel);
@@ -1529,28 +1535,28 @@ static void changedTabItem(struct WMTabViewDelegate
*self, WMTabView * tabView,
i = WMGetTabViewItemIdentifier(item);
switch (i) {
- case 0:
+ case TAB_TEXTURE:
switch (panel->oldTabItem) {
- case 1:
+ case TAB_COLOR:
changeColorPage(NULL, panel);
break;
}
changePage(panel->secP, panel);
break;
- case 1:
+ case TAB_COLOR:
switch (panel->oldTabItem) {
- case 0:
+ case TAB_TEXTURE:
changePage(NULL, panel);
break;
}
changeColorPage(panel->colP, panel);
break;
- case 3:
+ case TAB_OPTIONS:
switch (panel->oldTabItem) {
- case 0:
+ case TAB_TEXTURE:
changePage(NULL, panel);
break;
- case 1:
+ case TAB_COLOR:
changeColorPage(NULL, panel);
break;
}
@@ -1661,7 +1667,7 @@ static void createPanel(Panel * p)
panel->texF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->texF, WRFlat);
- item = WMCreateTabViewItemWithIdentifier(0);
+ item = WMCreateTabViewItemWithIdentifier(TAB_TEXTURE);
WMSetTabViewItemView(item, WMWidgetView(panel->texF));
WMSetTabViewItemLabel(item, _("Texture"));
@@ -1751,7 +1757,7 @@ static void createPanel(Panel * p)
panel->colF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->colF, WRFlat);
- item = WMCreateTabViewItemWithIdentifier(1);
+ item = WMCreateTabViewItemWithIdentifier(TAB_COLOR);
WMSetTabViewItemView(item, WMWidgetView(panel->colF));
WMSetTabViewItemLabel(item, _("Color"));
@@ -1800,7 +1806,7 @@ static void createPanel(Panel * p)
panel->optF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->optF, WRFlat);
- item = WMCreateTabViewItemWithIdentifier(3);
+ item = WMCreateTabViewItemWithIdentifier(TAB_OPTIONS);
WMSetTabViewItemView(item, WMWidgetView(panel->optF));
WMSetTabViewItemLabel(item, _("Options"));
http://repo.or.cz/w/wmaker-crm.git/commit/ca073f698f0b6b05601f75da166f58c36de22560
commit ca073f698f0b6b05601f75da166f58c36de22560
Author: Doug Torrance <dtorra...@monmouthcollege.edu>
Date: Fri May 16 09:39:57 2014 -0500
WPrefs: remove unfinished background tab from appearances panel code
WPrefs.app/Appearances.c contained code for an unfinished feature
in the appearances panel of WPrefs, a tab for setting the background.
Since this feature has now been implemented as part of the texture
tab (see commit c2aca1a ("WPrefs: Set workspace background")), there
is no reason to keep this code.
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 90690ac8..0c0c724a 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -75,14 +75,6 @@ typedef struct _Panel {
WMFrame *taliF;
WMButton *taliB[3];
- /* root bg */
- WMFrame *bgF;
-
- WMLabel *bgprevL;
- WMButton *selbgB;
-
- WMPopUpButton *modeB[3];
-
/* */
int textureIndex[8];
@@ -1804,30 +1796,6 @@ static void createPanel(Panel * p)
WMMapSubwidgets(panel->colF);
-#ifdef unfinished
- /*** root bg ***/
-
- panel->bgF = WMCreateFrame(panel->box);
- WMSetFrameRelief(panel->bgF, WRFlat);
-
- item = WMCreateTabViewItemWithIdentifier(2);
- WMSetTabViewItemView(item, WMWidgetView(panel->bgF));
- WMSetTabViewItemLabel(item, _("Background"));
-
- WMAddItemInTabView(panel->tabv, item);
-
- panel->bgprevL = WMCreateLabel(panel->bgF);
- WMResizeWidget(panel->bgprevL, 230, 155);
- WMMoveWidget(panel->bgprevL, 5, 5);
- WMSetLabelRelief(panel->bgprevL, WRSunken);
-
- panel->selbgB = WMCreateCommandButton(panel->bgF);
- WMMoveWidget(panel->selbgB, 5, 165);
- WMResizeWidget(panel->selbgB, 100, 24);
- WMSetButtonText(panel->selbgB, _("Browse..."));
-
- WMMapSubwidgets(panel->bgF);
-#endif /* unfinished */
/*** options ***/
panel->optF = WMCreateFrame(panel->box);
WMSetFrameRelief(panel->optF, WRFlat);
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Appearance.c | 58 +++++++++++++----------------------------------
1 files changed, 16 insertions(+), 42 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.
