anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Michael Schmitt's UI patch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8153 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2003-11-28 19:17:34 +00:00
parent 505ae17833
commit 629bd3d17e
5 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,11 @@
2003-11-28 Michael Schmitt <michael.schmitt@teststep.org>
* src/frontends/xforms/forms/form_box.fd:
* src/frontends/xforms/FormMinipage.C:
* src/frontends/xforms/FormDocument.C:
* src/frontends/xforms/FormBox.C: fix capitalization in
messages; harmonize messages of different dialogs
2003-11-28 Angus Leeming <leeming@lyx.org> 2003-11-28 Angus Leeming <leeming@lyx.org>
* FormVSpace (build): fill the 'choice_space' widget. Enable the other * FormVSpace (build): fill the 'choice_space' widget. Enable the other

26
src/frontends/xforms/FormBox.C
View File

@ -71,21 +71,21 @@ void FormBox::build()
bcview().addReadOnly(dialog_->radio_minipage); bcview().addReadOnly(dialog_->radio_minipage);
bcview().addReadOnly(dialog_->choice_pos); bcview().addReadOnly(dialog_->choice_pos);
fl_addto_choice(dialog_->choice_pos, _("top").c_str()); fl_addto_choice(dialog_->choice_pos, _("Top").c_str());
fl_addto_choice(dialog_->choice_pos, _("middle").c_str()); fl_addto_choice(dialog_->choice_pos, _("Middle").c_str());
fl_addto_choice(dialog_->choice_pos, _("bottom").c_str()); fl_addto_choice(dialog_->choice_pos, _("Bottom").c_str());
bcview().addReadOnly(dialog_->choice_inner_pos); bcview().addReadOnly(dialog_->choice_inner_pos);
fl_addto_choice(dialog_->choice_inner_pos, _("top").c_str()); fl_addto_choice(dialog_->choice_inner_pos, _("Top").c_str());
fl_addto_choice(dialog_->choice_inner_pos, _("middle").c_str()); fl_addto_choice(dialog_->choice_inner_pos, _("Middle").c_str());
fl_addto_choice(dialog_->choice_inner_pos, _("bottom").c_str()); fl_addto_choice(dialog_->choice_inner_pos, _("Bottom").c_str());
fl_addto_choice(dialog_->choice_inner_pos, _("stretch").c_str()); fl_addto_choice(dialog_->choice_inner_pos, _("Stretch").c_str());
bcview().addReadOnly(dialog_->choice_hor_pos); bcview().addReadOnly(dialog_->choice_hor_pos);
fl_addto_choice(dialog_->choice_hor_pos, _("left").c_str()); fl_addto_choice(dialog_->choice_hor_pos, _("Left").c_str());
fl_addto_choice(dialog_->choice_hor_pos, _("center").c_str()); fl_addto_choice(dialog_->choice_hor_pos, _("Center").c_str());
fl_addto_choice(dialog_->choice_hor_pos, _("right").c_str()); fl_addto_choice(dialog_->choice_hor_pos, _("Right").c_str());
fl_addto_choice(dialog_->choice_hor_pos, _("stretch").c_str()); fl_addto_choice(dialog_->choice_hor_pos, _("Stretch").c_str());
bcview().addReadOnly(dialog_->input_width); bcview().addReadOnly(dialog_->input_width);
bcview().addReadOnly(dialog_->choice_width_unit); bcview().addReadOnly(dialog_->choice_width_unit);
@ -261,7 +261,7 @@ ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long)
string const input = getString(dialog_->input_width); string const input = getString(dialog_->input_width);
bool const invalid = !isValidLength(input) && !isStrDbl(input); bool const invalid = !isValidLength(input) && !isStrDbl(input);
if (invalid) { if (invalid) {
postWarning(_("Invalid Length!")); postWarning(_("Invalid length!"));
return ButtonPolicy::SMI_INVALID; return ButtonPolicy::SMI_INVALID;
} }
} }
@ -269,7 +269,7 @@ ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long)
string const input = getString(dialog_->input_height); string const input = getString(dialog_->input_height);
bool const invalid = !isValidLength(input) && !isStrDbl(input); bool const invalid = !isValidLength(input) && !isStrDbl(input);
if (invalid) { if (invalid) {
postWarning(_("Invalid Length!")); postWarning(_("Invalid length!"));
return ButtonPolicy::SMI_INVALID; return ButtonPolicy::SMI_INVALID;
} }
} }

2
src/frontends/xforms/FormDocument.C
View File

@ -309,7 +309,7 @@ void FormDocument::build()
fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED); fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
fl_addto_choice(options_->choice_ams_math, fl_addto_choice(options_->choice_ams_math,
_("Never | Automatically | Yes ").c_str()); _(" Never | Automatically | Yes ").c_str());
for (int n = 0; tex_graphics[n][0]; ++n) { for (int n = 0; tex_graphics[n][0]; ++n) {
fl_addto_choice(options_->choice_postscript_driver, fl_addto_choice(options_->choice_postscript_driver,

2
src/frontends/xforms/FormMinipage.C
View File

@ -118,7 +118,7 @@ ButtonPolicy::SMInput FormMinipage::input(FL_OBJECT * ob, long)
string const input = getString(dialog_->input_width); string const input = getString(dialog_->input_width);
bool const invalid = !isValidLength(input) && !isStrDbl(input); bool const invalid = !isValidLength(input) && !isStrDbl(input);
if (invalid) { if (invalid) {
postWarning(_("Invalid Length!")); postWarning(_("Invalid length!"));
action = ButtonPolicy::SMI_INVALID; action = ButtonPolicy::SMI_INVALID;
} else { } else {
action = ButtonPolicy::SMI_VALID; action = ButtonPolicy::SMI_VALID;

6
src/frontends/xforms/forms/form_box.fd
View File

@ -131,7 +131,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Vertical Position label: Vertical Alignment
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -257,7 +257,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Inner Position (Vert.) label: Inner Alignment (Vert.)
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
@ -275,7 +275,7 @@ alignment: FL_ALIGN_LEFT
style: FL_NORMAL_STYLE style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE size: FL_NORMAL_SIZE
lcol: FL_BLACK lcol: FL_BLACK
label: Horizontal Position label: Horizontal Alignment
shortcut: shortcut:
resize: FL_RESIZE_ALL resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity