mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Michael's UI patch v2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7548 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
bb8ee4b950
commit
ee8d50c73d
@ -1,3 +1,21 @@
|
||||
2003-08-12 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* 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 <j.spitzmueller@gmx.de>
|
||||
|
||||
* templates/koma-letter2.lyx: fix typo.
|
||||
|
@ -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"
|
||||
|
@ -462,7 +462,7 @@ cat >$outfile <<EOF
|
||||
\\Format lyxpreview lyxpreview "LyX Preview" ""
|
||||
\\Format literate nw NoWeb N
|
||||
\\Format pbm pbm PBM ""
|
||||
\\Format pdf pdf PDF P
|
||||
\\Format pdf pdf "PDF (ps2pdf)" P
|
||||
\\Format pdf2 pdf "PDF (pdflatex)" F
|
||||
\\Format pdf3 pdf "PDF (dvipdfm)" m
|
||||
\\Format pdftex pdftex_t PDFTEX ""
|
||||
|
@ -78,8 +78,8 @@ Menuset
|
||||
Item "Spellchecker...|S" "dialog-show spellchecker"
|
||||
Item "Thesaurus..." "thesaurus-entry"
|
||||
Item "Check TeX|h" "buffer-chktex"
|
||||
Item "Open/Close float|l" "inset-toggle"
|
||||
Submenu "Change tracking|g" "edit_change"
|
||||
Item "Open/Close Float|l" "inset-toggle"
|
||||
Submenu "Change Tracking|g" "edit_change"
|
||||
Separator
|
||||
Item "Preferences...|P" "dialog-show preferences"
|
||||
Item "Reconfigure|R" "reconfigure"
|
||||
@ -98,13 +98,7 @@ Menuset
|
||||
Item "Line Left|L" "tabular-feature toggle-line-left"
|
||||
Item "Line Right|R" "tabular-feature toggle-line-right"
|
||||
Separator
|
||||
Item "Align Left|e" "tabular-feature align-left"
|
||||
Item "Align Center|C" "tabular-feature align-center"
|
||||
Item "Align Right|i" "tabular-feature align-right"
|
||||
Separator
|
||||
Item "V.Align Top|o" "tabular-feature valign-top"
|
||||
Item "V.Align Center|n" "tabular-feature valign-center"
|
||||
Item "V.Align Bottom|V" "tabular-feature valign-bottom"
|
||||
Submenu "Alignment|i" "edit_align"
|
||||
Separator
|
||||
Item "Add Row|A" "tabular-feature append-row"
|
||||
Item "Delete Row|w" "tabular-feature delete-row"
|
||||
@ -117,6 +111,16 @@ Menuset
|
||||
Item "Swap Columns" "tabular-feature swap-column"
|
||||
End
|
||||
|
||||
Menu "edit_align"
|
||||
Item "Left|L" "tabular-feature align-left"
|
||||
Item "Center|C" "tabular-feature align-center"
|
||||
Item "Right|R" "tabular-feature align-right"
|
||||
Separator
|
||||
Item "Top|T" "tabular-feature valign-top"
|
||||
Item "Middle|M" "tabular-feature valign-middle"
|
||||
Item "Bottom|B" "tabular-feature valign-bottom"
|
||||
End
|
||||
|
||||
Menu "edit_math"
|
||||
# Item "Make eqnarray|e" "break-line e"
|
||||
# Item "Make multline|m" "break-line m"
|
||||
@ -135,7 +139,7 @@ Menuset
|
||||
Separator
|
||||
Submenu "Use Computer Algebra System|S" "edit_math_extern"
|
||||
Separator
|
||||
Submenu "Alignment|A" "edit_math_align"
|
||||
Submenu "Alignment|A" "edit_align"
|
||||
Separator
|
||||
Item "Add Row|R" "tabular-feature append-row"
|
||||
Item "Delete Row|D" "tabular-feature delete-row"
|
||||
@ -171,22 +175,12 @@ Menuset
|
||||
Item "Eqnarray Environment|q" "math-mutate eqnarray"
|
||||
Item "Align Environment|A" "math-mutate align"
|
||||
Item "AlignAt Environment" "math-mutate alignat"
|
||||
Item "Flalign Environment|f" "math-mutate flalign"
|
||||
Item "Flalign Environment|F" "math-mutate flalign"
|
||||
#Item "XAlignAt Environment" "math-mutate xalignat"
|
||||
#Item "XXAlignAt Environment" "math-mutate xxalignat"
|
||||
Item "Gather Environment" "math-mutate gather"
|
||||
Item "Multline Environment" "math-mutate multline"
|
||||
End
|
||||
|
||||
Menu "edit_math_align"
|
||||
Item "Align Left|L" "tabular-feature align-left"
|
||||
Item "Align Center|C" "tabular-feature align-center"
|
||||
Item "Align Right|R" "tabular-feature align-right"
|
||||
Separator
|
||||
Item "V.Align Top|T" "tabular-feature valign-top"
|
||||
Item "V.Align Center|e" "tabular-feature valign-center"
|
||||
Item "V.Align Bottom|B" "tabular-feature valign-bottom"
|
||||
End
|
||||
#
|
||||
# INSERT MENU
|
||||
#
|
||||
@ -237,7 +231,7 @@ Menuset
|
||||
Item "Inline Formula|I" "math-mode"
|
||||
Item "Display Formula|D" "math-display"
|
||||
Item "Eqnarray Environment|E" "command-sequence math-mode; math-mutate eqnarray;"
|
||||
Item "AMS align Environment|A" "command-sequence math-mode; math-mutate align;"
|
||||
Item "AMS align Environment|a" "command-sequence math-mode; math-mutate align;"
|
||||
Item "AMS alignat Environment|t" "command-sequence math-mode; math-mutate alignat;"
|
||||
Item "AMS flalign Environment|f" "command-sequence math-mode; math-mutate flalign;"
|
||||
#Item "AMS xalignat Environment|x" "command-sequence math-mode; math-mutate xalignat;"
|
||||
@ -249,34 +243,34 @@ Menuset
|
||||
Item "Cases Environment|C" "math-insert \cases"
|
||||
Item "Split Environment|S" "math-insert \split"
|
||||
Separator
|
||||
Submenu "Font Change|f" "insert_math_font"
|
||||
Submenu "Font Change|o" "insert_math_font"
|
||||
Item "Math Panel|l" "dialog-show mathpanel"
|
||||
End
|
||||
|
||||
Menu "insert_math_font"
|
||||
Item "Math normal font" "math-insert \mathnormal"
|
||||
Item "Math Normal Font" "math-insert \mathnormal"
|
||||
Separator
|
||||
Item "Math calligraphic family" "math-insert \mathcal"
|
||||
Item "Math fraktur family" "math-insert \mathfrak"
|
||||
Item "Math roman family" "math-insert \mathrm"
|
||||
Item "Math sans serif family" "math-insert \mathsf"
|
||||
Item "Math Calligraphic Family" "math-insert \mathcal"
|
||||
Item "Math Fraktur Family" "math-insert \mathfrak"
|
||||
Item "Math Roman Family" "math-insert \mathrm"
|
||||
Item "Math Sans Serif Family" "math-insert \mathsf"
|
||||
Separator
|
||||
Item "Math bold series" "math-insert \mathbf"
|
||||
Item "Math Bold Series" "math-insert \mathbf"
|
||||
Separator
|
||||
Item "Text normal font" "math-insert \textnormal"
|
||||
Item "Text Normal Font" "math-insert \textnormal"
|
||||
Separator
|
||||
Item "Text roman family" "math-insert \textrm"
|
||||
Item "Text sans serif family" "math-insert \textsf"
|
||||
Item "Text typewriter family" "math-insert \texttt"
|
||||
Item "Text Roman Family" "math-insert \textrm"
|
||||
Item "Text Sans Serif Family" "math-insert \textsf"
|
||||
Item "Text Typewriter Family" "math-insert \texttt"
|
||||
Separator
|
||||
Item "Text bold series" "math-insert \textbf"
|
||||
Item "Text medium series" "math-insert \textmd"
|
||||
Item "Text Bold Series" "math-insert \textbf"
|
||||
Item "Text Medium Series" "math-insert \textmd"
|
||||
Separator
|
||||
Item "Text italic shape" "math-insert \textit"
|
||||
Item "Text small caps shape" "math-insert \textsc"
|
||||
Item "Text slanted shape" "math-insert \textsl"
|
||||
Item "Text upright shape" "math-insert \textup"
|
||||
End
|
||||
Item "Text Italic Shape" "math-insert \textit"
|
||||
Item "Text Small Caps Shape" "math-insert \textsc"
|
||||
Item "Text Slanted Shape" "math-insert \textsl"
|
||||
Item "Text Upright Shape" "math-insert \textup"
|
||||
End
|
||||
|
||||
Menu "insert_floats"
|
||||
FloatInsert
|
||||
@ -297,10 +291,10 @@ Menuset
|
||||
End
|
||||
|
||||
Menu "edit_change"
|
||||
Item "Track changes|T" "track-changes"
|
||||
Item "Merge changes ...|M" "merge-changes"
|
||||
Item "Accept all changes|A" "accept-all-changes"
|
||||
Item "Reject all changes|R" "reject-all-changes"
|
||||
Item "Track Changes|T" "track-changes"
|
||||
Item "Merge Changes ...|M" "merge-changes"
|
||||
Item "Accept All Changes|A" "accept-all-changes"
|
||||
Item "Reject All Changes|R" "reject-all-changes"
|
||||
End
|
||||
#
|
||||
# LAYOUT MENU
|
||||
@ -332,8 +326,8 @@ Menuset
|
||||
Submenu "Update|U" "update"
|
||||
Separator
|
||||
Item "LaTeX Logfile|L" "dialog-show latexlog"
|
||||
Item "Table of Contents|T" "toc-view"
|
||||
Item "Child Processes|C" "dialog-show forks"
|
||||
Item "Table of Contents|C" "toc-view"
|
||||
Item "Child Processes|o" "dialog-show forks"
|
||||
Item "TeX Information|X" "dialog-show texinfo"
|
||||
End
|
||||
|
||||
|
@ -118,12 +118,17 @@ Menuset
|
||||
Item "Left Line|L" "tabular-feature toggle-line-left"
|
||||
Item "Right Line|R" "tabular-feature toggle-line-right"
|
||||
Separator
|
||||
Item "Left aligned|e" "tabular-feature align-left"
|
||||
Item "Centered|C" "tabular-feature align-center"
|
||||
Item "Right aligned|i" "tabular-feature align-right"
|
||||
Item "Top aligned|o" "tabular-feature valign-top"
|
||||
Item "Vertically Centered|V" "tabular-feature valign-center"
|
||||
Item "Bottom aligned|g" "tabular-feature valign-bottom"
|
||||
Submenu "Alignment|i" "edit_align"
|
||||
End
|
||||
|
||||
Menu "edit_align"
|
||||
Item "Left|L" "tabular-feature align-left"
|
||||
Item "Center|C" "tabular-feature align-center"
|
||||
Item "Right|R" "tabular-feature align-right"
|
||||
Separator
|
||||
Item "Top|T" "tabular-feature valign-top"
|
||||
Item "Middle|M" "tabular-feature valign-middle"
|
||||
Item "Bottom|B" "tabular-feature valign-bottom"
|
||||
End
|
||||
|
||||
Menu "edit_math"
|
||||
@ -135,7 +140,7 @@ Menuset
|
||||
Separator
|
||||
Submenu "Use Computer Algebra System|S" "edit_math_extern"
|
||||
Separator
|
||||
Submenu "Alignment|A" "edit_math_align"
|
||||
Submenu "Alignment|A" "edit_align"
|
||||
Separator
|
||||
Item "Add Row|R" "tabular-feature append-row"
|
||||
Item "Delete Row|D" "tabular-feature delete-row"
|
||||
@ -176,16 +181,6 @@ Menuset
|
||||
Item "AMS multline Environment|m" "math-mutate multline"
|
||||
End
|
||||
|
||||
Menu "edit_math_align"
|
||||
Item "Left-aligned|L" "tabular-feature align-left"
|
||||
Item "Centered|C" "tabular-feature align-center"
|
||||
Item "Right-aligned|R" "tabular-feature align-right"
|
||||
Separator
|
||||
Item "Top-aligned|T" "tabular-feature valign-top"
|
||||
Item "Centered Vertically|e" "tabular-feature valign-center"
|
||||
Item "Bottom-aligned|B" "tabular-feature valign-bottom"
|
||||
End
|
||||
|
||||
#
|
||||
# VIEW MENU
|
||||
#
|
||||
@ -279,28 +274,28 @@ Menuset
|
||||
End
|
||||
|
||||
Menu "insert_math_font"
|
||||
Item "Math normal font" "math-insert \mathnormal"
|
||||
Item "Math Normal Font" "math-insert \mathnormal"
|
||||
Separator
|
||||
Item "Math calligraphic family" "math-insert \mathcal"
|
||||
Item "Math fraktur family" "math-insert \mathfrak"
|
||||
Item "Math roman family" "math-insert \mathrm"
|
||||
Item "Math sans serif family" "math-insert \mathsf"
|
||||
Item "Math Calligraphic Family" "math-insert \mathcal"
|
||||
Item "Math Fraktur Family" "math-insert \mathfrak"
|
||||
Item "Math Roman Family" "math-insert \mathrm"
|
||||
Item "Math Sans Serif Family" "math-insert \mathsf"
|
||||
Separator
|
||||
Item "Math bold series" "math-insert \mathbf"
|
||||
Item "Math Bold Series" "math-insert \mathbf"
|
||||
Separator
|
||||
Item "Text normal font" "math-insert \textnormal"
|
||||
Item "Text Normal Font" "math-insert \textnormal"
|
||||
Separator
|
||||
Item "Text roman family" "math-insert \textrm"
|
||||
Item "Text sans serif family" "math-insert \textsf"
|
||||
Item "Text typewriter family" "math-insert \texttt"
|
||||
Item "Text Roman Family" "math-insert \textrm"
|
||||
Item "Text Sans Serif Family" "math-insert \textsf"
|
||||
Item "Text Typewriter Family" "math-insert \texttt"
|
||||
Separator
|
||||
Item "Text bold series" "math-insert \textbf"
|
||||
Item "Text medium series" "math-insert \textmd"
|
||||
Item "Text Bold Series" "math-insert \textbf"
|
||||
Item "Text Medium Series" "math-insert \textmd"
|
||||
Separator
|
||||
Item "Text italic shape" "math-insert \textit"
|
||||
Item "Text small caps shape" "math-insert \textsc"
|
||||
Item "Text slanted shape" "math-insert \textsl"
|
||||
Item "Text upright shape" "math-insert \textup"
|
||||
Item "Text Italic Shape" "math-insert \textit"
|
||||
Item "Text Small Caps Shape" "math-insert \textsc"
|
||||
Item "Text Slanted Shape" "math-insert \textsl"
|
||||
Item "Text Upright Shape" "math-insert \textup"
|
||||
End
|
||||
|
||||
Menu "insert_float"
|
||||
@ -336,7 +331,7 @@ Menuset
|
||||
#
|
||||
|
||||
Menu "document"
|
||||
Submenu "Change tracking|C" "edit_change"
|
||||
Submenu "Change Tracking|C" "edit_change"
|
||||
OptItem "Build Program|B" "build-program"
|
||||
Item "LaTeX Log File...|L" "dialog-show latexlog"
|
||||
Item "Table of Contents...|T" "toc-view"
|
||||
@ -347,10 +342,10 @@ Menuset
|
||||
End
|
||||
|
||||
Menu "edit_change"
|
||||
Item "Track changes|T" "track-changes"
|
||||
Item "Merge changes...|M" "merge-changes"
|
||||
Item "Accept all changes|A" "accept-all-changes"
|
||||
Item "Reject all changes|R" "reject-all-changes"
|
||||
Item "Track Changes|T" "track-changes"
|
||||
Item "Merge Changes...|M" "merge-changes"
|
||||
Item "Accept All Changes|A" "accept-all-changes"
|
||||
Item "Reject All Changes|R" "reject-all-changes"
|
||||
End
|
||||
|
||||
#
|
||||
|
@ -70,8 +70,8 @@ Toolbar "Extra"
|
||||
Item "Insert TeX" "ert-insert"
|
||||
Item "Include file" "dialog-show-new-inset include"
|
||||
Separator
|
||||
Item "Text Style" "dialog-show character"
|
||||
Item "Paragraph Settings" "layout-paragraph"
|
||||
Item "Text style" "dialog-show character"
|
||||
Item "Paragraph settings" "layout-paragraph"
|
||||
Item "Table of contents" "toc-view"
|
||||
Item "Check spelling" "dialog-show spellchecker"
|
||||
Item "Thesaurus" "thesaurus-entry"
|
||||
@ -90,12 +90,13 @@ Toolbar "Table"
|
||||
Item "Set all lines" "tabular-feature set-all-lines"
|
||||
Item "Unset all lines" "tabular-feature unset-all-lines"
|
||||
Separator
|
||||
Item "Left aligned" "tabular-feature align-left"
|
||||
Item "Centered" "tabular-feature align-center"
|
||||
Item "Right aligned" "tabular-feature align-right"
|
||||
Item "Top aligned" "tabular-feature valign-top"
|
||||
Item "Vertically centered" "tabular-feature valign-center"
|
||||
Item "Bottom aligned" "tabular-feature valign-bottom"
|
||||
Item "Align left" "tabular-feature align-left"
|
||||
Item "Align center" "tabular-feature align-center"
|
||||
Item "Align right" "tabular-feature align-right"
|
||||
Separator
|
||||
Item "Align top" "tabular-feature valign-top"
|
||||
Item "Align middle" "tabular-feature valign-middle"
|
||||
Item "Align bottom" "tabular-feature valign-bottom"
|
||||
Separator
|
||||
Item "Rotate cell" "tabular-feature set-rotate-cell"
|
||||
Item "Rotate table" "tabular-feature set-rotate-tabular"
|
||||
|
@ -1,3 +1,11 @@
|
||||
2003-08-12 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* 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 <poenitz@gmx.net>
|
||||
|
||||
|
@ -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
|
||||
|
@ -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()) {
|
||||
|
@ -1,3 +1,11 @@
|
||||
2003-08-12 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* 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 <poenitz@gmx.net>
|
||||
|
||||
|
@ -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 *);
|
||||
|
||||
|
@ -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;
|
||||
|
@ -61,7 +61,7 @@ public:
|
||||
|
||||
void halign(HALIGN h);
|
||||
|
||||
enum VALIGN { TOP, VCENTER, BOTTOM };
|
||||
enum VALIGN { TOP, MIDDLE, BOTTOM };
|
||||
|
||||
void valign(VALIGN h);
|
||||
|
||||
|
@ -1,3 +1,13 @@
|
||||
2003-08-12 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* 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 <lasgouttes@lyx.org>
|
||||
|
||||
* QWorkArea.C (QWorkArea):
|
||||
|
@ -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:
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>caption</name>
|
||||
<string>Bibtex</string>
|
||||
<string>BibTeX</string>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>sizeGripEnabled</name>
|
||||
|
@ -82,7 +82,7 @@
|
||||
</property>
|
||||
<property>
|
||||
<name>toolTip</name>
|
||||
<string>Reset to the default settings for the document class</string>
|
||||
<string>Reset to the default settings for the document class</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget>
|
||||
|
@ -314,7 +314,7 @@
|
||||
<item>
|
||||
<property>
|
||||
<name>text</name>
|
||||
<string>Center</string>
|
||||
<string>Middle</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
|
@ -343,7 +343,7 @@
|
||||
<item>
|
||||
<property>
|
||||
<name>text</name>
|
||||
<string>Center</string>
|
||||
<string>Middle</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
|
@ -1,3 +1,11 @@
|
||||
2003-08-12 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* 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 <lasgouttes@lyx.org>
|
||||
|
||||
* .cvsignore: add lyx_forms.h-tmp, stamp-forms, lyx_xpm.h-tmp,
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -1,3 +1,8 @@
|
||||
2003-08-12 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* 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 <poenitz@gmx.net>
|
||||
|
||||
|
@ -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:
|
||||
|
@ -1,3 +1,7 @@
|
||||
2003-08-12 Michael Schmitt <michael.schmitt@teststep.org>
|
||||
|
||||
* math_gridinset.C: rename valign-center to valign-middle
|
||||
|
||||
2003-08-02 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* always use std::endl with lyxerr, and <config.h> in some places.
|
||||
|
@ -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');
|
||||
|
@ -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 << '"';
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user