The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 20519c96195d46c27f725e8dc95076576815bfa2 Author: Richard Heck <[email protected]> Date: Sat Jul 14 22:16:13 2012 -0400 Add "Close Current View" to the context menu, as requested by Andrew Parsloe. diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 0c30672..fb6a45d 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -317,6 +317,7 @@ Menuset LanguageSelector Separator Item "Fullscreen Mode" "ui-toggle fullscreen" + OptItem "Close Current View" "close-tab-group" End commit a0afcdb391b90efc6b15badb72273c2c0c1d0a38 Author: Richard Heck <[email protected]> Date: Sat Jul 14 22:13:40 2012 -0400 LFUN_CLOSE_TAB_GROUP does exactly the same thing as LFUN_BUFFER_CLOSE_ALL if there's only one tab group open, so there's no need to enable it in that case. diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index b7e1f03..097de8e 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" - Item "Close Current View|w" "close-tab-group" + OptItem "Close Current View|w" "close-tab-group" Item "Fullscreen|l" "ui-toggle fullscreen" Submenu "Toolbars|b" "toolbars" Separator diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index ca63632..52a4379 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1702,7 +1702,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) break; case LFUN_CLOSE_TAB_GROUP: - enable = d.currentTabWorkArea(); + enable = d.tabWorkAreaCount() > 1; break; case LFUN_TOOLBAR_TOGGLE: { ----------------------------------------------------------------------- Summary of changes: lib/ui/stdcontext.inc | 1 + lib/ui/stdmenus.inc | 2 +- src/frontends/qt4/GuiView.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
