From: <enl...@li...> - 2005-02-09 13:45:41
|
Enlightenment CVS committal Author : andreas99 Project : e16 Module : e Dir : e16/e/src Modified Files: E.h iconify.c settings.c warp.c Log Message: new focuslist with images =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v retrieving revision 1.361 retrieving revision 1.362 diff -u -3 -r1.361 -r1.362 --- E.h 8 Feb 2005 21:11:12 -0000 1.361 +++ E.h 9 Feb 2005 13:45:25 -0000 1.362 @@ -929,6 +929,7 @@ #endif struct { + char icon_mode; char enable; char showsticky; char showshaded; @@ -1892,6 +1893,9 @@ char expose, int image_type, TextClass * tc, TextState * ts, const char *text); +/* iconify.c */ +void UpdateAppIcon(EWin * ewin, int imode); + /* ipc.c */ void __PRINTF__ IpcPrintf(const char *fmt, ...); int HandleIPC(const char *params, Client * c); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v retrieving revision 1.126 retrieving revision 1.127 diff -u -3 -r1.126 -r1.127 --- iconify.c 6 Feb 2005 19:13:31 -0000 1.126 +++ iconify.c 9 Feb 2005 13:45:27 -0000 1.127 @@ -34,7 +34,6 @@ typedef struct _iconbox Iconbox; static void IconboxesConfigSave(void); -static void UpdateAppIcon(EWin * ewin, int imode); static Iconbox *SelectIconboxForEwin(EWin * ewin); /* Systray stuff */ @@ -944,7 +943,7 @@ Efree(ib); } -static void +void UpdateAppIcon(EWin * ewin, int imode) { /* free whatever we had before */ @@ -999,6 +998,20 @@ if (!ewin->icon_image) IB_GetAppIcon(ewin); break; + case 3: + /* try E first, then app */ + if (!ewin->icon_image) + IB_GetEIcon(ewin); + if (!ewin->icon_image) + IB_GetAppIcon(ewin); + break; + case 4: + /* try app first, then E */ + if (!ewin->icon_image) + IB_GetAppIcon(ewin); + if (!ewin->icon_image) + IB_GetEIcon(ewin); + break; default: break; } =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -3 -r1.130 -r1.131 --- settings.c 29 Jan 2005 07:11:58 -0000 1.130 +++ settings.c 9 Feb 2005 13:45:28 -0000 1.131 @@ -29,6 +29,7 @@ static char tmp_owner_popup_focus; static char tmp_raise_focus; static char tmp_warp_focus; +static int tmp_warp_icon_mode; static char tmp_warp_after_focus; static char tmp_raise_after_focus; @@ -60,6 +61,7 @@ Conf.warplist.showshaded = tmp_showshaded; Conf.warplist.showiconified = tmp_showiconified; Conf.warplist.warpfocused = tmp_warpfocused; + Conf.warplist.icon_mode = tmp_warp_icon_mode; Conf.focus.clickraises = tmp_clickalways; FocusFix(); @@ -71,7 +73,7 @@ SettingsFocus(void) { Dialog *d; - DItem *table, *di, *radio; + DItem *table, *di, *radio, *radio2; if ((d = FindItem("CONFIGURE_FOCUS", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG))) { @@ -95,6 +97,7 @@ tmp_showshaded = Conf.warplist.showshaded; tmp_showiconified = Conf.warplist.showiconified; tmp_warpfocused = Conf.warplist.warpfocused; + tmp_warp_icon_mode = Conf.warplist.icon_mode; tmp_clickalways = Conf.focus.clickraises; @@ -283,6 +286,46 @@ DialogItemSetFill(di, 1, 0); DialogItemSeparatorSetOrientation(di, 0); + di = DialogAddItem(table, DITEM_TEXT); + DialogItemSetPadding(di, 2, 2, 2, 2); + DialogItemSetFill(di, 0, 0); + DialogItemSetAlign(di, 0, 512); + DialogItemSetColSpan(di, 2); + DialogItemTextSetText(di, + _ + ("Focuslist image display policy (if one operation fails, try the next):")); + + radio2 = di = DialogAddItem(table, DITEM_RADIOBUTTON); + DialogItemSetPadding(di, 2, 2, 2, 2); + DialogItemSetFill(di, 1, 0); + DialogItemSetColSpan(di, 2); + DialogItemRadioButtonSetText(di, _("First E Icon, then App Icon")); + DialogItemRadioButtonSetFirst(di, radio2); + DialogItemRadioButtonGroupSetVal(di, 3); + + di = DialogAddItem(table, DITEM_RADIOBUTTON); + DialogItemSetPadding(di, 2, 2, 2, 2); + DialogItemSetFill(di, 1, 0); + DialogItemSetColSpan(di, 2); + DialogItemRadioButtonSetText(di, _("First App Icon, then E Icon")); + DialogItemRadioButtonSetFirst(di, radio2); + DialogItemRadioButtonGroupSetVal(di, 4); + + di = DialogAddItem(table, DITEM_RADIOBUTTON); + DialogItemSetPadding(di, 2, 2, 2, 2); + DialogItemSetFill(di, 1, 0); + DialogItemSetColSpan(di, 2); + DialogItemRadioButtonSetText(di, _("None")); + DialogItemRadioButtonSetFirst(di, radio2); + DialogItemRadioButtonGroupSetVal(di, 0); + DialogItemRadioButtonGroupSetValPtr(radio2, &tmp_warp_icon_mode); + + di = DialogAddItem(table, DITEM_SEPARATOR); + DialogItemSetColSpan(di, 2); + DialogItemSetPadding(di, 2, 2, 2, 2); + 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); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- warp.c 2 Feb 2005 17:12:06 -0000 1.53 +++ warp.c 9 Feb 2005 13:45:30 -0000 1.54 @@ -116,7 +116,10 @@ } Efree(lst); } - w += (ic->padding.left + ic->padding.right); + if (Conf.warplist.icon_mode != 0) + w += (ic->padding.left + ic->padding.right + 2 * h); + else + w += (ic->padding.left + ic->padding.right); h += (ic->padding.top + ic->padding.bottom); GetPointerScreenAvailableArea(&x, &y, &ww, &hh); x += (ww - w) / 2; @@ -153,13 +156,46 @@ if (warplist[i].ewin) { int state; + int text_h, text_w; + int icon_size = + mh - ((ic->padding.top + ic->padding.bottom) / 2); state = (ewin == warplist[i].ewin) ? STATE_CLICKED : STATE_NORMAL; ImageclassApply(ic, warplist[i].win, mw, mh, 0, 0, state, 0, ST_WARPLIST); - TextclassApply(ic, warplist[i].win, mw, mh, 0, 0, state, 0, tc, - warplist[i].txt); + + /* New icon stuff */ + if (Conf.warplist.icon_mode != 0) + { + TextSize(tc, 0, 0, 0, warplist[i].txt, &text_w, &text_h, 17); + TextDraw(tc, warplist[i].win, 0, 0, state, warplist[i].txt, + icon_size + 1.5 * ic->padding.left, + (mh - text_h) / 2, mw, mh, 0, 0); + + UpdateAppIcon(warplist[i].ewin, Conf.warplist.icon_mode); + + if (!warplist[i].ewin->icon_image) + return; + + imlib_context_set_image(warplist[i].ewin->icon_image); + + imlib_context_set_drawable(warplist[i].win); + + imlib_context_set_blend(1); + imlib_render_image_on_drawable_at_size(ic->padding.left, + (ic->padding.top + + ic->padding.bottom) / + 4, icon_size, + icon_size); + imlib_context_set_blend(0); + + } + else + { + TextclassApply(ic, warplist[i].win, mw, mh, 0, 0, state, 0, + tc, warplist[i].txt); + } } } @@ -325,6 +361,7 @@ } static const CfgItem WarplistCfgItems[] = { + CFG_ITEM_INT(Conf.warplist, icon_mode, 3), CFG_ITEM_BOOL(Conf.warplist, enable, 1), CFG_ITEM_BOOL(Conf.warplist, showsticky, 1), CFG_ITEM_BOOL(Conf.warplist, showshaded, 1), |
From: <enl...@li...> - 2005-02-09 19:29:24
|
Enlightenment CVS committal Author : andreas99 Project : e16 Module : e Dir : e16/e/src Modified Files: warp.c Log Message: some geometry changes (thanks kwo) =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- warp.c 9 Feb 2005 13:45:30 -0000 1.54 +++ warp.c 9 Feb 2005 19:29:16 -0000 1.55 @@ -54,6 +54,8 @@ static int warplist_num = 0; static WarplistItem *warplist; +#define ICON_PAD 2 + static void WarpFocusShowTitle(EWin * ewin) { @@ -61,7 +63,7 @@ ImageClass *ic; char pq; int i, x, y, w, h, num, ww, hh; - static int mw, mh; + static int mw, mh, tw, th; char s[1024]; tc = TextclassFind("WARPFOCUS", 0); @@ -116,17 +118,21 @@ } Efree(lst); } - if (Conf.warplist.icon_mode != 0) - w += (ic->padding.left + ic->padding.right + 2 * h); - else - w += (ic->padding.left + ic->padding.right); + + tw = w; /* Text size */ + th = h; + w += (ic->padding.left + ic->padding.right); h += (ic->padding.top + ic->padding.bottom); + if (Conf.warplist.icon_mode != 0) + w += h; + mw = w; /* Focus list item size */ + mh = h; + GetPointerScreenAvailableArea(&x, &y, &ww, &hh); x += (ww - w) / 2; y += (hh - h * warplist_num) / 2; - mw = w; - mh = h; EMoveResizeWindow(warpFocusTitleWindow, x, y, w, (h * warplist_num)); + for (i = 0; i < warplist_num; i++) { EMoveResizeWindow(warplist[i].win, 0, (h * i), mw, mh); @@ -137,6 +143,7 @@ ImageclassApply(ic, warplist[i].win, mw, mh, 0, 0, STATE_NORMAL, 0, ST_WARPLIST); } + PropagateShapes(warpFocusTitleWindow); EMapWindow(warpFocusTitleWindow); @@ -156,9 +163,6 @@ if (warplist[i].ewin) { int state; - int text_h, text_w; - int icon_size = - mh - ((ic->padding.top + ic->padding.bottom) / 2); state = (ewin == warplist[i].ewin) ? STATE_CLICKED : STATE_NORMAL; @@ -168,28 +172,23 @@ /* New icon stuff */ if (Conf.warplist.icon_mode != 0) { - TextSize(tc, 0, 0, 0, warplist[i].txt, &text_w, &text_h, 17); + int icon_size = mh - 2 * ICON_PAD; + TextDraw(tc, warplist[i].win, 0, 0, state, warplist[i].txt, - icon_size + 1.5 * ic->padding.left, - (mh - text_h) / 2, mw, mh, 0, 0); + ic->padding.left + mh, ic->padding.top, + tw, th, 0, 0); UpdateAppIcon(warplist[i].ewin, Conf.warplist.icon_mode); - if (!warplist[i].ewin->icon_image) - return; + continue; imlib_context_set_image(warplist[i].ewin->icon_image); - imlib_context_set_drawable(warplist[i].win); - imlib_context_set_blend(1); - imlib_render_image_on_drawable_at_size(ic->padding.left, - (ic->padding.top + - ic->padding.bottom) / - 4, icon_size, - icon_size); + imlib_render_image_on_drawable_at_size(ic->padding.left + + ICON_PAD, ICON_PAD, + icon_size, icon_size); imlib_context_set_blend(0); - } else { |
From: <enl...@li...> - 2005-02-16 18:02:28
|
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 - ki...@wo...\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); } =================================================================== 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); |