diff --git a/ChangeLog b/ChangeLog index d771bc9bfe..dafb744228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-09-26 Juergen Vigna + + * src/frontends/xforms/FormParagraph.C: fixed de/activation of fields, + better visibility and error-message on wrong VSpace input. + + * src/language.C (initL): added english again. + 2000-09-25 Juergen Vigna * src/frontends/kde/Dialogs.C (Dialogs): diff --git a/src/frontends/kde/Makefile.am b/src/frontends/kde/Makefile.am index 55fbecb038..bbf8d39c84 100644 --- a/src/frontends/kde/Makefile.am +++ b/src/frontends/kde/Makefile.am @@ -9,6 +9,7 @@ INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \ BUILTSOURCES = formcopyrightdialog_moc.C \ formurldialog_moc.C \ formindexdialog_moc.C \ + formindexdialogdata_moc.C \ formcitationdialog_moc.C \ formtocdialog_moc.C \ formrefdialog_moc.C diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index 32dec9b537..3dfdc68f96 100644 --- a/src/frontends/xforms/FormParagraph.C +++ b/src/frontends/xforms/FormParagraph.C @@ -120,13 +120,6 @@ void FormParagraph::build() bc_->addReadOnly (extra_->radio_pextra_indent); bc_->addReadOnly (extra_->radio_pextra_minipage); bc_->addReadOnly (extra_->radio_pextra_floatflt); - bc_->addReadOnly (extra_->input_pextra_width); - bc_->addReadOnly (extra_->input_pextra_widthp); - bc_->addReadOnly (extra_->radio_pextra_top); - bc_->addReadOnly (extra_->radio_pextra_middle); - bc_->addReadOnly (extra_->radio_pextra_bottom); - bc_->addReadOnly (extra_->radio_pextra_hfill); - bc_->addReadOnly (extra_->radio_pextra_startmp); // now make them fit together fl_set_form_atclose(dialog_->form, C_FormParagraphWMHideCB, 0); @@ -514,41 +507,56 @@ void FormParagraph::extra_update() par->pextra_hfill); fl_set_button(extra_->radio_pextra_startmp, par->pextra_start_minipage); -// CheckInputWidth(); if (par->pextra_type == LyXParagraph::PEXTRA_INDENT) { fl_set_button(extra_->radio_pextra_indent, 1); fl_set_button(extra_->radio_pextra_minipage, 0); fl_set_button(extra_->radio_pextra_floatflt, 0); fl_deactivate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_INACTIVE); fl_deactivate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_INACTIVE); fl_deactivate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_INACTIVE); + CheckParagraphInput(extra_->radio_pextra_indent, 0); } else if (par->pextra_type == LyXParagraph::PEXTRA_MINIPAGE) { fl_set_button(extra_->radio_pextra_indent, 0); fl_set_button(extra_->radio_pextra_minipage, 1); fl_set_button(extra_->radio_pextra_floatflt, 0); fl_activate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_BLACK); fl_activate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_BLACK); fl_activate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_BLACK); + CheckParagraphInput(extra_->radio_pextra_minipage, 0); } else if (par->pextra_type == LyXParagraph::PEXTRA_FLOATFLT) { fl_set_button(extra_->radio_pextra_indent, 0); fl_set_button(extra_->radio_pextra_minipage, 0); fl_set_button(extra_->radio_pextra_floatflt, 1); fl_deactivate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_INACTIVE); fl_deactivate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_INACTIVE); fl_deactivate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_INACTIVE); + CheckParagraphInput(extra_->radio_pextra_floatflt, 0); } else { fl_set_button(extra_->radio_pextra_indent, 0); fl_set_button(extra_->radio_pextra_minipage, 0); + fl_set_button(extra_->radio_pextra_floatflt, 0); fl_deactivate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_INACTIVE); fl_deactivate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_INACTIVE); fl_deactivate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_INACTIVE); fl_deactivate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_INACTIVE); fl_deactivate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_INACTIVE); + CheckParagraphInput(0, 0); } -// if (par->pextra_type == LyXParagraph::PEXTRA_NONE) -// ActivateParagraphExtraButtons(); - - fl_hide_object(extra_->text_warning); + fl_hide_object(dialog_->text_warning); } @@ -636,10 +644,12 @@ bool FormParagraph::CheckParagraphInput(FL_OBJECT * ob, long) { bool ret = true; - fl_hide_object(extra_->text_warning); + fl_hide_object(dialog_->text_warning); + // First check the buttons which are exclusive and you have to + // check only the actuall de/activated button. // - // first the general form + // general form first // // "Synchronize" the choices and input fields, making it // impossible to commit senseless data. @@ -650,7 +660,99 @@ bool FormParagraph::CheckParagraphInput(FL_OBJECT * ob, long) if (fl_get_choice (general_->choice_space_below) != 7) fl_set_input (general_->input_space_below, ""); } + // + // then the extra form + // + else if (ob == extra_->radio_pextra_indent) { + int n = fl_get_button(extra_->radio_pextra_indent); + if (n) { + fl_set_button(extra_->radio_pextra_minipage, 0); + fl_set_button(extra_->radio_pextra_floatflt, 0); + fl_activate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_BLACK); + fl_activate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_BLACK); + } else { + fl_deactivate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_INACTIVE); + fl_deactivate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_INACTIVE); + } + fl_deactivate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_INACTIVE); + fl_deactivate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_INACTIVE); + fl_deactivate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_INACTIVE); + fl_activate_object(extra_->radio_pextra_hfill); + fl_set_object_lcol(extra_->radio_pextra_hfill, FL_INACTIVE); + fl_activate_object(extra_->radio_pextra_startmp); + fl_set_object_lcol(extra_->radio_pextra_startmp, FL_INACTIVE); + } else if (ob == extra_->radio_pextra_minipage) { + int n = fl_get_button(extra_->radio_pextra_minipage); + if (n) { + fl_set_button(extra_->radio_pextra_indent, 0); + fl_set_button(extra_->radio_pextra_floatflt, 0); + fl_activate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_BLACK); + fl_activate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_BLACK); + fl_activate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_BLACK); + fl_activate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_BLACK); + fl_activate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_BLACK); + fl_activate_object(extra_->radio_pextra_hfill); + fl_set_object_lcol(extra_->radio_pextra_hfill, FL_BLACK); + fl_activate_object(extra_->radio_pextra_startmp); + fl_set_object_lcol(extra_->radio_pextra_startmp, FL_BLACK); + } else { + fl_deactivate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_INACTIVE); + fl_deactivate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_INACTIVE); + fl_deactivate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_INACTIVE); + fl_deactivate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_INACTIVE); + fl_deactivate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_INACTIVE); + fl_activate_object(extra_->radio_pextra_hfill); + fl_set_object_lcol(extra_->radio_pextra_hfill, FL_INACTIVE); + fl_activate_object(extra_->radio_pextra_startmp); + fl_set_object_lcol(extra_->radio_pextra_startmp, FL_INACTIVE); + } + } else if (ob == extra_->radio_pextra_floatflt) { + int n = fl_get_button(extra_->radio_pextra_floatflt); + if (n) { + fl_set_button(extra_->radio_pextra_indent, 0); + fl_set_button(extra_->radio_pextra_minipage, 0); + fl_activate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_BLACK); + fl_activate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_BLACK); + } else { + fl_deactivate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_INACTIVE); + fl_deactivate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_INACTIVE); + } + fl_deactivate_object(extra_->radio_pextra_top); + fl_set_object_lcol(extra_->radio_pextra_top, FL_INACTIVE); + fl_deactivate_object(extra_->radio_pextra_middle); + fl_set_object_lcol(extra_->radio_pextra_middle, FL_INACTIVE); + fl_deactivate_object(extra_->radio_pextra_bottom); + fl_set_object_lcol(extra_->radio_pextra_bottom, FL_INACTIVE); + fl_activate_object(extra_->radio_pextra_hfill); + fl_set_object_lcol(extra_->radio_pextra_hfill, FL_INACTIVE); + fl_activate_object(extra_->radio_pextra_startmp); + fl_set_object_lcol(extra_->radio_pextra_startmp, FL_INACTIVE); + } + // + // first the general form + // string input = fl_get_input (general_->input_space_above); if (input.empty()) { @@ -659,6 +761,9 @@ bool FormParagraph::CheckParagraphInput(FL_OBJECT * ob, long) fl_set_choice (general_->choice_space_above, 7); } else { fl_set_choice (general_->choice_space_above, 7); + fl_set_object_label(dialog_->text_warning, + _("Warning: Invalid Length (valid example: 10mm)")); + fl_show_object(dialog_->text_warning); ret = false; } @@ -666,40 +771,57 @@ bool FormParagraph::CheckParagraphInput(FL_OBJECT * ob, long) if (input.empty()) { fl_set_choice (general_->choice_space_below, 1); - } else if (isValidGlueLength (input)) { + } else if (isValidGlueLength(input)) { fl_set_choice (general_->choice_space_below, 7); } else { fl_set_choice (general_->choice_space_below, 7); + fl_set_object_label(dialog_->text_warning, + _("Warning: Invalid Length (valid example: 10mm)")); + fl_show_object(dialog_->text_warning); ret = false; } // // then the extra form // + int n = fl_get_button(extra_->radio_pextra_indent) + + fl_get_button(extra_->radio_pextra_minipage) + + fl_get_button(extra_->radio_pextra_floatflt); string s1 = fl_get_input(extra_->input_pextra_width); string s2 = fl_get_input(extra_->input_pextra_widthp); - if (s1.empty() && s2.empty()) { - fl_activate_object(extra_->input_pextra_width); - fl_activate_object(extra_->input_pextra_widthp); - fl_hide_object(extra_->text_warning); - ret = false; - } - if (!s1.empty()) { // LyXLength parameter - fl_activate_object(extra_->input_pextra_width); + if (!n) { // no button pressed both should be deactivated now + fl_deactivate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_INACTIVE); fl_deactivate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_INACTIVE); + fl_hide_object(dialog_->text_warning); + } else if (s1.empty() && s2.empty()) { + fl_activate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_BLACK); + fl_activate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_BLACK); + fl_hide_object(dialog_->text_warning); + ret = false; + } else if (!s1.empty()) { // LyXLength parameter + fl_activate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_BLACK); + fl_deactivate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_INACTIVE); if (!isValidLength(s1)) { - fl_set_object_label(extra_->text_warning, - _("Warning: Invalid Length (valid example: 10mm)")); - fl_show_object(extra_->text_warning); + fl_set_object_label(dialog_->text_warning, + _("Warning: Invalid Length (valid example: 10mm)")); + fl_show_object(dialog_->text_warning); ret = false; } } else { // !s2.empty() % parameter fl_deactivate_object(extra_->input_pextra_width); + fl_set_object_lcol(extra_->input_pextra_width, FL_INACTIVE); fl_activate_object(extra_->input_pextra_widthp); + fl_set_object_lcol(extra_->input_pextra_widthp, FL_BLACK); if ((atoi(s2.c_str()) < 0 ) || (atoi(s2.c_str()) > 100)) { ret = false; - fl_set_object_label(extra_->text_warning, - _("Warning: Invalid percent value (0-100)")); - fl_show_object(extra_->text_warning); + fl_set_object_label(dialog_->text_warning, + _("Warning: Invalid percent value (0-100)")); + fl_show_object(dialog_->text_warning); } } return ret; diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C index 3d092aee8a..f8bbc10735 100644 --- a/src/frontends/xforms/form_paragraph.C +++ b/src/frontends/xforms/form_paragraph.C @@ -22,9 +22,9 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general() FL_OBJECT *obj; FD_form_paragraph_general *fdui = new FD_form_paragraph_general; - fdui->form = fl_bgn_form(FL_NO_BOX, 490, 260); + fdui->form = fl_bgn_form(FL_NO_BOX, 490, 250); fdui->form->u_vdata = this; - obj = fl_add_box(FL_UP_BOX, 0, 0, 490, 260, ""); + obj = fl_add_box(FL_FLAT_BOX, 0, 0, 490, 250, ""); obj = fl_add_frame(FL_ENGRAVED_FRAME, 360, 110, 120, 50, ""); fl_set_object_color(obj, FL_COL1, FL_COL1); obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 110, 340, 90, ""); @@ -146,9 +146,9 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra() FL_OBJECT *obj; FD_form_paragraph_extra *fdui = new FD_form_paragraph_extra; - fdui->form = fl_bgn_form(FL_NO_BOX, 490, 260); + fdui->form = fl_bgn_form(FL_NO_BOX, 490, 250); fdui->form->u_vdata = this; - obj = fl_add_box(FL_UP_BOX, 0, 0, 490, 260, ""); + obj = fl_add_box(FL_FLAT_BOX, 0, 0, 490, 250, ""); obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 170, 100, ""); fl_set_object_color(obj, FL_COL1, FL_COL1); obj = fl_add_frame(FL_ENGRAVED_FRAME, 350, 20, 100, 100, ""); @@ -191,10 +191,6 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra() fl_set_object_callback(obj, C_FormParagraphInputCB, 0); fl_end_group(); - fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 190, 470, 30, ""); - fl_set_object_lsize(obj, FL_NORMAL_SIZE); - fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - fl_set_object_lstyle(obj, FL_BOLD_STYLE); fdui->radio_pextra_hfill = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 130, 300, 30, idex(_("HFill between Minipage paragraphs|#H"))); fl_set_button_shortcut(obj, scex(_("HFill between Minipage paragraphs|#H")), 1); fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -239,26 +235,30 @@ FD_form_tabbed_paragraph * FormParagraph::build_tabbed_paragraph() FL_OBJECT *obj; FD_form_tabbed_paragraph *fdui = new FD_form_tabbed_paragraph; - fdui->form = fl_bgn_form(FL_NO_BOX, 510, 340); + fdui->form = fl_bgn_form(FL_NO_BOX, 510, 350); fdui->form->u_vdata = this; - obj = fl_add_box(FL_UP_BOX, 0, 0, 510, 340, ""); - fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 10, 490, 280, _("Tabbed folder")); + obj = fl_add_box(FL_UP_BOX, 0, 0, 510, 350, ""); + fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 10, 490, 270, _("Tabbed folder")); fl_set_object_resize(obj, FL_RESIZE_ALL); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 300, 100, 30, idex(_("Cancel|^["))); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_("Cancel|^["))); fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormParagraphCancelCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 300, 100, 30, idex(_("Apply|#A"))); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 310, 100, 30, idex(_("Apply|#A"))); fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormParagraphApplyCB, 0); - fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 180, 300, 100, 30, _("OK")); + fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 180, 310, 100, 30, _("OK")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormParagraphOKCB, 0); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 300, 100, 30, idex(_("Restore|#R"))); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 310, 100, 30, idex(_("Restore|#R"))); fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormParagraphRestoreCB, 0); + fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 280, 490, 30, ""); + fl_set_object_lsize(obj, FL_NORMAL_SIZE); + fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + fl_set_object_lstyle(obj, FL_BOLD_STYLE); fl_end_form(); fdui->form->fdui = fdui; diff --git a/src/frontends/xforms/form_paragraph.h b/src/frontends/xforms/form_paragraph.h index a0e6d857dd..4456f0b6bf 100644 --- a/src/frontends/xforms/form_paragraph.h +++ b/src/frontends/xforms/form_paragraph.h @@ -49,7 +49,6 @@ struct FD_form_paragraph_extra { FL_OBJECT *radio_pextra_top; FL_OBJECT *radio_pextra_middle; FL_OBJECT *radio_pextra_bottom; - FL_OBJECT *text_warning; FL_OBJECT *radio_pextra_hfill; FL_OBJECT *radio_pextra_startmp; FL_OBJECT *group_extraopt; @@ -66,6 +65,7 @@ struct FD_form_tabbed_paragraph { FL_OBJECT *button_apply; FL_OBJECT *button_ok; FL_OBJECT *button_restore; + FL_OBJECT *text_warning; }; #endif /* FD_form_paragraph_general_h_ */ diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd index ce8dea84fe..8584850460 100644 --- a/src/frontends/xforms/forms/form_paragraph.fd +++ b/src/frontends/xforms/forms/form_paragraph.fd @@ -9,14 +9,14 @@ Unit of measure: FL_COORD_PIXEL =============== FORM =============== Name: form_paragraph_general Width: 490 -Height: 260 +Height: 250 Number of Objects: 29 -------------------- class: FL_BOX -type: UP_BOX -box: 0 0 490 260 -boxtype: FL_UP_BOX +type: FLAT_BOX +box: 0 0 490 250 +boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE @@ -136,7 +136,7 @@ resize: FL_RESIZE_X gravity: FL_West FL_East name: input_labelwidth callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_TEXT @@ -172,7 +172,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lines_top callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -190,7 +190,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_lines_bottom callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -208,7 +208,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_pagebreaks_top callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -226,7 +226,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_pagebreaks_bottom callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -244,7 +244,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_noindent callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_BEGIN_GROUP @@ -280,7 +280,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_right callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -298,7 +298,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_left callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -316,7 +316,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_block callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -334,7 +334,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_align_center callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_END_GROUP @@ -514,7 +514,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_space_above callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -532,19 +532,19 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: check_space_below callback: C_FormParagraphInputCB -argument: +argument: 0 =============== FORM =============== Name: form_paragraph_extra Width: 490 -Height: 260 -Number of Objects: 22 +Height: 250 +Number of Objects: 21 -------------------- class: FL_BOX -type: UP_BOX -box: 0 0 490 260 -boxtype: FL_UP_BOX +type: FLAT_BOX +box: 0 0 490 250 +boxtype: FL_FLAT_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE @@ -792,24 +792,6 @@ name: callback: argument: --------------------- -class: FL_TEXT -type: NORMAL_TEXT -box: 10 190 470 30 -boxtype: FL_FLAT_BOX -colors: FL_COL1 FL_MCOL -alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE -style: FL_BOLD_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: text_warning -callback: -argument: - -------------------- class: FL_CHECKBUTTON type: PUSH_BUTTON @@ -826,7 +808,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_pextra_hfill callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_CHECKBUTTON @@ -844,7 +826,7 @@ resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: radio_pextra_startmp callback: C_FormParagraphInputCB -argument: +argument: 0 -------------------- class: FL_BEGIN_GROUP @@ -939,13 +921,13 @@ argument: =============== FORM =============== Name: form_tabbed_paragraph Width: 510 -Height: 340 -Number of Objects: 6 +Height: 350 +Number of Objects: 7 -------------------- class: FL_BOX type: UP_BOX -box: 0 0 510 340 +box: 0 0 510 350 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -963,7 +945,7 @@ argument: -------------------- class: FL_TABFOLDER type: TOP_TABFOLDER -box: 10 10 490 280 +box: 10 10 490 270 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -981,7 +963,7 @@ argument: -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 400 300 100 30 +box: 400 310 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -999,7 +981,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 290 300 100 30 +box: 290 310 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -1017,7 +999,7 @@ argument: 0 -------------------- class: FL_BUTTON type: RETURN_BUTTON -box: 180 300 100 30 +box: 180 310 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -1035,7 +1017,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 10 300 100 30 +box: 10 310 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -1050,5 +1032,23 @@ name: button_restore callback: C_FormParagraphRestoreCB argument: 0 +-------------------- +class: FL_TEXT +type: NORMAL_TEXT +box: 10 280 490 30 +boxtype: FL_FLAT_BOX +colors: FL_COL1 FL_MCOL +alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE +style: FL_BOLD_STYLE +size: FL_NORMAL_SIZE +lcol: FL_BLACK +label: +shortcut: +resize: FL_RESIZE_ALL +gravity: FL_NoGravity FL_NoGravity +name: text_warning +callback: +argument: + ============================== create_the_forms diff --git a/src/language.C b/src/language.C index 6a14782a18..cffd06447f 100644 --- a/src/language.C +++ b/src/language.C @@ -69,7 +69,7 @@ void LangInit::initL() { "danish", N_("Danish"), false, &iso8859_1, "da_DK" }, { "default", N_("Document wide language"), false, &iso8859_1, "" }, { "dutch", N_("Dutch"), false, &iso8859_1, "nl" }, - // changed from en_EN (Garst) + { "english", N_("English"), false, &iso8859_1, "en" }, { "esperanto", N_("Esperanto"), false, &iso8859_3, "eo" }, // and what country code should esperanto have?? (Garst) { "estonian", N_("Estonian"), false, &iso8859_4, "et_EE" },