Some more dialog creation refactoring bits.
SVN revision: 24226
This commit is contained in:
parent
6e84ce4815
commit
3767ae0da4
|
@ -317,11 +317,13 @@ _DlgFillAbout(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
static const DialogDef DlgAbout = {
|
||||
_DlgFillAbout,
|
||||
"ABOUT_ENLIGHTENMENT",
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
_DlgFillAbout
|
||||
NULL,
|
||||
NULL,
|
||||
};
|
||||
|
||||
void
|
||||
|
|
|
@ -2025,11 +2025,6 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
|
|||
|
||||
DialogItemTableSetOptions(table, 3, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/bg.png",
|
||||
_("Enlightenment Desktop\n"
|
||||
"Background Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetText(di, _("BG Colour\n"));
|
||||
|
||||
|
@ -2274,11 +2269,13 @@ _DlgFillBackground(Dialog * d, DItem * table, void *data)
|
|||
}
|
||||
|
||||
const DialogDef DlgBackground = {
|
||||
_DlgFillBackground,
|
||||
"CONFIGURE_BG",
|
||||
N_("Background"),
|
||||
N_("Desktop Background Settings"),
|
||||
"SOUND_SETTINGS_BG",
|
||||
_DlgFillBackground
|
||||
"pix/bg.png",
|
||||
N_("Enlightenment Desktop\n" "Background Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -2370,11 +2370,6 @@ _DlgFillDesks(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/desktops.png",
|
||||
_("Enlightenment Multiple Desktop\n"
|
||||
"Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Number of virtual desktops:\n"));
|
||||
|
@ -2471,11 +2466,13 @@ _DlgFillDesks(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgDesks = {
|
||||
_DlgFillDesks,
|
||||
"CONFIGURE_DESKTOPS",
|
||||
N_("Desks"),
|
||||
N_("Multiple Desktop Settings"),
|
||||
"SOUND_SETTINGS_DESKTOPS",
|
||||
_DlgFillDesks
|
||||
"pix/desktops.png",
|
||||
N_("Enlightenment Multiple Desktop\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static int tmp_area_x;
|
||||
|
@ -2587,10 +2584,6 @@ _DlgFillAreas(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 1, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/areas.png",
|
||||
_("Enlightenment Virtual Desktop\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetText(di, _("Virtual Desktop size:\n"));
|
||||
|
||||
|
@ -2654,11 +2647,13 @@ _DlgFillAreas(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgAreas = {
|
||||
_DlgFillAreas,
|
||||
"CONFIGURE_AREA",
|
||||
N_("Areas"),
|
||||
N_("Virtual Desktop Settings"),
|
||||
"SOUND_SETTINGS_AREA",
|
||||
_DlgFillAreas
|
||||
"pix/areas.png",
|
||||
N_("Enlightenment Virtual Desktop\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
27
src/dialog.c
27
src/dialog.c
|
@ -701,11 +701,17 @@ _DialogClose(Dialog * d)
|
|||
|
||||
void
|
||||
DialogShowSimple(const DialogDef * dd, void *data)
|
||||
{
|
||||
DialogShowSimpleWithName(dd, dd->name, data);
|
||||
}
|
||||
|
||||
void
|
||||
DialogShowSimpleWithName(const DialogDef * dd, const char *name, void *data)
|
||||
{
|
||||
Dialog *d;
|
||||
DItem *table;
|
||||
|
||||
d = DialogFind(dd->name);
|
||||
d = DialogFind(name);
|
||||
if (d)
|
||||
{
|
||||
SoundPlay("SOUND_SETTINGS_ACTIVE");
|
||||
|
@ -714,7 +720,7 @@ DialogShowSimple(const DialogDef * dd, void *data)
|
|||
}
|
||||
SoundPlay(dd->sound);
|
||||
|
||||
d = DialogCreate(dd->name);
|
||||
d = DialogCreate(name);
|
||||
if (!d)
|
||||
return;
|
||||
|
||||
|
@ -724,6 +730,13 @@ DialogShowSimple(const DialogDef * dd, void *data)
|
|||
if (!table)
|
||||
return;
|
||||
|
||||
if (Conf.dialogs.headers && (dd->header_image || dd->header_text))
|
||||
DialogAddHeader(table, dd->header_image, _(dd->header_text));
|
||||
|
||||
table = DialogAddItem(d->item, DITEM_TABLE);
|
||||
if (!table)
|
||||
return;
|
||||
|
||||
dd->fill(d, table, data);
|
||||
|
||||
DialogShow(d);
|
||||
|
@ -880,14 +893,15 @@ DialogAddItem(DItem * dii, int type)
|
|||
}
|
||||
|
||||
void
|
||||
DialogAddHeader(Dialog * d, const char *img, const char *txt)
|
||||
DialogAddHeader(DItem * parent, const char *img, const char *txt)
|
||||
{
|
||||
DItem *table, *di;
|
||||
|
||||
/* FIXME - Center table horizontally */
|
||||
table = DialogAddItem(d->item, DITEM_TABLE);
|
||||
DialogItemSetColSpan(table, d->item->item.table.num_columns);
|
||||
table = DialogAddItem(parent, DITEM_TABLE);
|
||||
DialogItemSetColSpan(table, 1);
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
DialogItemSetAlign(table, 512, 0);
|
||||
|
||||
di = DialogAddItem(table, DITEM_IMAGE);
|
||||
DialogItemImageSetFile(di, img);
|
||||
|
@ -895,8 +909,7 @@ DialogAddHeader(Dialog * d, const char *img, const char *txt)
|
|||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetText(di, txt);
|
||||
|
||||
di = DialogAddItem(d->item, DITEM_SEPARATOR);
|
||||
DialogItemSetColSpan(di, d->item->item.table.num_columns);
|
||||
di = DialogAddItem(parent, DITEM_SEPARATOR);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
11
src/dialog.h
11
src/dialog.h
|
@ -55,11 +55,13 @@ typedef void (DialogItemCallbackFunc) (DItem * di, int val, void *data);
|
|||
|
||||
typedef struct
|
||||
{
|
||||
void (*fill) (Dialog * d, DItem * table, void *data);
|
||||
const char *name;
|
||||
const char *label;
|
||||
const char *title;
|
||||
const char *sound;
|
||||
void (*fill) (Dialog * d, DItem * table, void *data);
|
||||
const char *header_image;
|
||||
const char *header_text;
|
||||
} DialogDef;
|
||||
|
||||
/* dialog.c */
|
||||
|
@ -76,14 +78,17 @@ void *DialogGetData(Dialog * d);
|
|||
|
||||
void DialogShow(Dialog * d);
|
||||
void DialogShowCentered(Dialog * d);
|
||||
void DialogShowSimple(const DialogDef * dd, void *data);
|
||||
void DialogRedraw(Dialog * d);
|
||||
void DialogClose(Dialog * d);
|
||||
|
||||
void DialogShowSimple(const DialogDef * dd, void *data);
|
||||
void DialogShowSimpleWithName(const DialogDef * dd,
|
||||
const char *name, void *data);
|
||||
|
||||
void DialogAddButton(Dialog * d, const char *text,
|
||||
DialogCallbackFunc * func, char doclose,
|
||||
int image);
|
||||
void DialogAddHeader(Dialog * d, const char *img,
|
||||
void DialogAddHeader(DItem * parent, const char *img,
|
||||
const char *txt);
|
||||
void DialogAddFooter(Dialog * d, int flags,
|
||||
DialogCallbackFunc * cb);
|
||||
|
|
|
@ -703,10 +703,6 @@ _DlgFillFocus(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/focus.png",
|
||||
_("Enlightenment Focus\n" "Settings Dialog\n"));
|
||||
|
||||
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Focus follows pointer"));
|
||||
|
@ -841,11 +837,13 @@ _DlgFillFocus(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgFocus = {
|
||||
_DlgFillFocus,
|
||||
"CONFIGURE_FOCUS",
|
||||
N_("Focus"),
|
||||
N_("Focus Settings"),
|
||||
"SOUND_SETTINGS_FOCUS",
|
||||
_DlgFillFocus
|
||||
"pix/focus.png",
|
||||
N_("Enlightenment Focus\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
8
src/fx.c
8
src/fx.c
|
@ -982,10 +982,6 @@ _DlgFillFx(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 1, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/fx.png",
|
||||
_("Enlightenment Special Effects\n" "Settings Dialog\n"));
|
||||
|
||||
/* Effects */
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetText(di, _("Effects"));
|
||||
|
@ -1006,11 +1002,13 @@ _DlgFillFx(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgFx = {
|
||||
_DlgFillFx,
|
||||
"CONFIGURE_FX",
|
||||
N_("FX"),
|
||||
N_("Special FX Settings"),
|
||||
"SOUND_SETTINGS_FX",
|
||||
_DlgFillFx
|
||||
"pix/fx.png",
|
||||
N_("Enlightenment Special Effects\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
125
src/groups.c
125
src/groups.c
|
@ -594,6 +594,7 @@ static int tmp_group_index;
|
|||
static int tmp_index;
|
||||
static EWin *tmp_ewin;
|
||||
static Group **tmp_groups;
|
||||
static int tmp_group_num;
|
||||
static int tmp_action;
|
||||
|
||||
static void
|
||||
|
@ -638,15 +639,62 @@ GroupCallback(Dialog * d __UNUSED__, int val, void *data __UNUSED__)
|
|||
tmp_index = val;
|
||||
}
|
||||
|
||||
static void
|
||||
_DlgFillGroupChoose(Dialog * d, DItem * table, void *data)
|
||||
{
|
||||
DItem *di, *radio;
|
||||
int i, num_groups;
|
||||
char **group_member_strings;
|
||||
const char *message = data;
|
||||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetAlign(di, 0, 512);
|
||||
DialogItemSetText(di, message);
|
||||
|
||||
num_groups = tmp_group_num;
|
||||
group_member_strings = GetWinGroupMemberNames(tmp_groups, num_groups);
|
||||
|
||||
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetCallback(di, GroupCallback, 0, (void *)d);
|
||||
DialogItemSetText(di, group_member_strings[0]);
|
||||
DialogItemRadioButtonSetFirst(di, radio);
|
||||
DialogItemRadioButtonGroupSetVal(di, 0);
|
||||
|
||||
for (i = 1; i < num_groups; i++)
|
||||
{
|
||||
di = DialogAddItem(table, DITEM_RADIOBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetCallback(di, GroupCallback, i, NULL);
|
||||
DialogItemSetText(di, group_member_strings[i]);
|
||||
DialogItemRadioButtonSetFirst(di, radio);
|
||||
DialogItemRadioButtonGroupSetVal(di, i);
|
||||
}
|
||||
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"),
|
||||
};
|
||||
|
||||
static void
|
||||
ChooseGroupDialog(EWin * ewin, const char *message, char group_select,
|
||||
int action)
|
||||
{
|
||||
|
||||
Dialog *d;
|
||||
DItem *table, *di, *radio;
|
||||
int i, num_groups;
|
||||
char **group_member_strings;
|
||||
int num_groups;
|
||||
|
||||
if (!ewin)
|
||||
return;
|
||||
|
@ -655,6 +703,7 @@ ChooseGroupDialog(EWin * ewin, const char *message, char group_select,
|
|||
tmp_group_index = tmp_index = 0;
|
||||
tmp_action = action;
|
||||
tmp_groups = ListWinGroups(ewin, group_select, &num_groups);
|
||||
tmp_group_num = num_groups;
|
||||
|
||||
if ((num_groups == 0)
|
||||
&& (action == GROUP_OP_BREAK || action == GROUP_OP_DEL))
|
||||
|
@ -684,54 +733,7 @@ ChooseGroupDialog(EWin * ewin, const char *message, char group_select,
|
|||
|
||||
ShowHideWinGroups(ewin, 0, SET_ON);
|
||||
|
||||
d = DialogFind("GROUP_SELECTION");
|
||||
if (d)
|
||||
{
|
||||
SoundPlay("GROUP_SETTINGS_ACTIVE");
|
||||
DialogShow(d);
|
||||
}
|
||||
SoundPlay("SOUND_SETTINGS_GROUP");
|
||||
|
||||
d = DialogCreate("GROUP_SELECTION");
|
||||
DialogSetTitle(d, _("Window Group Selection"));
|
||||
|
||||
table = DialogInitItem(d);
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/group.png",
|
||||
_("Enlightenment Window Group\n" "Selection Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetAlign(di, 0, 512);
|
||||
DialogItemSetText(di, message);
|
||||
|
||||
group_member_strings = GetWinGroupMemberNames(tmp_groups, num_groups);
|
||||
|
||||
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetCallback(di, GroupCallback, 0, (void *)d);
|
||||
DialogItemSetText(di, group_member_strings[0]);
|
||||
DialogItemRadioButtonSetFirst(di, radio);
|
||||
DialogItemRadioButtonGroupSetVal(di, 0);
|
||||
|
||||
for (i = 1; i < num_groups; i++)
|
||||
{
|
||||
di = DialogAddItem(table, DITEM_RADIOBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetCallback(di, GroupCallback, i, NULL);
|
||||
DialogItemSetText(di, group_member_strings[i]);
|
||||
DialogItemRadioButtonSetFirst(di, radio);
|
||||
DialogItemRadioButtonGroupSetVal(di, i);
|
||||
}
|
||||
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_group_index);
|
||||
|
||||
StrlistFree(group_member_strings, num_groups);
|
||||
|
||||
DialogAddFooter(d, DLG_OC, ChooseGroup);
|
||||
|
||||
DialogShow(d);
|
||||
DialogShowSimple(&DlgGroupChoose, (void *)message);
|
||||
}
|
||||
|
||||
typedef struct
|
||||
|
@ -813,10 +815,6 @@ _DlgFillGroups(Dialog * d, DItem * table, void *data)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/group.png",
|
||||
_("Enlightenment Window Group\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetAlign(di, 0, 512);
|
||||
|
@ -898,11 +896,13 @@ _DlgFillGroups(Dialog * d, DItem * table, void *data)
|
|||
}
|
||||
|
||||
static const DialogDef DlgGroups = {
|
||||
_DlgFillGroups,
|
||||
"CONFIGURE_GROUP",
|
||||
NULL,
|
||||
N_("Window Group Settings"),
|
||||
"SOUND_SETTINGS_GROUP",
|
||||
_DlgFillGroups
|
||||
"pix/group.png",
|
||||
N_("Enlightenment Window Group\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static void
|
||||
|
@ -946,11 +946,6 @@ _DlgFillGroupDefaults(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/group.png",
|
||||
_("Enlightenment Default\n"
|
||||
"Group Control Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetAlign(di, 0, 512);
|
||||
|
@ -1016,11 +1011,13 @@ _DlgFillGroupDefaults(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgGroupDefaults = {
|
||||
_DlgFillGroupDefaults,
|
||||
"CONFIGURE_DEFAULT_GROUP_CONTROL",
|
||||
N_("Groups"),
|
||||
N_("Default Group Control Settings"),
|
||||
"SOUND_SETTINGS_GROUP",
|
||||
_DlgFillGroupDefaults
|
||||
"pix/group.png",
|
||||
N_("Enlightenment Default\n" "Group Control Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -2169,10 +2169,6 @@ _DlgFillIconbox(Dialog * d, DItem * table, void *data)
|
|||
|
||||
DialogItemTableSetOptions(table, 1, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/iconbox.png",
|
||||
_("Enlightenment Iconbox\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetText(di, _("Transparent background"));
|
||||
DialogItemCheckButtonSetPtr(di, &tmp_ib_nobg);
|
||||
|
@ -2339,11 +2335,13 @@ _DlgFillIconbox(Dialog * d, DItem * table, void *data)
|
|||
}
|
||||
|
||||
static const DialogDef DlgIconbox = {
|
||||
_DlgFillIconbox,
|
||||
"CONFIGURE_ICONBOX",
|
||||
NULL,
|
||||
NULL,
|
||||
"SOUND_SETTINGS_ICONBOX",
|
||||
_DlgFillIconbox
|
||||
"pix/iconbox.png",
|
||||
N_("Enlightenment Iconbox\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -2043,10 +2043,6 @@ _DlgFillMenus(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 3, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/place.png",
|
||||
_("Enlightenment Menu\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 3);
|
||||
DialogItemSetText(di, _("Animated display of menus"));
|
||||
|
@ -2066,11 +2062,13 @@ _DlgFillMenus(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgMenus = {
|
||||
_DlgFillMenus,
|
||||
"CONFIGURE_MENUS",
|
||||
N_("Menus"),
|
||||
N_("Menu Settings"),
|
||||
"SOUND_SETTINGS_MENUS",
|
||||
_DlgFillMenus
|
||||
"pix/place.png",
|
||||
N_("Enlightenment Menu\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -125,11 +125,6 @@ _DlgFillThemeTrans(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 7, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/tips.png",
|
||||
_("Enlightenment Selective Transparency\n"
|
||||
"Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetColSpan(di, 7);
|
||||
DialogItemSetAlign(di, 0, 512);
|
||||
|
@ -271,11 +266,13 @@ _DlgFillThemeTrans(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgThemeTrans = {
|
||||
_DlgFillThemeTrans,
|
||||
"CONFIGURE_TRANS",
|
||||
N_("Transparency"),
|
||||
N_("Selective Transparency Settings"),
|
||||
"SOUND_SETTINGS_TRANS",
|
||||
_DlgFillThemeTrans
|
||||
"pix/tips.png",
|
||||
N_("Enlightenment Selective Transparency\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -1747,11 +1747,6 @@ _DlgFillPagers(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/pager.png",
|
||||
_("Enlightenment Desktop & Area\n"
|
||||
"Pager Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Enable pager display"));
|
||||
|
@ -1878,11 +1873,13 @@ _DlgFillPagers(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgPagers = {
|
||||
_DlgFillPagers,
|
||||
"CONFIGURE_PAGER",
|
||||
N_("Pagers"),
|
||||
N_("Pager Settings"),
|
||||
"SOUND_SETTINGS_PAGER",
|
||||
_DlgFillPagers
|
||||
"pix/pager.png",
|
||||
N_("Enlightenment Desktop & Area\n" "Pager Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -783,10 +783,6 @@ _DlgFillSession(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/miscellaneous.png",
|
||||
_("Enlightenment Session\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Enable Session Script"));
|
||||
|
@ -806,9 +802,11 @@ _DlgFillSession(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgSession = {
|
||||
_DlgFillSession,
|
||||
"CONFIGURE_SESSION",
|
||||
N_("Session"),
|
||||
N_("Session Settings"),
|
||||
"SOUND_SETTINGS_SESSION",
|
||||
_DlgFillSession
|
||||
"pix/miscellaneous.png",
|
||||
N_("Enlightenment Session\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
|
|
@ -55,11 +55,6 @@ _DlgFillMoveResize(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/moveres.png",
|
||||
_("Enlightenment Move & Resize\n"
|
||||
"Method Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_TEXT);
|
||||
DialogItemSetFill(di, 0, 0);
|
||||
DialogItemSetAlign(di, 0, 512);
|
||||
|
@ -169,11 +164,13 @@ _DlgFillMoveResize(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgMoveResize = {
|
||||
_DlgFillMoveResize,
|
||||
"CONFIGURE_MOVERESIZE",
|
||||
N_("Move/Resize"),
|
||||
N_("Move & Resize Settings"),
|
||||
"SOUND_SETTINGS_MOVERESIZE",
|
||||
_DlgFillMoveResize
|
||||
"pix/moveres.png",
|
||||
N_("Enlightenment Move & Resize\n" "Method Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static char tmp_with_leader;
|
||||
|
@ -253,11 +250,6 @@ _DlgFillPlacement(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 1, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/place.png",
|
||||
_("Enlightenment Window Placement\n"
|
||||
"Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Dialog windows appear together with their owner"));
|
||||
|
@ -391,11 +383,13 @@ _DlgFillPlacement(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgPlacement = {
|
||||
_DlgFillPlacement,
|
||||
"CONFIGURE_PLACEMENT",
|
||||
N_("Placement"),
|
||||
N_("Window Placement Settings"),
|
||||
"SOUND_SETTINGS_PLACEMENT",
|
||||
_DlgFillPlacement
|
||||
"pix/place.png",
|
||||
N_("Enlightenment Window Placement\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static char tmp_autoraise;
|
||||
|
@ -422,11 +416,6 @@ _DlgFillAutoraise(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/raise.png",
|
||||
_("Enlightenment Automatic Raising\n"
|
||||
"of Windows Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Raise Windows Automatically"));
|
||||
|
@ -447,11 +436,13 @@ _DlgFillAutoraise(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgAutoraise = {
|
||||
_DlgFillAutoraise,
|
||||
"CONFIGURE_AUTORAISE",
|
||||
N_("Autoraise"),
|
||||
N_("Autoraise Settings"),
|
||||
"SOUND_SETTINGS_AUTORAISE",
|
||||
_DlgFillAutoraise
|
||||
"pix/raise.png",
|
||||
N_("Enlightenment Automatic Raising\n" "of Windows Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static char tmp_dialog_headers;
|
||||
|
@ -484,10 +475,6 @@ _DlgFillMisc(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/miscellaneous.png",
|
||||
_("Enlightenment Miscellaneous\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Enable Dialog Headers"));
|
||||
|
@ -518,11 +505,13 @@ _DlgFillMisc(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgMisc = {
|
||||
_DlgFillMisc,
|
||||
"CONFIGURE_MISCELLANEOUS",
|
||||
N_("Miscellaneous"),
|
||||
N_("Miscellaneous Settings"),
|
||||
"SOUND_SETTINGS_MISCELLANEOUS",
|
||||
_DlgFillMisc
|
||||
"pix/miscellaneous.png",
|
||||
N_("Enlightenment Miscellaneous\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
#if USE_COMPOSITE
|
||||
|
@ -561,10 +550,6 @@ _DlgFillComposite(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
/* Layout */
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/pager.png",
|
||||
_("Enlightenment Composite\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Enable Composite"));
|
||||
|
@ -621,11 +606,13 @@ _DlgFillComposite(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgComposite = {
|
||||
_DlgFillComposite,
|
||||
"CONFIGURE_COMPOSITE",
|
||||
N_("Composite"),
|
||||
N_("Composite Settings"),
|
||||
"SOUND_SETTINGS_COMPOSITE",
|
||||
_DlgFillComposite
|
||||
"pix/pager.png",
|
||||
N_("Enlightenment Composite\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
void
|
||||
|
|
58
src/snaps.c
58
src/snaps.c
|
@ -669,32 +669,13 @@ CB_ApplySnap(Dialog * d, int val, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
SnapshotEwinDialog(const EWin * ewin)
|
||||
_DlgFillSnap(Dialog * d, DItem * table, void *data)
|
||||
{
|
||||
Dialog *d;
|
||||
DItem *table, *di;
|
||||
DItem *di;
|
||||
Snapshot *sn;
|
||||
SnapDlgData *sd;
|
||||
char s[1024];
|
||||
|
||||
Esnprintf(s, sizeof(s), "SNAPSHOT_WINDOW-%#lx", _EwinGetClientXwin(ewin));
|
||||
|
||||
d = DialogFind(s);
|
||||
if (d)
|
||||
{
|
||||
DialogShow(d);
|
||||
return;
|
||||
}
|
||||
d = DialogCreate(s);
|
||||
DialogSetTitle(d, _("Remembered Application Attributes"));
|
||||
|
||||
table = DialogInitItem(d);
|
||||
DialogItemTableSetOptions(table, 4, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/snapshots.png",
|
||||
_("Select the attributes of this\n"
|
||||
"window you wish to Remember\n" "from now on\n"));
|
||||
const EWin *ewin = data;
|
||||
|
||||
sd = Ecalloc(1, sizeof(SnapDlgData));
|
||||
DialogSetData(d, sd);
|
||||
|
@ -753,6 +734,9 @@ SnapshotEwinDialog(const EWin * ewin)
|
|||
}
|
||||
}
|
||||
|
||||
table = DialogAddItem(table, DITEM_TABLE);
|
||||
DialogItemTableSetOptions(table, 4, 0, 0, 0);
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetAlign(di, 0, 512);
|
||||
DialogItemSetText(di, _("Title:"));
|
||||
|
@ -946,8 +930,27 @@ SnapshotEwinDialog(const EWin * ewin)
|
|||
}
|
||||
|
||||
DialogAddFooter(d, DLG_OAC, CB_ApplySnap);
|
||||
}
|
||||
|
||||
DialogShow(d);
|
||||
const DialogDef DlgSnap = {
|
||||
_DlgFillSnap,
|
||||
NULL,
|
||||
NULL,
|
||||
N_("Remembered Application Attributes"),
|
||||
NULL,
|
||||
"pix/snapshots.png",
|
||||
N_("Select the attributes of this\n"
|
||||
"window you wish to Remember\n" "from now on\n"),
|
||||
};
|
||||
|
||||
static void
|
||||
SnapshotEwinDialog(const EWin * ewin)
|
||||
{
|
||||
char s[1024];
|
||||
|
||||
Esnprintf(s, sizeof(s), "SNAPSHOT_WINDOW-%#lx", _EwinGetClientXwin(ewin));
|
||||
|
||||
DialogShowSimpleWithName(&DlgSnap, s, (void *)ewin);
|
||||
}
|
||||
|
||||
/* list of remembered items for the remember dialog -- it's either
|
||||
|
@ -1016,11 +1019,6 @@ _DlgFillRemember(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 3, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/snapshots.png",
|
||||
_("Enlightenment Remembered\n"
|
||||
"Windows Settings Dialog\n"));
|
||||
|
||||
num = ecore_list_nodes(ss_list);
|
||||
rd_ewin_list = Emalloc(sizeof(RememberWinList) * (num + 1));
|
||||
|
||||
|
@ -1085,11 +1083,13 @@ _DlgFillRemember(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgRemember = {
|
||||
_DlgFillRemember,
|
||||
"CONFIGURE_PAGER",
|
||||
NULL,
|
||||
N_("Remembered Windows Settings"),
|
||||
"SOUND_SETTINGS_PAGER",
|
||||
_DlgFillRemember
|
||||
"pix/snapshots.png",
|
||||
N_("Enlightenment Remembered\n" "Windows Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/* ... combine writes, only save after a timeout */
|
||||
|
|
|
@ -447,10 +447,6 @@ _DlgFillSound(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/sound.png",
|
||||
_("Enlightenment Audio\n" "Settings Dialog\n"));
|
||||
|
||||
#ifdef HAVE_LIBESD
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
|
@ -468,11 +464,13 @@ _DlgFillSound(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgSound = {
|
||||
_DlgFillSound,
|
||||
"CONFIGURE_AUDIO",
|
||||
N_("Sound"),
|
||||
N_("Audio Settings"),
|
||||
"SOUND_SETTINGS_AUDIO",
|
||||
_DlgFillSound
|
||||
"pix/sound.png",
|
||||
N_("Enlightenment Audio\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -849,10 +849,6 @@ _DlgFillTooltips(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
|
||||
DialogItemTableSetOptions(table, 2, 0, 0, 0);
|
||||
|
||||
if (Conf.dialogs.headers)
|
||||
DialogAddHeader(d, "pix/tips.png",
|
||||
_("Enlightenment Tooltip\n" "Settings Dialog\n"));
|
||||
|
||||
di = DialogAddItem(table, DITEM_CHECKBUTTON);
|
||||
DialogItemSetColSpan(di, 2);
|
||||
DialogItemSetText(di, _("Display Tooltips"));
|
||||
|
@ -877,11 +873,13 @@ _DlgFillTooltips(Dialog * d, DItem * table, void *data __UNUSED__)
|
|||
}
|
||||
|
||||
const DialogDef DlgTooltips = {
|
||||
_DlgFillTooltips,
|
||||
"CONFIGURE_TOOLTIPS",
|
||||
N_("Tooltips"),
|
||||
N_("Tooltip Settings"),
|
||||
"SOUND_SETTINGS_TOOLTIPS",
|
||||
_DlgFillTooltips
|
||||
"pix/tips.png",
|
||||
N_("Enlightenment Tooltip\n" "Settings Dialog\n"),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
Loading…
Reference in New Issue