e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

images for dialog buttons 

SVN revision: 13406
This commit is contained in:
Andreas Volz 2005-02-16 17:59:16 +00:00
parent b9b2a9ec29
commit d9c30e3167
16 changed files with 165 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/E.h
View File

@ -809,6 +809,7 @@ typedef struct
struct
{
char headers;
char button_image;
} dialogs;
struct
{
@ -1076,6 +1077,13 @@ Qentry;
#define DITEM_SLIDER 8
#define DITEM_AREA 9
/* Dialog button icons */
#define DIALOG_BUTTON_NONE 0
#define DIALOG_BUTTON_OK 1
#define DIALOG_BUTTON_CANCEL 2
#define DIALOG_BUTTON_APPLY 3
#define DIALOG_BUTTON_CLOSE 4
typedef struct _drawqueue
{
void (*func) (struct _drawqueue *);
@ -1394,7 +1402,8 @@ void ShowDialog(Dialog * d);
void DialogClose(Dialog * d);
void DialogAddButton(Dialog * d, const char *text,
DialogCallbackFunc * func, char doclose);
DialogCallbackFunc * func, char doclose,
int image);
DItem *DialogInitItem(Dialog * d);
DItem *DialogAddItem(DItem * dii, int type);
DItem *DialogItem(Dialog * d);

2
src/actions.c
View File

@ -286,7 +286,7 @@ About(void)
"Kim Woelders - kim@woelders.dk\n"), e_wm_version, e_wm_date);
DialogItemTextSetText(di, buf);
DialogAddButton(d, _("OK"), NULL, 1);
DialogAddButton(d, _("OK"), NULL, 1, DIALOG_BUTTON_OK);
ShowDialog(d);
}

6
src/backgrounds.c
View File

@ -2334,9 +2334,9 @@ SettingsBackground(Background * bg)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureBG, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureBG, 0);
DialogAddButton(d, _("Close"), CB_ConfigureBG, 1);
DialogAddButton(d, _("OK"), CB_ConfigureBG, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureBG, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureBG, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureBG, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureBG, 0);

12
src/desktops.c
View File

@ -1936,9 +1936,9 @@ SettingsDesktops(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureDesktops, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureDesktops, 0);
DialogAddButton(d, _("Close"), CB_ConfigureDesktops, 1);
DialogAddButton(d, _("OK"), CB_ConfigureDesktops, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureDesktops, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureDesktops, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureDesktops, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureDesktops, 0);
@ -2169,9 +2169,9 @@ SettingsArea(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureAreas, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureAreas, 0);
DialogAddButton(d, _("Close"), CB_ConfigureAreas, 1);
DialogAddButton(d, _("OK"), CB_ConfigureAreas, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureAreas, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureAreas, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureAreas, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureAreas, 0);

65
src/dialog.c
View File

