From ee8d50c73d3c93a894d020df6828f4c2439a7779 Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 14 Aug 2003 15:45:09 +0000 Subject: [PATCH] Michael's UI patch v2 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7548 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 18 ++++ lib/bind/math.bind | 2 +- lib/configure.m4 | 2 +- lib/ui/classic.ui | 86 +++++++++---------- lib/ui/stdmenus.ui | 71 +++++++-------- lib/ui/stdtoolbars.ui | 17 ++-- src/ChangeLog | 8 ++ src/buffer.C | 2 +- src/bufferlist.C | 8 +- src/frontends/controllers/ChangeLog | 8 ++ src/frontends/controllers/ControlGraphics.C | 6 +- src/frontends/controllers/ControlTabular.C | 10 +-- src/frontends/controllers/ControlTabular.h | 2 +- src/frontends/qt2/ChangeLog | 10 +++ src/frontends/qt2/QTabular.C | 2 +- src/frontends/qt2/QTabularDialog.C | 2 +- src/frontends/qt2/ui/QBibtexDialogBase.ui | 2 +- src/frontends/qt2/ui/QDocumentDialogBase.ui | 2 +- src/frontends/qt2/ui/QMathMatrixDialogBase.ui | 2 +- src/frontends/qt2/ui/QTabularDialogBase.ui | 2 +- src/frontends/xforms/ChangeLog | 8 ++ src/frontends/xforms/FormMathsMatrix.C | 2 +- src/frontends/xforms/FormTabular.C | 28 +++--- src/frontends/xforms/forms/form_paragraph.fd | 2 +- src/frontends/xforms/forms/form_tabular.fd | 12 +-- src/insets/ChangeLog | 5 ++ src/insets/insettabular.C | 20 ++--- src/mathed/ChangeLog | 4 + src/mathed/math_gridinset.C | 2 +- src/tabular.C | 18 ++-- src/tabular.h | 6 +- 31 files changed, 210 insertions(+), 159 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 28c472a589..46ca3ac6e1 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,21 @@ +2003-08-12 Michael Schmitt + + * configure.m4: replace "PDF" by "PDF (ps2pdf)" + + * bind/math.bind: rename "valign-center" to "valign-middle" + + * ui/classic.ui: Consistent capitalization of menu items; + introduce submenu "alignment" in "Edit/Tabular" (shared with + "Edit/Math"); fix shortcuts for "Flalign Environment" and + "Font Change" and "Table of Contents" + + * ui/stdmenus.ui: Consistent capitalization of menu items; + introduce submenu "alignment" in "Edit/Tabular" (shared with + "Edit/Math") + + * ui/stdtoolbars.ui: De-capitalize names for consistency; + use imperative style for consistency: "XXX aligned" => "Align XXX" + 2003-08-09 Juergen Spitzmueller * templates/koma-letter2.lyx: fix typo. diff --git a/lib/bind/math.bind b/lib/bind/math.bind index 32059841b4..fd10d0922c 100644 --- a/lib/bind/math.bind +++ b/lib/bind/math.bind @@ -78,7 +78,7 @@ \bind "M-m w s" "tabular-feature swap-row" \bind "M-m w t" "tabular-feature valign-top" -\bind "M-m w m" "tabular-feature valign-center" +\bind "M-m w m" "tabular-feature valign-middle" \bind "M-m w b" "tabular-feature valign-bottom" \bind "M-m c l" "tabular-feature align-left" \bind "M-m c m" "tabular-feature align-center" diff --git a/lib/configure.m4 b/lib/configure.m4 index 2ad6325e82..f86f09c02f 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -462,7 +462,7 @@ cat >$outfile < + + * bufferlist.C: beautify two alerts (shorter text of buttons) + * buffer.C: Remove redundant ' ' from message + * tabular.h: + * tabular.C: rename LYX_VALIGN_CENTER" to LYX_VALIGN_MIDDLE"; + rename M_VALIGN_CENTER to M_VALIGN_MIDDLE; + rename VALIGN_CENTER to VALIGN_MIDDLE 2003-08-11 André Pönitz diff --git a/src/buffer.C b/src/buffer.C index 12f4c75b15..9c19e1bb73 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -246,7 +246,7 @@ void unknownClass(string const & unknown) { Alert::warning(_("Unknown document class"), bformat(_("Using the default document class, because the " - " class %1$s is unknown."), unknown)); + "class %1$s is unknown."), unknown)); } } // anon diff --git a/src/bufferlist.C b/src/bufferlist.C index 5b8c6d58df..135749e13f 100644 --- a/src/bufferlist.C +++ b/src/bufferlist.C @@ -70,9 +70,9 @@ bool BufferList::quitWriteBuffer(Buffer * buf) file = MakeDisplayPath(buf->fileName(), 30); string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document?"), file); + "Do you want to save the document or discard the changes?"), file); int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel")); + text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); if (ret == 0) { // FIXME: WriteAs can be asynch ! @@ -174,9 +174,9 @@ bool BufferList::close(Buffer * buf, bool ask) fname = MakeDisplayPath(buf->fileName(), 30); string text = bformat(_("The document %1$s has unsaved changes.\n\n" - "Do you want to save the document?"), fname); + "Do you want to save the document or discard the changes?"), fname); int const ret = Alert::prompt(_("Save changed document?"), - text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel")); + text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel")); if (ret == 0) { if (buf->isUnnamed()) { diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 8f0c6875e7..a58c70605d 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,11 @@ +2003-08-12 Michael Schmitt + + * ControlGraphics.C: rename "XXX baseline" to "Baseline XXX" + for consistency + * ControlTabular.h: + * ControlTabular.C: rename VALIGN_CENTER to VALIGN_MIDDLE; + rename M_VALIGN_CENTER to M_VALIGN_MIDDLE; + rename VCENTER to MIDDLE 2003-08-04 André Pönitz diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C index ef667050d3..ddd33c8b23 100644 --- a/src/frontends/controllers/ControlGraphics.C +++ b/src/frontends/controllers/ControlGraphics.C @@ -144,9 +144,9 @@ char const * const rorigin_lyx_strs[] = { // use. Note that they can/should be translated. char const * const rorigin_gui_strs[] = { N_("Default"), - N_("Top left"), N_("Bottom left"), N_("Left baseline"), - N_("Center"), N_("Top center"), N_("Bottom center"), N_("Center baseline"), - N_("Top right"), N_("Bottom right"), N_("Right baseline") }; + N_("Top left"), N_("Bottom left"), N_("Baseline left"), + N_("Center"), N_("Top center"), N_("Bottom center"), N_("Baseline center"), + N_("Top right"), N_("Bottom right"), N_("Baseline right") }; size_t const rorigin_size = sizeof(rorigin_lyx_strs) / sizeof(char *); diff --git a/src/frontends/controllers/ControlTabular.C b/src/frontends/controllers/ControlTabular.C index 40d4854fb0..1d83d6ff31 100644 --- a/src/frontends/controllers/ControlTabular.C +++ b/src/frontends/controllers/ControlTabular.C @@ -188,17 +188,17 @@ void ControlTabular::halign(ControlTabular::HALIGN h) void ControlTabular::valign(ControlTabular::VALIGN v) { - LyXTabular::Feature num = LyXTabular::VALIGN_CENTER; - LyXTabular::Feature multi_num = LyXTabular::M_VALIGN_CENTER; + LyXTabular::Feature num = LyXTabular::VALIGN_MIDDLE; + LyXTabular::Feature multi_num = LyXTabular::M_VALIGN_MIDDLE; switch (v) { case TOP: num = LyXTabular::VALIGN_TOP; multi_num = LyXTabular::M_VALIGN_TOP; break; - case VCENTER: - num = LyXTabular::VALIGN_CENTER; - multi_num = LyXTabular::M_VALIGN_CENTER; + case MIDDLE: + num = LyXTabular::VALIGN_MIDDLE; + multi_num = LyXTabular::M_VALIGN_MIDDLE; break; case BOTTOM: num = LyXTabular::VALIGN_BOTTOM; diff --git a/src/frontends/controllers/ControlTabular.h b/src/frontends/controllers/ControlTabular.h index 76a059fc04..da85d26958 100644 --- a/src/frontends/controllers/ControlTabular.h +++ b/src/frontends/controllers/ControlTabular.h @@ -61,7 +61,7 @@ public: void halign(HALIGN h); - enum VALIGN { TOP, VCENTER, BOTTOM }; + enum VALIGN { TOP, MIDDLE, BOTTOM }; void valign(VALIGN h); diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 0cf15a15a6..179c9922e8 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,13 @@ +2003-08-12 Michael Schmitt + + * QTabularDialog.C: + * QTabular.C: rename LYX_VALIGN_CENTER to LYX_VALIGN_MIDDLE; + rename VCENTER to MIDDLE; + * ui/QTabularDialogBase.ui: + * ui/QMathMatrixDialogBase.ui: replace "Center" by "Middle" + * ui/QBibtexDialogBase.ui: rename "Bibtex" to "BibTeX" + * ui/QDocumentDialogBase.ui: Remove redundant ' ' from message + 2003-08-05 Jean-Marc Lasgouttes * QWorkArea.C (QWorkArea): diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C index 4dc7e50750..a11d96a98a 100644 --- a/src/frontends/qt2/QTabular.C +++ b/src/frontends/qt2/QTabular.C @@ -207,7 +207,7 @@ void QTabular::update_contents() case LyXTabular::LYX_VALIGN_TOP: valign = 0; break; - case LyXTabular::LYX_VALIGN_CENTER: + case LyXTabular::LYX_VALIGN_MIDDLE: valign = 1; break; case LyXTabular::LYX_VALIGN_BOTTOM: diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C index 8f3f668b7d..26d5f61960 100644 --- a/src/frontends/qt2/QTabularDialog.C +++ b/src/frontends/qt2/QTabularDialog.C @@ -159,7 +159,7 @@ void QTabularDialog::vAlign_changed(int align) switch (align) { case 0: v = ControlTabular::TOP; break; - case 1: v = ControlTabular::VCENTER; break; + case 1: v = ControlTabular::MIDDLE; break; case 2: v = ControlTabular::BOTTOM; break; } diff --git a/src/frontends/qt2/ui/QBibtexDialogBase.ui b/src/frontends/qt2/ui/QBibtexDialogBase.ui index 06305e6005..38a077332b 100644 --- a/src/frontends/qt2/ui/QBibtexDialogBase.ui +++ b/src/frontends/qt2/ui/QBibtexDialogBase.ui @@ -19,7 +19,7 @@ caption - Bibtex + BibTeX sizeGripEnabled diff --git a/src/frontends/qt2/ui/QDocumentDialogBase.ui b/src/frontends/qt2/ui/QDocumentDialogBase.ui index 8477acf424..227b65ae61 100644 --- a/src/frontends/qt2/ui/QDocumentDialogBase.ui +++ b/src/frontends/qt2/ui/QDocumentDialogBase.ui @@ -82,7 +82,7 @@ toolTip - Reset to the default settings for the document class + Reset to the default settings for the document class diff --git a/src/frontends/qt2/ui/QMathMatrixDialogBase.ui b/src/frontends/qt2/ui/QMathMatrixDialogBase.ui index c27ed15df6..f9a7ae05a3 100644 --- a/src/frontends/qt2/ui/QMathMatrixDialogBase.ui +++ b/src/frontends/qt2/ui/QMathMatrixDialogBase.ui @@ -314,7 +314,7 @@ text - Center + Middle diff --git a/src/frontends/qt2/ui/QTabularDialogBase.ui b/src/frontends/qt2/ui/QTabularDialogBase.ui index a8724f59bf..80e54ef603 100644 --- a/src/frontends/qt2/ui/QTabularDialogBase.ui +++ b/src/frontends/qt2/ui/QTabularDialogBase.ui @@ -343,7 +343,7 @@ text - Center + Middle diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 360264f2bc..3c42fd35d9 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,11 @@ +2003-08-12 Michael Schmitt + + * FormMathsMatrix.C: rename "Center" to "Middle" + * FormTabular.C: replace radio_valign_center by radio_valign_middle; + rename LyXTabular::LYX_VALIGN_CENTER to LyXTabular::LYX_VALIGN_MIDDLE; + * form/form_paragraph.fd: rename "Centered" to "Center" + * forms/form_tabular.fd: rename "Center" to "Middle" + 2003-08-06 Jean-Marc Lasgouttes * .cvsignore: add lyx_forms.h-tmp, stamp-forms, lyx_xpm.h-tmp, diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C index b071274b90..3a0b117c54 100644 --- a/src/frontends/xforms/FormMathsMatrix.C +++ b/src/frontends/xforms/FormMathsMatrix.C @@ -68,7 +68,7 @@ void FormMathsMatrix::build() dialog_.reset(build_maths_matrix(this)); fl_addto_choice(dialog_->choice_valign, - _("Top | Center | Bottom").c_str()); + _("Top | Middle | Bottom").c_str()); fl_set_choice(dialog_->choice_valign, 2); fl_set_input(dialog_->input_halign, h_align_str); dialog_->input_halign->u_vdata = this; diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C index 0be76f3ff4..892ba96624 100644 --- a/src/frontends/xforms/FormTabular.C +++ b/src/frontends/xforms/FormTabular.C @@ -213,9 +213,9 @@ void FormTabular::update() align = tabular.getVAlignment(cell); fl_set_button(cell_options_->radio_valign_top, 0); fl_set_button(cell_options_->radio_valign_bottom, 0); - fl_set_button(cell_options_->radio_valign_center, 0); - if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_CENTER)) - fl_set_button(cell_options_->radio_valign_center, 1); + fl_set_button(cell_options_->radio_valign_middle, 0); + if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_MIDDLE)) + fl_set_button(cell_options_->radio_valign_middle, 1); else if (align == LyXTabular::LYX_VALIGN_BOTTOM) fl_set_button(cell_options_->radio_valign_bottom, 1); else @@ -237,7 +237,7 @@ void FormTabular::update() setEnabled(cell_options_->radio_valign_top, !pwidth.zero()); setEnabled(cell_options_->radio_valign_bottom, !pwidth.zero()); - setEnabled(cell_options_->radio_valign_center, !pwidth.zero()); + setEnabled(cell_options_->radio_valign_middle, !pwidth.zero()); setEnabled(cell_options_->radio_align_left, true); setEnabled(cell_options_->radio_align_right, true); @@ -272,8 +272,8 @@ void FormTabular::update() fl_set_button(cell_options_->radio_valign_bottom, 0); setEnabled(cell_options_->radio_valign_bottom, false); - fl_set_button(cell_options_->radio_valign_center, 0); - setEnabled(cell_options_->radio_valign_center, false); + fl_set_button(cell_options_->radio_valign_middle, 0); + setEnabled(cell_options_->radio_valign_middle, false); fl_set_input(cell_options_->input_special_multialign, ""); setEnabled(cell_options_->input_special_multialign, false); @@ -342,9 +342,9 @@ void FormTabular::update() align = tabular.getVAlignment(cell, true); fl_set_button(column_options_->radio_valign_top, 0); fl_set_button(column_options_->radio_valign_bottom, 0); - fl_set_button(column_options_->radio_valign_center, 0); - if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_CENTER)) - fl_set_button(column_options_->radio_valign_center, 1); + fl_set_button(column_options_->radio_valign_middle, 0); + if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_MIDDLE)) + fl_set_button(column_options_->radio_valign_middle, 1); else if (align == LyXTabular::LYX_VALIGN_BOTTOM) fl_set_button(column_options_->radio_valign_bottom, 1); else @@ -356,7 +356,7 @@ void FormTabular::update() setEnabled(column_options_->radio_align_block, !pwidth.zero()); setEnabled(column_options_->radio_valign_top, !pwidth.zero()); setEnabled(column_options_->radio_valign_bottom, !pwidth.zero()); - setEnabled(column_options_->radio_valign_center, !pwidth.zero()); + setEnabled(column_options_->radio_valign_middle, !pwidth.zero()); fl_set_button(tabular_options_->check_longtable, tabular.isLongTabular()); @@ -610,8 +610,8 @@ ButtonPolicy::SMInput FormTabular::input(FL_OBJECT * ob, long) num = LyXTabular::VALIGN_TOP; else if (ob == column_options_->radio_valign_bottom) num = LyXTabular::VALIGN_BOTTOM; - else if (ob == column_options_->radio_valign_center) - num = LyXTabular::VALIGN_CENTER; + else if (ob == column_options_->radio_valign_middle) + num = LyXTabular::VALIGN_MIDDLE; else if (ob == cell_options_->check_multicolumn) num = LyXTabular::MULTICOLUMN; else if (ob == tabular_options_->check_longtable) { @@ -675,8 +675,8 @@ ButtonPolicy::SMInput FormTabular::input(FL_OBJECT * ob, long) num = LyXTabular::M_VALIGN_TOP; else if (ob == cell_options_->radio_valign_bottom) num = LyXTabular::M_VALIGN_BOTTOM; - else if (ob == cell_options_->radio_valign_center) - num = LyXTabular::M_VALIGN_CENTER; + else if (ob == cell_options_->radio_valign_middle) + num = LyXTabular::M_VALIGN_MIDDLE; else return ButtonPolicy::SMI_VALID; diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd index ffc9ad98d4..3bf6b6aeb8 100644 --- a/src/frontends/xforms/forms/form_paragraph.fd +++ b/src/frontends/xforms/forms/form_paragraph.fd @@ -545,7 +545,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Centered|#C +label: Center|#C shortcut: resize: FL_RESIZE_NONE gravity: FL_East FL_East diff --git a/src/frontends/xforms/forms/form_tabular.fd b/src/frontends/xforms/forms/form_tabular.fd index d50daa0eb7..8b70fd0fdc 100644 --- a/src/frontends/xforms/forms/form_tabular.fd +++ b/src/frontends/xforms/forms/form_tabular.fd @@ -558,7 +558,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Center|#c +label: Center|#C shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -631,11 +631,11 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Center|#n +label: Middle|#m shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_valign_center +name: radio_valign_middle callback: C_FormDialogView_InputCB argument: 0 @@ -998,7 +998,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Center|#c +label: Center|#C shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -1071,11 +1071,11 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Center|#n +label: Middle|#d shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_valign_center +name: radio_valign_middle callback: C_FormDialogView_InputCB argument: 0 diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 2b716025f7..8ef1376179 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2003-08-12 Michael Schmitt + + * insettabular.C: rename M_VALIGN_CENTER to M_VALIGN_MIDDLE; + rename valign-center to valign-middle; + rename VALIGN_CENTER to VALIGN_MIDDLE 2003-08-11 André Pönitz diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 3847968f66..f5ca11fc7e 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -91,7 +91,7 @@ TabularFeature tabularFeature[] = { LyXTabular::ALIGN_BLOCK, "align-block" }, { LyXTabular::VALIGN_TOP, "valign-top" }, { LyXTabular::VALIGN_BOTTOM, "valign-bottom" }, - { LyXTabular::VALIGN_CENTER, "valign-center" }, + { LyXTabular::VALIGN_MIDDLE, "valign-middle" }, { LyXTabular::M_TOGGLE_LINE_TOP, "m-toggle-line-top" }, { LyXTabular::M_TOGGLE_LINE_BOTTOM, "m-toggle-line-bottom" }, { LyXTabular::M_TOGGLE_LINE_LEFT, "m-toggle-line-left" }, @@ -101,7 +101,7 @@ TabularFeature tabularFeature[] = { LyXTabular::M_ALIGN_CENTER, "m-align-center" }, { LyXTabular::M_VALIGN_TOP, "m-valign-top" }, { LyXTabular::M_VALIGN_BOTTOM, "m-valign-bottom" }, - { LyXTabular::M_VALIGN_CENTER, "m-valign-center" }, + { LyXTabular::M_VALIGN_MIDDLE, "m-valign-middle" }, { LyXTabular::MULTICOLUMN, "multicolumn" }, { LyXTabular::SET_ALL_LINES, "set-all-lines" }, { LyXTabular::UNSET_ALL_LINES, "unset-all-lines" }, @@ -1613,9 +1613,9 @@ void InsetTabular::tabularFeatures(BufferView * bv, setVAlign = LyXTabular::LYX_VALIGN_BOTTOM; break; - case LyXTabular::M_VALIGN_CENTER: - case LyXTabular::VALIGN_CENTER: - setVAlign = LyXTabular::LYX_VALIGN_CENTER; + case LyXTabular::M_VALIGN_MIDDLE: + case LyXTabular::VALIGN_MIDDLE: + setVAlign = LyXTabular::LYX_VALIGN_MIDDLE; break; default: @@ -1795,11 +1795,11 @@ void InsetTabular::tabularFeatures(BufferView * bv, case LyXTabular::M_VALIGN_TOP: case LyXTabular::M_VALIGN_BOTTOM: - case LyXTabular::M_VALIGN_CENTER: + case LyXTabular::M_VALIGN_MIDDLE: flag = false; case LyXTabular::VALIGN_TOP: case LyXTabular::VALIGN_BOTTOM: - case LyXTabular::VALIGN_CENTER: + case LyXTabular::VALIGN_MIDDLE: for (int i = sel_row_start; i <= sel_row_end; ++i) for (int j = sel_col_start; j <= sel_col_end; ++j) tabular.setVAlignment( @@ -2130,10 +2130,10 @@ FuncStatus InsetTabular::getStatus(string const & what) const status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM); break; - case LyXTabular::M_VALIGN_CENTER: + case LyXTabular::M_VALIGN_MIDDLE: flag = false; - case LyXTabular::VALIGN_CENTER: - status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER); + case LyXTabular::VALIGN_MIDDLE: + status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE); break; case LyXTabular::SET_LONGTABULAR: diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index c6793d1566..2f3efa8bda 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2003-08-12 Michael Schmitt + + * math_gridinset.C: rename valign-center to valign-middle + 2003-08-02 Lars Gullik Bjønnes * always use std::endl with lyxerr, and in some places. diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index e80458db6b..50d4fef3ed 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/math_gridinset.C @@ -1087,7 +1087,7 @@ dispatch_result MathGridInset::dispatch is >> s; if (s == "valign-top") valign('t'); - else if (s == "valign-center") + else if (s == "valign-middle") valign('c'); else if (s == "valign-bottom") valign('b'); diff --git a/src/tabular.C b/src/tabular.C index 334b2978c6..f5d9ee2f7d 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -117,8 +117,8 @@ string const tostr(LyXTabular::VAlignment const & num) switch (num) { case LyXTabular::LYX_VALIGN_TOP: return "top"; - case LyXTabular::LYX_VALIGN_CENTER: - return "center"; + case LyXTabular::LYX_VALIGN_MIDDLE: + return "middle"; case LyXTabular::LYX_VALIGN_BOTTOM: return "bottom"; } @@ -162,8 +162,8 @@ bool string2type(string const str, LyXTabular::VAlignment & num) { if (str == "top") num = LyXTabular::LYX_VALIGN_TOP; - else if (str == "center") - num = LyXTabular::LYX_VALIGN_CENTER; + else if (str == "middle" ) + num = LyXTabular::LYX_VALIGN_MIDDLE; else if (str == "bottom") num = LyXTabular::LYX_VALIGN_BOTTOM; else @@ -1869,7 +1869,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const case LYX_VALIGN_TOP: os << 'p'; break; - case LYX_VALIGN_CENTER: + case LYX_VALIGN_MIDDLE: os << 'm'; break; case LYX_VALIGN_BOTTOM: @@ -1906,7 +1906,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const case LYX_VALIGN_TOP: os << 't'; break; - case LYX_VALIGN_CENTER: + case LYX_VALIGN_MIDDLE: os << 'c'; break; case LYX_VALIGN_BOTTOM: @@ -1920,7 +1920,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const case LYX_VALIGN_TOP: os << 't'; break; - case LYX_VALIGN_CENTER: + case LYX_VALIGN_MIDDLE: os << 'm'; break; case LYX_VALIGN_BOTTOM: @@ -2137,7 +2137,7 @@ int LyXTabular::latex(Buffer const * buf, ostream & os, case LYX_VALIGN_TOP: os << 'p'; break; - case LYX_VALIGN_CENTER: + case LYX_VALIGN_MIDDLE: os << 'm'; break; case LYX_VALIGN_BOTTOM: @@ -2272,7 +2272,7 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const case LYX_VALIGN_BOTTOM: os << "bottom"; break; - case LYX_VALIGN_CENTER: + case LYX_VALIGN_MIDDLE: os << "middle"; } os << '"'; diff --git a/src/tabular.h b/src/tabular.h index a26244cc94..0033e28511 100644 --- a/src/tabular.h +++ b/src/tabular.h @@ -57,7 +57,7 @@ public: /// VALIGN_BOTTOM, /// - VALIGN_CENTER, + VALIGN_MIDDLE, /// M_TOGGLE_LINE_TOP, /// @@ -77,7 +77,7 @@ public: /// M_VALIGN_BOTTOM, /// - M_VALIGN_CENTER, + M_VALIGN_MIDDLE, /// MULTICOLUMN, /// @@ -140,7 +140,7 @@ public: /// LYX_VALIGN_BOTTOM = 1, /// - LYX_VALIGN_CENTER = 2 + LYX_VALIGN_MIDDLE = 2 }; enum BoxType { -- 2.39.2