fix font size names

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6057 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-02-07 14:28:41 +00:00
parent e67711becd
commit 666e7059c4
5 changed files with 27 additions and 16 deletions

View File

@ -1,3 +1,8 @@
2003-01-31 Michael Schmitt <michael.schmitt@teststep.org>
* 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 <levon@movementarian.org>
* QLPrintDialog.C: fix braindead "helpful" code

View File

@ -254,37 +254,31 @@
<item>
<property>
<name>text</name>
<string>tiny</string>
<string>Tiny</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>script</string>
<string>Smallest</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>footnote</string>
<string>Smaller</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>small</string>
<string>Small</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>normal</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>large</string>
<string>Normal</string>
</property>
</item>
<item>
@ -296,13 +290,13 @@
<item>
<property>
<name>text</name>
<string>LARGE</string>
<string>Larger</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>huge</string>
<string>Largest</string>
</property>
</item>
<item>
@ -311,6 +305,12 @@
<string>Huge</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Huger</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>bulletsizeCO</cstring>

View File

@ -1,3 +1,9 @@
2003-01-31 Michael Schmitt <michael.schmitt@teststep.org>
* 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 <leeming@lyx.org>
* FormGraphics.C: Fix off by one error in update/apply of rotation

View File

@ -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);

View File

@ -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)