On Wed, Sep 17, 2003 at 06:35:10PM +0100, Angus Leeming spake thusly: > > Martin Vermeer wrote: > > Yes! This does the trick. > > Great! I wonder what changed between 13x and 14x in this regard. > > > Shall I prepare a patch? > > Why not.
Here's the patch. Notes: 1) To suppress the bug, it would be sufficient to change _( to N_( only in those dialogs that can be opened from clicking on insets. I applied the change to all dialogs however. I don't think it hurts. 2) I still have the feeling that this only prevents a deeper bug from expressing itself. Remember that the crash only happened if an inset was copied and pasted; creating the same on-screen geometry by creating the 'guilty' inset from the menu did *not* lead to a crash. There is something in cut&paste of insets that's wrong. 3) I discovered a new (?) bug: a) create an inset, e.g., note; b) insert a math inset into it; c) copy and paste the math inset to inside the note inset; d) exit without saving. I added instrumentation to Dialogs::find showing that the name argument is corrupted/undefined. The name is very long and will give a crash elsewhere. Again this bug will not manifest itself if the second mathinset is created the regular way. There is something fishy with cut&paste... I suggest to put this patch in and take it from there. - Martin
Index: Dialogs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Dialogs.C,v
retrieving revision 1.28
diff -u -p -r1.28 Dialogs.C
--- Dialogs.C 5 Sep 2003 10:55:42 -0000 1.28
+++ Dialogs.C 18 Sep 2003 07:17:53 -0000
@@ -18,6 +18,7 @@
#include <boost/signals/signal2.hpp>
#include <boost/bind.hpp>
+#include "debug.h"
// Note that static boost signals break some compilers, so this wrapper
@@ -77,6 +78,10 @@ Dialogs::Dialogs(LyXView & lyxview)
Dialog * Dialogs::find(string const & name)
{
+ if (name.size() > 100) {
+ lyxerr << "Name problem Dialogs::find, length " << name.size() << endl;
+ return 0;
+ }
if (!isValidName(name))
return 0;
Index: xforms/FormAboutlyx.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormAboutlyx.C,v
retrieving revision 1.28
diff -u -p -r1.28 FormAboutlyx.C
--- xforms/FormAboutlyx.C 5 Sep 2003 18:02:18 -0000 1.28
+++ xforms/FormAboutlyx.C 18 Sep 2003 07:17:54 -0000
@@ -40,7 +40,7 @@ bool const scalableTabfolders = true;
typedef FormController<ControlAboutlyx, FormView<FD_aboutlyx> > base_class;
FormAboutlyx::FormAboutlyx(Dialog & parent)
- : base_class(parent, _("About LyX"), scalableTabfolders)
+ : base_class(parent, N_("About LyX"), scalableTabfolders)
{}
Index: xforms/FormBibitem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormBibitem.C,v
retrieving revision 1.31
diff -u -p -r1.31 FormBibitem.C
--- xforms/FormBibitem.C 9 Sep 2003 22:13:40 -0000 1.31
+++ xforms/FormBibitem.C 18 Sep 2003 07:17:54 -0000
@@ -28,7 +28,7 @@ using lyx::support::compare;
typedef FormController<ControlCommand, FormView<FD_bibitem> > base_class;
FormBibitem::FormBibitem(Dialog & parent)
- : base_class(parent, _("Bibliography Entry"))
+ : base_class(parent, N_("Bibliography Entry"))
{}
Index: xforms/FormBibtex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormBibtex.C,v
retrieving revision 1.61
diff -u -p -r1.61 FormBibtex.C
--- xforms/FormBibtex.C 9 Sep 2003 22:13:40 -0000 1.61
+++ xforms/FormBibtex.C 18 Sep 2003 07:17:54 -0000
@@ -42,7 +42,7 @@ using std::vector;
typedef FormController<ControlBibtex, FormView<FD_bibtex> > base_class;
FormBibtex::FormBibtex(Dialog & parent)
- : base_class(parent, _("BibTeX Database"))
+ : base_class(parent, N_("BibTeX Database"))
{}
Index: xforms/FormBranch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormBranch.C,v
retrieving revision 1.4
diff -u -p -r1.4 FormBranch.C
--- xforms/FormBranch.C 9 Sep 2003 18:27:22 -0000 1.4
+++ xforms/FormBranch.C 18 Sep 2003 07:17:54 -0000
@@ -25,7 +25,7 @@
typedef FormController<ControlBranch, FormView<FD_branch> > base_class;
FormBranch::FormBranch(Dialog & parent)
- : base_class(parent, _("Branch"))
+ : base_class(parent, N_("Branch"))
{}
Index: xforms/FormChanges.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormChanges.C,v
retrieving revision 1.9
diff -u -p -r1.9 FormChanges.C
--- xforms/FormChanges.C 5 Sep 2003 13:15:42 -0000 1.9
+++ xforms/FormChanges.C 18 Sep 2003 07:17:54 -0000
@@ -23,7 +23,7 @@
typedef FormController<ControlChanges, FormView<FD_changes> > base_class;
FormChanges::FormChanges(Dialog & parent)
- : base_class(parent, _("Merge Changes"))
+ : base_class(parent, N_("Merge Changes"))
{}
Index: xforms/FormCharacter.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormCharacter.C,v
retrieving revision 1.49
diff -u -p -r1.49 FormCharacter.C
--- xforms/FormCharacter.C 16 Sep 2003 09:01:12 -0000 1.49
+++ xforms/FormCharacter.C 18 Sep 2003 07:17:54 -0000
@@ -50,7 +50,7 @@ using std::vector;
typedef FormController<ControlCharacter, FormView<FD_character> > base_class;
FormCharacter::FormCharacter(Dialog & parent)
- : base_class(parent, _("Text Style"), false)
+ : base_class(parent, N_("Text Style"), false)
{}
Index: xforms/FormCitation.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormCitation.C,v
retrieving revision 1.97
diff -u -p -r1.97 FormCitation.C
--- xforms/FormCitation.C 9 Sep 2003 22:13:40 -0000 1.97
+++ xforms/FormCitation.C 18 Sep 2003 07:17:54 -0000
@@ -90,7 +90,7 @@ typedef FormController<ControlCitation,
FormCitation::FormCitation(Dialog & parent)
- : base_class(parent, _("Citation"))
+ : base_class(parent, N_("Citation"))
{}
Index: xforms/FormDialogView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormDialogView.C,v
retrieving revision 1.15
diff -u -p -r1.15 FormDialogView.C
--- xforms/FormDialogView.C 9 Sep 2003 22:13:40 -0000 1.15
+++ xforms/FormDialogView.C 18 Sep 2003 07:17:54 -0000
@@ -106,7 +106,7 @@ void FormDialogView::prepare_to_show()
// set the title for the minimized form
if (!lyxrc.dialogs_iconify_with_main)
- fl_winicontitle(form()->window, getTitle().c_str());
+ fl_winicontitle(form()->window, _(getTitle()).c_str());
// assign an icon to the form
string const iconname = LibFileSearch("images", "lyx", "xpm");
@@ -159,7 +159,7 @@ void FormDialogView::show()
if (!allow_resize_)
fl_set_form_maxsize(form(), minw_, minh_);
- string const maximize_title = "LyX: " + getTitle();
+ string const maximize_title = "LyX: " + _(getTitle());
int const iconify_policy = lyxrc.dialogs_iconify_with_main ?
FL_TRANSIENT : 0;
Index: xforms/FormERT.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormERT.C,v
retrieving revision 1.18
diff -u -p -r1.18 FormERT.C
--- xforms/FormERT.C 5 Sep 2003 13:15:42 -0000 1.18
+++ xforms/FormERT.C 18 Sep 2003 07:17:54 -0000
@@ -22,7 +22,7 @@
typedef FormController<ControlERT, FormView<FD_ert> > base_class;
FormERT::FormERT(Dialog & parent)
- : base_class(parent, _("TeX Settings"))
+ : base_class(parent, N_("TeX Settings"))
{}
Index: xforms/FormExternal.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormExternal.C,v
retrieving revision 1.41
diff -u -p -r1.41 FormExternal.C
--- xforms/FormExternal.C 9 Sep 2003 22:13:40 -0000 1.41
+++ xforms/FormExternal.C 18 Sep 2003 07:17:54 -0000
@@ -35,7 +35,7 @@ using lyx::support::strToInt;
typedef FormController<ControlExternal, FormView<FD_external> > base_class;
FormExternal::FormExternal(Dialog & parent)
- : base_class(parent, _("External Material"))
+ : base_class(parent, N_("External Material"))
{}
Index: xforms/FormFloat.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormFloat.C,v
retrieving revision 1.29
diff -u -p -r1.29 FormFloat.C
--- xforms/FormFloat.C 9 Sep 2003 22:13:40 -0000 1.29
+++ xforms/FormFloat.C 18 Sep 2003 07:17:54 -0000
@@ -43,7 +43,7 @@ enum {
typedef FormController<ControlFloat, FormView<FD_float> > base_class;
FormFloat::FormFloat(Dialog & parent)
- : base_class(parent, _("Float Settings"))
+ : base_class(parent, N_("Float Settings"))
{}
Index: xforms/FormForks.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormForks.C,v
retrieving revision 1.28
diff -u -p -r1.28 FormForks.C
--- xforms/FormForks.C 9 Sep 2003 22:13:40 -0000 1.28
+++ xforms/FormForks.C 18 Sep 2003 07:17:54 -0000
@@ -38,7 +38,7 @@ using std::vector;
typedef FormCB<ControlForks, FormDB<FD_forks> > base_class;
FormForks::FormForks()
- : base_class(_("Child Processes"))
+ : base_class(N_("Child Processes"))
{}
Index: xforms/FormGraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormGraphics.C,v
retrieving revision 1.118
diff -u -p -r1.118 FormGraphics.C
--- xforms/FormGraphics.C 9 Sep 2003 22:13:40 -0000 1.118
+++ xforms/FormGraphics.C 18 Sep 2003 07:17:54 -0000
@@ -67,7 +67,7 @@ bool const scalableTabfolders = true;
typedef FormController<ControlGraphics, FormView<FD_graphics> > base_class;
FormGraphics::FormGraphics(Dialog & parent)
- : base_class(parent, _("Graphics"), scalableTabfolders)
+ : base_class(parent, N_("Graphics"), scalableTabfolders)
{}
Index: xforms/FormInclude.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormInclude.C,v
retrieving revision 1.46
diff -u -p -r1.46 FormInclude.C
--- xforms/FormInclude.C 9 Sep 2003 22:13:40 -0000 1.46
+++ xforms/FormInclude.C 18 Sep 2003 07:17:54 -0000
@@ -30,7 +30,7 @@ using lyx::support::rtrim;
typedef FormController<ControlInclude, FormView<FD_include> > base_class;
FormInclude::FormInclude(Dialog & parent)
- : base_class(parent, _("Child Document"))
+ : base_class(parent, N_("Child Document"))
{}
Index: xforms/FormMathsDelim.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsDelim.C,v
retrieving revision 1.44
diff -u -p -r1.44 FormMathsDelim.C
--- xforms/FormMathsDelim.C 15 Sep 2003 10:59:55 -0000 1.44
+++ xforms/FormMathsDelim.C 18 Sep 2003 07:17:54 -0000
@@ -49,7 +49,7 @@ static char const * delim_values[] = {
typedef FormController<ControlMath, FormView<FD_maths_delim> > base_class;
FormMathsDelim::FormMathsDelim(Dialog & parent)
- : base_class(parent, _("Math Delimiters"), false)
+ : base_class(parent, N_("Math Delimiters"), false)
{}
Index: xforms/FormMathsMatrix.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsMatrix.C,v
retrieving revision 1.53
diff -u -p -r1.53 FormMathsMatrix.C
--- xforms/FormMathsMatrix.C 15 Sep 2003 10:59:55 -0000 1.53
+++ xforms/FormMathsMatrix.C 18 Sep 2003 07:17:54 -0000
@@ -58,7 +58,7 @@ extern "C" {
typedef FormController<ControlMath, FormView<FD_maths_matrix> > base_class;
FormMathsMatrix::FormMathsMatrix(Dialog & parent)
- : base_class(parent, _("Math Matrix"), false)
+ : base_class(parent, N_("Math Matrix"), false)
{}
Index: xforms/FormMathsPanel.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsPanel.C,v
retrieving revision 1.58
diff -u -p -r1.58 FormMathsPanel.C
--- xforms/FormMathsPanel.C 5 Sep 2003 13:15:43 -0000 1.58
+++ xforms/FormMathsPanel.C 18 Sep 2003 07:17:54 -0000
@@ -36,7 +36,7 @@
typedef FormController<ControlMath, FormView<FD_maths_panel> > base_class;
FormMathsPanel::FormMathsPanel(Dialog & parent)
- : base_class(parent, _("Math Panel"))
+ : base_class(parent, N_("Math Panel"))
{}
Index: xforms/FormMathsSpace.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsSpace.C,v
retrieving revision 1.26
diff -u -p -r1.26 FormMathsSpace.C
--- xforms/FormMathsSpace.C 5 Sep 2003 13:15:43 -0000 1.26
+++ xforms/FormMathsSpace.C 18 Sep 2003 07:17:54 -0000
@@ -26,7 +26,7 @@ extern char * latex_mathspace[];
typedef FormController<ControlMath, FormView<FD_maths_space> > base_class;
FormMathsSpace::FormMathsSpace(Dialog & parent)
- : base_class(parent, _("Math Spacing"), false),
+ : base_class(parent, N_("Math Spacing"), false),
space_(-1)
{}
Index: xforms/FormMathsStyle.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMathsStyle.C,v
retrieving revision 1.23
diff -u -p -r1.23 FormMathsStyle.C
--- xforms/FormMathsStyle.C 5 Sep 2003 13:15:43 -0000 1.23
+++ xforms/FormMathsStyle.C 18 Sep 2003 07:17:54 -0000
@@ -39,7 +39,7 @@ kb_action latex_mathfontcmds[] = {
typedef FormController<ControlMath, FormView<FD_maths_style> > base_class;
FormMathsStyle::FormMathsStyle(Dialog & parent)
- : base_class(parent, _("Math Styles & Fonts"), false),
+ : base_class(parent, N_("Math Styles & Fonts"), false),
style_(-1)
{}
Index: xforms/FormMinipage.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormMinipage.C,v
retrieving revision 1.39
diff -u -p -r1.39 FormMinipage.C
--- xforms/FormMinipage.C 9 Sep 2003 22:13:40 -0000 1.39
+++ xforms/FormMinipage.C 18 Sep 2003 07:17:54 -0000
@@ -32,7 +32,7 @@ using lyx::support::subst;
typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;
FormMinipage::FormMinipage(Dialog & parent)
- : base_class(parent, _("Minipage Settings"))
+ : base_class(parent, N_("Minipage Settings"))
{}
Index: xforms/FormNote.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormNote.C,v
retrieving revision 1.9
diff -u -p -r1.9 FormNote.C
--- xforms/FormNote.C 9 Sep 2003 18:27:22 -0000 1.9
+++ xforms/FormNote.C 18 Sep 2003 07:17:54 -0000
@@ -25,7 +25,7 @@
typedef FormController<ControlNote, FormView<FD_note> > base_class;
FormNote::FormNote(Dialog & parent)
- : base_class(parent, _("Note"))
+ : base_class(parent, N_("Note"))
{}
Index: xforms/FormParagraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormParagraph.C,v
retrieving revision 1.97
diff -u -p -r1.97 FormParagraph.C
--- xforms/FormParagraph.C 9 Sep 2003 22:13:40 -0000 1.97
+++ xforms/FormParagraph.C 18 Sep 2003 07:17:54 -0000
@@ -67,7 +67,7 @@ void setWidgetsFromVSpace(VSpace const &
typedef FormController<ControlParagraph, FormView<FD_paragraph> > base_class;
FormParagraph::FormParagraph(Dialog & parent)
- : base_class(parent, _("Paragraph Settings"))
+ : base_class(parent, N_("Paragraph Settings"))
{}
Index: xforms/FormPreamble.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreamble.C,v
retrieving revision 1.27
diff -u -p -r1.27 FormPreamble.C
--- xforms/FormPreamble.C 5 Sep 2003 13:15:43 -0000 1.27
+++ xforms/FormPreamble.C 18 Sep 2003 07:17:54 -0000
@@ -23,7 +23,7 @@
typedef FormCB<ControlPreamble, FormDB<FD_preamble> > base_class;
FormPreamble::FormPreamble()
- : base_class(_("LaTeX Preamble"))
+ : base_class(N_("LaTeX Preamble"))
{}
Index: xforms/FormPreferences.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreferences.C,v
retrieving revision 1.179
diff -u -p -r1.179 FormPreferences.C
--- xforms/FormPreferences.C 16 Sep 2003 09:01:12 -0000 1.179
+++ xforms/FormPreferences.C 18 Sep 2003 07:17:54 -0000
@@ -92,7 +92,7 @@ typedef FormCB<ControlPrefs, FormDB<FD_p
FormPreferences::FormPreferences()
- : base_class(_("Preferences"), scalableTabfolders),
+ : base_class(N_("Preferences"), scalableTabfolders),
colors_(*this), converters_(*this), inputs_misc_(*this),
formats_(*this), interface_(*this), language_(*this),
lnf_misc_(*this), identity_(*this), outputs_misc_(*this),
Index: xforms/FormPrint.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPrint.C,v
retrieving revision 1.61
diff -u -p -r1.61 FormPrint.C
--- xforms/FormPrint.C 9 Sep 2003 22:13:41 -0000 1.61
+++ xforms/FormPrint.C 18 Sep 2003 07:17:54 -0000
@@ -33,7 +33,7 @@ using lyx::support::strToInt;
typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;
FormPrint::FormPrint()
- : base_class(_("Print Document"))
+ : base_class(N_("Print Document"))
{}
Index: xforms/FormRef.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormRef.C,v
retrieving revision 1.75
diff -u -p -r1.75 FormRef.C
--- xforms/FormRef.C 9 Sep 2003 22:13:41 -0000 1.75
+++ xforms/FormRef.C 18 Sep 2003 07:17:54 -0000
@@ -36,7 +36,7 @@ using std::vector;
typedef FormController<ControlRef, FormView<FD_ref> > base_class;
FormRef::FormRef(Dialog & parent)
- : base_class(parent, _("Cross-reference")),
+ : base_class(parent, N_("Cross-reference")),
at_ref_(false)
{}
Index: xforms/FormSearch.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormSearch.C,v
retrieving revision 1.26
diff -u -p -r1.26 FormSearch.C
--- xforms/FormSearch.C 5 Sep 2003 13:15:43 -0000 1.26
+++ xforms/FormSearch.C 18 Sep 2003 07:17:54 -0000
@@ -24,7 +24,7 @@
typedef FormCB<ControlSearch, FormDB<FD_search> > base_class;
FormSearch::FormSearch()
- : base_class(_("Find and Replace"))
+ : base_class(N_("Find and Replace"))
{}
Index: xforms/FormSendto.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormSendto.C,v
retrieving revision 1.26
diff -u -p -r1.26 FormSendto.C
--- xforms/FormSendto.C 9 Sep 2003 22:13:41 -0000 1.26
+++ xforms/FormSendto.C 18 Sep 2003 07:17:54 -0000
@@ -32,7 +32,7 @@ using std::vector;
typedef FormCB<ControlSendto, FormDB<FD_sendto> > base_class;
FormSendto::FormSendto()
- : base_class(_("Send document to command"))
+ : base_class(N_("Send document to command"))
{}
Index: xforms/FormSpellchecker.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormSpellchecker.C,v
retrieving revision 1.39
diff -u -p -r1.39 FormSpellchecker.C
--- xforms/FormSpellchecker.C 8 Sep 2003 00:33:36 -0000 1.39
+++ xforms/FormSpellchecker.C 18 Sep 2003 07:17:54 -0000
@@ -26,7 +26,7 @@
typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
FormSpellchecker::FormSpellchecker()
- : base_class(_("Spell-check Document"))
+ : base_class(N_("Spell-check Document"))
{}
Index: xforms/FormTabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormTabular.C,v
retrieving revision 1.80
diff -u -p -r1.80 FormTabular.C
--- xforms/FormTabular.C 9 Sep 2003 22:13:41 -0000 1.80
+++ xforms/FormTabular.C 18 Sep 2003 07:17:54 -0000
@@ -47,7 +47,7 @@ bool const scalableTabfolders = true;
typedef FormController<ControlTabular, FormView<FD_tabular> > base_class;
FormTabular::FormTabular(Dialog & parent)
- : base_class(parent, _("Table Settings"), scalableTabfolders),
+ : base_class(parent, N_("Table Settings"), scalableTabfolders),
closing_(false), actCell_(-1)
{
}
Index: xforms/FormTabularCreate.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormTabularCreate.C,v
retrieving revision 1.35
diff -u -p -r1.35 FormTabularCreate.C
--- xforms/FormTabularCreate.C 5 Sep 2003 13:15:43 -0000 1.35
+++ xforms/FormTabularCreate.C 18 Sep 2003 07:17:54 -0000
@@ -25,7 +25,7 @@ using std::make_pair;
typedef FormController<ControlTabularCreate, FormView<FD_tabular_create> > base_class;
FormTabularCreate::FormTabularCreate(Dialog & parent)
- : base_class(parent, _("Insert Table"))
+ : base_class(parent, N_("Insert Table"))
{}
Index: xforms/FormTexinfo.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormTexinfo.C,v
retrieving revision 1.34
diff -u -p -r1.34 FormTexinfo.C
--- xforms/FormTexinfo.C 9 Sep 2003 22:13:41 -0000 1.34
+++ xforms/FormTexinfo.C 18 Sep 2003 07:17:54 -0000
@@ -26,7 +26,7 @@ using lyx::support::OnlyFilename;
typedef FormController<ControlTexinfo, FormView<FD_texinfo> > base_class;
FormTexinfo::FormTexinfo(Dialog & parent)
- : base_class(parent, _("LaTeX Information")),
+ : base_class(parent, N_("LaTeX Information")),
activeStyle(ControlTexinfo::cls)
{}
Index: xforms/FormThesaurus.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormThesaurus.C,v
retrieving revision 1.26
diff -u -p -r1.26 FormThesaurus.C
--- xforms/FormThesaurus.C 9 Sep 2003 22:13:41 -0000 1.26
+++ xforms/FormThesaurus.C 18 Sep 2003 07:17:54 -0000
@@ -37,7 +37,7 @@ typedef FormController<ControlThesaurus,
FormThesaurus::FormThesaurus(Dialog & parent)
- : base_class(parent, _("Thesaurus"), false),
+ : base_class(parent, N_("Thesaurus"), false),
clickline_(-1)
{
}
Index: xforms/FormToc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormToc.C,v
retrieving revision 1.58
diff -u -p -r1.58 FormToc.C
--- xforms/FormToc.C 9 Sep 2003 22:13:41 -0000 1.58
+++ xforms/FormToc.C 18 Sep 2003 07:17:54 -0000
@@ -29,7 +29,7 @@ using std::vector;
typedef FormController<ControlToc, FormView<FD_toc> > base_class;
FormToc::FormToc(Dialog & parent)
- : base_class(parent, _("Table of Contents"))
+ : base_class(parent, N_("Table of Contents"))
{}
Index: xforms/FormUrl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormUrl.C,v
retrieving revision 1.51
diff -u -p -r1.51 FormUrl.C
--- xforms/FormUrl.C 5 Sep 2003 13:15:43 -0000 1.51
+++ xforms/FormUrl.C 18 Sep 2003 07:17:54 -0000
@@ -23,7 +23,7 @@
typedef FormController<ControlCommand, FormView<FD_url> > base_class;
FormUrl::FormUrl(Dialog & parent)
- : base_class(parent, _("URL"))
+ : base_class(parent, N_("URL"))
{}
Index: xforms/FormWrap.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormWrap.C,v
retrieving revision 1.12
diff -u -p -r1.12 FormWrap.C
--- xforms/FormWrap.C 9 Sep 2003 22:13:41 -0000 1.12
+++ xforms/FormWrap.C 18 Sep 2003 07:17:54 -0000
@@ -32,7 +32,7 @@ using lyx::support::subst;
typedef FormController<ControlWrap, FormView<FD_wrap> > base_class;
FormWrap::FormWrap(Dialog & parent)
- : base_class(parent, _("Text Wrap Settings"))
+ : base_class(parent, N_("Text Wrap Settings"))
{}
Index: xforms/xformsBC.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/xformsBC.C,v
retrieving revision 1.19
diff -u -p -r1.19 xformsBC.C
--- xforms/xformsBC.C 23 Aug 2003 00:16:47 -0000 1.19
+++ xforms/xformsBC.C 18 Sep 2003 07:17:54 -0000
@@ -38,5 +38,5 @@ void xformsBC::setWidgetEnabled(FL_OBJEC
void xformsBC::setButtonLabel(FL_OBJECT * obj, string const & label) const
{
- fl_set_object_label(obj, label.c_str());
+ fl_set_object_label(obj, _(label).c_str());
}
Index: xforms/xformsBC.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/xformsBC.h,v
retrieving revision 1.17
diff -u -p -r1.17 xformsBC.h
--- xforms/xformsBC.h 23 Aug 2003 00:16:47 -0000 1.17
+++ xforms/xformsBC.h 18 Sep 2003 07:17:54 -0000
@@ -23,7 +23,7 @@ class xformsBC : public GuiBC<FL_OBJECT,
public:
///
xformsBC(ButtonController const &,
- string const & = _("Cancel"), string const & = _("Close"));
+ string const & = N_("Cancel"), string const & = N_("Close"));
private:
/// Updates the button sensitivity (enabled/disabled)
pgp00000.pgp
Description: PGP signature
