diff --git a/ChangeLog b/ChangeLog index 3a0f70ad4b..f70af7eb1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2000-12-06 Angus Leeming + + * src/frontends/xforms/FormPreferences.C (ScreenFonts::build): changed + filter for screen fonts input filter from int to float + + * src/frontends/xforms/input_validators.c: removed. + * src/frontends/xforms/input_validators.C: new file. Can now call C++ + functions from within the filter functions. + + * src/frontends/xforms/input_validators.[Ch] + (fl_unsigned_float_filter): new filter function. + + * src/frontends/xforms/forms/fdfixc.sed: I defy gettext to get confused + now! And if you think I'm going to do this in ./forms/fdfix.sh with + its "sed -e" declarations, then think again! + +2000-12-06 Lars Gullik Bj鷢nes + + * src/buffer.C (asciiParagraph): small NEW_INSETS fix from Levon + + * src/WorkArea.C (work_area_handler): don't handle button requests + if xbutton.button == 0 + 2000-12-06 Jean-Marc Lasgouttes * lib/layouts/lyxmacros.inc: do not use \verbatim@font in lyxcode. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 5b156d0111..9434f9f629 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -409,7 +409,7 @@ AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[ ]) if test x$lyx_cv_std_string_good = xyes ; then AC_DEFINE(STD_STRING_IS_GOOD, 1, - [Define is the systems std::string is really good.]) + [Define if the systems std::string is really good.]) fi ]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 0eaa3a317a..6bbe76c923 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -53,35 +53,36 @@ src/frontends/kde/refdlg.C src/frontends/kde/tocdlg.C src/frontends/kde/urldlg.C src/frontends/xforms/FormBase.h -src/frontends/xforms/FormCitation.C src/frontends/xforms/form_citation.C -src/frontends/xforms/FormCopyright.C +src/frontends/xforms/FormCitation.C src/frontends/xforms/form_copyright.C -src/frontends/xforms/FormDocument.C +src/frontends/xforms/FormCopyright.C src/frontends/xforms/form_document.C -src/frontends/xforms/FormError.C +src/frontends/xforms/FormDocument.C src/frontends/xforms/form_error.C -src/frontends/xforms/FormGraphics.C +src/frontends/xforms/FormError.C src/frontends/xforms/form_graphics.C -src/frontends/xforms/FormIndex.C +src/frontends/xforms/FormGraphics.C src/frontends/xforms/form_index.C +src/frontends/xforms/FormIndex.C src/frontends/xforms/FormInset.h -src/frontends/xforms/FormParagraph.C src/frontends/xforms/form_paragraph.C -src/frontends/xforms/FormPreferences.C +src/frontends/xforms/FormParagraph.C src/frontends/xforms/form_preferences.C -src/frontends/xforms/FormPrint.C +src/frontends/xforms/FormPreferences.C src/frontends/xforms/form_print.C -src/frontends/xforms/FormRef.C +src/frontends/xforms/FormPrint.C src/frontends/xforms/form_ref.C -src/frontends/xforms/FormTabular.C +src/frontends/xforms/FormRef.C src/frontends/xforms/form_tabular.C -src/frontends/xforms/FormTabularCreate.C +src/frontends/xforms/FormTabular.C src/frontends/xforms/form_tabular_create.C -src/frontends/xforms/FormToc.C +src/frontends/xforms/FormTabularCreate.C src/frontends/xforms/form_toc.C -src/frontends/xforms/FormUrl.C +src/frontends/xforms/FormToc.C src/frontends/xforms/form_url.C +src/frontends/xforms/FormUrl.C +src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C src/frontends/xforms/xform_helpers.C src/gettext.h diff --git a/src/WorkArea.C b/src/WorkArea.C index e4eb592b01..5735d381f3 100644 --- a/src/WorkArea.C +++ b/src/WorkArea.C @@ -293,7 +293,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event, Lgb_bug_find_hack = false; break; case FL_PUSH: - if (!ev) break; + if (!ev || ev->xbutton.button == 0) break; // Should really have used xbutton.state lyxerr[Debug::GUI] << "Workarea event: PUSH" << endl; area->workAreaButtonPress(ev->xbutton.x - ob->x, @@ -302,7 +302,7 @@ int WorkArea::work_area_handler(FL_OBJECT * ob, int event, //area->workAreaKeyPress(XK_Pointer_Button1, ev->xbutton.state); break; case FL_RELEASE: - if (!ev) break; + if (!ev || ev->xbutton.button == 0) break; // Should really have used xbutton.state lyxerr[Debug::GUI] << "Workarea event: RELEASE" << endl; area->workAreaButtonRelease(ev->xbutton.x - ob->x, diff --git a/src/buffer.C b/src/buffer.C index 96eb02eb4e..d0b864ef9a 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -1282,7 +1282,9 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, LyXFont font2; Inset const * inset; char c; +#ifndef NEW_INSETS LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE; +#endif char depth = 0; int ltype = 0; int ltype_depth = 0; @@ -1384,7 +1386,11 @@ string const Buffer::asciiParagraph(LyXParagraph const * par, font1 = LyXFont(LyXFont::ALL_INHERIT, params.language); for (LyXParagraph::size_type i = 0; i < par->size(); ++i) { - if (!i && !footnoteflag && !noparbreak){ + if (!i && +#ifndef NEW_INSETS + !footnoteflag && +#endif + !noparbreak) { if (linelen > 0) buffer << "\n\n"; for (char j = 0; j < depth; ++j) diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index d1ac93e457..7723513d97 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -632,9 +632,9 @@ void FormPreferences::Colors::InputHSV() double const sat = fl_get_slider_value(dialog_->slider_saturation); double const val = fl_get_slider_value(dialog_->slider_value); - int const h = hue; - int const s = 100 * sat; - int const v = 100 * val; + int const h = int(hue); + int const s = int(100.0 * sat); + int const v = int(100.0 * val); string const label = tostr(h) + string(", ") + tostr(s) + string(", ") + tostr(v); @@ -686,9 +686,9 @@ void FormPreferences::Colors::InputHSV() void FormPreferences::Colors::InputRGB() { - int const red = fl_get_slider_value(dialog_->slider_red); - int const green = fl_get_slider_value(dialog_->slider_green); - int const blue = fl_get_slider_value(dialog_->slider_blue); + int const red = int(fl_get_slider_value(dialog_->slider_red)); + int const green = int(fl_get_slider_value(dialog_->slider_green)); + int const blue = int(fl_get_slider_value(dialog_->slider_blue)); string const label = tostr(red) + string(", ") + tostr(green) + string(", ") + tostr(blue); @@ -2612,16 +2612,16 @@ void FormPreferences::ScreenFonts::build() fl_set_input_return(dialog_->input_huge, FL_RETURN_CHANGED); fl_set_input_return(dialog_->input_huger, FL_RETURN_CHANGED); - fl_set_input_filter(dialog_->input_tiny, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_script, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_footnote, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_small, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_normal, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_large, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_larger, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_largest, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_huge, fl_unsigned_int_filter); - fl_set_input_filter(dialog_->input_huger, fl_unsigned_int_filter); + fl_set_input_filter(dialog_->input_tiny, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_script, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_footnote, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_small, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_normal, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_large, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_larger, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_largest, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_huge, fl_unsigned_float_filter); + fl_set_input_filter(dialog_->input_huger, fl_unsigned_float_filter); // set up the feedback mechanism setPreHandler(dialog_->input_roman); diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index 3b6641b1d2..17d5023ca8 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -79,7 +79,7 @@ libxforms_la_SOURCES = \ form_url.C \ form_url.h \ input_validators.h \ - input_validators.c \ + input_validators.C \ Menubar_pimpl.C \ Menubar_pimpl.h \ RadioButtonGroup.C \ diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index 28b757d1ae..1f1a198a79 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -58,7 +58,7 @@ extern "C" void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button); // This is used a few times below. -inline +static inline int string_width(string const & str) { return fl_get_string_widthTAB(FL_NORMAL_STYLE, MENU_LABEL_SIZE, @@ -189,7 +189,8 @@ void Menubar::Pimpl::openByName(string const & name) } -string limit_string_length(string const & str) +static inline +string const limit_string_length(string const & str) { string::size_type const max_item_length = 45; @@ -200,6 +201,7 @@ string limit_string_length(string const & str) } +static int get_new_submenu(vector & smn, Window win) { static size_type max_number_of_menus = 32; @@ -211,9 +213,10 @@ int get_new_submenu(vector & smn, Window win) return menu; } + size_type const max_number_of_items = 25; -inline +static inline string const fixlabel(string const & str) { #if FL_REVISION < 89 @@ -223,6 +226,7 @@ string const fixlabel(string const & str) #endif } + void add_toc2(int menu, string const & extra_label, vector & smn, Window win, vector const & toc_list, @@ -230,7 +234,7 @@ void add_toc2(int menu, string const & extra_label, { if (to - from <= max_number_of_items) { for (size_type i = from; i < to; ++i) { - int action = lyxaction. + int const action = lyxaction. getPseudoAction(LFUN_GOTO_PARAGRAPH, tostr(toc_list[i].par->id())); string label(4 * max(0, toc_list[i].depth - depth),' '); @@ -262,7 +266,7 @@ void add_toc2(int menu, string const & extra_label, toc_list[new_pos].depth > depth) ++new_pos; - int action = lyxaction. + int const action = lyxaction. getPseudoAction(LFUN_GOTO_PARAGRAPH, tostr(toc_list[pos].par->id())); string label(4 * max(0, toc_list[pos].depth - depth), ' '); @@ -286,6 +290,7 @@ void add_toc2(int menu, string const & extra_label, } } + void Menubar::Pimpl::add_toc(int menu, string const & extra_label, vector & smn, Window win) { @@ -313,7 +318,7 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label, fl_addtopup(menu2, ". . .%d"); break; } - int action = lyxaction. + int const action = lyxaction. getPseudoAction(LFUN_GOTO_PARAGRAPH, tostr(toc_list[j][i].par->id())); string label = fixlabel(toc_list[j][i].str); @@ -350,7 +355,7 @@ void add_references2(int menu, vector & smn, Window win, if (label_list.size() <= max_number_of_items) for (size_type i = 0; i < label_list.size(); ++i) { - int action = (type == "goto") + int const action = (type == "goto") ? lyxaction.getPseudoAction(LFUN_REF_GOTO, label_list[i]) : lyxaction.getPseudoAction(LFUN_REF_INSERT, @@ -385,7 +390,7 @@ void add_references2(int menu, vector & smn, Window win, int menu2 = get_new_submenu(smn, win); for (size_type k = i; k < j; ++k) { - int action = (type == "goto") + int const action = (type == "goto") ? lyxaction.getPseudoAction(LFUN_REF_GOTO, label_list[k]) : lyxaction.getPseudoAction(LFUN_REF_INSERT, @@ -533,7 +538,7 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, // Get the keys bound to this action, but keep only the // first one later - string accel = toplevel_keymap->findbinding(item.action()); + string const accel = toplevel_keymap->findbinding(item.action()); // Build the menu label from all the info string label = item.label(); @@ -625,6 +630,7 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, return menu; } + extern "C" void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button) { diff --git a/src/frontends/xforms/form_citation.C b/src/frontends/xforms/form_citation.C index cbd1861a0c..a42b253118 100644 --- a/src/frontends/xforms/form_citation.C +++ b/src/frontends/xforms/form_citation.C @@ -25,14 +25,20 @@ FD_form_citation * FormCitation::build_citation() fdui->form = fl_bgn_form(FL_NO_BOX, 435, 665); fdui->form->u_vdata = this; fdui->box = obj = fl_add_box(FL_UP_BOX, 0, 0, 435, 665, ""); - fdui->citeBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 180, 300, idex(_("Inset keys|#I"))); - fl_set_button_shortcut(obj, scex(_("Inset keys|#I")), 1); + { + char const * const dummy = N_("Inset keys|#I"); + fdui->citeBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 30, 180, 300, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_gravity(obj, FL_NorthWest, FL_South); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, CITEBRSR); - fdui->bibBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 240, 30, 180, 300, idex(_("Bibliography keys|#B"))); - fl_set_button_shortcut(obj, scex(_("Bibliography keys|#B")), 1); + { + char const * const dummy = N_("Bibliography keys|#B"); + fdui->bibBrsr = obj = fl_add_browser(FL_HOLD_BROWSER, 240, 30, 180, 300, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_gravity(obj, FL_North, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_X); @@ -61,32 +67,50 @@ FD_form_citation * FormCitation::build_citation() fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); - fdui->style = obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 470, 130, 30, idex(_("Citation style|#s"))); - fl_set_button_shortcut(obj, scex(_("Citation style|#s")), 1); + { + char const * const dummy = N_("Citation style|#s"); + fdui->style = obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 470, 130, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_DOWN_BOX); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); - fdui->textBefore = obj = fl_add_input(FL_NORMAL_INPUT, 100, 520, 250, 30, idex(_("Text before|#T"))); - fl_set_button_shortcut(obj, scex(_("Text before|#T")), 1); + { + char const * const dummy = N_("Text before|#T"); + fdui->textBefore = obj = fl_add_input(FL_NORMAL_INPUT, 100, 520, 250, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); - fdui->textAftr = obj = fl_add_input(FL_NORMAL_INPUT, 100, 570, 250, 30, idex(_("Text after|#e"))); - fl_set_button_shortcut(obj, scex(_("Text after|#e")), 1); + { + char const * const dummy = N_("Text after|#e"); + fdui->textAftr = obj = fl_add_input(FL_NORMAL_INPUT, 100, 570, 250, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthWest, FL_SouthEast); fl_set_object_resize(obj, FL_RESIZE_NONE); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 630, 90, 30, idex(_("Restore|#R"))); - fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); + { + char const * const dummy = N_("Restore|#R"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 630, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 130, 630, 90, 30, _("OK")); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 630, 90, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 630, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 630, 90, 30, idex(_("Cancel|#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1); + { + char const * const dummy = N_("Cancel|#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 630, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fl_end_form(); diff --git a/src/frontends/xforms/form_copyright.C b/src/frontends/xforms/form_copyright.C index 4d2fff85b7..eb68ba588d 100644 --- a/src/frontends/xforms/form_copyright.C +++ b/src/frontends/xforms/form_copyright.C @@ -37,8 +37,11 @@ FD_form_copyright * FormCopyright::build_copyright() fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE); - fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 160, 390, 140, 30, idex(_("Close|#C^[^M"))); - fl_set_button_shortcut(obj, scex(_("Close|#C^[^M")), 1); + { + char const * const dummy = N_("Close|#C^[^M"); + fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 160, 390, 140, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_South, FL_South); fl_set_object_resize(obj, FL_RESIZE_NONE); diff --git a/src/frontends/xforms/form_document.C b/src/frontends/xforms/form_document.C index 79123c97d3..3c7e0295a5 100644 --- a/src/frontends/xforms/form_document.C +++ b/src/frontends/xforms/form_document.C @@ -29,12 +29,18 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document() obj = fl_add_box(FL_UP_BOX, 0, 0, 465, 450, ""); fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder")); fl_set_object_resize(obj, FL_RESIZE_ALL); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 410, 100, 30, idex(_("Cancel|#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1); + { + char const * const dummy = N_("Cancel|#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 410, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseCancelCB, INPUT); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 410, 100, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 410, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, INPUT); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 135, 410, 100, 30, _("OK")); @@ -42,8 +48,11 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document() fl_set_object_callback(obj, C_FormBaseOKCB, INPUT); fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 20, 380, 435, 30, ""); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 410, 100, 30, idex(_("Restore|#R"))); - fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); + { + char const * const dummy = N_("Restore|#R"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 410, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseRestoreCB, INPUT); fl_end_form(); @@ -72,8 +81,11 @@ FD_form_doc_paper * FormDocument::build_doc_paper() obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 85, 200, 100, ""); fl_set_object_color(obj, FL_COL1, FL_COL1); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); - fdui->choice_paperpackage = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 15, 140, 30, idex(_("Special:|#S"))); - fl_set_button_shortcut(obj, scex(_("Special:|#S")), 1); + { + char const * const dummy = N_("Special:|#S"); + fdui->choice_paperpackage = obj = fl_add_choice(FL_NORMAL_CHOICE, 290, 15, 140, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); @@ -104,18 +116,27 @@ FD_form_doc_paper * FormDocument::build_doc_paper() fl_set_object_lstyle(obj, FL_BOLD_STYLE); fdui->greoup_radio_orientation = fl_bgn_group(); - fdui->radio_portrait = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 90, 120, 30, idex(_("Portrait|#o"))); - fl_set_button_shortcut(obj, scex(_("Portrait|#o")), 1); + { + char const * const dummy = N_("Portrait|#o"); + fdui->radio_portrait = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 90, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->radio_landscape = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 120, 120, 30, idex(_("Landscape|#L"))); - fl_set_button_shortcut(obj, scex(_("Landscape|#L")), 1); + { + char const * const dummy = N_("Landscape|#L"); + fdui->radio_landscape = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 120, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fl_end_group(); - fdui->choice_papersize2 = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 15, 160, 30, idex(_("Papersize:|#P"))); - fl_set_button_shortcut(obj, scex(_("Papersize:|#P")), 1); + { + char const * const dummy = N_("Papersize:|#P"); + fdui->choice_papersize2 = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 15, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); @@ -123,44 +144,74 @@ FD_form_doc_paper * FormDocument::build_doc_paper() 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->push_use_geometry = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 45, 170, 30, idex(_("Use Geometry Package|#U"))); - fl_set_button_shortcut(obj, scex(_("Use Geometry Package|#U")), 1); + { + char const * const dummy = N_("Use Geometry Package|#U"); + fdui->push_use_geometry = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 45, 170, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_custom_width = obj = fl_add_input(FL_NORMAL_INPUT, 330, 100, 90, 30, idex(_("Width:|#W"))); - fl_set_button_shortcut(obj, scex(_("Width:|#W")), 1); + { + char const * const dummy = N_("Width:|#W"); + fdui->input_custom_width = obj = fl_add_input(FL_NORMAL_INPUT, 330, 100, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_custom_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 140, 90, 30, idex(_("Height:|#H"))); - fl_set_button_shortcut(obj, scex(_("Height:|#H")), 1); + { + char const * const dummy = N_("Height:|#H"); + fdui->input_custom_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 140, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_top_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 175, 90, 30, idex(_("Top:|#T"))); - fl_set_button_shortcut(obj, scex(_("Top:|#T")), 1); + { + char const * const dummy = N_("Top:|#T"); + fdui->input_top_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 175, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_bottom_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 215, 90, 30, idex(_("Bottom:|#B"))); - fl_set_button_shortcut(obj, scex(_("Bottom:|#B")), 1); + { + char const * const dummy = N_("Bottom:|#B"); + fdui->input_bottom_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 215, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_left_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 255, 90, 30, idex(_("Left:|#e"))); - fl_set_button_shortcut(obj, scex(_("Left:|#e")), 1); + { + char const * const dummy = N_("Left:|#e"); + fdui->input_left_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 255, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_right_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 295, 90, 30, idex(_("Right:|#R"))); - fl_set_button_shortcut(obj, scex(_("Right:|#R")), 1); + { + char const * const dummy = N_("Right:|#R"); + fdui->input_right_margin = obj = fl_add_input(FL_NORMAL_INPUT, 100, 295, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_head_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 215, 90, 30, idex(_("Headheight:|#i"))); - fl_set_button_shortcut(obj, scex(_("Headheight:|#i")), 1); + { + char const * const dummy = N_("Headheight:|#i"); + fdui->input_head_height = obj = fl_add_input(FL_NORMAL_INPUT, 330, 215, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_head_sep = obj = fl_add_input(FL_NORMAL_INPUT, 330, 255, 90, 30, idex(_("Headsep:|#d"))); - fl_set_button_shortcut(obj, scex(_("Headsep:|#d")), 1); + { + char const * const dummy = N_("Headsep:|#d"); + fdui->input_head_sep = obj = fl_add_input(FL_NORMAL_INPUT, 330, 255, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_foot_skip = obj = fl_add_input(FL_NORMAL_INPUT, 330, 295, 90, 30, idex(_("Footskip:|#F"))); - fl_set_button_shortcut(obj, scex(_("Footskip:|#F")), 1); + { + char const * const dummy = N_("Footskip:|#F"); + fdui->input_foot_skip = obj = fl_add_input(FL_NORMAL_INPUT, 330, 295, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 360, 420, 20, ""); @@ -199,75 +250,114 @@ FD_form_doc_class * FormDocument::build_doc_class() obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 20, 120, 70, _("Sides")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); - fdui->choice_doc_fonts = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 100, 160, 30, idex(_("Fonts:|#F"))); - fl_set_button_shortcut(obj, scex(_("Fonts:|#F")), 1); + { + char const * const dummy = N_("Fonts:|#F"); + fdui->choice_doc_fonts = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 100, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->choice_doc_fontsize = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 140, 160, 30, idex(_("Font Size:|#O"))); - fl_set_button_shortcut(obj, scex(_("Font Size:|#O")), 1); + { + char const * const dummy = N_("Font Size:|#O"); + fdui->choice_doc_fontsize = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 140, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->choice_doc_class = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 20, 160, 30, idex(_("Class:|#C"))); - fl_set_button_shortcut(obj, scex(_("Class:|#C")), 1); + { + char const * const dummy = N_("Class:|#C"); + fdui->choice_doc_class = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 20, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, CHECKCHOICECLASS); - fdui->choice_doc_pagestyle = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 60, 160, 30, idex(_("Pagestyle:|#P"))); - fl_set_button_shortcut(obj, scex(_("Pagestyle:|#P")), 1); + { + char const * const dummy = N_("Pagestyle:|#P"); + fdui->choice_doc_pagestyle = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 60, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->choice_doc_spacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 290, 160, 30, idex(_("Spacing|#g"))); - fl_set_button_shortcut(obj, scex(_("Spacing|#g")), 1); + { + char const * const dummy = N_("Spacing|#g"); + fdui->choice_doc_spacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 290, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->input_doc_extra = obj = fl_add_input(FL_NORMAL_INPUT, 120, 185, 160, 30, idex(_("Extra Options:|#X"))); - fl_set_button_shortcut(obj, scex(_("Extra Options:|#X")), 1); + { + char const * const dummy = N_("Extra Options:|#X"); + fdui->input_doc_extra = obj = fl_add_input(FL_NORMAL_INPUT, 120, 185, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fdui->input_doc_skip = obj = fl_add_input(FL_NORMAL_INPUT, 220, 225, 60, 30, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->choice_doc_skip = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 225, 90, 30, idex(_("Default Skip:|#u"))); - fl_set_button_shortcut(obj, scex(_("Default Skip:|#u")), 1); + { + char const * const dummy = N_("Default Skip:|#u"); + fdui->choice_doc_skip = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 225, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fdui->group_doc_sides = fl_bgn_group(); - fdui->radio_doc_sides_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_("One|#n"))); - fl_set_button_shortcut(obj, scex(_("One|#n")), 1); + { + char const * const dummy = N_("One|#n"); + fdui->radio_doc_sides_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 30, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->radio_doc_sides_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 60, 120, 30, idex(_("Two|#T"))); - fl_set_button_shortcut(obj, scex(_("Two|#T")), 1); + { + char const * const dummy = N_("Two|#T"); + fdui->radio_doc_sides_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 60, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fl_end_group(); fdui->group_doc_columns = fl_bgn_group(); - fdui->radio_doc_columns_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_("One|#e"))); - fl_set_button_shortcut(obj, scex(_("One|#e")), 1); + { + char const * const dummy = N_("One|#e"); + fdui->radio_doc_columns_one = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 120, 110, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->radio_doc_columns_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 150, 110, 30, idex(_("Two|#w"))); - fl_set_button_shortcut(obj, scex(_("Two|#w")), 1); + { + char const * const dummy = N_("Two|#w"); + fdui->radio_doc_columns_two = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 150, 110, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fl_end_group(); fdui->group_doc_sep = fl_bgn_group(); - fdui->radio_doc_indent = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 210, 110, 30, idex(_("Indent|#I"))); - fl_set_button_shortcut(obj, scex(_("Indent|#I")), 1); + { + char const * const dummy = N_("Indent|#I"); + fdui->radio_doc_indent = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 210, 110, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->radio_doc_skip = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 240, 110, 30, idex(_("Skip|#K"))); - fl_set_button_shortcut(obj, scex(_("Skip|#K")), 1); + { + char const * const dummy = N_("Skip|#K"); + fdui->radio_doc_skip = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 300, 240, 110, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fl_set_button(obj, 1); @@ -300,29 +390,44 @@ FD_form_doc_language * FormDocument::build_doc_language() fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, ""); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 40, 120, 290, 110, _("Quote Style ")); - fdui->choice_inputenc = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 70, 190, 30, idex(_("Encoding:|#D"))); - fl_set_button_shortcut(obj, scex(_("Encoding:|#D")), 1); + { + char const * const dummy = N_("Encoding:|#D"); + fdui->choice_inputenc = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 70, 190, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->choice_quotes_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 110, 140, 190, 30, idex(_("Type:|#T"))); - fl_set_button_shortcut(obj, scex(_("Type:|#T")), 1); + { + char const * const dummy = N_("Type:|#T"); + fdui->choice_quotes_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 110, 140, 190, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fl_bgn_group(); - fdui->radio_single = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 180, 90, 30, idex(_("Single|#S"))); - fl_set_button_shortcut(obj, scex(_("Single|#S")), 1); + { + char const * const dummy = N_("Single|#S"); + fdui->radio_single = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 180, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->radio_double = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 210, 180, 90, 30, idex(_("Double|#D"))); - fl_set_button_shortcut(obj, scex(_("Double|#D")), 1); + { + char const * const dummy = N_("Double|#D"); + fdui->radio_double = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 210, 180, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fl_end_group(); - fdui->choice_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 35, 190, 30, idex(_("Language:|#L"))); - fl_set_button_shortcut(obj, scex(_("Language:|#L")), 1); + { + char const * const dummy = N_("Language:|#L"); + fdui->choice_language = obj = fl_add_choice(FL_NORMAL_CHOICE, 120, 35, 190, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); @@ -349,8 +454,11 @@ FD_form_doc_options * FormDocument::build_doc_options() fdui->form = fl_bgn_form(FL_NO_BOX, 440, 345); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 440, 345, ""); - fdui->input_float_placement = obj = fl_add_input(FL_NORMAL_INPUT, 155, 60, 120, 30, idex(_("Float Placement:|#L"))); - fl_set_button_shortcut(obj, scex(_("Float Placement:|#L")), 1); + { + char const * const dummy = N_("Float Placement:|#L"); + fdui->input_float_placement = obj = fl_add_input(FL_NORMAL_INPUT, 155, 60, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fdui->slider_secnumdepth = obj = fl_add_counter(FL_SIMPLE_COUNTER, 155, 110, 80, 30, _("Section number depth")); @@ -361,13 +469,19 @@ FD_form_doc_options * FormDocument::build_doc_options() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->choice_postscript_driver = obj = fl_add_choice(FL_NORMAL_CHOICE, 155, 205, 190, 30, idex(_("PS Driver:|#S"))); - fl_set_button_shortcut(obj, scex(_("PS Driver:|#S")), 1); + { + char const * const dummy = N_("PS Driver:|#S"); + fdui->choice_postscript_driver = obj = fl_add_choice(FL_NORMAL_CHOICE, 155, 205, 190, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); - fdui->check_use_amsmath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 250, 200, 30, idex(_("Use AMS Math|#M"))); - fl_set_button_shortcut(obj, scex(_("Use AMS Math|#M")), 1); + { + char const * const dummy = N_("Use AMS Math|#M"); + fdui->check_use_amsmath = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 140, 250, 200, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUT); fl_end_form(); @@ -405,34 +519,52 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet() "xpm").c_str()); fl_set_border_width(-1); obj = fl_add_frame(FL_ENGRAVED_FRAME, 95, 20, 255, 70, ""); - fdui->choice_bullet_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 15, 45, 65, 30, idex(_("Size|#z"))); - fl_set_button_shortcut(obj, scex(_("Size|#z")), 1); + { + char const * const dummy = N_("Size|#z"); + fdui->choice_bullet_size = obj = fl_add_choice(FL_NORMAL_CHOICE, 15, 45, 65, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_callback(obj, C_FormBaseInputCB, CHOICEBULLETSIZE); - fdui->input_bullet_latex = obj = fl_add_input(FL_NORMAL_INPUT, 80, 300, 275, 30, idex(_("LaTeX|#L"))); - fl_set_button_shortcut(obj, scex(_("LaTeX|#L")), 1); + { + char const * const dummy = N_("LaTeX|#L"); + fdui->input_bullet_latex = obj = fl_add_input(FL_NORMAL_INPUT, 80, 300, 275, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_FIXED_STYLE); fl_set_object_callback(obj, C_FormBaseInputCB, INPUTBULLETLATEX); fdui->radio_bullet_depth = fl_bgn_group(); - fdui->radio_bullet_depth_1 = obj = fl_add_button(FL_RADIO_BUTTON, 105, 35, 55, 40, idex(_("1|#1"))); - fl_set_button_shortcut(obj, scex(_("1|#1")), 1); + { + char const * const dummy = N_("1|#1"); + fdui->radio_bullet_depth_1 = obj = fl_add_button(FL_RADIO_BUTTON, 105, 35, 55, 40, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_LARGE_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH1); fl_set_button(obj, 1); - fdui->radio_bullet_depth_2 = obj = fl_add_button(FL_RADIO_BUTTON, 165, 35, 55, 40, idex(_("2|#2"))); - fl_set_button_shortcut(obj, scex(_("2|#2")), 1); + { + char const * const dummy = N_("2|#2"); + fdui->radio_bullet_depth_2 = obj = fl_add_button(FL_RADIO_BUTTON, 165, 35, 55, 40, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_LARGE_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH2); - fdui->radio_bullet_depth_3 = obj = fl_add_button(FL_RADIO_BUTTON, 225, 35, 55, 40, idex(_("3|#3"))); - fl_set_button_shortcut(obj, scex(_("3|#3")), 1); + { + char const * const dummy = N_("3|#3"); + fdui->radio_bullet_depth_3 = obj = fl_add_button(FL_RADIO_BUTTON, 225, 35, 55, 40, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_LARGE_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH3); - fdui->radio_bullet_depth_4 = obj = fl_add_button(FL_RADIO_BUTTON, 285, 35, 55, 40, idex(_("4|#4"))); - fl_set_button_shortcut(obj, scex(_("4|#4")), 1); + { + char const * const dummy = N_("4|#4"); + fdui->radio_bullet_depth_4 = obj = fl_add_button(FL_RADIO_BUTTON, 285, 35, 55, 40, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_LARGE_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETDEPTH4); fl_end_group(); @@ -442,34 +574,52 @@ FD_form_doc_bullet * FormDocument::build_doc_bullet() fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); fdui->radio_bullet_panel = fl_bgn_group(); - fdui->radio_bullet_panel_standard = obj = fl_add_button(FL_RADIO_BUTTON, 15, 105, 65, 30, idex(_("Standard|#S"))); - fl_set_button_shortcut(obj, scex(_("Standard|#S")), 1); + { + char const * const dummy = N_("Standard|#S"); + fdui->radio_bullet_panel_standard = obj = fl_add_button(FL_RADIO_BUTTON, 15, 105, 65, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL1); fl_set_button(obj, 1); - fdui->radio_bullet_panel_maths = obj = fl_add_button(FL_RADIO_BUTTON, 15, 135, 65, 30, idex(_("Maths|#M"))); - fl_set_button_shortcut(obj, scex(_("Maths|#M")), 1); + { + char const * const dummy = N_("Maths|#M"); + fdui->radio_bullet_panel_maths = obj = fl_add_button(FL_RADIO_BUTTON, 15, 135, 65, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL2); - fdui->radio_bullet_panel_ding2 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 195, 65, 30, idex(_("Ding 2|#i"))); - fl_set_button_shortcut(obj, scex(_("Ding 2|#i")), 1); + { + char const * const dummy = N_("Ding 2|#i"); + fdui->radio_bullet_panel_ding2 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 195, 65, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL3); - fdui->radio_bullet_panel_ding3 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 225, 65, 30, idex(_("Ding 3|#n"))); - fl_set_button_shortcut(obj, scex(_("Ding 3|#n")), 1); + { + char const * const dummy = N_("Ding 3|#n"); + fdui->radio_bullet_panel_ding3 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 225, 65, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL4); - fdui->radio_bullet_panel_ding4 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 255, 65, 30, idex(_("Ding 4|#g"))); - fl_set_button_shortcut(obj, scex(_("Ding 4|#g")), 1); + { + char const * const dummy = N_("Ding 4|#g"); + fdui->radio_bullet_panel_ding4 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 255, 65, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL5); - fdui->radio_bullet_panel_ding1 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 165, 65, 30, idex(_("Ding 1|#D"))); - fl_set_button_shortcut(obj, scex(_("Ding 1|#D")), 1); + { + char const * const dummy = N_("Ding 1|#D"); + fdui->radio_bullet_panel_ding1 = obj = fl_add_button(FL_RADIO_BUTTON, 15, 165, 65, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseInputCB, BULLETPANEL6); diff --git a/src/frontends/xforms/form_error.C b/src/frontends/xforms/form_error.C index 7f8c30da7c..fe14e8377e 100644 --- a/src/frontends/xforms/form_error.C +++ b/src/frontends/xforms/form_error.C @@ -27,8 +27,11 @@ FD_form_error * FormError::build_error() obj = fl_add_box(FL_UP_BOX, 0, 0, 400, 240, ""); fdui->message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, ""); fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast); - fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_("Close|#C^[^M"))); - fl_set_button_shortcut(obj, scex(_("Close|#C^[^M")), 1); + { + char const * const dummy = N_("Close|#C^[^M"); + fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_South, FL_South); fl_set_object_resize(obj, FL_RESIZE_NONE); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); diff --git a/src/frontends/xforms/form_graphics.C b/src/frontends/xforms/form_graphics.C index bcb4e34026..f37e4496cf 100644 --- a/src/frontends/xforms/form_graphics.C +++ b/src/frontends/xforms/form_graphics.C @@ -29,11 +29,17 @@ FD_form_graphics * FormGraphics::build_graphics() fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast); obj = fl_add_frame(FL_ENGRAVED_FRAME, 20, 310, 138, 30, ""); obj = fl_add_frame(FL_ENGRAVED_FRAME, 279, 250, 201, 50, ""); - fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 150, 20, 210, 30, idex(_("Graphics File|#F"))); - fl_set_button_shortcut(obj, scex(_("Graphics File|#F")), 1); + { + char const * const dummy = N_("Graphics File|#F"); + fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 150, 20, 210, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT); - fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 20, 90, 30, idex(_("Browse|#B"))); - fl_set_button_shortcut(obj, scex(_("Browse|#B")), 1); + { + char const * const dummy = N_("Browse|#B"); + fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 20, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, BROWSE); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 70, 240, 160, _("Width")); fl_set_object_lalign(obj, FL_ALIGN_CENTER); @@ -80,41 +86,71 @@ FD_form_graphics * FormGraphics::build_graphics() fdui->radio_button_group_display = fl_bgn_group(); - fdui->radio_display_monochrome = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 80, 98, 30, idex(_("in Monochrome|#M"))); - fl_set_button_shortcut(obj, scex(_("in Monochrome|#M")), 1); + { + char const * const dummy = N_("in Monochrome|#M"); + fdui->radio_display_monochrome = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 80, 98, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_button(obj, 1); - fdui->radio_display_grayscale = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 110, 98, 30, idex(_("in Grayscale|#G"))); - fl_set_button_shortcut(obj, scex(_("in Grayscale|#G")), 1); - fdui->radio_display_color = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 140, 98, 30, idex(_("in Color|#C"))); - fl_set_button_shortcut(obj, scex(_("in Color|#C")), 1); - fdui->radio_no_display = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 170, 98, 30, idex(_("Don't display|#D"))); - fl_set_button_shortcut(obj, scex(_("Don't display|#D")), 1); + { + char const * const dummy = N_("in Grayscale|#G"); + fdui->radio_display_grayscale = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 110, 98, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } + { + char const * const dummy = N_("in Color|#C"); + fdui->radio_display_color = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 140, 98, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } + { + char const * const dummy = N_("Don't display|#D"); + fdui->radio_no_display = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 170, 98, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_end_group(); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 250, 236, 50, _("Rotate")); - fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 91, 260, 94, 30, idex(_("Angle|#A"))); - fl_set_button_shortcut(obj, scex(_("Angle|#A")), 1); + { + char const * const dummy = N_("Angle|#A"); + fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 91, 260, 94, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT); - fdui->check_inline = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 279, 260, 201, 30, idex(_("Inline Figure|#I"))); - fl_set_button_shortcut(obj, scex(_("Inline Figure|#I")), 1); + { + char const * const dummy = N_("Inline Figure|#I"); + fdui->check_inline = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 279, 260, 201, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT); fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 158, 310, 322, 30, ""); fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT); - fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 120, 310, 30, 30, idex(_("Subcaption|#S"))); - fl_set_button_shortcut(obj, scex(_("Subcaption|#S")), 1); + { + char const * const dummy = N_("Subcaption|#S"); + fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 120, 310, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 20, 350, 90, 30, idex(_("Update|#U"))); - fl_set_button_shortcut(obj, scex(_("Update|#U")), 1); + { + char const * const dummy = N_("Update|#U"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 20, 350, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 190, 350, 90, 30, _("Ok")); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 350, 90, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 350, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 390, 350, 90, 30, idex(_("Cancel|^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1); + { + char const * const dummy = N_("Cancel|^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 390, 350, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fl_end_form(); diff --git a/src/frontends/xforms/form_index.C b/src/frontends/xforms/form_index.C index 65a456157b..c13054afaf 100644 --- a/src/frontends/xforms/form_index.C +++ b/src/frontends/xforms/form_index.C @@ -30,21 +30,30 @@ FD_form_index * FormIndex::build_index() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 60, 100, 30, idex(_("Restore|#R"))); - fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); + { + char const * const dummy = N_("Restore|#R"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 60, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 190, 60, 100, 30, _("OK")); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 60, 100, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 60, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_("Cancel|#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1); + { + char const * const dummy = N_("Cancel|#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C index 8b660004f3..69ba516349 100644 --- a/src/frontends/xforms/form_paragraph.C +++ b/src/frontends/xforms/form_paragraph.C @@ -36,8 +36,11 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general() fl_set_object_color(obj, FL_COL1, FL_COL1); obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 190, 70, ""); fl_set_object_color(obj, FL_COL1, FL_COL1); - fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 100, 210, 360, 30, idex(_("Label Width:|#d"))); - fl_set_button_shortcut(obj, scex(_("Label Width:|#d")), 1); + { + char const * const dummy = N_("Label Width:|#d"); + fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 100, 210, 360, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_West, FL_East); fl_set_object_resize(obj, FL_RESIZE_X); @@ -46,42 +49,69 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general() 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->check_lines_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 30, 120, 30, idex(_("Above|#b"))); - fl_set_button_shortcut(obj, scex(_("Above|#b")), 1); + { + char const * const dummy = N_("Above|#b"); + fdui->check_lines_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 30, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_lines_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 60, 120, 30, idex(_("Below|#E"))); - fl_set_button_shortcut(obj, scex(_("Below|#E")), 1); + { + char const * const dummy = N_("Below|#E"); + fdui->check_lines_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 60, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_pagebreaks_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 30, 120, 30, idex(_("Above|#o"))); - fl_set_button_shortcut(obj, scex(_("Above|#o")), 1); + { + char const * const dummy = N_("Above|#o"); + fdui->check_pagebreaks_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 30, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_pagebreaks_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 60, 120, 30, idex(_("Below|#l"))); - fl_set_button_shortcut(obj, scex(_("Below|#l")), 1); + { + char const * const dummy = N_("Below|#l"); + fdui->check_pagebreaks_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 60, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 120, 120, 30, idex(_("No Indent|#I"))); - fl_set_button_shortcut(obj, scex(_("No Indent|#I")), 1); + { + char const * const dummy = N_("No Indent|#I"); + fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 120, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->group_radio_alignment = fl_bgn_group(); - fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 80, 30, idex(_("Right|#R"))); - fl_set_button_shortcut(obj, scex(_("Right|#R")), 1); + { + char const * const dummy = N_("Right|#R"); + fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 80, 30, idex(_("Left|#f"))); - fl_set_button_shortcut(obj, scex(_("Left|#f")), 1); + { + char const * const dummy = N_("Left|#f"); + fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_block = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 30, 80, 30, idex(_("Block|#c"))); - fl_set_button_shortcut(obj, scex(_("Block|#c")), 1); + { + char const * const dummy = N_("Block|#c"); + fdui->radio_align_block = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 30, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 60, 80, 30, idex(_("Center|#n"))); - fl_set_button_shortcut(obj, scex(_("Center|#n")), 1); + { + char const * const dummy = N_("Center|#n"); + fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 60, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_group(); @@ -92,13 +122,19 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general() fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 160, 90, 30, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 120, 100, 30, idex(_("Above:|#v"))); - fl_set_button_shortcut(obj, scex(_("Above:|#v")), 1); + { + char const * const dummy = N_("Above:|#v"); + fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 120, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 160, 100, 30, idex(_("Below:|#w"))); - fl_set_button_shortcut(obj, scex(_("Below:|#w")), 1); + { + char const * const dummy = N_("Below:|#w"); + fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 160, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -118,12 +154,18 @@ FD_form_paragraph_general * FormParagraph::build_paragraph_general() 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->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 120, 40, 30, idex(_("Keep|#K"))); - fl_set_button_shortcut(obj, scex(_("Keep|#K")), 1); + { + char const * const dummy = N_("Keep|#K"); + fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 120, 40, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 160, 40, 30, idex(_("Keep|#p"))); - fl_set_button_shortcut(obj, scex(_("Keep|#p")), 1); + { + char const * const dummy = N_("Keep|#p"); + fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 160, 40, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_form(); @@ -159,13 +201,19 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra() 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->input_pextra_width = obj = fl_add_input(FL_NORMAL_INPUT, 240, 30, 90, 30, idex(_("Length|#L"))); - fl_set_button_shortcut(obj, scex(_("Length|#L")), 1); + { + char const * const dummy = N_("Length|#L"); + fdui->input_pextra_width = obj = fl_add_input(FL_NORMAL_INPUT, 240, 30, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - // xgettext:no-c-format - fdui->input_pextra_widthp = obj = fl_add_input(FL_INT_INPUT, 240, 70, 90, 30, idex(_("or %|#o"))); - fl_set_button_shortcut(obj, scex(_("or %|#o")), 1); + { + // xgettext:no-c-format + char const * const dummy = N_("or %|#o"); + fdui->input_pextra_widthp = obj = fl_add_input(FL_INT_INPUT, 240, 70, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); obj = fl_add_text(FL_NORMAL_TEXT, 200, 10, 60, 20, _("Width")); @@ -178,40 +226,64 @@ FD_form_paragraph_extra * FormParagraph::build_paragraph_extra() fl_set_object_lstyle(obj, FL_BOLD_STYLE); fdui->group_alignment = fl_bgn_group(); - fdui->radio_pextra_top = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 30, 80, 30, idex(_("Top|#T"))); - fl_set_button_shortcut(obj, scex(_("Top|#T")), 1); + { + char const * const dummy = N_("Top|#T"); + fdui->radio_pextra_top = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 30, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_pextra_middle = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 60, 80, 30, idex(_("Middle|#d"))); - fl_set_button_shortcut(obj, scex(_("Middle|#d")), 1); + { + char const * const dummy = N_("Middle|#d"); + fdui->radio_pextra_middle = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 60, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_pextra_bottom = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 90, 80, 30, idex(_("Bottom|#B"))); - fl_set_button_shortcut(obj, scex(_("Bottom|#B")), 1); + { + char const * const dummy = N_("Bottom|#B"); + fdui->radio_pextra_bottom = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 90, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_group(); - 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); + { + char const * const dummy = N_("HFill between Minipage paragraphs|#H"); + fdui->radio_pextra_hfill = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 130, 300, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_pextra_startmp = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 160, 260, 30, idex(_("Start new Minipage|#S"))); - fl_set_button_shortcut(obj, scex(_("Start new Minipage|#S")), 1); + { + char const * const dummy = N_("Start new Minipage|#S"); + fdui->radio_pextra_startmp = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 160, 260, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->group_extraopt = fl_bgn_group(); - fdui->radio_pextra_indent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 30, 160, 30, idex(_("Indented Paragraph|#I"))); - fl_set_button_shortcut(obj, scex(_("Indented Paragraph|#I")), 1); + { + char const * const dummy = N_("Indented Paragraph|#I"); + fdui->radio_pextra_indent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 30, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_pextra_minipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 60, 160, 30, idex(_("Minipage|#M"))); - fl_set_button_shortcut(obj, scex(_("Minipage|#M")), 1); + { + char const * const dummy = N_("Minipage|#M"); + fdui->radio_pextra_minipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 60, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_pextra_floatflt = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 90, 160, 30, idex(_("Floatflt|#F"))); - fl_set_button_shortcut(obj, scex(_("Floatflt|#F")), 1); + { + char const * const dummy = N_("Floatflt|#F"); + fdui->radio_pextra_floatflt = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 90, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_group(); @@ -241,19 +313,28 @@ FD_form_tabbed_paragraph * FormParagraph::build_tabbed_paragraph() 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, 310, 100, 30, idex(_("Cancel|C#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1); + { + char const * const dummy = N_("Cancel|C#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); - 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); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 310, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); 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_FormBaseOKCB, 0); - 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); + { + char const * const dummy = N_("Restore|#R"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 310, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 280, 490, 30, ""); diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C index 4313bdc100..7ac1325dac 100644 --- a/src/frontends/xforms/form_preferences.C +++ b/src/frontends/xforms/form_preferences.C @@ -27,19 +27,28 @@ FD_form_preferences * FormPreferences::build_preferences() obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 500, ""); fdui->tabfolder_prefs = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 10, 455, 375, ""); fl_set_object_boxtype(obj, FL_FLAT_BOX); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 390, 90, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 390, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_("Cancel|C#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1); + { + char const * const dummy = N_("Cancel|C#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 170, 390, 90, 30, _("Save")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 390, 90, 30, idex(_("Restore|#R"))); - fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); + { + char const * const dummy = N_("Restore|#R"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 390, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); obj = fl_add_frame(FL_ENGRAVED_FRAME, 0, 425, 470, 1, ""); @@ -102,9 +111,12 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts() fdui->input_typewriter = obj = fl_add_input(FL_NORMAL_INPUT, 210, 65, 200, 30, _("Typewriter")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - // xgettext:no-c-format - fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER, 310, 130, 100, 30, idex(_("Zoom %|#Z"))); - fl_set_button_shortcut(obj, scex(_("Zoom %|#Z")), 1); + { + // xgettext:no-c-format + char const * const dummy = N_("Zoom %|#Z"); + fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER, 310, 130, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -138,8 +150,11 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts() fdui->input_normal = obj = fl_add_input(FL_FLOAT_INPUT, 200, 229, 70, 30, _("normal")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->counter_dpi = obj = fl_add_counter(FL_NORMAL_COUNTER, 310, 160, 100, 30, idex(_("Screen DPI|#D"))); - fl_set_button_shortcut(obj, scex(_("Screen DPI|#D")), 1); + { + char const * const dummy = N_("Screen DPI|#D"); + fdui->counter_dpi = obj = fl_add_counter(FL_NORMAL_COUNTER, 310, 160, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -183,8 +198,11 @@ FD_form_outputs_misc * FormPreferences::build_outputs_misc() fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, ""); fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast); - fdui->counter_line_len = obj = fl_add_counter(FL_NORMAL_COUNTER, 315, 50, 100, 30, idex(_("Ascii line length|#A"))); - fl_set_button_shortcut(obj, scex(_("Ascii line length|#A")), 1); + { + char const * const dummy = N_("Ascii line length|#A"); + fdui->counter_line_len = obj = fl_add_counter(FL_NORMAL_COUNTER, 315, 50, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -192,21 +210,33 @@ FD_form_outputs_misc * FormPreferences::build_outputs_misc() fl_set_counter_bounds(obj, 0, 120); fl_set_counter_value(obj, 75); fl_set_counter_step(obj, 1, 1); - fdui->input_tex_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 216, 95, 200, 30, idex(_("TeX encoding|#T"))); - fl_set_button_shortcut(obj, scex(_("TeX encoding|#T")), 1); + { + char const * const dummy = N_("TeX encoding|#T"); + fdui->input_tex_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 216, 95, 200, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_default_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 219, 142, 199, 29, idex(_("Default paper size|#p"))); - fl_set_button_shortcut(obj, scex(_("Default paper size|#p")), 1); + { + char const * const dummy = N_("Default paper size|#p"); + fdui->choice_default_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 219, 142, 199, 29, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_ascii_roff = obj = fl_add_input(FL_NORMAL_INPUT, 121, 209, 285, 30, idex(_("ascii roff|#r"))); - fl_set_button_shortcut(obj, scex(_("ascii roff|#r")), 1); + { + char const * const dummy = N_("ascii roff|#r"); + fdui->input_ascii_roff = obj = fl_add_input(FL_NORMAL_INPUT, 121, 209, 285, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_checktex = obj = fl_add_input(FL_NORMAL_INPUT, 121, 250, 285, 30, idex(_("checktex|#c"))); - fl_set_button_shortcut(obj, scex(_("checktex|#c")), 1); + { + char const * const dummy = N_("checktex|#c"); + fdui->input_checktex = obj = fl_add_input(FL_NORMAL_INPUT, 121, 250, 285, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 12, 186, 406, 120, _("Outside code interaction")); @@ -235,44 +265,65 @@ FD_form_spellchecker * FormPreferences::build_spellchecker() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); - fdui->choice_spell_command = obj = fl_add_choice(FL_NORMAL_CHOICE, 141, 47, 171, 34, idex(_("Spell command|#S"))); - fl_set_button_shortcut(obj, scex(_("Spell command|#S")), 1); + { + char const * const dummy = N_("Spell command|#S"); + fdui->choice_spell_command = obj = fl_add_choice(FL_NORMAL_CHOICE, 141, 47, 171, 34, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_alt_lang = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 100, 30, 30, idex(_("Use alternative language|#a"))); - fl_set_button_shortcut(obj, scex(_("Use alternative language|#a")), 1); + { + char const * const dummy = N_("Use alternative language|#a"); + fdui->check_alt_lang = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 100, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->input_alt_lang = obj = fl_add_input(FL_NORMAL_INPUT, 239, 100, 170, 30, ""); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_escape_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 130, 30, 30, idex(_("Use escape characters|#e"))); - fl_set_button_shortcut(obj, scex(_("Use escape characters|#e")), 1); + { + char const * const dummy = N_("Use escape characters|#e"); + fdui->check_escape_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 130, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->input_escape_chars = obj = fl_add_input(FL_NORMAL_INPUT, 239, 130, 170, 30, ""); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_personal_dict = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 160, 30, 30, idex(_("Use personal dictionary|#d"))); - fl_set_button_shortcut(obj, scex(_("Use personal dictionary|#d")), 1); + { + char const * const dummy = N_("Use personal dictionary|#d"); + fdui->check_personal_dict = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 160, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->input_personal_dict = obj = fl_add_input(FL_NORMAL_INPUT, 239, 160, 170, 30, ""); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_personal_dict = obj = fl_add_button(FL_NORMAL_BUTTON, 239, 190, 89, 30, idex(_("Browse...|#B"))); - fl_set_button_shortcut(obj, scex(_("Browse...|#B")), 1); + { + char const * const dummy = N_("Browse...|#B"); + fdui->button_personal_dict = obj = fl_add_button(FL_NORMAL_BUTTON, 239, 190, 89, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_compound_words = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 230, 30, 30, idex(_("Accept compound words|#w"))); - fl_set_button_shortcut(obj, scex(_("Accept compound words|#w")), 1); + { + char const * const dummy = N_("Accept compound words|#w"); + fdui->check_compound_words = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 230, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_input_enc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 260, 30, 30, idex(_("Use input encoding|#i"))); - fl_set_button_shortcut(obj, scex(_("Use input encoding|#i")), 1); + { + char const * const dummy = N_("Use input encoding|#i"); + fdui->check_input_enc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 260, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -299,8 +350,11 @@ FD_form_inputs_misc * FormPreferences::build_inputs_misc() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); - fdui->input_date_format = obj = fl_add_input(FL_NORMAL_INPUT, 120, 70, 285, 30, idex(_("date format|#f"))); - fl_set_button_shortcut(obj, scex(_("date format|#f")), 1); + { + char const * const dummy = N_("date format|#f"); + fdui->input_date_format = obj = fl_add_input(FL_NORMAL_INPUT, 120, 70, 285, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_form(); @@ -326,53 +380,86 @@ FD_form_language * FormPreferences::build_language() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); - fdui->input_package = obj = fl_add_input(FL_NORMAL_INPUT, 131, 18, 300, 30, idex(_("Package|#P"))); - fl_set_button_shortcut(obj, scex(_("Package|#P")), 1); + { + char const * const dummy = N_("Package|#P"); + fdui->input_package = obj = fl_add_input(FL_NORMAL_INPUT, 131, 18, 300, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_default_lang = obj = fl_add_choice(FL_NORMAL_CHOICE, 231, 56, 200, 30, idex(_("Default language|#l"))); - fl_set_button_shortcut(obj, scex(_("Default language|#l")), 1); + { + char const * const dummy = N_("Default language|#l"); + fdui->choice_default_lang = obj = fl_add_choice(FL_NORMAL_CHOICE, 231, 56, 200, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_use_kbmap = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 78, 113, 30, 30, idex(_("Keyboard\nmap|#K"))); - fl_set_button_shortcut(obj, scex(_("Keyboard\nmap|#K")), 1); + { + char const * const dummy = N_("Keyboard\nmap|#K"); + fdui->check_use_kbmap = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 78, 113, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_rtl_support = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 154, 161, 30, 30, idex(_("RtL support|#R"))); - fl_set_button_shortcut(obj, scex(_("RtL support|#R")), 1); + { + char const * const dummy = N_("RtL support|#R"); + fdui->check_rtl_support = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 154, 161, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_mark_foreign = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 154, 187, 30, 30, idex(_("Mark foreign|#M"))); - fl_set_button_shortcut(obj, scex(_("Mark foreign|#M")), 1); + { + char const * const dummy = N_("Mark foreign|#M"); + fdui->check_mark_foreign = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 154, 187, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_auto_begin = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 362, 161, 30, 30, idex(_("Auto begin|#b"))); - fl_set_button_shortcut(obj, scex(_("Auto begin|#b")), 1); + { + char const * const dummy = N_("Auto begin|#b"); + fdui->check_auto_begin = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 362, 161, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_auto_end = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 362, 187, 30, 30, idex(_("Auto finish|#f"))); - fl_set_button_shortcut(obj, scex(_("Auto finish|#f")), 1); + { + char const * const dummy = N_("Auto finish|#f"); + fdui->check_auto_end = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 362, 187, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_command_begin = obj = fl_add_input(FL_NORMAL_INPUT, 131, 224, 300, 30, idex(_("Command start|#s"))); - fl_set_button_shortcut(obj, scex(_("Command start|#s")), 1); + { + char const * const dummy = N_("Command start|#s"); + fdui->input_command_begin = obj = fl_add_input(FL_NORMAL_INPUT, 131, 224, 300, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_command_end = obj = fl_add_input(FL_NORMAL_INPUT, 131, 257, 300, 30, idex(_("Command end|#e"))); - fl_set_button_shortcut(obj, scex(_("Command end|#e")), 1); + { + char const * const dummy = N_("Command end|#e"); + fdui->input_command_end = obj = fl_add_input(FL_NORMAL_INPUT, 131, 257, 300, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_kbmap1 = obj = fl_add_input(FL_NORMAL_INPUT, 144, 97, 195, 30, idex(_("1st|#1"))); - fl_set_button_shortcut(obj, scex(_("1st|#1")), 1); + { + char const * const dummy = N_("1st|#1"); + fdui->input_kbmap1 = obj = fl_add_input(FL_NORMAL_INPUT, 144, 97, 195, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_kbmap2 = obj = fl_add_input(FL_NORMAL_INPUT, 144, 129, 195, 30, idex(_("2nd|#2"))); - fl_set_button_shortcut(obj, scex(_("2nd|#2")), 1); + { + char const * const dummy = N_("2nd|#2"); + fdui->input_kbmap2 = obj = fl_add_input(FL_NORMAL_INPUT, 144, 129, 195, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->button_kbmap1_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 341, 99, 90, 30, _("Browse")); @@ -405,45 +492,69 @@ FD_form_colors * FormPreferences::build_colors() fdui->button_color = obj = fl_add_button(FL_NORMAL_BUTTON, 250, 285, 60, 30, ""); fl_set_object_boxtype(obj, FL_BORDER_BOX); fl_set_object_color(obj, FL_WHITE, FL_COL1); - fdui->browser_lyx_objs = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 25, 195, 290, idex(_("LyX objects|#L"))); - fl_set_button_shortcut(obj, scex(_("LyX objects|#L")), 1); + { + char const * const dummy = N_("LyX objects|#L"); + fdui->browser_lyx_objs = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 25, 195, 290, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_modify = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 285, 90, 30, idex(_("Modify|#M"))); - fl_set_button_shortcut(obj, scex(_("Modify|#M")), 1); + { + char const * const dummy = N_("Modify|#M"); + fdui->button_modify = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 285, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->slider_saturation = obj = fl_add_slider(FL_HOR_NICE_SLIDER, 251, 135, 150, 30, idex(_("S|#S"))); - fl_set_button_shortcut(obj, scex(_("S|#S")), 1); + { + char const * const dummy = N_("S|#S"); + fdui->slider_saturation = obj = fl_add_slider(FL_HOR_NICE_SLIDER, 251, 135, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_slider_size(obj, 0.15); - fdui->slider_value = obj = fl_add_slider(FL_HOR_NICE_SLIDER, 251, 175, 150, 30, idex(_("V|#V"))); - fl_set_button_shortcut(obj, scex(_("V|#V")), 1); + { + char const * const dummy = N_("V|#V"); + fdui->slider_value = obj = fl_add_slider(FL_HOR_NICE_SLIDER, 251, 175, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_slider_size(obj, 0.15); - fdui->dial_hue = obj = fl_add_dial(FL_NORMAL_DIAL, 276, 23, 100, 100, idex(_("H|#H"))); - fl_set_button_shortcut(obj, scex(_("H|#H")), 1); + { + char const * const dummy = N_("H|#H"); + fdui->dial_hue = obj = fl_add_dial(FL_NORMAL_DIAL, 276, 23, 100, 100, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lalign(obj, FL_ALIGN_CENTER); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->slider_red = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 250, 25, 40, 180, idex(_("R|#R"))); - fl_set_button_shortcut(obj, scex(_("R|#R")), 1); + { + char const * const dummy = N_("R|#R"); + fdui->slider_red = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 250, 25, 40, 180, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_color(obj, FL_COL1, FL_RED); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_slider_size(obj, 0.15); - fdui->slider_blue = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 360, 25, 40, 180, idex(_("B|#B"))); - fl_set_button_shortcut(obj, scex(_("B|#B")), 1); + { + char const * const dummy = N_("B|#B"); + fdui->slider_blue = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 360, 25, 40, 180, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_color(obj, FL_COL1, FL_BLUE); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_slider_size(obj, 0.15); - fdui->slider_green = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 305, 25, 40, 180, idex(_("G|#G"))); - fl_set_button_shortcut(obj, scex(_("G|#G")), 1); + { + char const * const dummy = N_("G|#G"); + fdui->slider_green = obj = fl_add_slider(FL_VERT_FILL_SLIDER, 305, 25, 40, 180, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_color(obj, FL_COL1, FL_GREEN); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -477,33 +588,54 @@ FD_form_converters * FormPreferences::build_converters() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); - fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_("All converters|#A"))); - fl_set_button_shortcut(obj, scex(_("All converters|#A")), 1); + { + char const * const dummy = N_("All converters|#A"); + fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_delete = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 270, 90, 30, idex(_("Delete|#D"))); - fl_set_button_shortcut(obj, scex(_("Delete|#D")), 1); + { + char const * const dummy = N_("Delete|#D"); + fdui->button_delete = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 270, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 240, 270, 90, 30, idex(_("Add|#A"))); - fl_set_button_shortcut(obj, scex(_("Add|#A")), 1); + { + char const * const dummy = N_("Add|#A"); + fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 240, 270, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_converter = obj = fl_add_input(FL_NORMAL_INPUT, 280, 110, 150, 30, idex(_("Converter|#C"))); - fl_set_button_shortcut(obj, scex(_("Converter|#C")), 1); + { + char const * const dummy = N_("Converter|#C"); + fdui->input_converter = obj = fl_add_input(FL_NORMAL_INPUT, 280, 110, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_from = obj = fl_add_choice(FL_NORMAL_CHOICE, 280, 30, 150, 30, idex(_("From|#F"))); - fl_set_button_shortcut(obj, scex(_("From|#F")), 1); + { + char const * const dummy = N_("From|#F"); + fdui->choice_from = obj = fl_add_choice(FL_NORMAL_CHOICE, 280, 30, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_to = obj = fl_add_choice(FL_NORMAL_CHOICE, 280, 70, 150, 30, idex(_("To|#T"))); - fl_set_button_shortcut(obj, scex(_("To|#T")), 1); + { + char const * const dummy = N_("To|#T"); + fdui->choice_to = obj = fl_add_choice(FL_NORMAL_CHOICE, 280, 70, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_flags = obj = fl_add_input(FL_NORMAL_INPUT, 280, 150, 150, 30, idex(_("Flags|#F"))); - fl_set_button_shortcut(obj, scex(_("Flags|#F")), 1); + { + char const * const dummy = N_("Flags|#F"); + fdui->input_flags = obj = fl_add_input(FL_NORMAL_INPUT, 280, 150, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_form(); @@ -529,37 +661,61 @@ FD_form_formats * FormPreferences::build_formats() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 360); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 360, ""); - fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_("All formats|#A"))); - fl_set_button_shortcut(obj, scex(_("All formats|#A")), 1); + { + char const * const dummy = N_("All formats|#A"); + fdui->browser_all = obj = fl_add_browser(FL_HOLD_BROWSER, 30, 30, 160, 270, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_format = obj = fl_add_input(FL_NORMAL_INPUT, 280, 30, 150, 30, idex(_("Format|#F"))); - fl_set_button_shortcut(obj, scex(_("Format|#F")), 1); + { + char const * const dummy = N_("Format|#F"); + fdui->input_format = obj = fl_add_input(FL_NORMAL_INPUT, 280, 30, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_gui_name = obj = fl_add_input(FL_NORMAL_INPUT, 280, 70, 150, 30, idex(_("GUI name|#G"))); - fl_set_button_shortcut(obj, scex(_("GUI name|#G")), 1); + { + char const * const dummy = N_("GUI name|#G"); + fdui->input_gui_name = obj = fl_add_input(FL_NORMAL_INPUT, 280, 70, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_delete = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 270, 90, 30, idex(_("Delete|#D"))); - fl_set_button_shortcut(obj, scex(_("Delete|#D")), 1); + { + char const * const dummy = N_("Delete|#D"); + fdui->button_delete = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 270, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 240, 270, 90, 30, idex(_("Add|#A"))); - fl_set_button_shortcut(obj, scex(_("Add|#A")), 1); + { + char const * const dummy = N_("Add|#A"); + fdui->button_add = obj = fl_add_button(FL_NORMAL_BUTTON, 240, 270, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_extension = obj = fl_add_input(FL_NORMAL_INPUT, 280, 150, 150, 30, idex(_("Extension|#E"))); - fl_set_button_shortcut(obj, scex(_("Extension|#E")), 1); + { + char const * const dummy = N_("Extension|#E"); + fdui->input_extension = obj = fl_add_input(FL_NORMAL_INPUT, 280, 150, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_viewer = obj = fl_add_input(FL_NORMAL_INPUT, 280, 190, 150, 30, idex(_("Viewer|#V"))); - fl_set_button_shortcut(obj, scex(_("Viewer|#V")), 1); + { + char const * const dummy = N_("Viewer|#V"); + fdui->input_viewer = obj = fl_add_input(FL_NORMAL_INPUT, 280, 190, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_shrtcut = obj = fl_add_input(FL_NORMAL_INPUT, 280, 110, 150, 30, idex(_("Shortcut|#S"))); - fl_set_button_shortcut(obj, scex(_("Shortcut|#S")), 1); + { + char const * const dummy = N_("Shortcut|#S"); + fdui->input_shrtcut = obj = fl_add_input(FL_NORMAL_INPUT, 280, 110, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_form(); @@ -585,18 +741,27 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, ""); - fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 15, 30, 30, idex(_("Show banner|#S"))); - fl_set_button_shortcut(obj, scex(_("Show banner|#S")), 1); + { + char const * const dummy = N_("Show banner|#S"); + fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 15, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_button(obj, 1); - fdui->check_auto_region_delete = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 45, 30, 30, idex(_("Auto region delete|#A"))); - fl_set_button_shortcut(obj, scex(_("Auto region delete|#A")), 1); + { + char const * const dummy = N_("Auto region delete|#A"); + fdui->check_auto_region_delete = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 45, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_button(obj, 1); - fdui->check_exit_confirm = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 75, 30, 30, idex(_("Exit confirmation|#E"))); - fl_set_button_shortcut(obj, scex(_("Exit confirmation|#E")), 1); + { + char const * const dummy = N_("Exit confirmation|#E"); + fdui->check_exit_confirm = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 75, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_button(obj, 1); @@ -612,13 +777,19 @@ FD_form_lnf_misc * FormPreferences::build_lnf_misc() fl_set_counter_bounds(obj, 0, 1200); fl_set_counter_value(obj, 300); fl_set_counter_step(obj, 1, 1); - fdui->check_ask_new_file = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 135, 30, 30, idex(_("File->New asks for name|#N"))); - fl_set_button_shortcut(obj, scex(_("File->New asks for name|#N")), 1); + { + char const * const dummy = N_("File->New asks for name|#N"); + fdui->check_ask_new_file = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 135, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_button(obj, 1); - fdui->check_cursor_follows_scrollbar = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 165, 30, 30, idex(_("Cursor follows scrollbar|#C"))); - fl_set_button_shortcut(obj, scex(_("Cursor follows scrollbar|#C")), 1); + { + char const * const dummy = N_("Cursor follows scrollbar|#C"); + fdui->check_cursor_follows_scrollbar = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 165, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_button(obj, 1); @@ -662,22 +833,31 @@ FD_form_interface * FormPreferences::build_interface() fdui->input_popup_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, _("Popup Encoding")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_bind_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 178, 190, 30, idex(_("Bind file|#B"))); - fl_set_button_shortcut(obj, scex(_("Bind file|#B")), 1); + { + char const * const dummy = N_("Bind file|#B"); + fdui->input_bind_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 178, 190, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->button_bind_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 178, 80, 30, _("Browse...")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_ui_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 148, 190, 30, idex(_("User Interface file|#U"))); - fl_set_button_shortcut(obj, scex(_("User Interface file|#U")), 1); + { + char const * const dummy = N_("User Interface file|#U"); + fdui->input_ui_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 148, 190, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->button_ui_file_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 350, 148, 80, 30, _("Browse...")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_override_x_dead_keys = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 24, 230, 30, 30, idex(_("Override X-Windows dead-keys|#O"))); - fl_set_button_shortcut(obj, scex(_("Override X-Windows dead-keys|#O")), 1); + { + char const * const dummy = N_("Override X-Windows dead-keys|#O"); + fdui->check_override_x_dead_keys = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 24, 230, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_set_button(obj, 1); @@ -783,15 +963,21 @@ FD_form_paths * FormPreferences::build_paths() fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, ""); - fdui->input_default_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 10, 170, 30, idex(_("Default path|#p"))); - fl_set_button_shortcut(obj, scex(_("Default path|#p")), 1); + { + char const * const dummy = N_("Default path|#p"); + fdui->input_default_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 10, 170, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->button_default_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 10, 90, 30, _("Browse...")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->counter_lastfiles = obj = fl_add_counter(FL_SIMPLE_COUNTER, 170, 130, 90, 30, idex(_("Last file count|#L"))); - fl_set_button_shortcut(obj, scex(_("Last file count|#L")), 1); + { + char const * const dummy = N_("Last file count|#L"); + fdui->counter_lastfiles = obj = fl_add_counter(FL_SIMPLE_COUNTER, 170, 130, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -799,15 +985,21 @@ FD_form_paths * FormPreferences::build_paths() fl_set_counter_bounds(obj, 0, 9); fl_set_counter_value(obj, 4); fl_set_counter_step(obj, 1, 1); - fdui->input_template_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 40, 170, 30, idex(_("Template path|#T"))); - fl_set_button_shortcut(obj, scex(_("Template path|#T")), 1); + { + char const * const dummy = N_("Template path|#T"); + fdui->input_template_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 40, 170, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->button_template_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 40, 90, 30, _("Browse...")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_last_files = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 100, 30, 30, idex(_("Check last files|#C"))); - fl_set_button_shortcut(obj, scex(_("Check last files|#C")), 1); + { + char const * const dummy = N_("Check last files|#C"); + fdui->check_last_files = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 100, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -821,8 +1013,11 @@ FD_form_paths * FormPreferences::build_paths() fdui->button_lastfiles_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 100, 90, 30, _("Browse...")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_make_backups = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 170, 30, 30, idex(_("Backup path|#B"))); - fl_set_button_shortcut(obj, scex(_("Backup path|#B")), 1); + { + char const * const dummy = N_("Backup path|#B"); + fdui->check_make_backups = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 170, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -833,8 +1028,11 @@ FD_form_paths * FormPreferences::build_paths() fdui->button_backup_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 170, 90, 30, _("Browse...")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_serverpipe = obj = fl_add_input(FL_NORMAL_INPUT, 169, 217, 170, 30, idex(_("LyXServer pipe|#S"))); - fl_set_button_shortcut(obj, scex(_("LyXServer pipe|#S")), 1); + { + char const * const dummy = N_("LyXServer pipe|#S"); + fdui->input_serverpipe = obj = fl_add_input(FL_NORMAL_INPUT, 169, 217, 170, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->button_serverpipe_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 339, 217, 90, 30, _("Browse...")); @@ -843,8 +1041,11 @@ FD_form_paths * FormPreferences::build_paths() fdui->input_temp_dir = obj = fl_add_input(FL_NORMAL_INPUT, 170, 70, 170, 30, ""); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->check_use_temp_dir = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 70, 30, 30, idex(_("Temp dir|#d"))); - fl_set_button_shortcut(obj, scex(_("Temp dir|#d")), 1); + { + char const * const dummy = N_("Temp dir|#d"); + fdui->check_use_temp_dir = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 70, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); diff --git a/src/frontends/xforms/form_print.C b/src/frontends/xforms/form_print.C index 41fd617315..7f5060f411 100644 --- a/src/frontends/xforms/form_print.C +++ b/src/frontends/xforms/form_print.C @@ -33,12 +33,18 @@ FD_form_print * FormPrint::build_print() fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->group_radio_printto = fl_bgn_group(); - fdui->radio_printer = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 225, 80, 30, idex(_("Printer|#P"))); - fl_set_button_shortcut(obj, scex(_("Printer|#P")), 1); + { + char const * const dummy = N_("Printer|#P"); + fdui->radio_printer = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 225, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_file = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 265, 80, 30, idex(_("File|#F"))); - fl_set_button_shortcut(obj, scex(_("File|#F")), 1); + { + char const * const dummy = N_("File|#F"); + fdui->radio_file = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 265, 80, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_group(); @@ -46,38 +52,59 @@ FD_form_print * FormPrint::build_print() fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 315, 100, 30, _("OK")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 315, 100, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 120, 315, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 315, 100, 30, idex(_("Cancel|C#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1); + { + char const * const dummy = N_("Cancel|C#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 315, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fdui->group_radio_pages = fl_bgn_group(); - fdui->radio_all_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 160, 30, idex(_("All Pages|#G"))); - fl_set_button_shortcut(obj, scex(_("All Pages|#G")), 1); + { + char const * const dummy = N_("All Pages|#G"); + fdui->radio_all_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_odd_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 160, 30, idex(_("Only Odd Pages|#O"))); - fl_set_button_shortcut(obj, scex(_("Only Odd Pages|#O")), 1); + { + char const * const dummy = N_("Only Odd Pages|#O"); + fdui->radio_odd_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_even_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 90, 160, 30, idex(_("Only Even Pages|#E"))); - fl_set_button_shortcut(obj, scex(_("Only Even Pages|#E")), 1); + { + char const * const dummy = N_("Only Even Pages|#E"); + fdui->radio_even_pages = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 90, 160, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_group(); fdui->group_radio_order = fl_bgn_group(); - fdui->radio_order_normal = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 180, 30, 150, 30, idex(_("Normal Order|#N"))); - fl_set_button_shortcut(obj, scex(_("Normal Order|#N")), 1); + { + char const * const dummy = N_("Normal Order|#N"); + fdui->radio_order_normal = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 180, 30, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_order_reverse = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 180, 60, 150, 30, idex(_("Reverse Order|#R"))); - fl_set_button_shortcut(obj, scex(_("Reverse Order|#R")), 1); + { + char const * const dummy = N_("Reverse Order|#R"); + fdui->radio_order_reverse = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 180, 60, 150, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fl_end_group(); @@ -90,8 +117,11 @@ FD_form_print * FormPrint::build_print() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_("Collated|#C"))); - fl_set_button_shortcut(obj, scex(_("Collated|#C")), 1); + { + char const * const dummy = N_("Collated|#C"); + fdui->radio_collated = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 180, 115, 140, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); fdui->input_to_page = obj = fl_add_input(FL_INT_INPUT, 110, 160, 50, 30, _("to")); diff --git a/src/frontends/xforms/form_ref.C b/src/frontends/xforms/form_ref.C index dabb23e45c..0956ba796f 100644 --- a/src/frontends/xforms/form_ref.C +++ b/src/frontends/xforms/form_ref.C @@ -29,43 +29,67 @@ FD_form_ref * FormRef::build_ref() fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_gravity(obj, FL_NorthWest, FL_South); fl_set_object_callback(obj, C_FormBaseInputCB, 2); - fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 40, 260, 90, 30, idex(_("Update|#U"))); - fl_set_button_shortcut(obj, scex(_("Update|#U")), 1); + { + char const * const dummy = N_("Update|#U"); + fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 40, 260, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest); fl_set_object_callback(obj, C_FormBaseInputCB, 3); - fdui->sort = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 170, 260, 30, 30, idex(_("Sort|#S"))); - fl_set_button_shortcut(obj, scex(_("Sort|#S")), 1); + { + char const * const dummy = N_("Sort|#S"); + fdui->sort = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 170, 260, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_gravity(obj, FL_SouthWest, FL_SouthWest); fl_set_object_callback(obj, C_FormBaseInputCB, 4); - fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 370, 10, 150, 40, idex(_("Name:|#N"))); - fl_set_button_shortcut(obj, scex(_("Name:|#N")), 1); + { + char const * const dummy = N_("Name:|#N"); + fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 370, 10, 150, 40, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast); fdui->ref = obj = fl_add_input(FL_NORMAL_INPUT, 370, 60, 150, 40, _("Ref:")); fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast); - fdui->type = obj = fl_add_choice(FL_NORMAL_CHOICE, 340, 140, 140, 40, idex(_("Reference type|#R"))); - fl_set_button_shortcut(obj, scex(_("Reference type|#R")), 1); + { + char const * const dummy = N_("Reference type|#R"); + fdui->type = obj = fl_add_choice(FL_NORMAL_CHOICE, 340, 140, 140, 40, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 5); - fdui->button_go = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 200, 140, 40, idex(_("Goto reference|#G"))); - fl_set_button_shortcut(obj, scex(_("Goto reference|#G")), 1); + { + char const * const dummy = N_("Goto reference|#G"); + fdui->button_go = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 200, 140, 40, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 1); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 230, 300, 90, 30, _("OK")); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 300, 90, 30, idex(_("Cancel|#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1); + { + char const * const dummy = N_("Cancel|#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 300, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 300, 90, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 300, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 300, 90, 30, idex(_("Restore|#R"))); - fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); + { + char const * const dummy = N_("Restore|#R"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 300, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); fl_end_form(); diff --git a/src/frontends/xforms/form_tabular.C b/src/frontends/xforms/form_tabular.C index 7e2a2eea13..cd8ace95d7 100644 --- a/src/frontends/xforms/form_tabular.C +++ b/src/frontends/xforms/form_tabular.C @@ -27,8 +27,11 @@ FD_form_tabular * FormTabular::build_tabular() obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 295, ""); fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder")); fl_set_object_resize(obj, FL_RESIZE_ALL); - fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 260, 90, 30, idex(_("Close|#C^["))); - fl_set_button_shortcut(obj, scex(_("Close|#C^[")), 1); + { + char const * const dummy = N_("Close|#C^["); + fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 260, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fdui->input_tabular_column = obj = fl_add_input(FL_NORMAL_INPUT, 65, 260, 60, 30, ""); @@ -64,35 +67,59 @@ FD_form_tabular_options * FormTabular::build_tabular_options() fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, ""); - fdui->button_append_column = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 40, 120, 30, idex(_("Append Column|#A"))); - fl_set_button_shortcut(obj, scex(_("Append Column|#A")), 1); + { + char const * const dummy = N_("Append Column|#A"); + fdui->button_append_column = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 40, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_delete_column = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 40, 120, 30, idex(_("Delete Column|#O"))); - fl_set_button_shortcut(obj, scex(_("Delete Column|#O")), 1); + { + char const * const dummy = N_("Delete Column|#O"); + fdui->button_delete_column = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 40, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_append_row = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 70, 120, 30, idex(_("Append Row|#p"))); - fl_set_button_shortcut(obj, scex(_("Append Row|#p")), 1); + { + char const * const dummy = N_("Append Row|#p"); + fdui->button_append_row = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 70, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_delete_row = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 70, 120, 30, idex(_("Delete Row|#w"))); - fl_set_button_shortcut(obj, scex(_("Delete Row|#w")), 1); + { + char const * const dummy = N_("Delete Row|#w"); + fdui->button_delete_row = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 70, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_set_borders = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 10, 120, 30, idex(_("Set Borders|#S"))); - fl_set_button_shortcut(obj, scex(_("Set Borders|#S")), 1); + { + char const * const dummy = N_("Set Borders|#S"); + fdui->button_set_borders = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 10, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_unset_borders = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 10, 120, 30, idex(_("Unset Borders|#U"))); - fl_set_button_shortcut(obj, scex(_("Unset Borders|#U")), 1); + { + char const * const dummy = N_("Unset Borders|#U"); + fdui->button_unset_borders = obj = fl_add_button(FL_NORMAL_BUTTON, 140, 10, 120, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_("Longtable|#L"))); - fl_set_button_shortcut(obj, scex(_("Longtable|#L")), 1); + { + char const * const dummy = N_("Longtable|#L"); + fdui->radio_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_("Rotate 90院#9"))); - fl_set_button_shortcut(obj, scex(_("Rotate 90院#9")), 1); + { + char const * const dummy = N_("Rotate 90院#9"); + fdui->radio_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 280, 20, 120, 75, _("Spec. Table")); fl_set_object_lstyle(obj, FL_BOLD_STYLE); @@ -119,48 +146,78 @@ FD_form_column_options * FormTabular::build_column_options() fdui->form = fl_bgn_form(FL_NO_BOX, 505, 227); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 227, ""); - fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_("Top|#t"))); - fl_set_button_shortcut(obj, scex(_("Top|#t")), 1); + { + char const * const dummy = N_("Top|#t"); + fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_("Bottom|#b"))); - fl_set_button_shortcut(obj, scex(_("Bottom|#b")), 1); + { + char const * const dummy = N_("Bottom|#b"); + fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_BOTTOM_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_("Left|#l"))); - fl_set_button_shortcut(obj, scex(_("Left|#l")), 1); + { + char const * const dummy = N_("Left|#l"); + fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_("Right|#r"))); - fl_set_button_shortcut(obj, scex(_("Right|#r")), 1); + { + char const * const dummy = N_("Right|#r"); + fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 30, 110, 25, idex(_("Left|#e"))); - fl_set_button_shortcut(obj, scex(_("Left|#e")), 1); + { + char const * const dummy = N_("Left|#e"); + fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 30, 110, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 80, 115, 25, idex(_("Right|#i"))); - fl_set_button_shortcut(obj, scex(_("Right|#i")), 1); + { + char const * const dummy = N_("Right|#i"); + fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 80, 115, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 55, 115, 25, idex(_("Center|#c"))); - fl_set_button_shortcut(obj, scex(_("Center|#c")), 1); + { + char const * const dummy = N_("Center|#c"); + fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 55, 115, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 30, 125, 25, idex(_("Top|#p"))); - fl_set_button_shortcut(obj, scex(_("Top|#p")), 1); + { + char const * const dummy = N_("Top|#p"); + fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 30, 125, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 55, 125, 25, idex(_("Center|#n"))); - fl_set_button_shortcut(obj, scex(_("Center|#n")), 1); + { + char const * const dummy = N_("Center|#n"); + fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 55, 125, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 80, 120, 25, idex(_("Bottom|#o"))); - fl_set_button_shortcut(obj, scex(_("Bottom|#o")), 1); + { + char const * const dummy = N_("Bottom|#o"); + fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 80, 120, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 170, 105, _("Borders")); @@ -172,13 +229,19 @@ FD_form_column_options * FormTabular::build_column_options() obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 340, 20, 130, 105, _("V. Alignment")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); - fdui->input_column_width = obj = fl_add_input(FL_NORMAL_INPUT, 320, 170, 95, 30, idex(_("Width|#W"))); - fl_set_button_shortcut(obj, scex(_("Width|#W")), 1); + { + char const * const dummy = N_("Width|#W"); + fdui->input_column_width = obj = fl_add_input(FL_NORMAL_INPUT, 320, 170, 95, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_special_alignment = obj = fl_add_input(FL_NORMAL_INPUT, 85, 170, 215, 30, idex(_("Alignment|#A"))); - fl_set_button_shortcut(obj, scex(_("Alignment|#A")), 1); + { + char const * const dummy = N_("Alignment|#A"); + fdui->input_special_alignment = obj = fl_add_input(FL_NORMAL_INPUT, 85, 170, 215, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -209,48 +272,78 @@ FD_form_cell_options * FormTabular::build_cell_options() fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, ""); - fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_("Top|#t"))); - fl_set_button_shortcut(obj, scex(_("Top|#t")), 1); + { + char const * const dummy = N_("Top|#t"); + fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_("Bottom|#b"))); - fl_set_button_shortcut(obj, scex(_("Bottom|#b")), 1); + { + char const * const dummy = N_("Bottom|#b"); + fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_BOTTOM_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_("Left|#l"))); - fl_set_button_shortcut(obj, scex(_("Left|#l")), 1); + { + char const * const dummy = N_("Left|#l"); + fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_("Right|#r"))); - fl_set_button_shortcut(obj, scex(_("Right|#r")), 1); + { + char const * const dummy = N_("Right|#r"); + fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_RIGHT); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 30, 110, 25, idex(_("Left|#e"))); - fl_set_button_shortcut(obj, scex(_("Left|#e")), 1); + { + char const * const dummy = N_("Left|#e"); + fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 30, 110, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 80, 115, 25, idex(_("Right|#i"))); - fl_set_button_shortcut(obj, scex(_("Right|#i")), 1); + { + char const * const dummy = N_("Right|#i"); + fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 80, 115, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 55, 115, 25, idex(_("Center|#c"))); - fl_set_button_shortcut(obj, scex(_("Center|#c")), 1); + { + char const * const dummy = N_("Center|#c"); + fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 55, 115, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 30, 125, 25, idex(_("Top|#p"))); - fl_set_button_shortcut(obj, scex(_("Top|#p")), 1); + { + char const * const dummy = N_("Top|#p"); + fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 30, 125, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 55, 125, 25, idex(_("Center|#n"))); - fl_set_button_shortcut(obj, scex(_("Center|#n")), 1); + { + char const * const dummy = N_("Center|#n"); + fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 55, 125, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 80, 120, 25, idex(_("Bottom|#o"))); - fl_set_button_shortcut(obj, scex(_("Bottom|#o")), 1); + { + char const * const dummy = N_("Bottom|#o"); + fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 80, 120, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseInputCB, 0); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 170, 105, _("Borders")); @@ -262,20 +355,35 @@ FD_form_cell_options * FormTabular::build_cell_options() obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 340, 20, 130, 105, _("V. Alignment")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lstyle(obj, FL_BOLD_STYLE); - fdui->input_mcolumn_width = obj = fl_add_input(FL_NORMAL_INPUT, 280, 180, 175, 30, idex(_("Width|#W"))); - fl_set_button_shortcut(obj, scex(_("Width|#W")), 1); + { + char const * const dummy = N_("Width|#W"); + fdui->input_mcolumn_width = obj = fl_add_input(FL_NORMAL_INPUT, 280, 180, 175, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->input_special_multialign = obj = fl_add_input(FL_NORMAL_INPUT, 280, 145, 175, 30, idex(_("Alignment|#A"))); - fl_set_button_shortcut(obj, scex(_("Alignment|#A")), 1); + { + char const * const dummy = N_("Alignment|#A"); + fdui->input_special_multialign = obj = fl_add_input(FL_NORMAL_INPUT, 280, 145, 175, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 140, 130, 25, idex(_("Multicolumn|#M"))); - fl_set_button_shortcut(obj, scex(_("Multicolumn|#M")), 1); + { + char const * const dummy = N_("Multicolumn|#M"); + fdui->radio_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 140, 130, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 165, 130, 25, idex(_("Use Minipage|#s"))); - fl_set_button_shortcut(obj, scex(_("Use Minipage|#s")), 1); + { + char const * const dummy = N_("Use Minipage|#s"); + fdui->radio_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 165, 130, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 190, 130, 25, idex(_("Rotate 90院#9"))); - fl_set_button_shortcut(obj, scex(_("Rotate 90院#9")), 1); + { + char const * const dummy = N_("Rotate 90院#9"); + fdui->radio_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 190, 130, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 135, 150, 80, _("Special Cell")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); @@ -306,20 +414,35 @@ FD_form_longtable_options * FormTabular::build_longtable_options() fdui->form = fl_bgn_form(FL_NO_BOX, 505, 227); fdui->form->u_vdata = this; obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 227, ""); - fdui->radio_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 55, 90, 25, idex(_("1st Head|#1"))); - fl_set_button_shortcut(obj, scex(_("1st Head|#1")), 1); + { + char const * const dummy = N_("1st Head|#1"); + fdui->radio_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 55, 90, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 30, 90, 25, idex(_("Head|#H"))); - fl_set_button_shortcut(obj, scex(_("Head|#H")), 1); + { + char const * const dummy = N_("Head|#H"); + fdui->radio_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 30, 90, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 195, 30, 90, 25, idex(_("Foot|#F"))); - fl_set_button_shortcut(obj, scex(_("Foot|#F")), 1); + { + char const * const dummy = N_("Foot|#F"); + fdui->radio_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 195, 30, 90, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 195, 55, 90, 25, idex(_("Last Foot|#L"))); - fl_set_button_shortcut(obj, scex(_("Last Foot|#L")), 1); + { + char const * const dummy = N_("Last Foot|#L"); + fdui->radio_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 195, 55, 90, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 355, 25, 90, 25, idex(_("New Page|#N"))); - fl_set_button_shortcut(obj, scex(_("New Page|#N")), 1); + { + char const * const dummy = N_("New Page|#N"); + fdui->radio_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 355, 25, 90, 25, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_callback(obj, C_FormBaseInputCB, 0); obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 150, 75, _("Header")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); diff --git a/src/frontends/xforms/form_tabular_create.C b/src/frontends/xforms/form_tabular_create.C index 06f5f65fb0..471550b25d 100644 --- a/src/frontends/xforms/form_tabular_create.C +++ b/src/frontends/xforms/form_tabular_create.C @@ -28,12 +28,18 @@ FD_form_tabular_create * FormTabularCreate::build_tabular_create() fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 90, 90, 30, _("OK")); fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 90, 90, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 110, 90, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_("Cancel|#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1); + { + char const * const dummy = N_("Cancel|#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fdui->slider_columns = obj = fl_add_valslider(FL_HOR_SLIDER, 80, 50, 220, 30, _("Columns")); diff --git a/src/frontends/xforms/form_toc.C b/src/frontends/xforms/form_toc.C index 18a111b841..9f1701bbec 100644 --- a/src/frontends/xforms/form_toc.C +++ b/src/frontends/xforms/form_toc.C @@ -28,18 +28,27 @@ FD_form_toc * FormToc::build_toc() fdui->browser_toc = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 10, 400, 280, ""); fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 300, 100, 30, idex(_("Update|#U"))); - fl_set_button_shortcut(obj, scex(_("Update|#U")), 1); + { + char const * const dummy = N_("Update|#U"); + fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 200, 300, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->choice_toc_type = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_("Type|#T"))); - fl_set_button_shortcut(obj, scex(_("Type|#T")), 1); + { + char const * const dummy = N_("Type|#T"); + fdui->choice_toc_type = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_boxtype(obj, FL_FRAME_BOX); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_("Close|#C^[^M"))); - fl_set_button_shortcut(obj, scex(_("Close|#C^[^M")), 1); + { + char const * const dummy = N_("Close|#C^[^M"); + fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); diff --git a/src/frontends/xforms/form_url.C b/src/frontends/xforms/form_url.C index 06787b3ce9..d5fd5e1a2e 100644 --- a/src/frontends/xforms/form_url.C +++ b/src/frontends/xforms/form_url.C @@ -25,40 +25,58 @@ FD_form_url * FormUrl::build_url() fdui->form = fl_bgn_form(FL_NO_BOX, 520, 170); fdui->form->u_vdata = this; obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 170, ""); - fdui->url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 50, 440, 30, idex(_("URL|#U"))); - fl_set_button_shortcut(obj, scex(_("URL|#U")), 1); + { + char const * const dummy = N_("URL|#U"); + fdui->url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 50, 440, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 90, 440, 30, idex(_("Name|#N"))); - fl_set_button_shortcut(obj, scex(_("Name|#N")), 1); + { + char const * const dummy = N_("Name|#N"); + fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 90, 440, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->radio_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 480, 10, 30, 30, idex(_("HTML type|#H"))); - fl_set_button_shortcut(obj, scex(_("HTML type|#H")), 1); + { + char const * const dummy = N_("HTML type|#H"); + fdui->radio_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 480, 10, 30, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_LEFT); fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); - fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_("Cancel|#C^["))); - fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1); + { + char const * const dummy = N_("Cancel|#C^["); + fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseCancelCB, 0); fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 190, 130, 100, 30, _("OK")); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseOKCB, 0); - fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 130, 100, 30, idex(_("Apply|#A"))); - fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1); + { + char const * const dummy = N_("Apply|#A"); + fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 130, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); - fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 130, 100, 30, idex(_("Restore|#R"))); - fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1); + { + char const * const dummy = N_("Restore|#R"); + fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 130, 100, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseRestoreCB, 0); diff --git a/src/frontends/xforms/forms/fdfixc.sed b/src/frontends/xforms/forms/fdfixc.sed index 8dcd0d60a1..eac6da86af 100644 --- a/src/frontends/xforms/forms/fdfixc.sed +++ b/src/frontends/xforms/forms/fdfixc.sed @@ -41,20 +41,54 @@ s/#include \"forms\.h\"/#include FORMS_H_LOCATION/ # replace the string with scex(_(string)) /shortcut/ s/".*[|].*"/scex(_(&))/ -# For all lines containing "fl_add" and a string containing |, replace -# the string with idex(_(string)) -/fl_add/ s/".*[|].*"/idex(_(&))/ - -# For all lines containing "fl_add" and a string containing |, add the -# shortcut command after the end of this line -/fl_add/ s/idex(\(.*\)").*$/&\ - fl_set_button_shortcut(obj,scex(\1")),1);/ - # gettext will get confused if the string contains a "%" unless the line is -# preceeded immediately by //xgettext:no-c-format +# preceeded immediately by // xgettext:no-c-format /_(".*[%].*")/i\ // xgettext:no-c-format +# For all lines containing "fl_add" and a string containing | +# do several things. +# Eg +# fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER,1,2,3,4,"Zoom %|#Z"); +# +# becomes +# fdui->counter_zoom = obj; +# { +# // xgettext:no-c-format +# char const * const dummy = N_("Zoom %|#Z"); +# fdui->counter_zoom = obj = fl_add_counter(FL_NORMAL_COUNTER,1,2,3,4,idex(_(dummy))); +# fl_set_button_shortcut(obj,scex(_(dummy)),1); +# } + +/fl_add/{ +/".*[|].*"/{ + + s/fdui\(.*\)"\(.*\)".*/{\ + char const * const dummy = N_("\2");\ + fdui\1idex(_(dummy)));\ + fl_set_button_shortcut(obj,scex(_(dummy)),1);\ + }/ + + /N_(".*[%].*");/ s/\(.*\)\(char const [*]\)/\1\/\/ xgettext:no-c-format\ + \2/ +} +} + +# /fl_add/{ +# /".*[|].*"/{ +# +# s/ = fl_add\(.*\)"\(.*\)".*/;\ +# {\ +# char const * dummy = N_("\2");\ +# obj = fl_add\1idex(_(dummy)));\ +# fl_set_button_shortcut(obj,scex(_(dummy)),1);\ +# }/ +# +# /N_(".*[%].*");/ s/\(.*\)\(char const [*]\)/\1\/\/ xgettext:no-c-format\ +# \2/ +# } +# } + # We use new/delete not malloc/free so change to suit. s/\(\(FD_[^ ]*\) \*fdui =\).*sizeof(\*fdui))/\1 new \2/ diff --git a/src/frontends/xforms/input_validators.c b/src/frontends/xforms/input_validators.C similarity index 88% rename from src/frontends/xforms/input_validators.c rename to src/frontends/xforms/input_validators.C index 9f050030e5..1e48205e64 100644 --- a/src/frontends/xforms/input_validators.c +++ b/src/frontends/xforms/input_validators.C @@ -6,6 +6,7 @@ #include "config.h" #include FORMS_H_LOCATION +#include "support/lstrings.h" #include "input_validators.h" #if defined(__cplusplus) @@ -27,6 +28,22 @@ int fl_unsigned_int_filter(FL_OBJECT * ob, } +int fl_unsigned_float_filter(FL_OBJECT * ob, + char const * not_used, + char const * unused, + int c) +{ + if (c == 0 /* final test before handing contents to app */ + || strchr("0123456789.", c)) { + if ( isStrDbl(fl_get_input(ob)) ) + return FL_VALID; + else + return FL_INVALID|FL_RINGBELL; + } + return FL_INVALID|FL_RINGBELL; +} + + int fl_lowercase_filter(FL_OBJECT * ob, char const * not_used, char const * unused, diff --git a/src/frontends/xforms/input_validators.h b/src/frontends/xforms/input_validators.h index 2dbe76bbb7..5b68c7fad8 100644 --- a/src/frontends/xforms/input_validators.h +++ b/src/frontends/xforms/input_validators.h @@ -26,6 +26,8 @@ extern "C" /** Only allow whole numbers no '+' or '-' signs or exponents. */ int fl_unsigned_int_filter(FL_OBJECT *, char const *, char const *, int); + /** Only allow whole numbers no '+' or '-' signs or exponents. */ +int fl_unsigned_float_filter(FL_OBJECT *, char const *, char const *, int); /** Only allow lowercase letters. */ int fl_lowercase_filter(FL_OBJECT *, char const *, char const *, int); diff --git a/src/gettext.C b/src/gettext.C index 9d17c623c5..ef13c283ea 100644 --- a/src/gettext.C +++ b/src/gettext.C @@ -17,7 +17,7 @@ string const _(string const & str) char * tmp = new char[s + 1]; str.copy(tmp, s); tmp[s] = '\0'; - string ret(_(tmp)); + string ret(gettext(tmp)); delete [] tmp; return ret; } diff --git a/src/lyx_cb.C b/src/lyx_cb.C index ea272c9716..dce423214f 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -491,7 +491,7 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph) // We use this until the compilers get better... vector tmp; copy(ii, end, back_inserter(tmp)); - string tmpstr(tmp.begin(), tmp.end()); + string const tmpstr(tmp.begin(), tmp.end()); #else // This is what we want to use and what we will use once the // compilers get good enough. diff --git a/src/support/lstrings.C b/src/support/lstrings.C index f803776484..74fc4fee8c 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -282,19 +282,21 @@ bool suffixIs(string const & a, char const * suf) Assert(suf); size_t const suflen = strlen(suf); - if (suflen > a.length()) + string::size_type const alen = a.length(); + + if (suflen > alen) return false; else { #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD) // Delete this code when the compilers get a bit better. - string tmp(a, a.length() - suflen); + string tmp(a, alen - suflen); return ::strncmp(tmp.c_str(), suf, suflen) == 0; #else // This is the code that we really want to use // but until gcc ships with a basic_string that // implements std::string correctly we have to // use the code above. - return a.compare(a.length() - suflen, suflen, suf) == 0; + return a.compare(alen - suflen, suflen, suf) == 0; #endif } }