@ -165,6 +165,7 @@ typedef struct
char close;
TextClass *tclass;
ImageClass *iclass;
int image;
} DButton;
typedef struct
@ -337,7 +338,7 @@ DialogGetData(Dialog * d)
void
DialogAddButton(Dialog * d, const char *text, DialogCallbackFunc * func,
char doclose)
char doclose, int image)
{
DButton *db;
int w, h;
@ -351,6 +352,7 @@ DialogAddButton(Dialog * d, const char *text, DialogCallbackFunc * func,
db->parent = d;
db->text = Estrdup(text);
db->func = func;
db->image = image;
db->win = ECreateWindow(d->win, -20, -20, 2, 2, 0);
EventCallbackRegister(db->win, 0, DButtonHandleEvents, db);
EMapWindow(db->win);
@ -371,8 +373,11 @@ DialogAddButton(Dialog * d, const char *text, DialogCallbackFunc * func,
db->iclass->ref_count++;
TextSize(db->tclass, 0, 0, STATE_NORMAL, text, &w, &h, 17);
db->w = w + db->iclass->padding.left + db->iclass->padding.right;
db->h = h + db->iclass->padding.top + db->iclass->padding.bottom;
if (!db->image)
db->w = w + db->iclass->padding.left + db->iclass->padding.right;
else
db->w = w + db->iclass->padding.left + db->iclass->padding.right + db->h;
ESelectInput(db->win,
EnterWindowMask | LeaveWindowMask | ButtonPressMask |
ButtonReleaseMask | ExposureMask);
@ -382,6 +387,7 @@ static void
DialogDrawButton(Dialog * d __UNUSED__, DButton * db)
{
int state;
Imlib_Image *im = NULL;
state = STATE_NORMAL;
if ((db->hilited) && (db->clicked))
@ -399,8 +405,57 @@ DialogDrawButton(Dialog * d __UNUSED__, DButton * db)
ImageclassApply(db->iclass, db->win, db->w, db->h, 0, 0, state, 0,
ST_WIDGET);
TextclassApply(db->iclass, db->win, db->w, db->h, 0, 0, state, 1, db->tclass,
db->text);
if (Conf.dialogs.button_image == 1)
{
switch (db->image)
{
case DIALOG_BUTTON_OK:
im = ELoadImage("pix/ok.png");
break;
case DIALOG_BUTTON_CANCEL:
im = ELoadImage("pix/cancel.png");
break;
case DIALOG_BUTTON_APPLY:
im = ELoadImage("pix/apply.png");
break;
case DIALOG_BUTTON_CLOSE:
im = ELoadImage("pix/close.png");
break;
default:
im = NULL;
}
if (im)
{
int w, h;
TextSize(db->tclass, 0, 0, STATE_NORMAL, db->text, &w, &h, 17);
TextDraw(db->tclass, db->win, 0, 0, state, db->text,
db->w / 2.0 - w / 2.0 + db->h / 2.0, db->h / 4, db->w,
db->h, 0, 0);
imlib_context_set_image(im);
imlib_context_set_drawable(db->win);
imlib_context_set_blend(1);
imlib_render_image_on_drawable_at_size(db->w / 2.0 - w / 2.0 -
db->h / 2.0, 3, db->h - 6,
db->h - 6);
imlib_context_set_blend(0);
imlib_free_image();
}
else
{
TextclassApply(db->iclass, db->win, db->w, db->h, 0, 0, state, 1,
db->tclass, db->text);
}
}
else
{
TextclassApply(db->iclass, db->win, db->w, db->h, 0, 0, state, 1,
db->tclass, db->text);
}
}
static void
@ -2000,7 +2055,7 @@ DialogOKstr(const char *title, const char *txt)
DialogSetTitle(d, title);
DialogSetText(d, txt);
DialogAddButton(d, _("OK"), NULL, 1);
DialogAddButton(d, _("OK"), NULL, 1, DIALOG_BUTTON_OK);
ShowDialog(d);
}

6
src/fx.c
View File

@ -1055,9 +1055,9 @@ FxSettings(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureFX, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureFX, 0);
DialogAddButton(d, _("Close"), CB_ConfigureFX, 1);
DialogAddButton(d, _("OK"), CB_ConfigureFX, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureFX, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureFX, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureFX, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureFX, 0);

19
src/groups.c
View File

@ -662,8 +662,8 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), ChooseGroup, 1);
DialogAddButton(d, _("Close"), ChooseGroup, 1);
DialogAddButton(d, _("OK"), ChooseGroup, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Close"), ChooseGroup, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, ChooseGroup, 2);
DialogBindKey(d, "Escape", ChooseGroupEscape, 0);
DialogBindKey(d, "Return", ChooseGroup, 0);
@ -965,9 +965,9 @@ SettingsGroups(EWin * ewin)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureGroup, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureGroup, 0);
DialogAddButton(d, _("Close"), CB_ConfigureGroup, 1);
DialogAddButton(d, _("OK"), CB_ConfigureGroup, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureGroup, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureGroup, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureGroup, 2);
DialogBindKey(d, "Escape", CB_ConfigureGroupEscape, 0);
DialogBindKey(d, "Return", CB_ConfigureGroup, 0);
@ -1142,9 +1142,12 @@ SettingsDefaultGroupControl(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureDefaultGroupSettings, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureDefaultGroupSettings, 0);
DialogAddButton(d, _("Close"), CB_ConfigureDefaultGroupSettings, 1);
DialogAddButton(d, _("OK"), CB_ConfigureDefaultGroupSettings, 1,
DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureDefaultGroupSettings, 0,
DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureDefaultGroupSettings, 1,
DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureDefaultGroupSettings, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureDefaultGroupSettings, 0);

6
src/iconify.c
View File

@ -2727,9 +2727,9 @@ IconboxConfigure(Iconbox * ib)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureIconbox, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureIconbox, 0);
DialogAddButton(d, _("Close"), CB_ConfigureIconbox, 1);
DialogAddButton(d, _("OK"), CB_ConfigureIconbox, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureIconbox, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureIconbox, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureIconbox, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureIconbox, 0);

