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

Dialog item text simplification. 

SVN revision: 15998
This commit is contained in:
Kim Woelders 2005-08-02 16:50:40 +00:00
parent 4014248555
commit 9eb7fab46c
15 changed files with 341 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/E.h
View File

@ -1201,12 +1201,10 @@ void DialogItemSetPadding(DItem * di, int left, int right,
int top, int bottom);
void DialogItemSetFill(DItem * di, char fill_h, char fill_v);
void DialogItemSetAlign(DItem * di, int align_h, int align_v);
void DialogItemSetText(DItem * di, const char *text);
void DialogItemCallCallback(Dialog * d, DItem * di);
void DialogDrawItems(Dialog * d, DItem * di, int x, int y, int w,
int h);
void DialogItemButtonSetText(DItem * di, const char *text);
void DialogItemCheckButtonSetText(DItem * di, const char *text);
void DialogItemTextSetText(DItem * di, const char *text);
void DialogItemRadioButtonSetEventFunc(DItem * di,
DialogItemCallbackFunc *
func);
@ -1221,7 +1219,6 @@ void DialogItemImageSetFile(DItem * di, const char *image);
void DialogFreeItem(DItem * di);
void DialogItemSetRowSpan(DItem * di, int row_span);
void DialogItemSetColSpan(DItem * di, int col_span);
void DialogItemRadioButtonSetText(DItem * di, const char *text);
void DialogItemRadioButtonSetFirst(DItem * di, DItem * first);
void DialogItemRadioButtonGroupSetValPtr(DItem * di,
int *val_ptr);

2
src/actions.c
View File

@ -321,7 +321,7 @@ About(void)
"The Rasterman - raster@rasterman.com\n"
"Mandrake - mandrake@mandrake.net\n"
"Kim Woelders - kim@woelders.dk\n"), e_wm_version, e_wm_date);
DialogItemTextSetText(di, buf);
DialogItemSetText(di, buf);
DialogAddButton(d, _("OK"), NULL, 1, DIALOG_BUTTON_OK);
ShowDialog(d);

56
src/backgrounds.c
View File

