gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

WPrefs: Grouped config key and user display string in a single struct

Browse Source 
Instead of defining 2 separate data arrays, use a array of struct
to make it less bug prone (no dependancy on order of elements).

Took opportunity to de-CamelCase the variable name;
Took opportunity to add appropriate const qualifier.
This commit is contained in:
Christophe CURIS
2013-10-12 16:18:02 +02:00
committed by Carlos R. Mafra
parent 85cef4e2d9
commit a01c1fcb79
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WPrefs.app/Docks.c
View File

@@ -47,8 +47,17 @@ typedef struct _Panel {
#define DELAY_ICON "timer%i" #define DELAY_ICON "timer%i"
#define DELAY_ICON_S "timer%is" #define DELAY_ICON_S "timer%is"
static char *autoDelayStrings[4]; static const struct {
static char *autoDelayKeys[4] = { "ClipAutoexpandDelay", "ClipAutocollapseDelay", "ClipAutoraiseDelay", "ClipAutolowerDelay" }; const char *key;
const char *string;
} auto_delay[] = {
{ "ClipAutoexpandDelay", N_("Delay before auto-expansion") },
{ "ClipAutocollapseDelay", N_("Delay before auto-collapsing") },
{ "ClipAutoraiseDelay", N_("Delay before auto-raise") },
{ "ClipAutolowerDelay", N_("Delay before auto-lowering") }
};
static char *autoDelayPresetValues[5] = { "0", "100", "250", "600", "1000" }; static char *autoDelayPresetValues[5] = { "0", "100", "250", "600", "1000" };
static char *dockDisablingKeys[3] = { "DisableDock", "DisableClip", "DisableDrawers" }; static char *dockDisablingKeys[3] = { "DisableDock", "DisableClip", "DisableDrawers" };
static char *dockFiles[3] = { "dock", "clip", "drawer" }; static char *dockFiles[3] = { "dock", "clip", "drawer" };
@@ -165,7 +174,7 @@ static void createPanel(Panel *p)
panel->autoDelayL[i + k * 2] = WMCreateLabel(panel->autoDelayF[k]); panel->autoDelayL[i + k * 2] = WMCreateLabel(panel->autoDelayF[k]);
WMResizeWidget(panel->autoDelayL[i + k * 2], 165, 20); WMResizeWidget(panel->autoDelayL[i + k * 2], 165, 20);
WMMoveWidget(panel->autoDelayL[i + k * 2], 10, 27 + 40 * i); WMMoveWidget(panel->autoDelayL[i + k * 2], 10, 27 + 40 * i);
WMSetLabelText(panel->autoDelayL[i + k * 2], autoDelayStrings[i + k * 2]); WMSetLabelText(panel->autoDelayL[i + k * 2], _(auto_delay[i + k * 2].string));
WMSetLabelTextAlignment(panel->autoDelayL[i + k * 2], WARight); WMSetLabelTextAlignment(panel->autoDelayL[i + k * 2], WARight);
for (j = 0; j < 5; j++) for (j = 0; j < 5; j++)
@@ -262,7 +271,7 @@ static void storeData(_Panel *panel)
int i; int i;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
SetStringForKey(WMGetTextFieldText(panel->autoDelayT[i]), autoDelayKeys[i]); SetStringForKey(WMGetTextFieldText(panel->autoDelayT[i]), auto_delay[i].key);
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -276,7 +285,7 @@ static void showData(_Panel *panel)
int i; int i;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
value = GetStringForKey(autoDelayKeys[i]); value = GetStringForKey(auto_delay[i].key);
WMSetTextFieldText(panel->autoDelayT[i], value); WMSetTextFieldText(panel->autoDelayT[i], value);
adjustButtonSelectionBasedOnValue(panel, i, value); adjustButtonSelectionBasedOnValue(panel, i, value);
} }
@@ -290,11 +299,6 @@ Panel *InitDocks(WMScreen *scr, WMWidget *parent)
{ {
_Panel *panel; _Panel *panel;
autoDelayStrings[0] = _("Delay before auto-expansion");
autoDelayStrings[1] = _("Delay before auto-collapsing");
autoDelayStrings[2] = _("Delay before auto-raise");
autoDelayStrings[3] = _("Delay before auto-lowering");
panel = wmalloc(sizeof(_Panel)); panel = wmalloc(sizeof(_Panel));
memset(panel, 0, sizeof(_Panel)); memset(panel, 0, sizeof(_Panel));