Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c backgrounds.c desktops.c dialog.c dialog.h focus.c
fx.c groups.c iconify.c menus.c mod-trans.c pager.c session.c
settings.c snaps.c sound.c tooltips.c
Log Message:
Still more dialog creation refactoring bits.
===================================================================
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- actions.c 27 Jul 2006 04:52:49 -0000 1.204
+++ actions.c 8 Aug 2006 03:58:41 -0000 1.205
@@ -317,13 +317,14 @@
}
static const DialogDef DlgAbout = {
- _DlgFillAbout,
"ABOUT_ENLIGHTENMENT",
NULL,
NULL,
NULL,
NULL,
NULL,
+ _DlgFillAbout,
+ 0, NULL,
};
void
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- backgrounds.c 27 Jul 2006 04:52:49 -0000 1.81
+++ backgrounds.c 8 Aug 2006 03:58:41 -0000 1.82
@@ -2264,18 +2264,17 @@
DialogItemSetText(di,
_("Enable background transparency compatibility mode"));
DialogItemCheckButtonSetPtr(di, &tmp_root_hint);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureBG);
}
const DialogDef DlgBackground = {
- _DlgFillBackground,
"CONFIGURE_BG",
N_("Background"),
N_("Desktop Background Settings"),
"SOUND_SETTINGS_BG",
"pix/bg.png",
N_("Enlightenment Desktop\n" "Background Settings Dialog\n"),
+ _DlgFillBackground,
+ DLG_OAC, CB_ConfigureBG,
};
/*
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -3 -r1.247 -r1.248
--- desktops.c 27 Jul 2006 04:52:50 -0000 1.247
+++ desktops.c 8 Aug 2006 03:58:42 -0000 1.248
@@ -2353,7 +2353,7 @@
}
static void
-_DlgFillDesks(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillDesks(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di, *area, *slider, *radio;
char s[64];
@@ -2461,18 +2461,17 @@
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_dragdir);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureDesktops);
}
const DialogDef DlgDesks = {
- _DlgFillDesks,
"CONFIGURE_DESKTOPS",
N_("Desks"),
N_("Multiple Desktop Settings"),
"SOUND_SETTINGS_DESKTOPS",
"pix/desktops.png",
N_("Enlightenment Multiple Desktop\n" "Settings Dialog\n"),
+ _DlgFillDesks,
+ DLG_OAC, CB_ConfigureDesktops,
};
static int tmp_area_x;
@@ -2568,7 +2567,7 @@
}
static void
-_DlgFillAreas(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillAreas(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di, *area, *slider, *slider2, *table2;
char s[64];
@@ -2642,18 +2641,17 @@
DialogItemSliderSetUnits(di, 1);
DialogItemSliderSetJump(di, 10);
DialogItemSliderSetValPtr(di, &tmp_edge_resist);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureAreas);
}
const DialogDef DlgAreas = {
- _DlgFillAreas,
"CONFIGURE_AREA",
N_("Areas"),
N_("Virtual Desktop Settings"),
"SOUND_SETTINGS_AREA",
"pix/areas.png",
N_("Enlightenment Virtual Desktop\n" "Settings Dialog\n"),
+ _DlgFillAreas,
+ DLG_OAC, CB_ConfigureAreas,
};
/*
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- dialog.c 7 Aug 2006 20:47:12 -0000 1.164
+++ dialog.c 8 Aug 2006 03:58:42 -0000 1.165
@@ -699,6 +699,11 @@
EwinHide(d->ewin);
}
+static void DialogAddHeader(DItem * parent, const char *img,
+ const char *txt);
+static void DialogAddFooter(Dialog * d, int flags,
+ DialogCallbackFunc * cb);
+
void
DialogShowSimple(const DialogDef * dd, void *data)
{
@@ -739,6 +744,9 @@
dd->fill(d, table, data);
+ if (dd->func)
+ DialogAddFooter(d, dd->flags, dd->func);
+
DialogShow(d);
}
@@ -892,7 +900,7 @@
return di;
}
-void
+static void
DialogAddHeader(DItem * parent, const char *img, const char *txt)
{
DItem *table, *di;
@@ -912,7 +920,7 @@
di = DialogAddItem(parent, DITEM_SEPARATOR);
}
-void
+static void
DialogAddFooter(Dialog * d, int flags, DialogCallbackFunc * cb)
{
DItem *di;
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- dialog.h 27 Jul 2006 04:52:50 -0000 1.12
+++ dialog.h 8 Aug 2006 03:58:42 -0000 1.13
@@ -55,13 +55,15 @@
typedef struct
{
- void (*fill) (Dialog * d, DItem * table, void *data);
const char *name;
const char *label;
const char *title;
const char *sound;
const char *header_image;
const char *header_text;
+ void (*fill) (Dialog * d, DItem * table, void *data);
+ int flags;
+ DialogCallbackFunc *func;
} DialogDef;
/* dialog.c */
@@ -88,10 +90,6 @@
void DialogAddButton(Dialog * d, const char *text,
DialogCallbackFunc * func, char doclose,
int image);
-void DialogAddHeader(DItem * parent, const char *img,
- const char *txt);
-void DialogAddFooter(Dialog * d, int flags,
- DialogCallbackFunc * cb);
DItem *DialogInitItem(Dialog * d);
DItem *DialogAddItem(DItem * dii, int type);
===================================================================
RCS file: /cvs/e/e16/e/src/focus.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- focus.c 7 Aug 2006 20:47:12 -0000 1.155
+++ focus.c 8 Aug 2006 03:58:42 -0000 1.156
@@ -678,7 +678,7 @@
}
static void
-_DlgFillFocus(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillFocus(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di, *radio, *radio2;
@@ -832,18 +832,17 @@
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 0);
DialogItemRadioButtonGroupSetValPtr(radio2, &tmp_warp_icon_mode);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureFocus);
}
const DialogDef DlgFocus = {
- _DlgFillFocus,
"CONFIGURE_FOCUS",
N_("Focus"),
N_("Focus Settings"),
"SOUND_SETTINGS_FOCUS",
"pix/focus.png",
N_("Enlightenment Focus\n" "Settings Dialog\n"),
+ _DlgFillFocus,
+ DLG_OAC, CB_ConfigureFocus,
};
/*
===================================================================
RCS file: /cvs/e/e16/e/src/fx.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- fx.c 7 Aug 2006 20:47:12 -0000 1.73
+++ fx.c 8 Aug 2006 03:58:42 -0000 1.74
@@ -972,7 +972,7 @@
}
static void
-_DlgFillFx(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillFx(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
@@ -997,18 +997,17 @@
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetText(di, _("Waves"));
DialogItemCheckButtonSetPtr(di, &tmp_effect_waves);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureFX);
}
const DialogDef DlgFx = {
- _DlgFillFx,
"CONFIGURE_FX",
N_("FX"),
N_("Special FX Settings"),
"SOUND_SETTINGS_FX",
"pix/fx.png",
N_("Enlightenment Special Effects\n" "Settings Dialog\n"),
+ _DlgFillFx,
+ DLG_OAC, CB_ConfigureFX,
};
static void
===================================================================
RCS file: /cvs/e/e16/e/src/groups.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- groups.c 27 Jul 2006 04:52:50 -0000 1.84
+++ groups.c 8 Aug 2006 03:58:42 -0000 1.85
@@ -676,18 +676,17 @@
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_group_index);
StrlistFree(group_member_strings, num_groups);
-
- DialogAddFooter(d, DLG_OC, ChooseGroup);
}
static const DialogDef DlgGroupChoose = {
- _DlgFillGroupChoose,
"GROUP_SELECTION",
NULL,
N_("Window Group Selection"),
"SOUND_SETTINGS_GROUP",
"pix/group.png",
N_("Enlightenment Window Group\n" "Selection Dialog\n"),
+ _DlgFillGroupChoose,
+ DLG_OC, ChooseGroup,
};
static void
@@ -891,18 +890,17 @@
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Mirror Shade/Iconify/Stick"));
DialogItemCheckButtonSetPtr(di, &(dd->cfg.mirror));
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureGroup);
}
static const DialogDef DlgGroups = {
- _DlgFillGroups,
"CONFIGURE_GROUP",
NULL,
N_("Window Group Settings"),
"SOUND_SETTINGS_GROUP",
"pix/group.png",
N_("Enlightenment Window Group\n" "Settings Dialog\n"),
+ _DlgFillGroups,
+ DLG_OAC, CB_ConfigureGroup,
};
static void
@@ -937,7 +935,8 @@
}
static void
-_DlgFillGroupDefaults(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillGroupDefaults(Dialog * d __UNUSED__, DItem * table,
+ void *data __UNUSED__)
{
DItem *di;
@@ -1006,18 +1005,17 @@
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Swap Window Locations"));
DialogItemCheckButtonSetPtr(di, &(tmp_group_swap));
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureDefaultGroupSettings);
}
const DialogDef DlgGroupDefaults = {
- _DlgFillGroupDefaults,
"CONFIGURE_DEFAULT_GROUP_CONTROL",
N_("Groups"),
N_("Default Group Control Settings"),
"SOUND_SETTINGS_GROUP",
"pix/group.png",
N_("Enlightenment Default\n" "Group Control Settings Dialog\n"),
+ _DlgFillGroupDefaults,
+ DLG_OAC, CB_ConfigureDefaultGroupSettings,
};
/*
===================================================================
RCS file: /cvs/e/e16/e/src/iconify.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -3 -r1.217 -r1.218
--- iconify.c 7 Aug 2006 23:26:36 -0000 1.217
+++ iconify.c 8 Aug 2006 03:58:42 -0000 1.218
@@ -2330,18 +2330,17 @@
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetValPtr(radio3, &tmp_ib_arrows);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureIconbox);
}
static const DialogDef DlgIconbox = {
- _DlgFillIconbox,
"CONFIGURE_ICONBOX",
NULL,
NULL,
"SOUND_SETTINGS_ICONBOX",
"pix/iconbox.png",
N_("Enlightenment Iconbox\n" "Settings Dialog\n"),
+ _DlgFillIconbox,
+ DLG_OAC, CB_ConfigureIconbox,
};
/*
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -3 -r1.254 -r1.255
--- menus.c 7 Aug 2006 20:47:12 -0000 1.254
+++ menus.c 8 Aug 2006 03:58:42 -0000 1.255
@@ -2034,7 +2034,7 @@
}
static void
-_DlgFillMenus(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillMenus(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
@@ -2058,18 +2058,17 @@
DialogItemSetColSpan(di, 3);
DialogItemSetText(di, _("Warp pointer after moving menus"));
DialogItemCheckButtonSetPtr(di, &tmp_warpmenus);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureMenus);
}
const DialogDef DlgMenus = {
- _DlgFillMenus,
"CONFIGURE_MENUS",
N_("Menus"),
N_("Menu Settings"),
"SOUND_SETTINGS_MENUS",
"pix/place.png",
N_("Enlightenment Menu\n" "Settings Dialog\n"),
+ _DlgFillMenus,
+ DLG_OAC, CB_ConfigureMenus,
};
static void
===================================================================
RCS file: /cvs/e/e16/e/src/mod-trans.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- mod-trans.c 27 Jul 2006 04:52:50 -0000 1.21
+++ mod-trans.c 8 Aug 2006 03:58:42 -0000 1.22
@@ -107,7 +107,7 @@
}
static void
-_DlgFillThemeTrans(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillThemeTrans(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di, *label;
DItem *radio_border, *radio_widget, *radio_menu,
@@ -261,18 +261,17 @@
DialogItemSliderSetJump(di, 16);
DialogItemSliderSetValPtr(di, &tmp_theme_transparency);
DialogItemSetCallback(di, CB_ThemeTransparency, 0, (void *)label);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureTrans);
}
const DialogDef DlgThemeTrans = {
- _DlgFillThemeTrans,
"CONFIGURE_TRANS",
N_("Transparency"),
N_("Selective Transparency Settings"),
"SOUND_SETTINGS_TRANS",
"pix/tips.png",
N_("Enlightenment Selective Transparency\n" "Settings Dialog\n"),
+ _DlgFillThemeTrans,
+ DLG_OAC, CB_ConfigureTrans,
};
static void
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -3 -r1.222 -r1.223
--- pager.c 7 Aug 2006 20:47:12 -0000 1.222
+++ pager.c 8 Aug 2006 03:58:42 -0000 1.223
@@ -1726,7 +1726,7 @@
}
static void
-_DlgFillPagers(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillPagers(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di, *radio;
char s[256];
@@ -1868,18 +1868,17 @@
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_pager_menu_button);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigurePager);
}
const DialogDef DlgPagers = {
- _DlgFillPagers,
"CONFIGURE_PAGER",
N_("Pagers"),
N_("Pager Settings"),
"SOUND_SETTINGS_PAGER",
"pix/pager.png",
N_("Enlightenment Desktop & Area\n" "Pager Settings Dialog\n"),
+ _DlgFillPagers,
+ DLG_OAC, CB_ConfigurePager,
};
/*
===================================================================
RCS file: /cvs/e/e16/e/src/session.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -3 -r1.133 -r1.134
--- session.c 7 Aug 2006 20:20:15 -0000 1.133
+++ session.c 8 Aug 2006 03:58:42 -0000 1.134
@@ -773,7 +773,7 @@
}
static void
-_DlgFillSession(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillSession(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
@@ -797,16 +797,15 @@
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Enable Reboot/Halt on Logout"));
DialogItemCheckButtonSetPtr(di, &tmp_reboot_halt);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureSession);
}
const DialogDef DlgSession = {
- _DlgFillSession,
"CONFIGURE_SESSION",
N_("Session"),
N_("Session Settings"),
"SOUND_SETTINGS_SESSION",
"pix/miscellaneous.png",
N_("Enlightenment Session\n" "Settings Dialog\n"),
+ _DlgFillSession,
+ DLG_OAC, CB_ConfigureSession,
};
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- settings.c 27 Jul 2006 04:52:50 -0000 1.154
+++ settings.c 8 Aug 2006 03:58:42 -0000 1.155
@@ -44,7 +44,7 @@
}
static void
-_DlgFillMoveResize(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillMoveResize(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di, *radio1, *radio2, *radio3;
@@ -159,18 +159,17 @@
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Update window while moving"));
DialogItemCheckButtonSetPtr(di, &tmp_update_while_moving);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureMoveResize);
}
const DialogDef DlgMoveResize = {
- _DlgFillMoveResize,
"CONFIGURE_MOVERESIZE",
N_("Move/Resize"),
N_("Move & Resize Settings"),
"SOUND_SETTINGS_MOVERESIZE",
"pix/moveres.png",
N_("Enlightenment Move & Resize\n" "Method Settings Dialog\n"),
+ _DlgFillMoveResize,
+ DLG_OAC, CB_ConfigureMoveResize,
};
static char tmp_with_leader;
@@ -222,7 +221,7 @@
}
static void
-_DlgFillPlacement(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillPlacement(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di, *radio;
@@ -378,18 +377,17 @@
DialogItemCheckButtonSetPtr(di, &tmp_extra_head);
}
#endif
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigurePlacement);
}
const DialogDef DlgPlacement = {
- _DlgFillPlacement,
"CONFIGURE_PLACEMENT",
N_("Placement"),
N_("Window Placement Settings"),
"SOUND_SETTINGS_PLACEMENT",
"pix/place.png",
N_("Enlightenment Window Placement\n" "Settings Dialog\n"),
+ _DlgFillPlacement,
+ DLG_OAC, CB_ConfigurePlacement,
};
static char tmp_autoraise;
@@ -407,7 +405,7 @@
}
static void
-_DlgFillAutoraise(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillAutoraise(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
@@ -431,18 +429,17 @@
DialogItemSliderSetUnits(di, 10);
DialogItemSliderSetJump(di, 25);
DialogItemSliderSetValPtr(di, &tmp_autoraisetime);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureAutoraise);
}
const DialogDef DlgAutoraise = {
- _DlgFillAutoraise,
"CONFIGURE_AUTORAISE",
N_("Autoraise"),
N_("Autoraise Settings"),
"SOUND_SETTINGS_AUTORAISE",
"pix/raise.png",
N_("Enlightenment Automatic Raising\n" "of Windows Settings Dialog\n"),
+ _DlgFillAutoraise,
+ DLG_OAC, CB_ConfigureAutoraise,
};
static char tmp_dialog_headers;
@@ -464,7 +461,7 @@
}
static void
-_DlgFillMisc(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillMisc(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
@@ -500,18 +497,17 @@
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("Use saveunders to reduce window exposures"));
DialogItemCheckButtonSetPtr(di, &tmp_saveunders);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureMiscellaneous);
}
const DialogDef DlgMisc = {
- _DlgFillMisc,
"CONFIGURE_MISCELLANEOUS",
N_("Miscellaneous"),
N_("Miscellaneous Settings"),
"SOUND_SETTINGS_MISCELLANEOUS",
"pix/miscellaneous.png",
N_("Enlightenment Miscellaneous\n" "Settings Dialog\n"),
+ _DlgFillMisc,
+ DLG_OAC, CB_ConfigureMiscellaneous,
};
#if USE_COMPOSITE
@@ -536,7 +532,7 @@
}
static void
-_DlgFillComposite(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillComposite(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
static cfg_composite Cfg_composite;
DItem *di, *radio;
@@ -601,18 +597,17 @@
DialogItemSliderSetUnits(di, 5);
DialogItemSliderSetJump(di, 5);
DialogItemSliderSetValPtr(di, &Cfg_composite.fade_speed);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureComposite);
}
const DialogDef DlgComposite = {
- _DlgFillComposite,
"CONFIGURE_COMPOSITE",
N_("Composite"),
N_("Composite Settings"),
"SOUND_SETTINGS_COMPOSITE",
"pix/pager.png",
N_("Enlightenment Composite\n" "Settings Dialog\n"),
+ _DlgFillComposite,
+ DLG_OAC, CB_ConfigureComposite,
};
void
===================================================================
RCS file: /cvs/e/e16/e/src/snaps.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- snaps.c 7 Aug 2006 20:20:15 -0000 1.122
+++ snaps.c 8 Aug 2006 03:58:42 -0000 1.123
@@ -928,12 +928,9 @@
DialogItemSetText(di, _("Remember this window's group(s)"));
DialogItemCheckButtonSetPtr(di, &sd->snap_group);
}
-
- DialogAddFooter(d, DLG_OAC, CB_ApplySnap);
}
const DialogDef DlgSnap = {
- _DlgFillSnap,
NULL,
NULL,
N_("Remembered Application Attributes"),
@@ -941,6 +938,8 @@
"pix/snapshots.png",
N_("Select the attributes of this\n"
"window you wish to Remember\n" "from now on\n"),
+ _DlgFillSnap,
+ DLG_OAC, CB_ApplySnap,
};
static void
@@ -1009,7 +1008,7 @@
}
static void
-_DlgFillRemember(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillRemember(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
Snapshot *sn;
@@ -1078,18 +1077,17 @@
_
("There are no active windows with remembered
attributes."));
}
-
- DialogAddFooter(d, DLG_OC, CB_ApplyRemember);
}
const DialogDef DlgRemember = {
- _DlgFillRemember,
"CONFIGURE_PAGER",
NULL,
N_("Remembered Windows Settings"),
"SOUND_SETTINGS_PAGER",
"pix/snapshots.png",
N_("Enlightenment Remembered\n" "Windows Settings Dialog\n"),
+ _DlgFillRemember,
+ DLG_OC, CB_ApplyRemember,
};
/* ... combine writes, only save after a timeout */
===================================================================
RCS file: /cvs/e/e16/e/src/sound.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- sound.c 27 Jul 2006 04:52:50 -0000 1.46
+++ sound.c 8 Aug 2006 03:58:42 -0000 1.47
@@ -439,7 +439,7 @@
}
static void
-_DlgFillSound(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillSound(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
@@ -459,18 +459,17 @@
_("Audio not available since EsounD was not\n"
"present at the time of compilation."));
#endif
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureAudio);
}
const DialogDef DlgSound = {
- _DlgFillSound,
"CONFIGURE_AUDIO",
N_("Sound"),
N_("Audio Settings"),
"SOUND_SETTINGS_AUDIO",
"pix/sound.png",
N_("Enlightenment Audio\n" "Settings Dialog\n"),
+ _DlgFillSound,
+ DLG_OAC, CB_ConfigureAudio,
};
/*
===================================================================
RCS file: /cvs/e/e16/e/src/tooltips.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- tooltips.c 27 Jul 2006 04:52:50 -0000 1.106
+++ tooltips.c 8 Aug 2006 03:58:42 -0000 1.107
@@ -839,7 +839,7 @@
}
static void
-_DlgFillTooltips(Dialog * d, DItem * table, void *data __UNUSED__)
+_DlgFillTooltips(Dialog * d __UNUSED__, DItem * table, void *data __UNUSED__)
{
DItem *di;
@@ -868,18 +868,17 @@
DialogItemSliderSetUnits(di, 10);
DialogItemSliderSetJump(di, 25);
DialogItemSliderSetValPtr(di, &tmp_tooltiptime);
-
- DialogAddFooter(d, DLG_OAC, CB_ConfigureTooltips);
}
const DialogDef DlgTooltips = {
- _DlgFillTooltips,
"CONFIGURE_TOOLTIPS",
N_("Tooltips"),
N_("Tooltip Settings"),
"SOUND_SETTINGS_TOOLTIPS",
"pix/tips.png",
N_("Enlightenment Tooltip\n" "Settings Dialog\n"),
+ _DlgFillTooltips,
+ DLG_OAC, CB_ConfigureTooltips,
};
static void
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