@ -1589,7 +1589,7 @@ BG_DialogSetFileName(DItem * di)
_("Background definition information:\nName: %s\nFile: %s\n"),
BackgroundGetName(tmp_bg), stmp);
Efree(stmp);
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
}
static void
@ -1879,7 +1879,7 @@ CB_DesktopTimeout(Dialog * d __UNUSED__, int val __UNUSED__, void *data)
tmp_bg_timeout / 3600,
(tmp_bg_timeout / 60) - (60 * (tmp_bg_timeout / 3600)),
(tmp_bg_timeout) - (60 * (tmp_bg_timeout / 60)));
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
DialogDrawItems(bg_sel_dialog, di, 0, 0, 99999, 99999);
}
@ -2118,9 +2118,9 @@ SettingsBackground(Background * bg)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Desktop\n"
"Background Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Desktop\n"
"Background Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 3);
@ -2132,7 +2132,7 @@ SettingsBackground(Background * bg)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, _("BG Colour\n"));
DialogItemSetText(di, _("BG Colour\n"));
di = DialogAddItem(table, DITEM_NONE);
@ -2143,26 +2143,26 @@ SettingsBackground(Background * bg)
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemButtonSetText(di, _("Move to Front\n"));
DialogItemSetText(di, _("Move to Front\n"));
DialogItemSetCallback(di, CB_ConfigureFrontBG, 0, NULL);
DialogBindKey(d, "F", CB_ConfigureFrontBG, 0);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemButtonSetText(di, _("Duplicate\n"));
DialogItemSetText(di, _("Duplicate\n"));
DialogItemSetCallback(di, CB_ConfigureNewBG, 0, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemButtonSetText(di, _("Unlist\n"));
DialogItemSetText(di, _("Unlist\n"));
DialogItemSetCallback(di, CB_ConfigureDelBG, 0, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemButtonSetText(di, _("Delete File\n"));
DialogItemSetText(di, _("Delete File\n"));
DialogItemSetCallback(di, CB_ConfigureDelBG, 0, NULL);
DialogBindKey(d, "D", CB_ConfigureDelBG, 0);
DialogBindKey(d, "Delete", CB_ConfigureDelBG, 1);
@ -2171,7 +2171,7 @@ SettingsBackground(Background * bg)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, _("Red:\n"));
DialogItemSetText(di, _("Red:\n"));
di = w1 = tmp_w[0] = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2185,7 +2185,7 @@ SettingsBackground(Background * bg)
di = w2 = tmp_w[1] = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Use background image"));
DialogItemSetText(di, _("Use background image"));
DialogItemCheckButtonSetState(di, tmp_bg_image);
DialogItemCheckButtonSetPtr(di, &tmp_bg_image);
@ -2193,7 +2193,7 @@ SettingsBackground(Background * bg)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, _("Green:\n"));
DialogItemSetText(di, _("Green:\n"));
di = w3 = tmp_w[2] = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2207,7 +2207,7 @@ SettingsBackground(Background * bg)
di = w4 = tmp_w[3] = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Keep aspect on scale"));
DialogItemSetText(di, _("Keep aspect on scale"));
DialogItemCheckButtonSetState(di, tmp_bg_keep_aspect);
DialogItemCheckButtonSetPtr(di, &tmp_bg_keep_aspect);
@ -2215,7 +2215,7 @@ SettingsBackground(Background * bg)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, _("Blue:\n"));
DialogItemSetText(di, _("Blue:\n"));
di = w5 = tmp_w[4] = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2229,7 +2229,7 @@ SettingsBackground(Background * bg)
di = w6 = tmp_w[5] = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Tile image across background"));
DialogItemSetText(di, _("Tile image across background"));
DialogItemCheckButtonSetState(di, tmp_bg_tile);
DialogItemCheckButtonSetPtr(di, &tmp_bg_tile);
@ -2244,9 +2244,9 @@ SettingsBackground(Background * bg)
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 512, 512);
DialogItemSetColSpan(di, 2);
DialogItemTextSetText(di,
_("Background\n" "Image\n" "Scaling\n" "and\n"
"Alignment\n"));
DialogItemSetText(di,
_("Background\n" "Image\n" "Scaling\n" "and\n"
"Alignment\n"));
table2 = DialogAddItem(table, DITEM_TABLE);
DialogItemSetPadding(table2, 2, 2, 2, 2);
@ -2326,14 +2326,14 @@ SettingsBackground(Background * bg)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Use dithering in Hi-Colour"));
DialogItemSetText(di, _("Use dithering in Hi-Colour"));
DialogItemCheckButtonSetState(di, tmp_hiq);
DialogItemCheckButtonSetPtr(di, &tmp_hiq);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Background overrides theme"));
DialogItemSetText(di, _("Background overrides theme"));
DialogItemCheckButtonSetState(di, tmp_userbg);
DialogItemCheckButtonSetPtr(di, &tmp_userbg);
@ -2346,7 +2346,7 @@ SettingsBackground(Background * bg)
tmp_bg_timeout / 3600,
(tmp_bg_timeout / 60) - (60 * (tmp_bg_timeout / 3600)),
(tmp_bg_timeout) - (60 * (tmp_bg_timeout / 60)));
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetColSpan(di, 3);
@ -2373,7 +2373,7 @@ SettingsBackground(Background * bg)
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, "<-");
DialogItemSetText(di, "<-");
DialogItemSetCallback(di, CB_BGPrev, 0, NULL);
DialogBindKey(d, "Left", CB_BGPrev, 0);
DialogBindKey(d, "BackSpace", CB_BGPrev, 0);
@ -2381,7 +2381,7 @@ SettingsBackground(Background * bg)
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, "->");
DialogItemSetText(di, "->");
DialogItemSetCallback(di, CB_BGNext, 0, NULL);
DialogBindKey(d, "Right", CB_BGNext, 0);
DialogBindKey(d, "space", CB_BGNext, 0);
@ -2389,7 +2389,7 @@ SettingsBackground(Background * bg)
di = DialogAddItem(table, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, _("Pre-scan BG's"));
DialogItemSetText(di, _("Pre-scan BG's"));
DialogItemSetCallback(di, CB_BGScan, 0, NULL);
table2 = DialogAddItem(table, DITEM_TABLE);
@ -2399,19 +2399,19 @@ SettingsBackground(Background * bg)
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, _("Sort by File"));
DialogItemSetText(di, _("Sort by File"));
DialogItemSetCallback(di, CB_BGSortFile, 0, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, _("Sort by Attr."));
DialogItemSetText(di, _("Sort by Attr."));
DialogItemSetCallback(di, CB_BGSortAttrib, 0, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemButtonSetText(di, _("Sort by Image"));
DialogItemSetText(di, _("Sort by Image"));
DialogItemSetCallback(di, CB_BGSortContent, 0, NULL);
di = bg_sel = DialogAddItem(table, DITEM_AREA);

44
src/desktops.c
View File

@ -1729,7 +1729,7 @@ CB_DesktopDisplayRedraw(Dialog * d __UNUSED__, int val, void *data)
Esnprintf(s, sizeof(s), _("%i Desktops"), tmp_desktops);
else
Esnprintf(s, sizeof(s), _("%i Desktop"), tmp_desktops);
DialogItemTextSetText(tmp_desk_text, s);
DialogItemSetText(tmp_desk_text, s);
DialogDrawItems(tmp_desk_dialog, tmp_desk_text, 0, 0, 99999, 99999);
}
@ -1772,9 +1772,9 @@ SettingsDesktops(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Multiple Desktop\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Multiple Desktop\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -1787,7 +1787,7 @@ SettingsDesktops(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemTextSetText(di, _("Number of virtual desktops:\n"));
DialogItemSetText(di, _("Number of virtual desktops:\n"));
di = tmp_desk_text = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -1797,7 +1797,7 @@ SettingsDesktops(void)
Esnprintf(s, sizeof(s), _("%i Desktops"), tmp_desktops);
else
Esnprintf(s, sizeof(s), _("%i Desktop"), tmp_desktops);
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
di = slider = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -1826,7 +1826,7 @@ SettingsDesktops(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Wrap desktops around"));
DialogItemSetText(di, _("Wrap desktops around"));
DialogItemCheckButtonSetState(di, tmp_desktop_wraparound);
DialogItemCheckButtonSetPtr(di, &tmp_desktop_wraparound);
@ -1840,7 +1840,7 @@ SettingsDesktops(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Display desktop dragbar"));
DialogItemSetText(di, _("Display desktop dragbar"));
DialogItemCheckButtonSetState(di, tmp_dragbar);
DialogItemCheckButtonSetPtr(di, &tmp_dragbar);
@ -1849,13 +1849,13 @@ SettingsDesktops(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Drag bar position:"));
DialogItemSetText(di, _("Drag bar position:"));
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Top"));
DialogItemSetText(di, _("Top"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 2);
@ -1863,7 +1863,7 @@ SettingsDesktops(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Bottom"));
DialogItemSetText(di, _("Bottom"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 3);
@ -1871,7 +1871,7 @@ SettingsDesktops(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Left"));
DialogItemSetText(di, _("Left"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 0);
@ -1879,7 +1879,7 @@ SettingsDesktops(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Right"));
DialogItemSetText(di, _("Right"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_dragdir);
@ -1979,7 +1979,7 @@ CB_AreaDisplayRedraw(Dialog * d __UNUSED__, int val, void *data)
9 - tmp_area_y);
else
Esnprintf(s, sizeof(s), _("1\nScreen in size"));
DialogItemTextSetText(tmp_area_text, s);
DialogItemSetText(tmp_area_text, s);
DialogDrawItems(tmp_area_dialog, tmp_area_text, 0, 0, 99999, 99999);
}
@ -2025,9 +2025,9 @@ SettingsArea(void)
di = DialogAddItem(table2, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Virtual Desktop\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Virtual Desktop\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2038,7 +2038,7 @@ SettingsArea(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, _("Virtual Desktop size:\n"));
DialogItemSetText(di, _("Virtual Desktop size:\n"));
di = tmp_area_text = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2048,7 +2048,7 @@ SettingsArea(void)
9 - tmp_area_y);
else
Esnprintf(s, sizeof(s), _("1\nScreen in size"));
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
table2 = DialogAddItem(table, DITEM_TABLE);
DialogItemTableSetOptions(table2, 2, 0, 0, 0);
@ -2092,21 +2092,21 @@ SettingsArea(void)
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Wrap virtual desktops around"));
DialogItemSetText(di, _("Wrap virtual desktops around"));
DialogItemCheckButtonSetState(di, tmp_area_wraparound);
DialogItemCheckButtonSetPtr(di, &tmp_area_wraparound);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Enable edge flip"));
DialogItemSetText(di, _("Enable edge flip"));
DialogItemCheckButtonSetState(di, tmp_edge_flip);
DialogItemCheckButtonSetPtr(di, &tmp_edge_flip);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, _("Resistance at edge of screen:\n"));
DialogItemSetText(di, _("Resistance at edge of screen:\n"));
di = slider = DialogAddItem(table, DITEM_SLIDER);
DialogItemSliderSetMinLength(di, 10);

113
src/dialog.c
View File

@ -71,23 +71,12 @@ typedef struct
typedef struct
{
char *text;
} DItemButton;
typedef struct
{
char *text;
Window check_win;
int check_orig_w, check_orig_h;
char onoff;
char *onoff_ptr;
} DItemCheckButton;
typedef struct
{
char *text;
} DItemText;
typedef struct
{
char *image;
@ -110,7 +99,6 @@ typedef struct
typedef struct
{
char *text;
Window radio_win;
int radio_orig_w, radio_orig_h;
char onoff;
@ -141,11 +129,10 @@ struct _ditem
char hilited;
char clicked;
Window win;
char *text;
union
{
DItemButton button;
DItemCheckButton check_button;
DItemText text;
DItemTable table;
DItemImage image;
DItemSeparator separator;
@ -303,10 +290,11 @@ DialogSetText(Dialog * d, const char *text)
if (d->text)
Efree(d->text);
d->text = Estrdup(text);
if ((!d->tclass) || (!d->iclass))
return;
TextSize(d->tclass, 0, 0, STATE_NORMAL, text, &w, &h, 17);
d->w = w + d->iclass->padding.left + d->iclass->padding.right;
d->h = h + d->iclass->padding.top + d->iclass->padding.bottom;
@ -695,10 +683,11 @@ DialogAddItem(DItem * dii, int type)
di->align_v = 512;
di->row_span = 1;
di->col_span = 1;
di->text = NULL;
switch (di->type)
{
case DITEM_NONE:
default:
break;
case DITEM_AREA:
di->item.area.area_win = 0;
@ -706,20 +695,13 @@ DialogAddItem(DItem * dii, int type)
di->item.area.h = 32;
di->item.area.event_func = NULL;
break;
case DITEM_BUTTON:
di->item.button.text = NULL;
break;
case DITEM_CHECKBUTTON:
di->item.check_button.text = NULL;
di->item.check_button.check_win = 0;
di->item.check_button.onoff = 0;
di->item.check_button.onoff_ptr = NULL;
di->item.check_button.check_orig_w = 10;
di->item.check_button.check_orig_h = 10;
break;
case DITEM_TEXT:
di->item.text.text = NULL;
break;
case DITEM_TABLE:
di->item.table.num_columns = 1;
di->item.table.border = 0;
@ -735,7 +717,6 @@ DialogAddItem(DItem * dii, int type)
di->item.separator.horizontal = 0;
break;
case DITEM_RADIOBUTTON:
di->item.radio_button.text = NULL;
di->item.radio_button.radio_win = 0;
di->item.radio_button.onoff = 0;
di->item.radio_button.val = 0;
@ -788,8 +769,6 @@ DialogAddItem(DItem * dii, int type)
di->item.slider.in_drag = 0;
di->item.slider.wanted_val = 0;
break;
default:
break;
}
if (dii)
@ -1068,8 +1047,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
di->h = ih;
break;
case DITEM_BUTTON:
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->item.button.text, &iw,
&ih, 17);
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->text, &iw, &ih, 17);
iw += di->iclass->padding.left + di->iclass->padding.right;
ih += di->iclass->padding.top + di->iclass->padding.bottom;
di->win = ECreateWindow(d->win, -20, -20, 2, 2, 0);
@ -1111,8 +1089,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
imlib_free_image();
}
}
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->item.check_button.text,
&iw, &ih, 17);
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->text, &iw, &ih, 17);
if (ih < di->item.check_button.check_orig_h)
ih = di->item.check_button.check_orig_h;
iw += di->item.check_button.check_orig_w + di->iclass->padding.left;
@ -1128,8 +1105,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
di->h = ih;
break;
case DITEM_TEXT:
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->item.text.text, &iw, &ih,
17);
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->text, &iw, &ih, 17);
di->w = iw;
di->h = ih;
break;
@ -1181,8 +1157,7 @@ DialogRealizeItem(Dialog * d, DItem * di)
imlib_free_image();
}
}
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->item.radio_button.text,
&iw, &ih, 17);
TextSize(di->tclass, 0, 0, STATE_NORMAL, di->text, &iw, &ih, 17);
if (ih < di->item.radio_button.radio_orig_h)
ih = di->item.radio_button.radio_orig_h;
iw += di->item.radio_button.radio_orig_w + di->iclass->padding.left;
@ -1609,7 +1584,7 @@ DialogDrawItem(Dialog * d, DItem * di)
ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0, state, 0,
ST_WIDGET);
TextclassApply(di->iclass, di->win, di->w, di->h, 0, 0, state, 1,
di->tclass, di->item.button.text);
di->tclass, di->text);
break;
case DITEM_AREA:
ImageclassApply(di->iclass, di->win, di->w, di->h, 0, 0,
@ -1634,8 +1609,7 @@ DialogDrawItem(Dialog * d, DItem * di)
di->item.check_button.check_orig_h, 0, 0, state,
0, ST_WIDGET);
EClearArea(d->win, di->x, di->y, di->w, di->h, False);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.check_button.text,
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, di->text,
di->x + di->item.check_button.check_orig_w +
di->iclass->padding.left, di->y,
di->w - di->item.check_button.check_orig_w -
@ -1644,9 +1618,8 @@ DialogDrawItem(Dialog * d, DItem * di)
break;
case DITEM_TEXT:
EClearArea(d->win, di->x, di->y, di->w, di->h, False);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.text.text, di->x, di->y, di->w, 99999, 17,
di->tclass->justification);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, di->text,
di->x, di->y, di->w, 99999, 17, di->tclass->justification);
break;
case DITEM_IMAGE:
break;
@ -1677,8 +1650,7 @@ DialogDrawItem(Dialog * d, DItem * di)
di->item.radio_button.radio_orig_w, 0, 0, state,
0, ST_WIDGET);
EClearArea(d->win, di->x, di->y, di->w, di->h, False);
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL,
di->item.radio_button.text,
TextDraw(di->tclass, d->win, 0, 0, STATE_NORMAL, di->text,
di->x + di->item.radio_button.radio_orig_w +
di->iclass->padding.left, di->y,
di->w - di->item.radio_button.radio_orig_w -
@ -1737,27 +1709,11 @@ DialogItemsRealize(Dialog * d)
}
void
DialogItemButtonSetText(DItem * di, const char *text)
DialogItemSetText(DItem * di, const char *text)
{
if (di->item.button.text)
Efree(di->item.button.text);
di->item.button.text = Estrdup(text);
}
void
DialogItemCheckButtonSetText(DItem * di, const char *text)
{
if (di->item.check_button.text)
Efree(di->item.check_button.text);
di->item.check_button.text = Estrdup(text);
}
void
DialogItemTextSetText(DItem * di, const char *text)
{
if (di->item.text.text)
Efree(di->item.text.text);
di->item.text.text = Estrdup(text);
if (di->text)
Efree(di->text);
di->text = Estrdup(text);
}
void
@ -1766,14 +1722,6 @@ DialogItemRadioButtonSetEventFunc(DItem * di, DialogItemCallbackFunc * func)
di->item.radio_button.event_func = func;
}
void
DialogItemRadioButtonSetText(DItem * di, const char *text)
{
if (di->item.radio_button.text)
Efree(di->item.radio_button.text);
di->item.radio_button.text = Estrdup(text);
}
void
DialogItemRadioButtonSetFirst(DItem * di, DItem * first)
{
@ -1813,6 +1761,7 @@ void
DialogItemCheckButtonSetPtr(DItem * di, char *onoff_ptr)
{
di->item.check_button.onoff_ptr = onoff_ptr;
DialogItemCheckButtonSetState(di, *onoff_ptr);
}
void
@ -1951,28 +1900,18 @@ DialogFreeItem(DItem * di)
for (i = 0; i < di->item.table.num_items; i++)
DialogFreeItem(di->item.table.items[i]);
}
if (di->text)
Efree(di->text);
switch (di->type)
{
case DITEM_BUTTON:
if (di->item.button.text)
Efree(di->item.button.text);
break;
case DITEM_CHECKBUTTON:
if (di->item.check_button.text)
Efree(di->item.check_button.text);
break;
case DITEM_TEXT:
if (di->item.text.text)
Efree(di->item.text.text);
default:
break;
case DITEM_IMAGE:
if (di->item.image.image)
Efree(di->item.image.image);
break;
case DITEM_RADIOBUTTON:
if (di->item.radio_button.text)
Efree(di->item.radio_button.text);
break;
case DITEM_SLIDER:
if (di->item.slider.ic_base)
di->item.slider.ic_base->ref_count--;
@ -1981,14 +1920,10 @@ DialogFreeItem(DItem * di)
if (di->item.slider.ic_border)
di->item.slider.ic_border->ref_count--;
break;
case DITEM_SEPARATOR:
break;
case DITEM_TABLE:
if (di->item.table.items)
Efree(di->item.table.items);
break;
default:
break;
}
if (di->iclass)

