From 629bd3d17ef942e467624c117e7037bbe322957f Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Fri, 28 Nov 2003 19:17:34 +0000 Subject: [PATCH] Michael Schmitt's UI patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8153 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 8 ++++++++ src/frontends/xforms/FormBox.C | 26 +++++++++++++------------- src/frontends/xforms/FormDocument.C | 2 +- src/frontends/xforms/FormMinipage.C | 2 +- src/frontends/xforms/forms/form_box.fd | 6 +++--- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index c3abee9d62..17290848ee 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,11 @@ +2003-11-28 Michael Schmitt + + * 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 * FormVSpace (build): fill the 'choice_space' widget. Enable the other diff --git a/src/frontends/xforms/FormBox.C b/src/frontends/xforms/FormBox.C index baf8f19ef9..5174639b14 100644 --- a/src/frontends/xforms/FormBox.C +++ b/src/frontends/xforms/FormBox.C @@ -71,21 +71,21 @@ void FormBox::build() bcview().addReadOnly(dialog_->radio_minipage); bcview().addReadOnly(dialog_->choice_pos); - fl_addto_choice(dialog_->choice_pos, _("top").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, _("Top").c_str()); + fl_addto_choice(dialog_->choice_pos, _("Middle").c_str()); + fl_addto_choice(dialog_->choice_pos, _("Bottom").c_str()); bcview().addReadOnly(dialog_->choice_inner_pos); - 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, _("bottom").c_str()); - fl_addto_choice(dialog_->choice_inner_pos, _("stretch").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, _("Bottom").c_str()); + fl_addto_choice(dialog_->choice_inner_pos, _("Stretch").c_str()); bcview().addReadOnly(dialog_->choice_hor_pos); - 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, _("right").c_str()); - fl_addto_choice(dialog_->choice_hor_pos, _("stretch").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, _("Right").c_str()); + fl_addto_choice(dialog_->choice_hor_pos, _("Stretch").c_str()); bcview().addReadOnly(dialog_->input_width); 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); bool const invalid = !isValidLength(input) && !isStrDbl(input); if (invalid) { - postWarning(_("Invalid Length!")); + postWarning(_("Invalid length!")); return ButtonPolicy::SMI_INVALID; } } @@ -269,7 +269,7 @@ ButtonPolicy::SMInput FormBox::input(FL_OBJECT * ob, long) string const input = getString(dialog_->input_height); bool const invalid = !isValidLength(input) && !isStrDbl(input); if (invalid) { - postWarning(_("Invalid Length!")); + postWarning(_("Invalid length!")); return ButtonPolicy::SMI_INVALID; } } diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C index ee80965183..a1c14a7742 100644 --- a/src/frontends/xforms/FormDocument.C +++ b/src/frontends/xforms/FormDocument.C @@ -309,7 +309,7 @@ void FormDocument::build() fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED); 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) { fl_addto_choice(options_->choice_postscript_driver, diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C index 05b81cd0e4..48b65c58d1 100644 --- a/src/frontends/xforms/FormMinipage.C +++ b/src/frontends/xforms/FormMinipage.C @@ -118,7 +118,7 @@ ButtonPolicy::SMInput FormMinipage::input(FL_OBJECT * ob, long) string const input = getString(dialog_->input_width); bool const invalid = !isValidLength(input) && !isStrDbl(input); if (invalid) { - postWarning(_("Invalid Length!")); + postWarning(_("Invalid length!")); action = ButtonPolicy::SMI_INVALID; } else { action = ButtonPolicy::SMI_VALID; diff --git a/src/frontends/xforms/forms/form_box.fd b/src/frontends/xforms/forms/form_box.fd index e55f6c97d3..beb47f12f2 100644 --- a/src/frontends/xforms/forms/form_box.fd +++ b/src/frontends/xforms/forms/form_box.fd @@ -131,7 +131,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Vertical Position +label: Vertical Alignment shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -257,7 +257,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Inner Position (Vert.) +label: Inner Alignment (Vert.) shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -275,7 +275,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Horizontal Position +label: Horizontal Alignment shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -- 2.39.2