From b1e1c598c40ae81a5565838f8606aa94b5a8a95e Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 26 Dec 2002 14:14:29 +0000 Subject: [PATCH] remove extra spaces; fix error message with xforms menus git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5893 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 6 +++ lib/layouts/broadway.layout | 2 +- lib/layouts/cl2emult.layout | 6 +-- lib/layouts/hollywood.layout | 4 +- po/POTFILES.in | 44 ++++++++++--------- src/ChangeLog | 4 ++ src/frontends/xforms/ChangeLog | 11 +++++ src/frontends/xforms/FormSpellchecker.C | 2 +- src/frontends/xforms/Menubar_pimpl.C | 2 +- .../xforms/forms/form_maths_matrix.fd | 2 +- src/frontends/xforms/forms/form_paragraph.fd | 2 +- src/lyxrc.C | 4 +- 12 files changed, 56 insertions(+), 33 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index a962d1ab93..b92cfd35c2 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2002-12-23 Jean-Marc Lasgouttes + + * layouts/cl2emult.layout: + * layouts/broadway.layout: + * layouts/hollywood.layout: remove spurious spaces + 2002-12-20 Dekel Tsur * mathed.lyx: Removed big delimiters table as they are not symbols. diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 2c6e67437e..6ddda0f86b 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -127,7 +127,7 @@ End # Parenthetical instruction to speaker (in parenthises, l.c.) # The ( and ) will automatically appear on screen, so don't type any. -Style Parenthetical +Style Parenthetical Margin Static LatexType Command LatexName parenthetical diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout index 64ddbe7921..f19d10cb66 100644 --- a/lib/layouts/cl2emult.layout +++ b/lib/layouts/cl2emult.layout @@ -56,7 +56,7 @@ Style Title End -Style Author +Style Author Margin Static LatexType Command InTitle 1 @@ -68,7 +68,7 @@ Style Author End -Style Institute +Style Institute LatexType Command InTitle 1 LatexName institute @@ -79,7 +79,7 @@ Style Institute End -Style Abstract +Style Abstract Margin First_Dynamic LeftMargin "" LatexType Environment diff --git a/lib/layouts/hollywood.layout b/lib/layouts/hollywood.layout index c7d9fbb056..d1cc01c9eb 100644 --- a/lib/layouts/hollywood.layout +++ b/lib/layouts/hollywood.layout @@ -158,7 +158,7 @@ End # Parenthetical instruction to speaker (in parenthises, l.c.) # The ( and ) will automatically appear on screen, so don't type any. -Style Parenthetical +Style Parenthetical Margin Static LatexType Command LatexName parenthetical @@ -186,7 +186,7 @@ End # Used when the same speaker continues after a narrative. Don't type # anything. -Style Continuing +Style Continuing Margin Static LatexType Command LatexName continuing diff --git a/po/POTFILES.in b/po/POTFILES.in index ee63c5d994..8929543485 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,16 +1,20 @@ -src/buffer.C -src/bufferlist.C src/BufferView.C -src/bufferview_funcs.C src/BufferView_pimpl.C src/Chktex.C -src/converter.C src/CutAndPaste.C +src/LColor.C +src/LaTeX.C +src/LyXAction.C +src/MenuBackend.C +src/buffer.C +src/bufferlist.C +src/bufferview_funcs.C +src/converter.C src/debug.C src/exporter.C -src/frontends/controllers/biblio.C +src/ext_l10n.h +src/frontends/LyXView.C src/frontends/controllers/ButtonController.h -src/frontends/controllers/character.C src/frontends/controllers/ControlAboutlyx.C src/frontends/controllers/ControlBibtex.C src/frontends/controllers/ControlCharacter.C @@ -26,13 +30,13 @@ src/frontends/controllers/ControlSearch.C src/frontends/controllers/ControlSpellchecker.C src/frontends/controllers/ControlThesaurus.C src/frontends/controllers/ControlVCLog.C +src/frontends/controllers/biblio.C +src/frontends/controllers/character.C src/frontends/controllers/frnt_lang.C src/frontends/controllers/helper_funcs.C src/frontends/gnome/GLog.C -src/frontends/LyXView.C src/frontends/qt2/Alert_pimpl.C src/frontends/qt2/FileDialog.C -src/frontends/qt2/lengthcombo.C src/frontends/qt2/QAbout.C src/frontends/qt2/QBibitem.C src/frontends/qt2/QBibtex.C @@ -44,8 +48,8 @@ src/frontends/qt2/QCommandBuffer.C src/frontends/qt2/QDelimiterDialog.C src/frontends/qt2/QDocument.C src/frontends/qt2/QDocumentDialog.C -src/frontends/qt2/QError.C src/frontends/qt2/QERT.C +src/frontends/qt2/QError.C src/frontends/qt2/QExternal.C src/frontends/qt2/QExternalDialog.C src/frontends/qt2/QFloat.C @@ -53,8 +57,8 @@ src/frontends/qt2/QGraphics.C src/frontends/qt2/QGraphicsDialog.C src/frontends/qt2/QInclude.C src/frontends/qt2/QIndex.C -src/frontends/qt2/QLog.C src/frontends/qt2/QLPrintDialog.C +src/frontends/qt2/QLog.C src/frontends/qt2/QMathDialog.C src/frontends/qt2/QMathMatrixDialog.C src/frontends/qt2/QMinipage.C @@ -77,9 +81,9 @@ src/frontends/qt2/QToc.C src/frontends/qt2/QURL.C src/frontends/qt2/QVCLog.C src/frontends/qt2/QWrap.C +src/frontends/qt2/lengthcombo.C src/frontends/xforms/Alert_pimpl.C src/frontends/xforms/ColorHandler.C -src/frontends/xforms/combox.C src/frontends/xforms/FileDialog.C src/frontends/xforms/FormAboutlyx.C src/frontends/xforms/FormBase.C @@ -88,8 +92,8 @@ src/frontends/xforms/FormBibtex.C src/frontends/xforms/FormCharacter.C src/frontends/xforms/FormCitation.C src/frontends/xforms/FormDocument.C -src/frontends/xforms/FormError.C src/frontends/xforms/FormERT.C +src/frontends/xforms/FormError.C src/frontends/xforms/FormExternal.C src/frontends/xforms/FormFiledialog.C src/frontends/xforms/FormFloat.C @@ -122,14 +126,15 @@ src/frontends/xforms/FormToc.C src/frontends/xforms/FormUrl.C src/frontends/xforms/FormVCLog.C src/frontends/xforms/FormWrap.C -src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C -src/frontends/xforms/xforms_helpers.C src/frontends/xforms/XMiniBuffer.C +src/frontends/xforms/combox.C +src/frontends/xforms/input_validators.C +src/frontends/xforms/xforms_helpers.C src/gettext.h src/importer.C -src/insets/insetbib.C src/insets/inset.C +src/insets/insetbib.C src/insets/insetcaption.C src/insets/inseterror.C src/insets/insetert.C @@ -156,15 +161,12 @@ src/insets/inseturl.C src/insets/insetwrap.C src/kbsequence.C src/language.C -src/LaTeX.C -src/LColor.C src/lengthcommon.C -src/LyXAction.C src/lyx_cb.C +src/lyx_main.C src/lyxfind.C src/lyxfont.C src/lyxfunc.C -src/lyx_main.C src/lyxrc.C src/lyxtextclasslist.C src/lyxvc.C @@ -173,10 +175,10 @@ src/mathed/formulamacro.C src/mathed/math_hullinset.C src/mathed/math_parboxinset.C src/mathed/ref_inset.C -src/MenuBackend.C src/paragraph.C src/support/filetools.C src/tabular.C +src/text.C src/text2.C src/text3.C -src/text.C +src/ext_l10n.h diff --git a/src/ChangeLog b/src/ChangeLog index a461a04515..b4626dc8e5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-12-23 Jean-Marc Lasgouttes + + * lyxrc.C (getDescription): remove extra spaces + 2002-12-20 John Levon * text3.C: hack fix for page up/down across tall rows diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index faf5cabaa0..baadda6e41 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,14 @@ +2002-12-26 Jean-Marc Lasgouttes + + * Menubar_pimpl.C (create_submenu): do not query the status of a + submenu either. + +2002-12-23 Jean-Marc Lasgouttes + + * FormSpellchecker.C (build): + * forms/form_paragraph.fd: + * forms/form_maths_matrix.fd: remove extra spaces + 2002-12-18 Jean-Marc Lasgouttes * Menubar_pimpl.C (create_submenu): do not query the status of a diff --git a/src/frontends/xforms/FormSpellchecker.C b/src/frontends/xforms/FormSpellchecker.C index 2d441c31be..e13e63a36c 100644 --- a/src/frontends/xforms/FormSpellchecker.C +++ b/src/frontends/xforms/FormSpellchecker.C @@ -58,7 +58,7 @@ void FormSpellchecker::build() // set up the tooltips string str = _("Type replacement for unknown word " - " or select from suggestions."); + "or select from suggestions."); tooltips().init(dialog_->input_replacement, str); str = _("List of replacement suggestions from dictionary."); tooltips().init(dialog_->browser_suggestions, str); diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index 56db1c5f4c..a5fa712a67 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -233,7 +233,7 @@ int Menubar::Pimpl::create_submenu(Window win, XFormsView * view, for (Menu::const_iterator i = menu.begin(); i != end; ++i, ++it) { if (i->kind() == MenuItem::Separator) *last = "%l"; - else { + else if (i->kind() == MenuItem::Command) { FuncStatus flag = view->getLyXFunc().getStatus(i->action()); if (!(i->optional() && flag.disabled()) diff --git a/src/frontends/xforms/forms/form_maths_matrix.fd b/src/frontends/xforms/forms/form_maths_matrix.fd index 55da21b3c1..769b29a900 100644 --- a/src/frontends/xforms/forms/form_maths_matrix.fd +++ b/src/frontends/xforms/forms/form_maths_matrix.fd @@ -119,7 +119,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: OK +label: OK shortcut: ^M resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd index 425729705a..3d4646d30e 100644 --- a/src/frontends/xforms/forms/form_paragraph.fd +++ b/src/frontends/xforms/forms/form_paragraph.fd @@ -329,7 +329,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Maximum label width:|#M +label: Maximum label width:|#M shortcut: resize: FL_RESIZE_X gravity: FL_West FL_East diff --git a/src/lyxrc.C b/src/lyxrc.C index 1053cdbcf7..eee995868c 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1983,7 +1983,7 @@ string const LyXRC::getDescription(LyXRCTags tag) break; case RC_UIFILE: - str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories."); + str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories."); break; case RC_KBMAP: @@ -1993,7 +1993,7 @@ string const LyXRC::getDescription(LyXRCTags tag) break; case RC_ASCIIROFF_COMMAND: - str = _("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used."); + str = _("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used."); break; case RC_ASCII_LINELEN: -- 2.39.5