62
src/focus.c
View File

@ -713,8 +713,7 @@ SettingsFocus(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Focus\n" "Settings Dialog\n"));
DialogItemSetText(di, _("Enlightenment Focus\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -727,7 +726,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("Focus follows pointer"));
DialogItemSetText(di, _("Focus follows pointer"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 0);
@ -735,7 +734,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("Focus follows pointer sloppily"));
DialogItemSetText(di, _("Focus follows pointer sloppily"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -743,7 +742,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("Focus follows mouse clicks"));
DialogItemSetText(di, _("Focus follows mouse clicks"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_focus);
@ -758,7 +757,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Clicking in a window always raises it"));
DialogItemSetText(di, _("Clicking in a window always raises it"));
DialogItemCheckButtonSetState(di, tmp_clickalways);
DialogItemCheckButtonSetPtr(di, &tmp_clickalways);
@ -772,7 +771,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("All new windows first get the focus"));
DialogItemSetText(di, _("All new windows first get the focus"));
DialogItemCheckButtonSetState(di, tmp_new_focus);
DialogItemCheckButtonSetPtr(di, &tmp_new_focus);
@ -780,7 +779,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Only new dialog windows get the focus"));
DialogItemSetText(di, _("Only new dialog windows get the focus"));
DialogItemCheckButtonSetState(di, tmp_popup_focus);
DialogItemCheckButtonSetPtr(di, &tmp_popup_focus);
@ -788,9 +787,9 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Only new dialogs whose owner is focused get the focus"));
DialogItemSetText(di,
_
("Only new dialogs whose owner is focused get the focus"));
DialogItemCheckButtonSetState(di, tmp_owner_popup_focus);
DialogItemCheckButtonSetPtr(di, &tmp_owner_popup_focus);
@ -798,7 +797,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Raise windows while switching focus"));
DialogItemSetText(di, _("Raise windows while switching focus"));
DialogItemCheckButtonSetState(di, tmp_raise_focus);
DialogItemCheckButtonSetPtr(di, &tmp_raise_focus);
@ -806,9 +805,8 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Send mouse pointer to window while switching focus"));
DialogItemSetText(di,
_("Send mouse pointer to window while switching focus"));
DialogItemCheckButtonSetState(di, tmp_warp_focus);
DialogItemCheckButtonSetPtr(di, &tmp_warp_focus);
@ -816,9 +814,8 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Always send mouse pointer to window on focus switch"));
DialogItemSetText(di,
_("Always send mouse pointer to window on focus switch"));
DialogItemCheckButtonSetState(di, tmp_warp_always);
DialogItemCheckButtonSetPtr(di, &tmp_warp_always);
@ -832,7 +829,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Display and use focus list"));
DialogItemSetText(di, _("Display and use focus list"));
DialogItemCheckButtonSetState(di, tmp_display_warp);
DialogItemCheckButtonSetPtr(di, &tmp_display_warp);
@ -840,7 +837,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Include sticky windows in focus list"));
DialogItemSetText(di, _("Include sticky windows in focus list"));
DialogItemCheckButtonSetState(di, tmp_showsticky);
DialogItemCheckButtonSetPtr(di, &tmp_showsticky);
@ -848,7 +845,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Include shaded windows in focus list"));
DialogItemSetText(di, _("Include shaded windows in focus list"));
DialogItemCheckButtonSetState(di, tmp_showshaded);
DialogItemCheckButtonSetPtr(di, &tmp_showshaded);
@ -856,8 +853,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_("Include iconified windows in focus list"));
DialogItemSetText(di, _("Include iconified windows in focus list"));
DialogItemCheckButtonSetState(di, tmp_showiconified);
DialogItemCheckButtonSetPtr(di, &tmp_showiconified);
@ -865,7 +861,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Focus windows while switching"));
DialogItemSetText(di, _("Focus windows while switching"));
DialogItemCheckButtonSetState(di, tmp_warpfocused);
DialogItemCheckButtonSetPtr(di, &tmp_warpfocused);
@ -873,7 +869,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Raise windows after focus switch"));
DialogItemSetText(di, _("Raise windows after focus switch"));
DialogItemCheckButtonSetState(di, tmp_raise_after_focus);
DialogItemCheckButtonSetPtr(di, &tmp_raise_after_focus);
@ -881,9 +877,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Send mouse pointer to window after focus switch"));
DialogItemSetText(di, _("Send mouse pointer to window after focus switch"));
DialogItemCheckButtonSetState(di, tmp_warp_after_focus);
DialogItemCheckButtonSetPtr(di, &tmp_warp_after_focus);
@ -898,15 +892,15 @@ SettingsFocus(void)
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemSetColSpan(di, 2);
DialogItemTextSetText(di,
_
("Focuslist image display policy (if one operation fails, try the next):"));
DialogItemSetText(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"));
DialogItemSetText(di, _("First E Icon, then App Icon"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 3);
@ -914,7 +908,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("First App Icon, then E Icon"));
DialogItemSetText(di, _("First App Icon, then E Icon"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 4);
@ -922,7 +916,7 @@ SettingsFocus(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("None"));
DialogItemSetText(di, _("None"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 0);
DialogItemRadioButtonGroupSetValPtr(radio2, &tmp_warp_icon_mode);

14
src/fx.c
View File

@ -993,9 +993,9 @@ FxSettings(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Miscellaneous Effects\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Miscellaneous Effects\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -1007,26 +1007,26 @@ FxSettings(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, _("Effects"));
DialogItemSetText(di, _("Effects"));
#if 0 /* Disabled */
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Enable Effect: Raindrops"));
DialogItemSetText(di, _("Enable Effect: Raindrops"));
DialogItemCheckButtonSetState(di, tmp_effect_raindrops);
DialogItemCheckButtonSetPtr(di, &tmp_effect_raindrops);
#endif
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Ripples"));
DialogItemSetText(di, _("Ripples"));
DialogItemCheckButtonSetState(di, tmp_effect_ripples);
DialogItemCheckButtonSetPtr(di, &tmp_effect_ripples);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Waves"));
DialogItemSetText(di, _("Waves"));
DialogItemCheckButtonSetState(di, tmp_effect_waves);
DialogItemCheckButtonSetPtr(di, &tmp_effect_waves);

74
src/groups.c
View File

@ -616,9 +616,9 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Window Group\n"
"Selection Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Window Group\n"
"Selection Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -632,14 +632,14 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, message);
DialogItemSetText(di, message);
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupCallback, 0, (void *)d);
DialogItemRadioButtonSetText(di, group_member_strings[0]);
DialogItemSetText(di, group_member_strings[0]);
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 0);
@ -650,7 +650,7 @@ ChooseGroupDialog(EWin * ewin, char *message, char group_select, int action)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetCallback(di, GroupCallback, i, NULL);
DialogItemRadioButtonSetText(di, group_member_strings[i]);
DialogItemSetText(di, group_member_strings[i]);
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, i);
}
@ -824,9 +824,9 @@ SettingsGroups(EWin * ewin)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Window Group\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Window Group\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -840,14 +840,14 @@ SettingsGroups(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _(" Pick the group to configure: "));
DialogItemSetText(di, _(" Pick the group to configure: "));
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupSelectCallback, 0, (void *)d);
DialogItemRadioButtonSetText(di, group_member_strings[0]);
DialogItemSetText(di, group_member_strings[0]);
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 0);
@ -858,7 +858,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetCallback(di, &GroupSelectCallback, i, (void *)d);
DialogItemRadioButtonSetText(di, group_member_strings[i]);
DialogItemSetText(di, group_member_strings[i]);
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, i);
}
@ -875,9 +875,9 @@ SettingsGroups(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di,
_(" The following actions are \n"
" applied to all group members: "));
DialogItemSetText(di,
_(" The following actions are \n"
" applied to all group members: "));
di_border = di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -885,7 +885,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_BORDER,
&(tmp_cfg.set_border));
DialogItemCheckButtonSetText(di, _("Changing Border Style"));
DialogItemSetText(di, _("Changing Border Style"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].set_border);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.set_border));
@ -895,7 +895,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback,
GROUP_FEATURE_ICONIFY, &(tmp_cfg.iconify));
DialogItemCheckButtonSetText(di, _("Iconifying"));
DialogItemSetText(di, _("Iconifying"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].iconify);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.iconify));
@ -905,7 +905,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_KILL,
&(tmp_cfg.kill));
DialogItemCheckButtonSetText(di, _("Killing"));
DialogItemSetText(di, _("Killing"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].kill);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.kill));
@ -915,7 +915,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_MOVE,
&(tmp_cfg.move));
DialogItemCheckButtonSetText(di, _("Moving"));
DialogItemSetText(di, _("Moving"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].move);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.move));
@ -925,7 +925,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_RAISE,
&(tmp_cfg.raise));
DialogItemCheckButtonSetText(di, _("Raising/Lowering"));
DialogItemSetText(di, _("Raising/Lowering"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].raise);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.raise));
@ -935,7 +935,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_STICK,
&(tmp_cfg.stick));
DialogItemCheckButtonSetText(di, _("Sticking"));
DialogItemSetText(di, _("Sticking"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].stick);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.stick));
@ -945,7 +945,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_SHADE,
&(tmp_cfg.shade));
DialogItemCheckButtonSetText(di, _("Shading"));
DialogItemSetText(di, _("Shading"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].shade);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.shade));
@ -955,7 +955,7 @@ SettingsGroups(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetCallback(di, &GroupFeatureChangeCallback, GROUP_FEATURE_MIRROR,
&(tmp_cfg.mirror));
DialogItemCheckButtonSetText(di, _("Mirror Shade/Iconify/Stick"));
DialogItemSetText(di, _("Mirror Shade/Iconify/Stick"));
DialogItemCheckButtonSetState(di, tmp_cfgs[0].mirror);
DialogItemCheckButtonSetPtr(di, &(tmp_cfg.mirror));
@ -1026,9 +1026,9 @@ SettingsDefaultGroupControl(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Default\n"
"Group Control Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Default\n"
"Group Control Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -1042,7 +1042,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _(" Per-group settings: "));
DialogItemSetText(di, _(" Per-group settings: "));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -1054,7 +1054,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Changing Border Style"));
DialogItemSetText(di, _("Changing Border Style"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.set_border);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.set_border));
@ -1062,7 +1062,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Iconifying"));
DialogItemSetText(di, _("Iconifying"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.iconify);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.iconify));
@ -1070,7 +1070,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Killing"));
DialogItemSetText(di, _("Killing"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.kill);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.kill));
@ -1078,7 +1078,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Moving"));
DialogItemSetText(di, _("Moving"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.move);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.move));
@ -1086,7 +1086,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Raising/Lowering"));
DialogItemSetText(di, _("Raising/Lowering"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.raise);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.raise));
@ -1094,7 +1094,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Sticking"));
DialogItemSetText(di, _("Sticking"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.stick);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.stick));
@ -1102,7 +1102,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Shading"));
DialogItemSetText(di, _("Shading"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.shade);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.shade));
@ -1110,7 +1110,7 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Mirror Shade/Iconify/Stick"));
DialogItemSetText(di, _("Mirror Shade/Iconify/Stick"));
DialogItemCheckButtonSetState(di, tmp_group_cfg.mirror);
DialogItemCheckButtonSetPtr(di, &(tmp_group_cfg.mirror));
@ -1125,13 +1125,13 @@ SettingsDefaultGroupControl(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _(" Global settings: "));
DialogItemSetText(di, _(" Global settings: "));
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Swap Window Locations"));
DialogItemSetText(di, _("Swap Window Locations"));
DialogItemCheckButtonSetState(di, tmp_group_swap);
DialogItemCheckButtonSetPtr(di, &(tmp_group_swap));

