fix dialog titles to match new menus

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6893 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c3001d0207d3835b1787b14a41c814605fe73cc3..ab0d8d2e42c2864b0536eb9ec47d1043ab68e33b 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-30  John Levon  <levon@movementarian.org>
+
+       * Form<Various>: fix dialog titles to match new menus
+
 2003-04-27  John Levon  <levon@movementarian.org>
 
        * Alert_pimpl.C: ignore cancel_button (for now)

diff --git a/src/frontends/xforms/FormChanges.C b/src/frontends/xforms/FormChanges.C
index c843963171d6388cce2c555d45f523298e5971b1..2d2d3c730c3cdfc27c027af55b05699ff19997b5 100644 (file)
--- a/src/frontends/xforms/FormChanges.C
+++ b/src/frontends/xforms/FormChanges.C
@@ -21,7 +21,7 @@
 typedef FormController<ControlChanges, FormView<FD_changes> > base_class;
 
 FormChanges::FormChanges(Dialog & parent)
-       : base_class(parent, _("Merge changes"))
+       : base_class(parent, _("Merge Changes"))
 {}
 
 

diff --git a/src/frontends/xforms/FormCharacter.C b/src/frontends/xforms/FormCharacter.C
index f20ec08aca1ee4120019a17014e40361e025df07..360633876632a9a9badd6782931574bc1683b145 100644 (file)
--- a/src/frontends/xforms/FormCharacter.C
+++ b/src/frontends/xforms/FormCharacter.C
@@ -37,7 +37,7 @@ using namespace frnt;
 typedef FormController<ControlCharacter, FormView<FD_character> > base_class;
 
 FormCharacter::FormCharacter(Dialog & parent)
-       : base_class(parent, _("Character Layout"), false)
+       : base_class(parent, _("Text Style"), false)
 {}
 
 

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index a71314f4c45ed678425dda36632df5459abfbda9..593857bbdab349dc027b2335b932ae6c838d729d 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -62,7 +62,7 @@ bool const scalableTabfolders = true;
 typedef FormCB<ControlDocument, FormDB<FD_document> > base_class;
 
 FormDocument::FormDocument()
-       : base_class(_("Document Layout"), scalableTabfolders),
+       : base_class(_("Document Settings"), scalableTabfolders),
          ActCell(0), Confirmed(0),
          current_bullet_panel(0), current_bullet_depth(0), fbullet(0)
 {}

diff --git a/src/frontends/xforms/FormERT.C b/src/frontends/xforms/FormERT.C
index d91e530c158d4041f16fb82c97a1c160170be5e1..9bdde61e92a5606acf22cb6ec9a80b6c7bded570 100644 (file)
--- a/src/frontends/xforms/FormERT.C
+++ b/src/frontends/xforms/FormERT.C
@@ -23,7 +23,7 @@
 typedef  FormController<ControlERT, FormView<FD_ert> > base_class;
 
 FormERT::FormERT(Dialog & parent)
-       : base_class(parent, _("ERT Options"))
+       : base_class(parent, _("TeX Settings"))
 {}
 
 

diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index a74505b0bf6afc7558ce70ab23efdafc285d1961..e47b923be9956d7e2b2ad53c6dedd486b2403b25 100644 (file)
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -27,7 +27,7 @@
 typedef FormController<ControlExternal, FormView<FD_external> > base_class;
 
 FormExternal::FormExternal(Dialog & parent)
-       : base_class(parent, _("Edit external file"))
+       : base_class(parent, _("External Material"))
 {}
 
 

