From: Jürgen Spitzmüller Date: Sun, 25 Jan 2009 17:04:57 +0000 (+0000) Subject: * GuiApplication.cpp: X-Git-Tag: 2.0.0~7360 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0f830027a3ee9c02bced30b8acdbb31a01296615;p=lyx.git * GuiApplication.cpp: - use the first command in sequence as icon name for command-alternatives. * lib/ui/stdtoolbars.inc: - use command-alternatives for the alignment buttons in the tabular toolbar (bug 5709). * lib/images/tabular-feature_align-*.png: * lib/images/tabular-feature_valign-*.png: - rename to tabular-feature_m-[v]align-*.png: git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28280 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 3362433b23..6815e591b8 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -1444,9 +1444,9 @@ lib_images_files = Split(''' split-view_horizontal.png split-view_vertical.png standard.png - tabular-feature_align-center.png - tabular-feature_align-left.png - tabular-feature_align-right.png + tabular-feature_m-align-center.png + tabular-feature_m-align-left.png + tabular-feature_m-align-right.png tabular-feature_append-column.png tabular-feature_append-row.png tabular-feature_delete-column.png @@ -1464,9 +1464,9 @@ lib_images_files = Split(''' tabular-feature_toggle-rotate-cell.png tabular-feature_toggle-rotate-tabular.png tabular-feature_unset-all-lines.png - tabular-feature_valign-bottom.png - tabular-feature_valign-middle.png - tabular-feature_valign-top.png + tabular-feature_m-valign-bottom.png + tabular-feature_m-valign-middle.png + tabular-feature_m-valign-top.png tabular-insert.png thesaurus-entry.png toolbar-toggle_math.png diff --git a/lib/Makefile.am b/lib/Makefile.am index 4531383192..5ad02e30ad 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -366,9 +366,9 @@ dist_images_DATA = \ images/split-view_horizontal.png \ images/split-view_vertical.png \ images/standard.png \ - images/tabular-feature_align-center.png \ - images/tabular-feature_align-left.png \ - images/tabular-feature_align-right.png \ + images/tabular-feature_m-align-center.png \ + images/tabular-feature_m-align-left.png \ + images/tabular-feature_m-align-right.png \ images/tabular-feature_append-column.png \ images/tabular-feature_append-row.png \ images/tabular-feature_delete-column.png \ @@ -386,9 +386,9 @@ dist_images_DATA = \ images/tabular-feature_toggle-rotate-cell.png \ images/tabular-feature_toggle-rotate-tabular.png \ images/tabular-feature_unset-all-lines.png \ - images/tabular-feature_valign-bottom.png \ - images/tabular-feature_valign-middle.png \ - images/tabular-feature_valign-top.png \ + images/tabular-feature_m-valign-bottom.png \ + images/tabular-feature_m-valign-middle.png \ + images/tabular-feature_m-valign-top.png \ images/tabular-insert.png \ images/thesaurus-entry.png \ images/toolbar-toggle_math.png \ diff --git a/lib/images/tabular-feature_align-center.png b/lib/images/tabular-feature_align-center.png deleted file mode 100644 index d343f959c2..0000000000 Binary files a/lib/images/tabular-feature_align-center.png and /dev/null differ diff --git a/lib/images/tabular-feature_align-left.png b/lib/images/tabular-feature_align-left.png deleted file mode 100644 index a82d739519..0000000000 Binary files a/lib/images/tabular-feature_align-left.png and /dev/null differ diff --git a/lib/images/tabular-feature_align-right.png b/lib/images/tabular-feature_align-right.png deleted file mode 100644 index c3494c60d2..0000000000 Binary files a/lib/images/tabular-feature_align-right.png and /dev/null differ diff --git a/lib/images/tabular-feature_m-align-center.png b/lib/images/tabular-feature_m-align-center.png new file mode 100644 index 0000000000..d343f959c2 Binary files /dev/null and b/lib/images/tabular-feature_m-align-center.png differ diff --git a/lib/images/tabular-feature_m-align-left.png b/lib/images/tabular-feature_m-align-left.png new file mode 100644 index 0000000000..a82d739519 Binary files /dev/null and b/lib/images/tabular-feature_m-align-left.png differ diff --git a/lib/images/tabular-feature_m-align-right.png b/lib/images/tabular-feature_m-align-right.png new file mode 100644 index 0000000000..c3494c60d2 Binary files /dev/null and b/lib/images/tabular-feature_m-align-right.png differ diff --git a/lib/images/tabular-feature_m-valign-bottom.png b/lib/images/tabular-feature_m-valign-bottom.png new file mode 100644 index 0000000000..4bab34bf1c Binary files /dev/null and b/lib/images/tabular-feature_m-valign-bottom.png differ diff --git a/lib/images/tabular-feature_m-valign-middle.png b/lib/images/tabular-feature_m-valign-middle.png new file mode 100644 index 0000000000..8637f5a289 Binary files /dev/null and b/lib/images/tabular-feature_m-valign-middle.png differ diff --git a/lib/images/tabular-feature_m-valign-top.png b/lib/images/tabular-feature_m-valign-top.png new file mode 100644 index 0000000000..73c7527267 Binary files /dev/null and b/lib/images/tabular-feature_m-valign-top.png differ diff --git a/lib/images/tabular-feature_valign-bottom.png b/lib/images/tabular-feature_valign-bottom.png deleted file mode 100644 index 4bab34bf1c..0000000000 Binary files a/lib/images/tabular-feature_valign-bottom.png and /dev/null differ diff --git a/lib/images/tabular-feature_valign-middle.png b/lib/images/tabular-feature_valign-middle.png deleted file mode 100644 index 8637f5a289..0000000000 Binary files a/lib/images/tabular-feature_valign-middle.png and /dev/null differ diff --git a/lib/images/tabular-feature_valign-top.png b/lib/images/tabular-feature_valign-top.png deleted file mode 100644 index 73c7527267..0000000000 Binary files a/lib/images/tabular-feature_valign-top.png and /dev/null differ diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index 889a8a622e..a76e02011f 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -126,13 +126,13 @@ ToolbarSet Item "Set all lines" "tabular-feature set-all-lines" Item "Unset all lines" "tabular-feature unset-all-lines" Separator - Item "Align left" "tabular-feature align-left" - Item "Align center" "tabular-feature align-center" - Item "Align right" "tabular-feature align-right" + Item "Align left" "command-alternatives tabular-feature m-align-left;tabular-feature align-left" + Item "Align center" "command-alternatives tabular-feature m-align-center;tabular-feature align-center" + Item "Align right" "command-alternatives tabular-feature m-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" + Item "Align top" "command-alternatives tabular-feature m-valign-top;tabular-feature valign-top" + Item "Align middle" "command-alternatives tabular-feature m-valign-middle;tabular-feature valign-middle" + Item "Align bottom" "command-alternatives tabular-feature m-valign-bottom;tabular-feature valign-bottom" Separator Item "Rotate cell" "tabular-feature toggle-rotate-cell" Item "Rotate table" "tabular-feature toggle-rotate-tabular" diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index d3ca5d9d9c..786fd1404f 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -312,6 +312,14 @@ QString iconName(FuncRequest const & f, bool unknown) path = "commands/"; name1 = toqstr(f.argument()); break; + case LFUN_COMMAND_ALTERNATIVES: { + // use the first of the alternative commands + docstring firstcom; + docstring dummy = split(f.argument(), firstcom, ';'); + name1 = toqstr(firstcom); + name1.replace(' ', '_'); + break; + } default: name2 = toqstr(lyxaction.getActionName(f.action)); name1 = name2;