[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kate
From:       Christoph Cullmann <crossfire () babylon2k ! de>
Date:       2004-10-04 14:00:41
Message-ID: 20041004140041.F12F1990A () office ! kde ! org
[Download RAW message or body]

CVS commit by cullmann: 

allow closing of a tab


  M +1 -0      app/katemainwindow.cpp   1.248
  M +25 -4     app/kateviewmanager.cpp   1.154
  M +4 -3      app/kateviewmanager.h   1.55
  M +2 -1      data/kateui.rc   1.79


--- kdebase/kate/app/katemainwindow.cpp  #1.247:1.248
@@ -255,4 +255,5 @@ void KateMainWindow::setupActions()
 
   a=new KAction (i18n("New Tab"),"view_new_tab",0,m_viewManager,SLOT(slotNewTab()), \
actionCollection(),"view_new_tab"); +  a=new KAction (i18n("Close Current \
Tab"),"tab_remove",0,m_viewManager,SLOT(slotCloseTab()), \
actionCollection(),"view_close_tab");  a=new KAction( i18n("Split Ve&rtical"), \
"view_left_right", CTRL+SHIFT+Key_L, m_viewManager, SLOT( slotSplitViewSpaceVert() ), \
actionCollection(), "view_split_vert");  a->setWhatsThis(i18n("Split the currently \
active view vertically into two views."));

--- kdebase/kate/app/kateviewmanager.cpp  #1.153:1.154
@@ -118,4 +118,25 @@ void KateViewManager::slotNewTab() {
 }
 
+void KateViewManager::slotCloseTab() {
+  if (!m_tabWidget) return;
+  if (m_viewSpaceContainerList.count() <= 1) return;
+  if (!m_currentContainer) return;
+
+  int pos = m_viewSpaceContainerList.find (m_currentContainer);
+
+  if (pos == -1)
+    return;
+
+  if (guiMergedView)
+    m_mainWindow->guiFactory()->removeClient (guiMergedView );
+
+  m_viewSpaceContainerList.remove (pos);
+
+  if ((uint)pos >= m_viewSpaceContainerList.count())
+    pos = m_viewSpaceContainerList.count()-1;
+
+  tabChanged(m_viewSpaceContainerList.at (pos));
+}
+
 bool KateViewManager::eventFilter(QObject *o,QEvent *e) {
   if (e->type()==QEvent::CaptionChange) {

--- kdebase/kate/app/kateviewmanager.h  #1.54:1.55
@@ -121,4 +121,5 @@ class KateViewManager : public QWidget
     void slotSplitViewSpaceVert () { splitViewSpace( 0L, false ); }
     void slotNewTab();
+    void slotCloseTab ();
     void slotCloseCurrentViewSpace();
 

--- kdebase/kate/data/kateui.rc  #1.78:1.79
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kate" version="31">
+<kpartgui name="kate" version="32">
 
 <MenuBar noMerge="1">
@@ -63,4 +63,5 @@
     <Separator />
     <Action name="view_new_tab"/>
+    <Action name="view_close_tab"/>
     <Separator />
     <Action name="view_split_vert"/>


[prev in list] [next in list] [prev in thread] [next in thread]