Proper naming for tab-group-close.

This commit is contained in:
Pavel Sanda 2012-09-29 17:16:52 +02:00
parent c9f9107a7f
commit a72b75c50c
11 changed files with 14 additions and 12 deletions

View File

@ -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 to show the settings dialog. This is no longer possible and one should use
inset-settings for this purpose. 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: The following LyX key bindings have been changed:

View File

@ -608,7 +608,7 @@
<file alias="images/all-changes-accept.png">../../lib/images/all-changes-accept.png</file> <file alias="images/all-changes-accept.png">../../lib/images/all-changes-accept.png</file>
<file alias="images/banner.png">../../lib/images/banner.png</file> <file alias="images/banner.png">../../lib/images/banner.png</file>
<file alias="images/url-insert.png">../../lib/images/url-insert.png</file> <file alias="images/url-insert.png">../../lib/images/url-insert.png</file>
<file alias="images/close-tab-group.png">../../lib/images/close-tab-group.png</file> <file alias="images/tab-group-close.png">../../lib/images/tab-group-close.png</file>
<file alias="images/tabular-feature_delete-row.png">../../lib/images/tabular-feature_delete-row.png</file> <file alias="images/tabular-feature_delete-row.png">../../lib/images/tabular-feature_delete-row.png</file>
<file alias="images/tabular-feature_set-longtabular.png">../../lib/images/tabular-feature_set-longtabular.png</file> <file alias="images/tabular-feature_set-longtabular.png">../../lib/images/tabular-feature_set-longtabular.png</file>
<file alias="images/buffer-view_pdf2.png">../../lib/images/buffer-view_pdf2.png</file> <file alias="images/buffer-view_pdf2.png">../../lib/images/buffer-view_pdf2.png</file>

View File

@ -355,7 +355,7 @@ dist_images_DATA = \
images/changes-output.png \ images/changes-output.png \
images/changes-track.png \ images/changes-track.png \
images/closetab.png \ images/closetab.png \
images/close-tab-group.png \ images/tab-group-close.png \
images/copy.png \ images/copy.png \
images/cut.png \ images/cut.png \
images/demote.png \ images/demote.png \
@ -1212,7 +1212,7 @@ dist_imagesoxygen_DATA = \
images/oxygen/change-reject.png \ images/oxygen/change-reject.png \
images/oxygen/changes-output.png \ images/oxygen/changes-output.png \
images/oxygen/changes-track.png \ images/oxygen/changes-track.png \
images/oxygen/close-tab-group.png \ images/oxygen/tab-group-close.png \
images/oxygen/closetab.png \ images/oxygen/closetab.png \
images/oxygen/copy.png \ images/oxygen/copy.png \
images/oxygen/cut.png \ images/oxygen/cut.png \
@ -1322,7 +1322,7 @@ dist_imagesclassic_DATA = \
images/classic/changes-merge.png \ images/classic/changes-merge.png \
images/classic/changes-output.png \ images/classic/changes-output.png \
images/classic/changes-track.png \ images/classic/changes-track.png \
images/classic/close-tab-group.png \ images/classic/tab-group-close.png \
images/classic/copy.png \ images/classic/copy.png \
images/classic/cut.png \ images/classic/cut.png \
images/classic/demote.png \ images/classic/demote.png \

View File

Before

Width:  |  Height:  |  Size: 624 B

After

Width:  |  Height:  |  Size: 624 B

View File

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 492 B

View File

Before

Width:  |  Height:  |  Size: 624 B

After

Width:  |  Height:  |  Size: 624 B

View File

@ -317,7 +317,7 @@ Menuset
LanguageSelector LanguageSelector
Separator Separator
Item "Fullscreen Mode" "ui-toggle fullscreen" Item "Fullscreen Mode" "ui-toggle fullscreen"
OptItem "Close Current View" "close-tab-group" OptItem "Close Current View" "tab-group-close"
End End

View File

@ -330,7 +330,7 @@ Menuset
Separator Separator
Item "Split View Into Left and Right Half|i" "split-view horizontal" Item "Split View Into Left and Right Half|i" "split-view horizontal"
Item "Split View Into Upper and Lower Half|e" "split-view vertical" 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" Item "Fullscreen|l" "ui-toggle fullscreen"
Submenu "Toolbars|b" "toolbars" Submenu "Toolbars|b" "toolbars"
Separator Separator

View File

@ -51,7 +51,7 @@ enum FuncCode
LFUN_SELECTION_PASTE, // JMarc 2008/12/15 LFUN_SELECTION_PASTE, // JMarc 2008/12/15
LFUN_CUT, LFUN_CUT,
LFUN_COPY, LFUN_COPY,
LFUN_CLOSE_TAB_GROUP, LFUN_TAB_GROUP_CLOSE,
LFUN_NOTE_NEXT, LFUN_NOTE_NEXT,
// 20 // 20
LFUN_INSET_TOGGLE, LFUN_INSET_TOGGLE,

View File

@ -2676,15 +2676,15 @@ void LyXAction::init()
{ LFUN_SPLIT_VIEW, "split-view", ReadOnly, Buffer }, { 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 Action: Close the current tab group.
* \li Notion: This only closes the work areas, not the buffers themselves. * \li Notion: This only closes the work areas, not the buffers themselves.
The still opened buffers can be visualized in another tab group. 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 * \li Origin: Abdel, 21 Feb 2008
* \endvar * \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 * \var lyx::FuncCode lyx::LFUN_VIEW_CLOSE

View File

@ -1717,7 +1717,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
d.splitter_->orientation() == Qt::Horizontal); d.splitter_->orientation() == Qt::Horizontal);
break; break;
case LFUN_CLOSE_TAB_GROUP: case LFUN_TAB_GROUP_CLOSE:
enable = d.tabWorkAreaCount() > 1; enable = d.tabWorkAreaCount() > 1;
break; break;
@ -3603,7 +3603,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
setCurrentWorkArea(wa); setCurrentWorkArea(wa);
break; break;
} }
case LFUN_CLOSE_TAB_GROUP: case LFUN_TAB_GROUP_CLOSE:
if (TabWorkArea * twa = d.currentTabWorkArea()) { if (TabWorkArea * twa = d.currentTabWorkArea()) {
closeTabWorkArea(twa); closeTabWorkArea(twa);
d.current_work_area_ = 0; d.current_work_area_ = 0;