From 666e7059c4391fc4d9c887b99b0bdf4389045907 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 7 Feb 2003 14:28:41 +0000 Subject: [PATCH] fix font size names git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6057 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 5 +++++ src/frontends/qt2/ui/BulletsModuleBase.ui | 20 ++++++++++---------- src/frontends/xforms/ChangeLog | 6 ++++++ src/frontends/xforms/FormDocument.C | 4 ++-- src/frontends/xforms/FormPreferences.C | 2 +- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 43eb762d88..9331874378 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2003-01-31 Michael Schmitt + + * ui/BulletsModuleBase.ui: Replace LaTeX font size names by LyX + names for consistency reasons and to resolve a translation conflict + 2003-02-05 John Levon * QLPrintDialog.C: fix braindead "helpful" code diff --git a/src/frontends/qt2/ui/BulletsModuleBase.ui b/src/frontends/qt2/ui/BulletsModuleBase.ui index f45fab3b96..f174a3e663 100644 --- a/src/frontends/qt2/ui/BulletsModuleBase.ui +++ b/src/frontends/qt2/ui/BulletsModuleBase.ui @@ -254,61 +254,61 @@ text - tiny + Tiny text - script + Smallest text - footnote + Smaller text - small + Small text - normal + Normal text - large + Large text - Large + Larger text - LARGE + Largest text - huge + Huge text - Huge + Huger diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 92112a0fc7..f15d62ce47 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2003-01-31 Michael Schmitt + + * FormDocument.C: + * FormPreferences.C: Replace LaTeX font size names by LyX + names for consistency reasons and to resolve a translation conflict + 2003-02-02 Angus Leeming * FormGraphics.C: Fix off by one error in update/apply of rotation diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index 566e03265f..39ad431d95 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -326,8 +326,8 @@ void FormDocument::build() fl_set_input_return(bullets_->input_bullet_latex, FL_RETURN_CHANGED); fl_addto_choice(bullets_->choice_bullet_size, - _(" default | tiny | script | footnote | small |" - " normal | large | Large | LARGE | huge | Huge")); + _(" Default | Tiny | Smallest | Smaller | Small |" + " Normal | Large | Larger | Largest | Huge | Huger ")); fl_set_choice(bullets_->choice_bullet_size, 1); fl_set_input_maxchars(bullets_->input_bullet_latex, 80); diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index 9321ef1c7e..7647255cb9 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -2693,7 +2693,7 @@ bool FormPreferences::ScreenFonts::input() strToDbl(fl_get_input(dialog_->input_huger))) { activate = false; - str = _("Fonts must be input in the order tiny > script> footnote > small > normal > large > larger > largest > huge > huger."); + str = _("Fonts must be input in the order Tiny > Smallest > Smaller > Small > Normal > Large > Larger > Largest > Huge > Huger."); } if (!activate) -- 2.39.2