gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-30 18:32:34 +01:00
Code Issues Projects Releases Wiki Activity

WPrefs: reorganised the Preference panel for better look

Browse Source 
As many option have been added to it, the panel started to look overloaded.
With a little rework, it now displays the same options in a cleaner way.
Took opportunity to include some balloon help for the AppIcon option to try
to be clearer than what the short label allows.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-11-08 20:49:33 +01:00
committed by Carlos R. Mafra
parent 03a7771c86
commit 753f44ca83
5 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
WPrefs.app/Preferences.c
View File

@@ -37,10 +37,16 @@ static const struct {
const char *db_key;
int default_value;
const char *label;
const char *balloon_msg;
} appicon_bouncing[] = {
{ "DoNotMakeAppIconsBounce", False, N_("Disable AppIcon bounce.") },
{ "BounceAppIconsWhenUrgent", True, N_("Bounce AppIcon when the application wants attention.") },
{ "RaiseAppIconsWhenBouncing", False, N_("Raise AppIcons when bouncing.") }
{ "DoNotMakeAppIconsBounce", False, N_("Disable AppIcon bounce"),
N_("By default, the AppIcon bounces when the application is launched") },
{ "BounceAppIconsWhenUrgent", True, N_("Bounce when the application wants attention"),
NULL },
{ "RaiseAppIconsWhenBouncing", False, N_("Raise AppIcon when bouncing"),
N_("Otherwise you will not see it bouncing if\nthere is a window in front of the AppIcon") }
};
typedef struct _Panel {
@@ -229,16 +235,16 @@ static void createPanel(Panel * p)
/***************** Size Display ****************/
panel->sizeF = WMCreateFrame(panel->box);
WMResizeWidget(panel->sizeF, 240, 60);
WMMoveWidget(panel->sizeF, 15, 10);
WMResizeWidget(panel->sizeF, 255, 52);
WMMoveWidget(panel->sizeF, 15, 7);
WMSetFrameTitle(panel->sizeF, _("Size Display"));
WMSetBalloonTextForView(_("The position or style of the window size\n"
"display that's shown when a window is resized."), WMWidgetView(panel->sizeF));
panel->sizeP = WMCreatePopUpButton(panel->sizeF);
WMResizeWidget(panel->sizeP, 200, 20);
WMMoveWidget(panel->sizeP, 20, 24);
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"));
@@ -249,16 +255,16 @@ static void createPanel(Panel * p)
/***************** Position Display ****************/
panel->posiF = WMCreateFrame(panel->box);
WMResizeWidget(panel->posiF, 240, 60);
WMMoveWidget(panel->posiF, 15, 75);
WMResizeWidget(panel->posiF, 255, 52);
WMMoveWidget(panel->posiF, 15, 66);
WMSetFrameTitle(panel->posiF, _("Position Display"));
WMSetBalloonTextForView(_("The position or style of the window position\n"
"display that's shown when a window is moved."), WMWidgetView(panel->posiF));
panel->posiP = WMCreatePopUpButton(panel->posiF);
WMResizeWidget(panel->posiP, 200, 20);
WMMoveWidget(panel->posiP, 20, 24);
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"));
@@ -268,14 +274,14 @@ static void createPanel(Panel * p)
/***************** Balloon Text ****************/
panel->ballF = WMCreateFrame(panel->box);
WMResizeWidget(panel->ballF, 240, 126);
WMMoveWidget(panel->ballF, 265, 10);
WMResizeWidget(panel->ballF, 220, 132);
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], 210, 20);
WMMoveWidget(panel->ballB[i], 15, 16 + i * 22);
WMResizeWidget(panel->ballB[i], 198, 20);
WMMoveWidget(panel->ballB[i], 11, 16 + i * 22);
WMSetButtonText(panel->ballB[i], _(balloon_choices[i].label));
}
@@ -283,47 +289,51 @@ static void createPanel(Panel * p)
/***************** Options ****************/
panel->optF = WMCreateFrame(panel->box);
WMResizeWidget(panel->optF, 240, 91);
WMMoveWidget(panel->optF, 265, 136);
WMResizeWidget(panel->optF, 255, 94);
WMMoveWidget(panel->optF, 15, 125);
WMSetFrameTitle(panel->optF, _("AppIcon bouncing"));
for (i = 0; i < wlengthof(appicon_bouncing); i++) {
panel->bounceB[i] = WMCreateSwitchButton(panel->optF);
WMResizeWidget(panel->bounceB[i], 210, 26);
WMMoveWidget(panel->bounceB[i], 15, 12 + i * 25);
WMResizeWidget(panel->bounceB[i], 237, 26);
WMMoveWidget(panel->bounceB[i], 9, 14 + i * 25);
WMSetButtonText(panel->bounceB[i], _(appicon_bouncing[i].label));
if (appicon_bouncing[i].default_value)
WMSetButtonSelected(panel->bounceB[i], True);
if (appicon_bouncing[i].balloon_msg)
WMSetBalloonTextForView(_(appicon_bouncing[i].balloon_msg),
WMWidgetView(panel->bounceB[i]));
}
WMMapSubwidgets(panel->optF);
/***************** Workspace border ****************/
panel->borderF = WMCreateFrame(panel->box);
WMResizeWidget(panel->borderF, 240, 82);
WMMoveWidget(panel->borderF, 15, 145);
WMResizeWidget(panel->borderF, 220, 75);
WMMoveWidget(panel->borderF, 285, 144);
WMSetFrameTitle(panel->borderF, _("Workspace border"));
panel->borderS = WMCreateSlider(panel->borderF);
WMResizeWidget(panel->borderS, 80, 15);
WMMoveWidget(panel->borderS, 20, 20);
WMMoveWidget(panel->borderS, 11, 22);
WMSetSliderMinValue(panel->borderS, 0);
WMSetSliderMaxValue(panel->borderS, 5);
WMSetSliderAction(panel->borderS, borderCallback, panel);
panel->borderL = WMCreateLabel(panel->borderF);
WMResizeWidget(panel->borderL, 100, 15);
WMMoveWidget(panel->borderL, 105, 20);
WMMoveWidget(panel->borderL, 105, 22);
panel->lrB = WMCreateSwitchButton(panel->borderF);
WMMoveWidget(panel->lrB, 20, 40);
WMResizeWidget(panel->lrB, 100, 30);
WMMoveWidget(panel->lrB, 11, 40);
WMResizeWidget(panel->lrB, 95, 30);
WMSetButtonText(panel->lrB, _("Left/Right"));
panel->tbB = WMCreateSwitchButton(panel->borderF);
WMMoveWidget(panel->tbB, 120, 40);
WMResizeWidget(panel->tbB, 100, 30);
WMMoveWidget(panel->tbB, 110, 40);
WMResizeWidget(panel->tbB, 105, 30);
WMSetButtonText(panel->tbB, _("Top/Bottom"));
WMMapSubwidgets(panel->borderF);