diff --git a/src/frontends/xforms/FormFloat.C b/src/frontends/xforms/FormFloat.C
index ef05398c05379fd149af631deb5546ded588fb0d..e1bae267154d69b1aee7f3263f3d49a1418d1351 100644 (file)
--- a/src/frontends/xforms/FormFloat.C
+++ b/src/frontends/xforms/FormFloat.C
@@ -37,7 +37,7 @@ enum {
 typedef FormController<ControlFloat, FormView<FD_float> > base_class;
 
 FormFloat::FormFloat(Dialog & parent)
-       : base_class(parent, _("Float Options"))
+       : base_class(parent, _("Float Settings"))
 {}
 
 

diff --git a/src/frontends/xforms/FormForks.C b/src/frontends/xforms/FormForks.C
index 344c5afd62d820936a7865bd5f4f699f5685e132..328841053891ecd48ae820af01262292476b4636 100644 (file)
--- a/src/frontends/xforms/FormForks.C
+++ b/src/frontends/xforms/FormForks.C
@@ -31,7 +31,7 @@ using std::find_if;
 typedef FormCB<ControlForks, FormDB<FD_forks> > base_class;
 
 FormForks::FormForks()
-       : base_class(_("Child processes"))
+       : base_class(_("Child Processes"))
 {}
 
 

diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index ba443738a50968040cc4185dc939baf95843a845..77ebe40fdf69207ab37c375a866af44233db10fc 100644 (file)
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -29,7 +29,7 @@
 typedef FormController<ControlInclude, FormView<FD_include> > base_class;
 
 FormInclude::FormInclude(Dialog & parent)
-       : base_class(parent, _("Include file"))
+       : base_class(parent, _("Child Document"))
 {}
 
 

diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 442711a3e7661cb5813b3abecb55d7e53998379c..dcc192f1076d75b680a7921542ba7226b6ef3357 100644 (file)
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -52,7 +52,7 @@ using std::endl;
 typedef FormCB<ControlMathSub, FormDB<FD_maths_delim> > base_class;
 
 FormMathsDelim::FormMathsDelim()
-       : base_class(_("Maths Delimiters"), false)
+       : base_class(_("Math Delimiters"), false)
 {}
 
 

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index 10541873a85b3e4564bc923c386e16a856f29412..9becd82a4aaba24663c066209d72f93304d674e1 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -57,7 +57,7 @@ extern "C" {
 typedef FormCB<ControlMathSub, FormDB<FD_maths_matrix> > base_class;
 
 FormMathsMatrix::FormMathsMatrix()
-       : base_class(_("Maths Matrix"), false)
+       : base_class(_("Math Matrix"), false)
 {}
 
 

diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index edc0f2d5554602d53319351493c076b4f8299de9..532b09e14cf38f930bd62b06c9207198843588d2 100644 (file)
--- a/src/frontends/xforms/FormMathsPanel.C
+++ b/src/frontends/xforms/FormMathsPanel.C
@@ -62,7 +62,7 @@
 typedef FormCB<ControlMath, FormDB<FD_maths_panel> > base_class;
 
 FormMathsPanel::FormMathsPanel()
-       : base_class(_("Maths Panel"))
+       : base_class(_("Math Panel"))
 {}
 
 

diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C
index 71b942bc72612cb7dab20829b5c9235173f565a4..5e6f03ad63696f2df5f911df21077547bf703ddc 100644 (file)
--- a/src/frontends/xforms/FormMathsSpace.C
+++ b/src/frontends/xforms/FormMathsSpace.C
@@ -26,7 +26,7 @@ extern char * latex_mathspace[];
 typedef FormCB<ControlMathSub, FormDB<FD_maths_space> > base_class;
 
 FormMathsSpace::FormMathsSpace()
-       : base_class(_("Maths Spacing"), false),
+       : base_class(_("Math Spacing"), false),
          space_(-1)
 {}
 

diff --git a/src/frontends/xforms/FormMathsStyle.C b/src/frontends/xforms/FormMathsStyle.C
index 155dbb9b4c35ed02078541eb4cdf9a02d2f23b42..30d646f084c3510bf96e94c3f611b2fc62917961 100644 (file)
--- a/src/frontends/xforms/FormMathsStyle.C
+++ b/src/frontends/xforms/FormMathsStyle.C
@@ -40,7 +40,7 @@ kb_action latex_mathfontcmds[] = {
 typedef FormCB<ControlMathSub, FormDB<FD_maths_style> > base_class;
 
 FormMathsStyle::FormMathsStyle()
-       : base_class(_("Maths Styles & Fonts"), false),
+       : base_class(_("Math Styles & Fonts"), false),
          style_(-1)
 {}
 

diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C
index 10d12e1204371b6b26b36ee7125240bdee029445..e97bd6ca87f588eebb83c1b24e6d3a44a9a6e50a 100644 (file)
--- a/src/frontends/xforms/FormMinipage.C
+++ b/src/frontends/xforms/FormMinipage.C
@@ -24,7 +24,7 @@
 typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;
 
 FormMinipage::FormMinipage(Dialog & parent)
-       : base_class(parent, _("Minipage Options"))
+       : base_class(parent, _("Minipage Settings"))
 {}
 
 

diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index ed583bc0b74f32ff4e2f9fd6fece2fad4bb76ae0..b84caa803d992f13afdd6063b27256866c2a4526 100644 (file)
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -64,7 +64,7 @@ void setWidgetsFromVSpace(VSpace const & space,
 typedef FormController<ControlParagraph, FormView<FD_paragraph> > base_class;
 
 FormParagraph::FormParagraph(Dialog & parent)
-       : base_class(parent, _("Paragraph Layout"))
+       : base_class(parent, _("Paragraph Settings"))
 {}
 
 

diff --git a/src/frontends/xforms/FormPreamble.C b/src/frontends/xforms/FormPreamble.C
index a793b9eb700d14629721cdd926a490225d6c0521..6b8fb39ae5ebdd556b15c97f447199fa5f18ac70 100644 (file)
--- a/src/frontends/xforms/FormPreamble.C
+++ b/src/frontends/xforms/FormPreamble.C
@@ -22,7 +22,7 @@
 typedef FormCB<ControlPreamble, FormDB<FD_preamble> > base_class;
 
 FormPreamble::FormPreamble()
-       : base_class(_("LaTeX preamble"))
+       : base_class(_("LaTeX Preamble"))
 {}
 
 

diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C
index a83db97f5a8a4da212a9f9cf55b567b6c013d8fc..a5f46b9ee7e027fc193027360fcac8722c61197b 100644 (file)
--- a/src/frontends/xforms/FormPrint.C
+++ b/src/frontends/xforms/FormPrint.C
@@ -30,7 +30,7 @@
 typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;
 
 FormPrint::FormPrint()
-       : base_class(_("Print"))
+       : base_class(_("Print Document"))
 {}
 
 

diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 6cd04355a86e837f3d2fef9f048ba825e1ee9a37..993c85822af948c809920a5db223357d712dbd75 100644 (file)
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -31,7 +31,7 @@ using std::vector;
 typedef FormController<ControlRef, FormView<FD_ref> > base_class;
 
 FormRef::FormRef(Dialog & parent)
-       : base_class(parent, _("Reference")),
+       : base_class(parent, _("Cross-reference")),
          at_ref_(false)
 {}
 

diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C
index 74924ce7cb1a7c4063e198fdcbf9a38986d92d4c..80469dcb8c3593fc8296e1991ff91427bb205078 100644 (file)
--- a/src/frontends/xforms/FormSpellchecker.C
+++ b/src/frontends/xforms/FormSpellchecker.C
@@ -28,7 +28,7 @@ using std::endl;
 typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
 
 FormSpellchecker::FormSpellchecker()
-       : base_class(_("Spellchecker"))
+       : base_class(_("Spell-check Document"))
 {}
 
 

diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index 58bceb7aa7169b1e4c9b500ae7e27a658c52bd97..4ce0843f396679509472587ec69695d23f0d9805 100644 (file)
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -49,7 +49,7 @@ bool const scalableTabfolders = true;
 typedef FormController<ControlTabular, FormView<FD_tabular> > base_class;
 
 FormTabular::FormTabular(Dialog & parent)
-       : base_class(parent, _("Edit table settings"), scalableTabfolders),
+       : base_class(parent, _("Table Settings"), scalableTabfolders),
        closing_(false), actCell_(-1)
 {
 }
@@ -127,7 +127,7 @@ void FormTabular::build()
                fl_set_tabfolder_autofit(dialog_->tabfolder, FL_FIT);
 
        // Stack tabs
-       fl_addto_tabfolder(dialog_->tabfolder, _("Tabular"),
+       fl_addto_tabfolder(dialog_->tabfolder, _("Table"),
                           tabular_options_->form);
        fl_addto_tabfolder(dialog_->tabfolder, _("Column/Row"),
                           column_options_->form);

diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C
index 384aefd1f61d63f41b297c37bf97b61d32b0fcb3..c8b82106072019b3d81729761920c2462b00fa67 100644 (file)
--- a/src/frontends/xforms/FormTabularCreate.C
+++ b/src/frontends/xforms/FormTabularCreate.C
@@ -27,7 +27,7 @@ using std::make_pair;
 typedef FormController<ControlTabularCreate, FormView<FD_tabular_create> > base_class;
 
 FormTabularCreate::FormTabularCreate(Dialog & parent)
-       : base_class(parent, _("Insert Tabular"))
+       : base_class(parent, _("Insert Table"))
 {}
 
 

diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index a58dbbf64278f77a3eb0f72177951c0f17c5e64f..6d591e850e508a21bf9e7497f40e317ab0b99f30 100644 (file)
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -21,7 +21,7 @@
 typedef  FormController<ControlCommand, FormView<FD_url> > base_class;
 
 FormUrl::FormUrl(Dialog & parent)
-       : base_class(parent, _("Url"))
+       : base_class(parent, _("URL"))
 {}
 
 

diff --git a/src/frontends/xforms/FormWrap.C b/src/frontends/xforms/FormWrap.C
index 9368d132e343742aa5e1798c6bb07b7b28ca6997..aaae3fbb1dd861cb40c710f7bc54f97f48717625 100644 (file)
--- a/src/frontends/xforms/FormWrap.C
+++ b/src/frontends/xforms/FormWrap.C
@@ -27,7 +27,7 @@
 typedef FormController<ControlWrap, FormView<FD_wrap> > base_class;
 
 FormWrap::FormWrap(Dialog & parent)
-       : base_class(parent, _("Wrap Options"))
+       : base_class(parent, _("Text Wrap Settings"))
 {}