1
src/mod-misc.c
View File

@ -101,6 +101,7 @@ static const CfgItem MiscCfgItems[] = {
CFG_ITEM_BOOL(Conf, backgrounds.user, 1),
CFG_ITEM_BOOL(Conf, dialogs.headers, 0),
CFG_ITEM_BOOL(Conf, dialogs.button_image, 0),
CFG_ITEM_BOOL(Conf, dock.enable, 1),
CFG_ITEM_BOOL(Conf, dock.sticky, 1),

6
src/mod-trans.c
View File

@ -360,9 +360,9 @@ SettingsTransparency(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureTrans, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureTrans, 0);
DialogAddButton(d, _("Close"), CB_ConfigureTrans, 1);
DialogAddButton(d, _("OK"), CB_ConfigureTrans, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureTrans, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureTrans, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureTrans, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureTrans, 0);

6
src/pager.c
View File

@ -2156,9 +2156,9 @@ SettingsPager(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigurePager, 1);
DialogAddButton(d, _("Apply"), CB_ConfigurePager, 0);
DialogAddButton(d, _("Close"), CB_ConfigurePager, 1);
DialogAddButton(d, _("OK"), CB_ConfigurePager, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigurePager, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigurePager, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigurePager, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigurePager, 0);

11
src/session.c
View File

@ -966,11 +966,14 @@ SessionLogoutConfirm(void)
"\n\n"));
if (Conf.session.enable_reboot_halt)
{
DialogAddButton(d, _(" Yes, Shut Down "), LogoutCB, 1);
DialogAddButton(d, _(" Yes, Reboot "), LogoutCB, 1);
DialogAddButton(d, _(" Yes, Shut Down "), LogoutCB, 1,
DIALOG_BUTTON_OK);
DialogAddButton(d, _(" Yes, Reboot "), LogoutCB, 1,
DIALOG_BUTTON_OK);
}
DialogAddButton(d, _(" Yes, Log Out "), LogoutCB, 1);
DialogAddButton(d, _(" No "), NULL, 1);
DialogAddButton(d, _(" Yes, Log Out "), LogoutCB, 1,
DIALOG_BUTTON_OK);
DialogAddButton(d, _(" No "), NULL, 1, DIALOG_BUTTON_CANCEL);
DialogBindKey(d, "Escape", DialogCallbackClose, 1);
DialogBindKey(d, "Return", LogoutCB, 0);
}

63
src/settings.c
View File

