From a72b75c50cd2017f37115af4da83502a47418db5 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 29 Sep 2012 17:16:52 +0200 Subject: [PATCH 1/1] Proper naming for tab-group-close. --- RELEASE-NOTES | 2 ++ development/qmake/Resources.qrc | 2 +- lib/Makefile.am | 6 +++--- .../{close-tab-group.png => tab-group-close.png} | Bin .../{close-tab-group.png => tab-group-close.png} | Bin .../{close-tab-group.png => tab-group-close.png} | Bin lib/ui/stdcontext.inc | 2 +- lib/ui/stdmenus.inc | 2 +- src/FuncCode.h | 2 +- src/LyXAction.cpp | 6 +++--- src/frontends/qt4/GuiView.cpp | 4 ++-- 11 files changed, 14 insertions(+), 12 deletions(-) rename lib/images/classic/{close-tab-group.png => tab-group-close.png} (100%) rename lib/images/oxygen/{close-tab-group.png => tab-group-close.png} (100%) rename lib/images/{close-tab-group.png => tab-group-close.png} (100%) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 3d5d7469cd..1883dc58b2 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -79,6 +79,8 @@ The following LyX functions have been changed: to show the settings dialog. This is no longer possible and one should use inset-settings for this purpose. +- LFUN_CLOSE_TAB_GROUP_CLOSE ("close-tab-group") was renamed to + LFUN_TAB_GROUP_CLOSE ("tab-group-close"). The following LyX key bindings have been changed: diff --git a/development/qmake/Resources.qrc b/development/qmake/Resources.qrc index 13262b5d98..070769869c 100644 --- a/development/qmake/Resources.qrc +++ b/development/qmake/Resources.qrc @@ -608,7 +608,7 @@ ../../lib/images/all-changes-accept.png ../../lib/images/banner.png ../../lib/images/url-insert.png -../../lib/images/close-tab-group.png +../../lib/images/tab-group-close.png ../../lib/images/tabular-feature_delete-row.png ../../lib/images/tabular-feature_set-longtabular.png ../../lib/images/buffer-view_pdf2.png diff --git a/lib/Makefile.am b/lib/Makefile.am index 557818aaf4..80ca7e79fb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -355,7 +355,7 @@ dist_images_DATA = \ images/changes-output.png \ images/changes-track.png \ images/closetab.png \ - images/close-tab-group.png \ + images/tab-group-close.png \ images/copy.png \ images/cut.png \ images/demote.png \ @@ -1212,7 +1212,7 @@ dist_imagesoxygen_DATA = \ images/oxygen/change-reject.png \ images/oxygen/changes-output.png \ images/oxygen/changes-track.png \ - images/oxygen/close-tab-group.png \ + images/oxygen/tab-group-close.png \ images/oxygen/closetab.png \ images/oxygen/copy.png \ images/oxygen/cut.png \ @@ -1322,7 +1322,7 @@ dist_imagesclassic_DATA = \ images/classic/changes-merge.png \ images/classic/changes-output.png \ images/classic/changes-track.png \ - images/classic/close-tab-group.png \ + images/classic/tab-group-close.png \ images/classic/copy.png \ images/classic/cut.png \ images/classic/demote.png \ diff --git a/lib/images/classic/close-tab-group.png b/lib/images/classic/tab-group-close.png similarity index 100% rename from lib/images/classic/close-tab-group.png rename to lib/images/classic/tab-group-close.png diff --git a/lib/images/oxygen/close-tab-group.png b/lib/images/oxygen/tab-group-close.png similarity index 100% rename from lib/images/oxygen/close-tab-group.png rename to lib/images/oxygen/tab-group-close.png diff --git a/lib/images/close-tab-group.png b/lib/images/tab-group-close.png similarity index 100% rename from lib/images/close-tab-group.png rename to lib/images/tab-group-close.png diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index fb6a45d2d5..41f498288c 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -317,7 +317,7 @@ Menuset LanguageSelector Separator Item "Fullscreen Mode" "ui-toggle fullscreen" - OptItem "Close Current View" "close-tab-group" + OptItem "Close Current View" "tab-group-close" End diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 097de8e2d5..cb0093571a 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -330,7 +330,7 @@ Menuset Separator Item "Split View Into Left and Right Half|i" "split-view horizontal" Item "Split View Into Upper and Lower Half|e" "split-view vertical" - OptItem "Close Current View|w" "close-tab-group" + OptItem "Close Current View|w" "tab-group-close" Item "Fullscreen|l" "ui-toggle fullscreen" Submenu "Toolbars|b" "toolbars" Separator diff --git a/src/FuncCode.h b/src/FuncCode.h index d196d641af..f70d461f6d 100644 --- a/src/FuncCode.h +++ b/src/FuncCode.h @@ -51,7 +51,7 @@ enum FuncCode LFUN_SELECTION_PASTE, // JMarc 2008/12/15 LFUN_CUT, LFUN_COPY, - LFUN_CLOSE_TAB_GROUP, + LFUN_TAB_GROUP_CLOSE, LFUN_NOTE_NEXT, // 20 LFUN_INSET_TOGGLE, diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 929c35236b..d1248b06c3 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -2676,15 +2676,15 @@ void LyXAction::init() { LFUN_SPLIT_VIEW, "split-view", ReadOnly, Buffer }, /*! - * \var lyx::FuncCode lyx::LFUN_CLOSE_TAB_GROUP + * \var lyx::FuncCode lyx::LFUN_TAB_GROUP_CLOSE * \li Action: Close the current tab group. * \li Notion: This only closes the work areas, not the buffers themselves. The still opened buffers can be visualized in another tab group. - * \li Syntax: close-tab-group + * \li Syntax: tab-group-close * \li Origin: Abdel, 21 Feb 2008 * \endvar */ - { LFUN_CLOSE_TAB_GROUP, "close-tab-group", ReadOnly, Buffer }, + { LFUN_TAB_GROUP_CLOSE, "tab-group-close", ReadOnly, Buffer }, /*! * \var lyx::FuncCode lyx::LFUN_VIEW_CLOSE diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 3eda5409a2..a68252186e 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1717,7 +1717,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) d.splitter_->orientation() == Qt::Horizontal); break; - case LFUN_CLOSE_TAB_GROUP: + case LFUN_TAB_GROUP_CLOSE: enable = d.tabWorkAreaCount() > 1; break; @@ -3603,7 +3603,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) setCurrentWorkArea(wa); break; } - case LFUN_CLOSE_TAB_GROUP: + case LFUN_TAB_GROUP_CLOSE: if (TabWorkArea * twa = d.currentTabWorkArea()) { closeTabWorkArea(twa); d.current_work_area_ = 0; -- 2.39.2