Enlightenment CVS committal
Author : andreas99
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c backgrounds.c desktops.c dialog.c fx.c groups.c
iconify.c mod-misc.c mod-trans.c pager.c session.c settings.c
snaps.c sound.c tooltips.c
Log Message:
images for dialog buttons
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -3 -r1.370 -r1.371
--- E.h 15 Feb 2005 22:18:14 -0000 1.370
+++ E.h 16 Feb 2005 17:57:19 -0000 1.371
@@ -809,6 +809,7 @@
struct
{
char headers;
+ char button_image;
} dialogs;
struct
{
@@ -1076,6 +1077,13 @@
#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 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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -3 -r1.183 -r1.184
--- actions.c 13 Feb 2005 14:49:37 -0000 1.183
+++ actions.c 16 Feb 2005 17:57:30 -0000 1.184
@@ -286,7 +286,7 @@
"Kim Woelders - [EMAIL PROTECTED]"), e_wm_version, e_wm_date);
DialogItemTextSetText(di, buf);
- DialogAddButton(d, _("OK"), NULL, 1);
+ DialogAddButton(d, _("OK"), NULL, 1, DIALOG_BUTTON_OK);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- backgrounds.c 2 Feb 2005 17:11:30 -0000 1.14
+++ backgrounds.c 16 Feb 2005 17:57:53 -0000 1.15
@@ -2334,9 +2334,9 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- desktops.c 13 Feb 2005 11:19:50 -0000 1.122
+++ desktops.c 16 Feb 2005 17:57:53 -0000 1.123
@@ -1936,9 +1936,9 @@
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 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- dialog.c 2 Feb 2005 17:11:36 -0000 1.98
+++ dialog.c 16 Feb 2005 17:58:07 -0000 1.99
@@ -165,6 +165,7 @@
char close;
TextClass *tclass;
ImageClass *iclass;
+ int image;
} DButton;
typedef struct
@@ -337,7 +338,7 @@
void
DialogAddButton(Dialog * d, const char *text, DialogCallbackFunc * func,
- char doclose)
+ char doclose, int image)
{
DButton *db;
int w, h;
@@ -351,6 +352,7 @@
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 @@
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 @@
DialogDrawButton(Dialog * d __UNUSED__, DButton * db)
{
int state;
+ Imlib_Image *im = NULL;
state = STATE_NORMAL;
if ((db->hilited) && (db->clicked))
@@ -399,8 +405,57 @@
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 @@
DialogSetTitle(d, title);
DialogSetText(d, txt);
- DialogAddButton(d, _("OK"), NULL, 1);
+ DialogAddButton(d, _("OK"), NULL, 1, DIALOG_BUTTON_OK);
ShowDialog(d);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- fx.c 28 Dec 2004 23:46:45 -0000 1.43
+++ fx.c 16 Feb 2005 17:58:23 -0000 1.44
@@ -1055,9 +1055,9 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/groups.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- groups.c 15 Feb 2005 22:18:53 -0000 1.62
+++ groups.c 16 Feb 2005 17:58:27 -0000 1.63
@@ -662,8 +662,8 @@
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 @@
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 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- iconify.c 15 Feb 2005 22:18:55 -0000 1.132
+++ iconify.c 16 Feb 2005 17:58:30 -0000 1.133
@@ -2727,9 +2727,9 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mod-misc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- mod-misc.c 7 Feb 2005 23:44:59 -0000 1.8
+++ mod-misc.c 16 Feb 2005 17:58:48 -0000 1.9
@@ -101,6 +101,7 @@
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),
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/mod-trans.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mod-trans.c 28 Dec 2004 23:46:46 -0000 1.2
+++ mod-trans.c 16 Feb 2005 17:58:48 -0000 1.3
@@ -360,9 +360,9 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- pager.c 15 Feb 2005 22:19:34 -0000 1.114
+++ pager.c 16 Feb 2005 17:58:48 -0000 1.115
@@ -2156,9 +2156,9 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- session.c 12 Feb 2005 16:16:29 -0000 1.89
+++ session.c 16 Feb 2005 17:58:52 -0000 1.90
@@ -966,11 +966,14 @@
"\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);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- settings.c 9 Feb 2005 13:45:28 -0000 1.131
+++ settings.c 16 Feb 2005 17:59:04 -0000 1.132
@@ -326,9 +326,9 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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"));
@@ -1062,6 +1071,14 @@
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);
+ DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable Logout Dialog"));
DialogItemCheckButtonSetState(di, tmp_logout_dialog);
DialogItemCheckButtonSetPtr(di, &tmp_logout_dialog);
@@ -1080,9 +1097,11 @@
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 @@
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 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/snaps.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- snaps.c 15 Feb 2005 22:19:38 -0000 1.79
+++ snaps.c 16 Feb 2005 17:59:12 -0000 1.80
@@ -851,9 +851,9 @@
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 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/sound.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- sound.c 25 Jan 2005 21:58:05 -0000 1.29
+++ sound.c 16 Feb 2005 17:59:15 -0000 1.30
@@ -483,9 +483,9 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- tooltips.c 10 Feb 2005 10:35:16 -0000 1.70
+++ tooltips.c 16 Feb 2005 17:59:16 -0000 1.71
@@ -898,9 +898,9 @@
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);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