@ -326,9 +326,9 @@ SettingsFocus(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureFocus, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureFocus, 0);
DialogAddButton(d, _("Close"), CB_ConfigureFocus, 1);
DialogAddButton(d, _("OK"), CB_ConfigureFocus, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureFocus, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureFocus, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureFocus, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureFocus, 0);
@ -694,9 +694,11 @@ SettingsMoveResize(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureMoveResize, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureMoveResize, 0);
DialogAddButton(d, _("Close"), CB_ConfigureMoveResize, 1);
DialogAddButton(d, _("OK"), CB_ConfigureMoveResize, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureMoveResize, 0,
DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureMoveResize, 1,
DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureMoveResize, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureMoveResize, 0);
@ -884,9 +886,11 @@ SettingsPlacement(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigurePlacement, 1);
DialogAddButton(d, _("Apply"), CB_ConfigurePlacement, 0);
DialogAddButton(d, _("Close"), CB_ConfigurePlacement, 1);
DialogAddButton(d, _("OK"), CB_ConfigurePlacement, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigurePlacement, 0,
DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigurePlacement, 1,
DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigurePlacement, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigurePlacement, 0);
@ -980,9 +984,11 @@ SettingsAutoRaise(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureAutoraise, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureAutoraise, 0);
DialogAddButton(d, _("Close"), CB_ConfigureAutoraise, 1);
DialogAddButton(d, _("OK"), CB_ConfigureAutoraise, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureAutoraise, 0,
DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureAutoraise, 1,
DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureAutoraise, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureAutoraise, 0);
@ -992,6 +998,7 @@ SettingsAutoRaise(void)
static char tmp_dialog_headers;
static char tmp_logout_dialog;
static char tmp_reboot_halt;
static char tmp_button_image;
static void
CB_ConfigureMiscellaneous(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
@ -1001,6 +1008,7 @@ CB_ConfigureMiscellaneous(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
Conf.dialogs.headers = tmp_dialog_headers;
Conf.session.enable_logout_dialog = tmp_logout_dialog;
Conf.session.enable_reboot_halt = tmp_reboot_halt;
Conf.dialogs.button_image = tmp_button_image;
}
autosave();
}
@ -1023,6 +1031,7 @@ SettingsMiscellaneous(void)
tmp_dialog_headers = Conf.dialogs.headers;
tmp_logout_dialog = Conf.session.enable_logout_dialog;
tmp_reboot_halt = Conf.session.enable_reboot_halt;
tmp_button_image = Conf.dialogs.button_image;
d = DialogCreate("CONFIGURE_MISCELLANEOUS");
DialogSetTitle(d, _("Miscellaneous Settings"));
@ -1058,6 +1067,14 @@ SettingsMiscellaneous(void)
DialogItemCheckButtonSetState(di, tmp_dialog_headers);
DialogItemCheckButtonSetPtr(di, &tmp_dialog_headers);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable Button Images"));
DialogItemCheckButtonSetState(di, tmp_button_image);
DialogItemCheckButtonSetPtr(di, &tmp_button_image);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
@ -1080,9 +1097,11 @@ SettingsMiscellaneous(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureMiscellaneous, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureMiscellaneous, 0);
DialogAddButton(d, _("Close"), CB_ConfigureMiscellaneous, 1);
DialogAddButton(d, _("OK"), CB_ConfigureMiscellaneous, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureMiscellaneous, 0,
DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureMiscellaneous, 1,
DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureMiscellaneous, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureMiscellaneous, 0);
@ -1396,9 +1415,9 @@ SettingsSpecialFX(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureFX, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureFX, 0);
DialogAddButton(d, _("Close"), CB_ConfigureFX, 1);
DialogAddButton(d, _("OK"), CB_ConfigureFX, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureFX, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureFX, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureFX, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureFX, 0);
@ -1539,9 +1558,11 @@ SettingsComposite(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureComposite, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureComposite, 0);
DialogAddButton(d, _("Close"), CB_ConfigureComposite, 1);
DialogAddButton(d, _("OK"), CB_ConfigureComposite, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureComposite, 0,
DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureComposite, 1,
DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureComposite, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureComposite, 0);

12
src/snaps.c
View File

@ -851,9 +851,9 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ApplySnap, 1);
DialogAddButton(d, _("Apply"), CB_ApplySnap, 0);
DialogAddButton(d, _("Close"), CB_ApplySnap, 1);
DialogAddButton(d, _("OK"), CB_ApplySnap, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ApplySnap, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ApplySnap, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ApplySnap, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ApplySnap, 0);
@ -1075,9 +1075,9 @@ SettingsRemember(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ApplyRemember, 1);
DialogAddButton(d, _("Apply"), CB_ApplyRemember, 0);
DialogAddButton(d, _("Close"), CB_ApplyRemember, 1);
DialogAddButton(d, _("OK"), CB_ApplyRemember, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ApplyRemember, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ApplyRemember, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ApplyRemember, 2);
DialogBindKey(d, "Escape", CB_ApplyRememberEscape, 0);
DialogBindKey(d, "Return", CB_ApplyRemember, 0);

6
src/sound.c
View File

@ -483,9 +483,9 @@ SettingsAudio(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureAudio, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureAudio, 0);
DialogAddButton(d, _("Close"), CB_ConfigureAudio, 1);
DialogAddButton(d, _("OK"), CB_ConfigureAudio, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureAudio, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureAudio, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureAudio, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureAudio, 0);

6
src/tooltips.c
View File

@ -898,9 +898,9 @@ SettingsTooltips(void)
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureTooltips, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureTooltips, 0);
DialogAddButton(d, _("Close"), CB_ConfigureTooltips, 1);
DialogAddButton(d, _("OK"), CB_ConfigureTooltips, 1, DIALOG_BUTTON_OK);
DialogAddButton(d, _("Apply"), CB_ConfigureTooltips, 0, DIALOG_BUTTON_APPLY);
DialogAddButton(d, _("Close"), CB_ConfigureTooltips, 1, DIALOG_BUTTON_CLOSE);
DialogSetExitFunction(d, CB_ConfigureTooltips, 2);
DialogBindKey(d, "Escape", DialogCallbackClose, 0);
DialogBindKey(d, "Return", CB_ConfigureTooltips, 0);