1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-06 13:54:12 +01:00

WPrefs: small reorganisation in the Dock Preferences panel

The goal is to reduce the risk for truncated label, and take the
opportunity to align everything with consistent spacings.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-11-08 20:49:35 +01:00
committed by Carlos R. Mafra
parent c3c8a0654c
commit 1b183633e1
4 changed files with 14 additions and 15 deletions

View File

@@ -33,7 +33,7 @@ static const struct {
} auto_delay[] = { } auto_delay[] = {
{ "ClipAutoexpandDelay", N_("Before auto-expansion") }, { "ClipAutoexpandDelay", N_("Before auto-expansion") },
{ "ClipAutocollapseDelay", N_("Before auto-collapsing") }, { "ClipAutocollapseDelay", N_("Before auto-collapsing") },
{ "ClipAutoraiseDelay", N_("Before auto-raise") }, { "ClipAutoraiseDelay", N_("Before auto-raising") },
{ "ClipAutolowerDelay", N_("Before auto-lowering") } { "ClipAutolowerDelay", N_("Before auto-lowering") }
}; };
@@ -182,23 +182,22 @@ static void createPanel(Panel *p)
for (k = 0; k < wlengthof(clip_delay_frame_titles); k++) for (k = 0; k < wlengthof(clip_delay_frame_titles); k++)
{ {
panel->autoDelayF[k] = WMCreateFrame(panel->box); panel->autoDelayF[k] = WMCreateFrame(panel->box);
WMResizeWidget(panel->autoDelayF[k], 370, 100); WMResizeWidget(panel->autoDelayF[k], 372, 100);
WMMoveWidget(panel->autoDelayF[k], 15, 10 + k * 110); WMMoveWidget(panel->autoDelayF[k], 11, 10 + k * 110);
WMSetFrameTitle(panel->autoDelayF[k], _(clip_delay_frame_titles[k])); WMSetFrameTitle(panel->autoDelayF[k], _(clip_delay_frame_titles[k]));
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
panel->autoDelayL[i + k * 2] = WMCreateLabel(panel->autoDelayF[k]); panel->autoDelayL[i + k * 2] = WMCreateLabel(panel->autoDelayF[k]);
WMResizeWidget(panel->autoDelayL[i + k * 2], 155, 20); WMResizeWidget(panel->autoDelayL[i + k * 2], 152, 20);
WMMoveWidget(panel->autoDelayL[i + k * 2], 10, 27 + 40 * i); WMMoveWidget(panel->autoDelayL[i + k * 2], 8, 27 + 40 * i);
WMSetLabelText(panel->autoDelayL[i + k * 2], _(auto_delay[i + k * 2].string)); WMSetLabelText(panel->autoDelayL[i + k * 2], _(auto_delay[i + k * 2].string));
/* WMSetLabelTextAlignment(panel->autoDelayL[i + k * 2], WARight); */
for (j = 0; j < wlengthof(autoDelayPresetValues); j++) for (j = 0; j < wlengthof(autoDelayPresetValues); j++)
{ {
panel->autoDelayB[i + k * 2][j] = WMCreateCustomButton(panel->autoDelayF[k], WBBStateChangeMask); panel->autoDelayB[i + k * 2][j] = WMCreateCustomButton(panel->autoDelayF[k], WBBStateChangeMask);
WMResizeWidget(panel->autoDelayB[i + k * 2][j], 25, 25); WMResizeWidget(panel->autoDelayB[i + k * 2][j], 25, 25);
WMMoveWidget(panel->autoDelayB[i + k * 2][j], 145 + (28 * j), 25 + 40 * i); WMMoveWidget(panel->autoDelayB[i + k * 2][j], 160 + (26 * j), 25 + 40 * i);
WMSetButtonBordered(panel->autoDelayB[i + k * 2][j], False); WMSetButtonBordered(panel->autoDelayB[i + k * 2][j], False);
WMSetButtonImagePosition(panel->autoDelayB[i + k * 2][j], WIPImageOnly); WMSetButtonImagePosition(panel->autoDelayB[i + k * 2][j], WIPImageOnly);
WMSetButtonAction(panel->autoDelayB[i + k * 2][j], pushAutoDelayButton, panel); WMSetButtonAction(panel->autoDelayB[i + k * 2][j], pushAutoDelayButton, panel);
@@ -223,15 +222,15 @@ static void createPanel(Panel *p)
} }
panel->autoDelayT[i + k * 2] = WMCreateTextField(panel->autoDelayF[k]); panel->autoDelayT[i + k * 2] = WMCreateTextField(panel->autoDelayF[k]);
WMResizeWidget(panel->autoDelayT[i + k * 2], 36, 20); WMResizeWidget(panel->autoDelayT[i + k * 2], 41, 20);
WMMoveWidget(panel->autoDelayT[i + k * 2], 287, 27 + 40 * i); WMMoveWidget(panel->autoDelayT[i + k * 2], 293, 27 + 40 * i);
WMAddNotificationObserver(autoDelayChanged, panel, WMTextDidChangeNotification, panel->autoDelayT[i + k * 2]); WMAddNotificationObserver(autoDelayChanged, panel, WMTextDidChangeNotification, panel->autoDelayT[i + k * 2]);
color = WMDarkGrayColor(scr); color = WMDarkGrayColor(scr);
font = WMSystemFontOfSize(scr, 10); font = WMSystemFontOfSize(scr, 10);
panel->autoDelayMsL[i + k * 2] = WMCreateLabel(panel->autoDelayF[k]); panel->autoDelayMsL[i + k * 2] = WMCreateLabel(panel->autoDelayF[k]);
WMResizeWidget(panel->autoDelayMsL[i + k * 2], 36, 16); WMResizeWidget(panel->autoDelayMsL[i + k * 2], 26, 16);
WMMoveWidget(panel->autoDelayMsL[i + k * 2], 327, 33 + 40 *i); WMMoveWidget(panel->autoDelayMsL[i + k * 2], 337, 30 + 40 * i);
WMSetLabelText(panel->autoDelayMsL[i + k * 2], _("msec")); WMSetLabelText(panel->autoDelayMsL[i + k * 2], _("msec"));
WMSetLabelTextColor(panel->autoDelayMsL[i + k * 2], color); WMSetLabelTextColor(panel->autoDelayMsL[i + k * 2], color);
WMSetLabelFont(panel->autoDelayMsL[i + k * 2], font); WMSetLabelFont(panel->autoDelayMsL[i + k * 2], font);
@@ -247,7 +246,7 @@ static void createPanel(Panel *p)
/***************** Enable/disable clip/dock/drawers *****************/ /***************** Enable/disable clip/dock/drawers *****************/
panel->dockF = WMCreateFrame(panel->box); panel->dockF = WMCreateFrame(panel->box);
WMResizeWidget(panel->dockF, 115, 210); WMResizeWidget(panel->dockF, 115, 210);
WMMoveWidget(panel->dockF, 390, 10); WMMoveWidget(panel->dockF, 394, 10);
WMSetFrameTitle(panel->dockF, _("Dock/Clip/Drawer")); WMSetFrameTitle(panel->dockF, _("Dock/Clip/Drawer"));
for (i = 0; i < wlengthof(dock_config); i++) for (i = 0; i < wlengthof(dock_config); i++)

View File

@@ -383,7 +383,7 @@ msgid "Before auto-collapsing"
msgstr "Összecsukás előtt" msgstr "Összecsukás előtt"
#: ../../../wmaker-crm/WPrefs.app/Docks.c:57 #: ../../../wmaker-crm/WPrefs.app/Docks.c:57
msgid "Before auto-raise" msgid "Before auto-raising"
msgstr "Előrehozás előtt" msgstr "Előrehozás előtt"
#: ../../../wmaker-crm/WPrefs.app/Docks.c:58 #: ../../../wmaker-crm/WPrefs.app/Docks.c:58

View File

@@ -379,7 +379,7 @@ msgid "Delay before auto-collapsing"
msgstr "자동 축소 전 지연 시간" msgstr "자동 축소 전 지연 시간"
#: ../../WPrefs.app/Docks.c:295 #: ../../WPrefs.app/Docks.c:295
msgid "Delay before auto-raise" msgid "Delay before auto-raising"
msgstr "자동 올림 전 지연 시간" msgstr "자동 올림 전 지연 시간"
#: ../../WPrefs.app/Docks.c:296 #: ../../WPrefs.app/Docks.c:296

View File

@@ -425,7 +425,7 @@ msgid "Before auto-collapsing"
msgstr "Vanzelf inschuiven na" msgstr "Vanzelf inschuiven na"
#: ../../WPrefs.app/Docks.c:57 #: ../../WPrefs.app/Docks.c:57
msgid "Before auto-raise" msgid "Before auto-raising"
msgstr "Vanzelf verhogen na" msgstr "Vanzelf verhogen na"
#: ../../WPrefs.app/Docks.c:58 #: ../../WPrefs.app/Docks.c:58