* wtools.c (real_input_dialog_help): Trim spaces from the label
text. Align label with the input field.
Этот коммит содержится в:
родитель
2a2df991d0
Коммит
9aa16b2c1a
@ -1,5 +1,8 @@
|
||||
2002-09-16 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* wtools.c (real_input_dialog_help): Trim spaces from the label
|
||||
text. Align label with the input field.
|
||||
|
||||
* cmd.c (do_link): Avoid using g_strconcat() on translatable
|
||||
strings.
|
||||
(other_symlink_cmd): Likewise.
|
||||
|
17
src/wtools.c
17
src/wtools.c
@ -367,7 +367,9 @@ int quick_dialog (QuickDialog *qd)
|
||||
/* {{{ Input routines */
|
||||
|
||||
#define INPUT_INDEX 2
|
||||
char *real_input_dialog_help (char *header, char *text, char *help, char *def_text)
|
||||
char *
|
||||
real_input_dialog_help (char *header, char *text, char *help,
|
||||
char *def_text)
|
||||
{
|
||||
QuickDialog Quick_input;
|
||||
QuickWidget quick_widgets[] = {
|
||||
@ -376,12 +378,14 @@ char *real_input_dialog_help (char *header, char *text, char *help, char *def_te
|
||||
{quick_button, 3, 10, 1, 0, N_("&Ok"), 0, B_ENTER, 0, 0,
|
||||
"button-ok"},
|
||||
{quick_input, 4, 80, 0, 0, "", 58, 0, 0, 0, 0},
|
||||
{ quick_label, 3, 80, 2, 0, "", 0, 0, 0, 0, "label" },
|
||||
{ 0 } };
|
||||
{quick_label, 4, 80, 2, 0, "", 0, 0, 0, 0, "label"},
|
||||
{0}
|
||||
};
|
||||
|
||||
int len;
|
||||
int i;
|
||||
int lines;
|
||||
int ret;
|
||||
char *my_str;
|
||||
char tk_name[64] = "inp|";
|
||||
|
||||
@ -421,7 +425,7 @@ char *real_input_dialog_help (char *header, char *text, char *help, char *def_te
|
||||
Quick_input.title = header;
|
||||
Quick_input.help = help;
|
||||
Quick_input.i18n = 0;
|
||||
quick_widgets [INPUT_INDEX+1].text = text;
|
||||
quick_widgets[INPUT_INDEX + 1].text = g_strstrip (g_strdup (text));
|
||||
quick_widgets[INPUT_INDEX].text = def_text;
|
||||
|
||||
for (i = 0; i < 4; i++)
|
||||
@ -434,7 +438,10 @@ char *real_input_dialog_help (char *header, char *text, char *help, char *def_te
|
||||
quick_widgets[INPUT_INDEX].str_result = &my_str;
|
||||
|
||||
Quick_input.widgets = quick_widgets;
|
||||
if (quick_dialog (&Quick_input) != B_CANCEL){
|
||||
ret = quick_dialog (&Quick_input);
|
||||
g_free (quick_widgets[INPUT_INDEX + 1].text);
|
||||
|
||||
if (ret != B_CANCEL) {
|
||||
return *(quick_widgets[INPUT_INDEX].str_result);
|
||||
} else
|
||||
return 0;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user