gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-08 14:54:13 +01:00
Code Issues Projects Releases Wiki Activity

WPrefs: grouped items related to the help balloon configuration in a single place

Browse Source 
Having all these information spread in different places makes it error
prone when wanting to add/remove/change something in the list are there are
many unrelated places to keep in sync. It also makes the code simpler.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-10-26 19:58:45 +01:00
committed by Carlos R. Mafra
parent 454c7bec5d
commit e73c3e84de
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
WPrefs.app/Preferences.c
View File

@@ -21,6 +21,18 @@
#include "WPrefs.h" #include "WPrefs.h"
static const struct {
const char *db_key;
const char *label;
} balloon_choices[] = {
{ "WindowTitleBalloons", N_("incomplete window titles"), },
{ "MiniwindowTitleBalloons", N_("miniwindow titles"), },
{ "MiniwindowApercuBalloons", N_("miniwindow apercus"), },
{ "AppIconBalloons", N_("application/dock icons"), },
{ "HelpBalloons", N_("internal help"), }
};
typedef struct _Panel { typedef struct _Panel {
WMBox *box; WMBox *box;
@@ -39,7 +51,7 @@ typedef struct _Panel {
WMPopUpButton *posiP; WMPopUpButton *posiP;
WMFrame *ballF; WMFrame *ballF;
WMButton *ballB[5]; WMButton *ballB[wlengthof_nocheck(balloon_choices)];
WMFrame *optF; WMFrame *optF;
WMButton *bounceB; WMButton *bounceB;
@@ -134,17 +146,15 @@ static void showData(_Panel * panel)
WMSetButtonSelected(panel->bounceUrgB, GetBoolForKey("BounceAppIconsWhenUrgent")); WMSetButtonSelected(panel->bounceUrgB, GetBoolForKey("BounceAppIconsWhenUrgent"));
WMSetButtonSelected(panel->bounceRaisB, GetBoolForKey("RaiseAppIconsWhenBouncing")); WMSetButtonSelected(panel->bounceRaisB, GetBoolForKey("RaiseAppIconsWhenBouncing"));
WMSetButtonSelected(panel->ballB[0], GetBoolForKey("WindowTitleBalloons")); for (x = 0; x < wlengthof(balloon_choices); x++)
WMSetButtonSelected(panel->ballB[1], GetBoolForKey("MiniwindowTitleBalloons")); WMSetButtonSelected(panel->ballB[x], GetBoolForKey(balloon_choices[x].db_key));
WMSetButtonSelected(panel->ballB[2], GetBoolForKey("MiniwindowApercuBalloons"));
WMSetButtonSelected(panel->ballB[3], GetBoolForKey("AppIconBalloons"));
WMSetButtonSelected(panel->ballB[4], GetBoolForKey("HelpBalloons"));
} }
static void storeData(_Panel * panel) static void storeData(_Panel * panel)
{ {
char *str; char *str;
Bool lr, tb; Bool lr, tb;
int i;
switch (WMGetPopUpButtonSelectedItem(panel->sizeP)) { switch (WMGetPopUpButtonSelectedItem(panel->sizeP)) {
case 0: case 0:
@@ -197,11 +207,9 @@ static void storeData(_Panel * panel)
SetBoolForKey(WMGetButtonSelected(panel->bounceB), "DoNotMakeAppIconsBounce"); SetBoolForKey(WMGetButtonSelected(panel->bounceB), "DoNotMakeAppIconsBounce");
SetBoolForKey(WMGetButtonSelected(panel->bounceUrgB), "BounceAppIconsWhenUrgent"); SetBoolForKey(WMGetButtonSelected(panel->bounceUrgB), "BounceAppIconsWhenUrgent");
SetBoolForKey(WMGetButtonSelected(panel->bounceRaisB), "RaiseAppIconsWhenBouncing"); SetBoolForKey(WMGetButtonSelected(panel->bounceRaisB), "RaiseAppIconsWhenBouncing");
SetBoolForKey(WMGetButtonSelected(panel->ballB[0]), "WindowTitleBalloons");
SetBoolForKey(WMGetButtonSelected(panel->ballB[1]), "MiniwindowTitleBalloons"); for (i = 0; i < wlengthof(balloon_choices); i++)
SetBoolForKey(WMGetButtonSelected(panel->ballB[2]), "MiniwindowApercuBalloons"); SetBoolForKey(WMGetButtonSelected(panel->ballB[i]), balloon_choices[i].db_key);
SetBoolForKey(WMGetButtonSelected(panel->ballB[3]), "AppIconBalloons");
SetBoolForKey(WMGetButtonSelected(panel->ballB[4]), "HelpBalloons");
} }
static void createPanel(Panel * p) static void createPanel(Panel * p)
@@ -257,16 +265,12 @@ static void createPanel(Panel * p)
WMMoveWidget(panel->ballF, 265, 10); WMMoveWidget(panel->ballF, 265, 10);
WMSetFrameTitle(panel->ballF, _("Show balloon for...")); WMSetFrameTitle(panel->ballF, _("Show balloon for..."));
for (i = 0; i < 5; i++) { for (i = 0; i < wlengthof(balloon_choices); i++) {
panel->ballB[i] = WMCreateSwitchButton(panel->ballF); panel->ballB[i] = WMCreateSwitchButton(panel->ballF);
WMResizeWidget(panel->ballB[i], 210, 20); WMResizeWidget(panel->ballB[i], 210, 20);
WMMoveWidget(panel->ballB[i], 15, 16 + i * 22); WMMoveWidget(panel->ballB[i], 15, 16 + i * 22);
WMSetButtonText(panel->ballB[i], _(balloon_choices[i].label));
} }
WMSetButtonText(panel->ballB[0], _("incomplete window titles"));
WMSetButtonText(panel->ballB[1], _("miniwindow titles"));
WMSetButtonText(panel->ballB[2], _("miniwindow apercus"));
WMSetButtonText(panel->ballB[3], _("application/dock icons"));
WMSetButtonText(panel->ballB[4], _("internal help"));
WMMapSubwidgets(panel->ballF); WMMapSubwidgets(panel->ballF);