72
src/iconify.c
View File

@ -2147,7 +2147,7 @@ CB_IconSizeSlider(Dialog * d, int val __UNUSED__, void *data)
di = data;
Esnprintf(s, sizeof(s), _("Icon size: %2d"), tmp_ib_iconsize);
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
DialogDrawItems(d, di, 0, 0, 99999, 99999);
}
@ -2209,8 +2209,7 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table2, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Iconbox\n" "Settings Dialog\n"));
DialogItemSetText(di, _("Enlightenment Iconbox\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2221,14 +2220,14 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Transparent background"));
DialogItemSetText(di, _("Transparent background"));
DialogItemCheckButtonSetState(di, tmp_ib_nobg);
DialogItemCheckButtonSetPtr(di, &tmp_ib_nobg);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Hide inner border"));
DialogItemSetText(di, _("Hide inner border"));
DialogItemCheckButtonSetState(di, tmp_ib_cover_hide);
DialogItemCheckButtonSetPtr(di, &tmp_ib_cover_hide);
@ -2237,7 +2236,7 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Show icon names"));
DialogItemSetText(di, _("Show icon names"));
DialogItemCheckButtonSetState(di, tmp_ib_shownames);
DialogItemCheckButtonSetPtr(di, &tmp_ib_shownames);
}
@ -2245,21 +2244,21 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Draw base image behind Icons"));
DialogItemSetText(di, _("Draw base image behind Icons"));
DialogItemCheckButtonSetState(di, tmp_ib_draw_icon_base);
DialogItemCheckButtonSetPtr(di, &tmp_ib_draw_icon_base);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Hide scrollbar when not needed"));
DialogItemSetText(di, _("Hide scrollbar when not needed"));
DialogItemCheckButtonSetState(di, tmp_ib_scrollbar_hide);
DialogItemCheckButtonSetPtr(di, &tmp_ib_scrollbar_hide);
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Automatically resize to fit Icons"));
DialogItemSetText(di, _("Automatically resize to fit Icons"));
DialogItemCheckButtonSetState(di, tmp_ib_auto_resize);
DialogItemCheckButtonSetPtr(di, &tmp_ib_auto_resize);
@ -2268,9 +2267,7 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di,
_
("Animate when iconifying to this Iconbox"));
DialogItemSetText(di, _("Animate when iconifying to this Iconbox"));
DialogItemCheckButtonSetState(di, tmp_ib_animate);
DialogItemCheckButtonSetPtr(di, &tmp_ib_animate);
}
@ -2279,9 +2276,8 @@ IconboxConfigure(Iconbox * ib)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di,
_
("Alignment of anchoring when automatically resizing:"));
DialogItemSetText(di,
_("Alignment of anchoring when automatically resizing:"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2303,34 +2299,32 @@ IconboxConfigure(Iconbox * ib)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di,
_
("Icon image display policy (if one operation fails, try the next):"));
DialogItemSetText(di,
_
("Icon image display policy (if one operation fails, try the next):"));
radio4 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di,
_
("Snapshot Windows, Use application icon, Use Enlightenment Icon"));
DialogItemSetText(di,
_
("Snapshot Windows, Use application icon, Use Enlightenment Icon"));
DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 0);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di,
_
("Use application icon, Use Enlightenment Icon, Snapshot Window"));
DialogItemSetText(di,
_
("Use application icon, Use Enlightenment Icon, Snapshot Window"));
DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 1);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di,
_
("Use Enlightenment Icon, Snapshot Window"));
DialogItemSetText(di, _("Use Enlightenment Icon, Snapshot Window"));
DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio4, &tmp_ib_mode);
@ -2346,7 +2340,7 @@ IconboxConfigure(Iconbox * ib)
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
Esnprintf(s, sizeof(s), _("Icon size: %2d"), tmp_ib_iconsize);
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -2370,45 +2364,45 @@ IconboxConfigure(Iconbox * ib)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Orientation:"));
DialogItemSetText(di, _("Orientation:"));
di = DialogAddItem(table2, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Scrollbar side:"));
DialogItemSetText(di, _("Scrollbar side:"));
di = DialogAddItem(table2, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Scrollbar arrows:"));
DialogItemSetText(di, _("Scrollbar arrows:"));
radio1 = di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Horizontal"));
DialogItemSetText(di, _("Horizontal"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 0);
radio2 = di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Left / Top"));
DialogItemSetText(di, _("Left / Top"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 0);
radio3 = di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Start"));
DialogItemSetText(di, _("Start"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 0);
di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Vertical"));
DialogItemSetText(di, _("Vertical"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio1, &tmp_ib_vert);
@ -2416,7 +2410,7 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Right / Bottom"));
DialogItemSetText(di, _("Right / Bottom"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio2, &tmp_ib_side);
@ -2424,7 +2418,7 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Both ends"));
DialogItemSetText(di, _("Both ends"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -2434,7 +2428,7 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("End"));
DialogItemSetText(di, _("End"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 2);
@ -2444,7 +2438,7 @@ IconboxConfigure(Iconbox * ib)
di = DialogAddItem(table2, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("None"));
DialogItemSetText(di, _("None"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetValPtr(radio3, &tmp_ib_arrows);

30
src/mod-trans.c
View File

@ -87,7 +87,7 @@ CB_ThemeTransparency(Dialog * d __UNUSED__, int val __UNUSED__, void *data)
di = (DItem *) data;
Esnprintf(s, sizeof(s), _("Theme transparency: %2d"),
tmp_theme_transparency);
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
DialogDrawItems(tr_sel_dialog, di, 0, 0, 99999, 99999);
/* FIXME - We may not want to do this unless things are speeded up */
@ -132,9 +132,9 @@ SettingsTransparency(void)
DialogItemSetColSpan(di, 7);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Selective Transparency\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Selective Transparency\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 7);
@ -148,7 +148,7 @@ SettingsTransparency(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Changes Might Require Restart:"));
DialogItemSetText(di, _("Changes Might Require Restart:"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 7);
@ -166,49 +166,49 @@ SettingsTransparency(void)
DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Borders:"));
DialogItemSetText(di, _("Borders:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Menus:"));
DialogItemSetText(di, _("Menus:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Hilights:"));
DialogItemSetText(di, _("Hilights:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("E Widgets:"));
DialogItemSetText(di, _("E Widgets:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("E Dialogs:"));
DialogItemSetText(di, _("E Dialogs:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Tooltips:"));
DialogItemSetText(di, _("Tooltips:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 1024);
DialogItemTextSetText(di, _("Opaque"));
DialogItemSetText(di, _("Opaque"));
radio_border = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 15, 2, 2);
@ -251,7 +251,7 @@ SettingsTransparency(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 1024);
DialogItemTextSetText(di, _("Background"));
DialogItemSetText(di, _("Background"));
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 15, 2, 2);
@ -297,7 +297,7 @@ SettingsTransparency(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 1024);
DialogItemTextSetText(di, _("Glass"));
DialogItemSetText(di, _("Glass"));
di = DialogAddItem(table, DITEM_NONE);
DialogItemSetPadding(di, 2, 15, 2, 2);
@ -345,7 +345,7 @@ SettingsTransparency(void)
DialogItemSetAlign(di, 512, 512);
Esnprintf(s, sizeof(s), _("Theme transparency: %2d"),
tmp_theme_transparency);
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetColSpan(di, 7);

55
src/pager.c
View File

@ -1732,7 +1732,7 @@ CB_PagerScanSlide(Dialog * d __UNUSED__, int val __UNUSED__,
Esnprintf(s, sizeof(s), "%s %03i %s", _("Pager scanning speed:"),
tmp_pager_scan_speed, _("lines per second"));
DialogItemTextSetText(pager_scan_speed_label, s);
DialogItemSetText(pager_scan_speed_label, s);
DialogDrawItems(pager_settings_dialog, pager_scan_speed_label, 0, 0, 99999,
99999);
}
@ -1781,9 +1781,9 @@ SettingsPager(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Desktop & Area\n"
"Pager Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Desktop & Area\n"
"Pager Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -1796,7 +1796,7 @@ SettingsPager(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable pager display"));
DialogItemSetText(di, _("Enable pager display"));
DialogItemCheckButtonSetState(di, tmp_show_pagers);
DialogItemCheckButtonSetPtr(di, &tmp_show_pagers);
@ -1804,8 +1804,7 @@ SettingsPager(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_("Make miniature snapshots of the screen"));
DialogItemSetText(di, _("Make miniature snapshots of the screen"));
DialogItemCheckButtonSetState(di, tmp_pager_snap);
DialogItemCheckButtonSetPtr(di, &tmp_pager_snap);
@ -1813,9 +1812,7 @@ SettingsPager(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Smooth high quality snapshots in snapshot mode"));
DialogItemSetText(di, _("Smooth high quality snapshots in snapshot mode"));
DialogItemCheckButtonSetState(di, tmp_pager_hiq);
DialogItemCheckButtonSetPtr(di, &tmp_pager_hiq);
@ -1823,9 +1820,7 @@ SettingsPager(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Zoom in on pager windows when mouse is over them"));
DialogItemSetText(di, _("Zoom in on pager windows when mouse is over them"));
DialogItemCheckButtonSetState(di, tmp_pager_zoom);
DialogItemCheckButtonSetPtr(di, &tmp_pager_zoom);
@ -1833,9 +1828,8 @@ SettingsPager(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Pop up window title when mouse is over the window"));
DialogItemSetText(di,
_("Pop up window title when mouse is over the window"));
DialogItemCheckButtonSetState(di, tmp_pager_title);
DialogItemCheckButtonSetPtr(di, &tmp_pager_title);
@ -1843,8 +1837,7 @@ SettingsPager(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_("Continuously scan screen to update pager"));
DialogItemSetText(di, _("Continuously scan screen to update pager"));
DialogItemCheckButtonSetState(di, tmp_pager_do_scan);
DialogItemCheckButtonSetPtr(di, &tmp_pager_do_scan);
@ -1855,7 +1848,7 @@ SettingsPager(void)
DialogItemSetAlign(di, 0, 512);
Esnprintf(s, sizeof(s), "%s %03i %s", _("Pager scanning speed:"),
tmp_pager_scan_speed, _("lines per second"));
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -1873,13 +1866,13 @@ SettingsPager(void)
DialogItemSetFill(di, 0, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di, _("Mouse button to select and drag windows:"));
DialogItemSetText(di, _("Mouse button to select and drag windows:"));
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Left"));
DialogItemSetText(di, _("Left"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -1887,7 +1880,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Middle"));
DialogItemSetText(di, _("Middle"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 2);
@ -1895,7 +1888,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Right"));
DialogItemSetText(di, _("Right"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_pager_win_button);
@ -1905,13 +1898,13 @@ SettingsPager(void)
DialogItemSetFill(di, 0, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di, _("Mouse button to select desktops:"));
DialogItemSetText(di, _("Mouse button to select desktops:"));
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Left"));
DialogItemSetText(di, _("Left"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -1919,7 +1912,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Middle"));
DialogItemSetText(di, _("Middle"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 2);
@ -1927,7 +1920,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Right"));
DialogItemSetText(di, _("Right"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_pager_sel_button);
@ -1937,13 +1930,13 @@ SettingsPager(void)
DialogItemSetFill(di, 0, 0);
DialogItemSetColSpan(di, 2);
DialogItemSetAlign(di, 0, 0);
DialogItemTextSetText(di, _("Mouse button to display pager menu:"));
DialogItemSetText(di, _("Mouse button to display pager menu:"));
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Left"));
DialogItemSetText(di, _("Left"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -1951,7 +1944,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Middle"));
DialogItemSetText(di, _("Middle"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 2);
@ -1959,7 +1952,7 @@ SettingsPager(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Right"));
DialogItemSetText(di, _("Right"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_pager_menu_button);

160
src/settings.c
View File

@ -227,9 +227,9 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Move & Resize\n"
"Method Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Move & Resize\n"
"Method Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -242,18 +242,18 @@ SettingsMoveResize(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Move Methods:"));
DialogItemSetText(di, _("Move Methods:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Resize Methods:"));
DialogItemSetText(di, _("Resize Methods:"));
radio1 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Opaque"));
DialogItemSetText(di, _("Opaque"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 0);
/* DialogItemRadioButtonSetEventFunc(di, je_movectrl); */
@ -261,7 +261,7 @@ SettingsMoveResize(void)
radio2 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Opaque"));
DialogItemSetText(di, _("Opaque"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 0);
/* DialogItemRadioButtonSetEventFunc(di, je_resizectrl); */
@ -269,7 +269,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Technical"));
DialogItemSetText(di, _("Technical"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 1);
/* DialogItemRadioButtonSetEventFunc(di, je_movectrl); */
@ -277,7 +277,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Technical"));
DialogItemSetText(di, _("Technical"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 1);
/* DialogItemRadioButtonSetEventFunc(di, je_resizectrl); */
@ -285,7 +285,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Box"));
DialogItemSetText(di, _("Box"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 2);
/* DialogItemRadioButtonSetEventFunc(di, je_movectrl); */
@ -293,7 +293,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Box"));
DialogItemSetText(di, _("Box"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 2);
/* DialogItemRadioButtonSetEventFunc(di, je_resizectrl); */
@ -301,7 +301,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Shaded"));
DialogItemSetText(di, _("Shaded"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 3);
/* DialogItemRadioButtonSetEventFunc(di, je_movectrl); */
@ -309,7 +309,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Shaded"));
DialogItemSetText(di, _("Shaded"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 3);
/* DialogItemRadioButtonSetEventFunc(di, je_resizectrl); */
@ -317,7 +317,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Semi-Solid"));
DialogItemSetText(di, _("Semi-Solid"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 4);
/* DialogItemRadioButtonSetEventFunc(di, je_movectrl); */
@ -325,7 +325,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Semi-Solid"));
DialogItemSetText(di, _("Semi-Solid"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 4);
DialogItemRadioButtonGroupSetValPtr(radio2, &tmp_resize);
@ -334,7 +334,7 @@ SettingsMoveResize(void)
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Translucent"));
DialogItemSetText(di, _("Translucent"));
DialogItemRadioButtonSetFirst(di, radio1);
DialogItemRadioButtonGroupSetVal(di, 5);
DialogItemRadioButtonGroupSetValPtr(radio1, &tmp_move);
@ -353,13 +353,13 @@ SettingsMoveResize(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Move/Resize Geometry Info Postion:"));
DialogItemSetText(di, _("Move/Resize Geometry Info Postion:"));
radio3 = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Window Center (O/T/B Methods)"));
DialogItemSetText(di, _("Window Center (O/T/B Methods)"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -367,7 +367,7 @@ SettingsMoveResize(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Always Screen corner"));
DialogItemSetText(di, _("Always Screen corner"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 2);
@ -375,7 +375,7 @@ SettingsMoveResize(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Don't show"));
DialogItemSetText(di, _("Don't show"));
DialogItemRadioButtonSetFirst(di, radio3);
DialogItemRadioButtonGroupSetVal(di, 0);
DialogItemRadioButtonGroupSetValPtr(radio3, &tmp_geominfo);
@ -390,7 +390,7 @@ SettingsMoveResize(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Update window while moving"));
DialogItemSetText(di, _("Update window while moving"));
DialogItemCheckButtonSetState(di, tmp_update_while_moving);
DialogItemCheckButtonSetPtr(di, &tmp_update_while_moving);
@ -423,7 +423,7 @@ SettingsMoveResize(void)
* DialogItemSetPadding(di, 2, 2, 2, 2);
* DialogItemSetFill(di, 0, 0);
* DialogItemSetAlign(di, 0, 512);
* DialogItemTextSetText(di, _("Example"));
* DialogItemSetText(di, _("Example"));
*
* di = DialogAddItem(table, DITEM_SEPARATOR);
* DialogItemSetColSpan(di, 1);
@ -509,9 +509,9 @@ SettingsPlacement(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Window Placement\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Window Placement\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -524,9 +524,7 @@ SettingsPlacement(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Dialog windows appear together with their owner"));
DialogItemSetText(di, _("Dialog windows appear together with their owner"));
DialogItemCheckButtonSetState(di, tmp_with_leader);
DialogItemCheckButtonSetPtr(di, &tmp_with_leader);
@ -534,8 +532,7 @@ SettingsPlacement(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_("Switch to desktop where dialog appears"));
DialogItemSetText(di, _("Switch to desktop where dialog appears"));
DialogItemCheckButtonSetState(di, tmp_switch_popup);
DialogItemCheckButtonSetPtr(di, &tmp_switch_popup);
@ -543,7 +540,7 @@ SettingsPlacement(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Place windows manually"));
DialogItemSetText(di, _("Place windows manually"));
DialogItemCheckButtonSetState(di, tmp_manual_placement);
DialogItemCheckButtonSetPtr(di, &tmp_manual_placement);
@ -551,7 +548,7 @@ SettingsPlacement(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Place windows under mouse"));
DialogItemSetText(di, _("Place windows under mouse"));
DialogItemCheckButtonSetState(di, tmp_manual_placement_mouse_pointer);
DialogItemCheckButtonSetPtr(di, &tmp_manual_placement_mouse_pointer);
@ -559,7 +556,7 @@ SettingsPlacement(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Ignore struts"));
DialogItemSetText(di, _("Ignore struts"));
DialogItemCheckButtonSetState(di, tmp_place_ignore_struts);
DialogItemCheckButtonSetPtr(di, &tmp_place_ignore_struts);
@ -567,7 +564,7 @@ SettingsPlacement(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Raise fullscreen windows"));
DialogItemSetText(di, _("Raise fullscreen windows"));
DialogItemCheckButtonSetState(di, tmp_raise_fullscreen);
DialogItemCheckButtonSetPtr(di, &tmp_raise_fullscreen);
@ -578,9 +575,7 @@ SettingsPlacement(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di,
_
("Place windows on another head when full"));
DialogItemSetText(di, _("Place windows on another head when full"));
DialogItemCheckButtonSetState(di, tmp_extra_head);
DialogItemCheckButtonSetPtr(di, &tmp_extra_head);
}
@ -650,9 +645,9 @@ SettingsAutoRaise(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Automatic Raising\n"
"of Windows Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Automatic Raising\n"
"of Windows Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -665,7 +660,7 @@ SettingsAutoRaise(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Raise Windows Automatically"));
DialogItemSetText(di, _("Raise Windows Automatically"));
DialogItemCheckButtonSetState(di, tmp_autoraise);
DialogItemCheckButtonSetPtr(di, &tmp_autoraise);
@ -673,7 +668,7 @@ SettingsAutoRaise(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Autoraise delay:"));
DialogItemSetText(di, _("Autoraise delay:"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);
@ -754,9 +749,9 @@ SettingsMiscellaneous(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Miscellaneous\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Miscellaneous\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -769,7 +764,7 @@ SettingsMiscellaneous(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable Dialog Headers"));
DialogItemSetText(di, _("Enable Dialog Headers"));
DialogItemCheckButtonSetState(di, tmp_dialog_headers);
DialogItemCheckButtonSetPtr(di, &tmp_dialog_headers);
@ -777,7 +772,7 @@ SettingsMiscellaneous(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable Button Images"));
DialogItemSetText(di, _("Enable Button Images"));
DialogItemCheckButtonSetState(di, tmp_button_image);
DialogItemCheckButtonSetPtr(di, &tmp_button_image);
@ -785,7 +780,7 @@ SettingsMiscellaneous(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable Logout Dialog"));
DialogItemSetText(di, _("Enable Logout Dialog"));
DialogItemCheckButtonSetState(di, tmp_logout_dialog);
DialogItemCheckButtonSetPtr(di, &tmp_logout_dialog);
@ -793,7 +788,7 @@ SettingsMiscellaneous(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable Reboot/Halt on Logout"));
DialogItemSetText(di, _("Enable Reboot/Halt on Logout"));
DialogItemCheckButtonSetState(di, tmp_reboot_halt);
DialogItemCheckButtonSetPtr(di, &tmp_reboot_halt);
@ -893,9 +888,9 @@ SettingsSpecialFX(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Special Effects\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Special Effects\n"
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_NONE);
@ -917,20 +912,20 @@ SettingsSpecialFX(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, _("Slide Method:"));
DialogItemSetText(di, _("Slide Method:"));
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 3);
DialogItemCheckButtonSetText(di, _("Slide desktops around when changing"));
DialogItemSetText(di, _("Slide desktops around when changing"));
DialogItemCheckButtonSetState(di, tmp_desktop_slide);
DialogItemCheckButtonSetPtr(di, &tmp_desktop_slide);
radio = di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Opaque"));
DialogItemSetText(di, _("Opaque"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 0);
@ -938,14 +933,14 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 3);
DialogItemCheckButtonSetText(di, _("Slide windows around when cleaning up"));
DialogItemSetText(di, _("Slide windows around when cleaning up"));
DialogItemCheckButtonSetState(di, tmp_cleanup_slide);
DialogItemCheckButtonSetPtr(di, &tmp_cleanup_slide);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Technical"));
DialogItemSetText(di, _("Technical"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -953,14 +948,14 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 3);
DialogItemCheckButtonSetText(di, _("Slide windows in when they appear"));
DialogItemSetText(di, _("Slide windows in when they appear"));
DialogItemCheckButtonSetState(di, tmp_map_slide);
DialogItemCheckButtonSetPtr(di, &tmp_map_slide);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Box"));
DialogItemSetText(di, _("Box"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 2);
@ -968,14 +963,14 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 3);
DialogItemCheckButtonSetText(di, _("Animated display of menus"));
DialogItemSetText(di, _("Animated display of menus"));
DialogItemCheckButtonSetState(di, tmp_animated_menus);
DialogItemCheckButtonSetPtr(di, &tmp_animated_menus);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Shaded"));
DialogItemSetText(di, _("Shaded"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 3);
@ -983,14 +978,14 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 3);
DialogItemCheckButtonSetText(di, _("Always pop up menus on screen"));
DialogItemSetText(di, _("Always pop up menus on screen"));
DialogItemCheckButtonSetState(di, tmp_menusonscreen);
DialogItemCheckButtonSetPtr(di, &tmp_menusonscreen);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetText(di, _("Semi-Solid"));
DialogItemSetText(di, _("Semi-Solid"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 4);
DialogItemRadioButtonGroupSetValPtr(radio, &tmp_slide_mode);
@ -999,7 +994,7 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 4);
DialogItemCheckButtonSetText(di, _("Warp pointer after moving menus"));
DialogItemSetText(di, _("Warp pointer after moving menus"));
DialogItemCheckButtonSetState(di, tmp_warpmenus);
DialogItemCheckButtonSetPtr(di, &tmp_warpmenus);
@ -1007,8 +1002,7 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 4);
DialogItemCheckButtonSetText(di,
_("Use saveunders to reduce window exposures"));
DialogItemSetText(di, _("Use saveunders to reduce window exposures"));
DialogItemCheckButtonSetState(di, tmp_saveunders);
DialogItemCheckButtonSetPtr(di, &tmp_saveunders);
@ -1016,8 +1010,7 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 4);
DialogItemCheckButtonSetText(di,
_("Animate shading and unshading of windows"));
DialogItemSetText(di, _("Animate shading and unshading of windows"));
DialogItemCheckButtonSetState(di, tmp_animate_shading);
DialogItemCheckButtonSetPtr(di, &tmp_animate_shading);
@ -1031,7 +1024,7 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, _("Desktop Slide speed: (slow)\n"));
DialogItemSetText(di, _("Desktop Slide speed: (slow)\n"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetColSpan(di, 2);
@ -1047,13 +1040,13 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("(fast)\n"));
DialogItemSetText(di, _("(fast)\n"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, _("Cleanup Slide speed: (slow)\n"));
DialogItemSetText(di, _("Cleanup Slide speed: (slow)\n"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetColSpan(di, 2);
@ -1069,13 +1062,13 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("(fast)\n"));
DialogItemSetText(di, _("(fast)\n"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, _("Appear Slide speed: (slow)\n"));
DialogItemSetText(di, _("Appear Slide speed: (slow)\n"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetColSpan(di, 2);
@ -1091,13 +1084,13 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("(fast)\n"));
DialogItemSetText(di, _("(fast)\n"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, _("Window Shading speed: (slow)\n"));
DialogItemSetText(di, _("Window Shading speed: (slow)\n"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetColSpan(di, 2);
@ -1113,7 +1106,7 @@ SettingsSpecialFX(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("(fast)\n"));
DialogItemSetText(di, _("(fast)\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 4);
@ -1189,9 +1182,8 @@ SettingsComposite(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemTextSetText(di,
_("Enlightenment Composite\n"
"Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Composite\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -1204,7 +1196,7 @@ SettingsComposite(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable Composite"));
DialogItemSetText(di, _("Enable Composite"));
DialogItemCheckButtonSetState(di, Cfg_composite.enable);
DialogItemCheckButtonSetPtr(di, &Cfg_composite.enable);
@ -1218,7 +1210,7 @@ SettingsComposite(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("Shadows Off"));
DialogItemSetText(di, _("Shadows Off"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 0);
@ -1226,7 +1218,7 @@ SettingsComposite(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("Shadows Sharp"));
DialogItemSetText(di, _("Shadows Sharp"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 1);
@ -1234,7 +1226,7 @@ SettingsComposite(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemRadioButtonSetText(di, _("Shadows Blurred"));
DialogItemSetText(di, _("Shadows Blurred"));
DialogItemRadioButtonSetFirst(di, radio);
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio, &Cfg_composite.shadow);
@ -1244,7 +1236,7 @@ SettingsComposite(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Fading Speed:\n"));
DialogItemSetText(di, _("Fading Speed:\n"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);

74
src/snaps.c
View File

@ -568,10 +568,9 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Select the attributes of this\n"
"window you wish to Remember\n"
"from now on\n"));
DialogItemSetText(di,
_("Select the attributes of this\n"
"window you wish to Remember\n" "from now on\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 4);
@ -623,14 +622,14 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Title:"));
DialogItemSetText(di, _("Title:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 3);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, ewin->icccm.wm_name);
DialogItemSetText(di, ewin->icccm.wm_name);
if (ewin->icccm.wm_res_name)
{
@ -638,14 +637,14 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Name:"));
DialogItemSetText(di, _("Name:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 3);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, ewin->icccm.wm_res_name);
DialogItemSetText(di, ewin->icccm.wm_res_name);
}
if (ewin->icccm.wm_res_class)
@ -654,14 +653,14 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Class:"));
DialogItemSetText(di, _("Class:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 3);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 1024, 512);
DialogItemTextSetText(di, ewin->icccm.wm_res_class);
DialogItemSetText(di, ewin->icccm.wm_res_class);
}
if (ewin->icccm.wm_command)
@ -670,7 +669,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Command:"));
DialogItemSetText(di, _("Command:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 3);
@ -701,10 +700,10 @@ SnapshotEwinDialog(EWin * ewin)
else
strcat(s, "...\n");
}
DialogItemTextSetText(di, s);
DialogItemSetText(di, s);
}
else
DialogItemTextSetText(di, ewin->icccm.wm_command);
DialogItemSetText(di, ewin->icccm.wm_command);
}
di = DialogAddItem(table, DITEM_SEPARATOR);
@ -717,7 +716,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 4);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Track Changes"));
DialogItemSetText(di, _("Track Changes"));
DialogItemCheckButtonSetState(di, sd->track_changes);
DialogItemCheckButtonSetPtr(di, &sd->track_changes);
@ -725,7 +724,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Location"));
DialogItemSetText(di, _("Location"));
DialogItemCheckButtonSetState(di, sd->snap_location);
DialogItemCheckButtonSetPtr(di, &sd->snap_location);
@ -733,7 +732,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Border style"));
DialogItemSetText(di, _("Border style"));
DialogItemCheckButtonSetState(di, sd->snap_border);
DialogItemCheckButtonSetPtr(di, &sd->snap_border);
@ -741,7 +740,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Size"));
DialogItemSetText(di, _("Size"));
DialogItemCheckButtonSetState(di, sd->snap_size);
DialogItemCheckButtonSetPtr(di, &sd->snap_size);
@ -749,7 +748,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Desktop"));
DialogItemSetText(di, _("Desktop"));
DialogItemCheckButtonSetState(di, sd->snap_desktop);
DialogItemCheckButtonSetPtr(di, &sd->snap_desktop);
@ -757,7 +756,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Shaded state"));
DialogItemSetText(di, _("Shaded state"));
DialogItemCheckButtonSetState(di, sd->snap_shaded);
DialogItemCheckButtonSetPtr(di, &sd->snap_shaded);
@ -765,7 +764,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Sticky state"));
DialogItemSetText(di, _("Sticky state"));
DialogItemCheckButtonSetState(di, sd->snap_sticky);
DialogItemCheckButtonSetPtr(di, &sd->snap_sticky);
@ -773,7 +772,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Stacking layer"));
DialogItemSetText(di, _("Stacking layer"));
DialogItemCheckButtonSetState(di, sd->snap_layer);
DialogItemCheckButtonSetPtr(di, &sd->snap_layer);
@ -781,7 +780,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Window List Skip"));
DialogItemSetText(di, _("Window List Skip"));
DialogItemCheckButtonSetState(di, sd->snap_skiplists);
DialogItemCheckButtonSetPtr(di, &sd->snap_skiplists);
@ -790,7 +789,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Opacity"));
DialogItemSetText(di, _("Opacity"));
DialogItemCheckButtonSetState(di, sd->snap_opacity);
DialogItemCheckButtonSetPtr(di, &sd->snap_opacity);
@ -798,7 +797,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Shadowing"));
DialogItemSetText(di, _("Shadowing"));
DialogItemCheckButtonSetState(di, sd->snap_shadow);
DialogItemCheckButtonSetPtr(di, &sd->snap_shadow);
#endif
@ -808,7 +807,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Never Focus"));
DialogItemSetText(di, _("Never Focus"));
DialogItemCheckButtonSetState(di, sd->snap_neverfocus);
DialogItemCheckButtonSetPtr(di, &sd->snap_neverfocus);
#endif
@ -827,8 +826,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 4);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di,
_("Restart application on login"));
DialogItemSetText(di, _("Restart application on login"));
DialogItemCheckButtonSetState(di, sd->snap_cmd);
DialogItemCheckButtonSetPtr(di, &sd->snap_cmd);
}
@ -850,7 +848,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemSetColSpan(di, 4);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemCheckButtonSetText(di, _("Remember this window's group(s)"));
DialogItemSetText(di, _("Remember this window's group(s)"));
DialogItemCheckButtonSetState(di, sd->snap_group);
DialogItemCheckButtonSetPtr(di, &sd->snap_group);
}
@ -973,9 +971,9 @@ SettingsRemember(void)
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Remembered\n"
"Windows Settings Dialog\n"));
DialogItemSetText(di,
_("Enlightenment Remembered\n"
"Windows Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 3);
@ -994,7 +992,7 @@ SettingsRemember(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Delete"));
DialogItemSetText(di, _("Delete"));
}
for (i = 0; i < num; i++)
@ -1017,7 +1015,7 @@ SettingsRemember(void)
Esnprintf(buf, sizeof(buf), "%s.%s", sn->win_name, sn->win_class);
s = buf;
}
DialogItemCheckButtonSetText(di, s);
DialogItemSetText(di, s);
DialogItemCheckButtonSetState(di, rd_ewin_list[i].remove);
DialogItemCheckButtonSetPtr(di, &(rd_ewin_list[i].remove));
@ -1027,7 +1025,7 @@ SettingsRemember(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemButtonSetText(di, _("Remembered Settings..."));
DialogItemSetText(di, _("Remembered Settings..."));
DialogItemSetCallback(di, CB_RememberWindowSettings, 0,
(char *)(&rd_ewin_list[i]));
}
@ -1036,7 +1034,7 @@ SettingsRemember(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, _("Unused"));
DialogItemSetText(di, _("Unused"));
}
}
if (lst)
@ -1050,9 +1048,9 @@ SettingsRemember(void)
DialogItemSetColSpan(di, 3);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_
("There are no active windows with remembered attributes."));
DialogItemSetText(di,
_
("There are no active windows with remembered attributes."));
}
di = DialogAddItem(table, DITEM_SEPARATOR);

11
src/sound.c
View File

@ -451,8 +451,7 @@ SettingsAudio(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Audio\n" "Settings Dialog\n"));
DialogItemSetText(di, _("Enlightenment Audio\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -465,7 +464,7 @@ SettingsAudio(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable sounds"));
DialogItemSetText(di, _("Enable sounds"));
DialogItemCheckButtonSetState(di, tmp_audio);
DialogItemCheckButtonSetPtr(di, &tmp_audio);
#else
@ -473,9 +472,9 @@ SettingsAudio(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetColSpan(di, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Audio not available since EsounD was not\n"
"present at the time of compilation."));
DialogItemSetText(di,
_("Audio not available since EsounD was not\n"
"present at the time of compilation."));
#endif
di = DialogAddItem(table, DITEM_SEPARATOR);

9
src/tooltips.c
View File

@ -854,8 +854,7 @@ SettingsTooltips(void)
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
_("Enlightenment Tooltip\n" "Settings Dialog\n"));
DialogItemSetText(di, _("Enlightenment Tooltip\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@ -868,7 +867,7 @@ SettingsTooltips(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Display Tooltips"));
DialogItemSetText(di, _("Display Tooltips"));
DialogItemCheckButtonSetState(di, tmp_tooltips);
DialogItemCheckButtonSetPtr(di, &tmp_tooltips);
@ -876,7 +875,7 @@ SettingsTooltips(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Display Root Window Tips"));
DialogItemSetText(di, _("Display Root Window Tips"));
DialogItemCheckButtonSetState(di, tmp_roottip);
DialogItemCheckButtonSetPtr(di, &tmp_roottip);
@ -884,7 +883,7 @@ SettingsTooltips(void)
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Tooltip Delay:\n"));
DialogItemSetText(di, _("Tooltip Delay:\n"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSetPadding(di, 2, 2, 2, 2);