From 09a6a5975ddf6b2eaff58d1ca2e09f8ab444ded8 Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Fri, 28 Dec 2007 22:11:58 +0000
Subject: [PATCH] Disable tabbed navigation inside the Konsole part itself. 
 This is something which I would like to add after KDE 4.0, but it does not
 work well enough to be used at the moment and causes problems for
 applications such as Yakuake and KDevelop which provide their own tabs.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=754004
---
 src/Part.cpp | 14 +-------------
 src/Part.h   |  1 -
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Part.cpp b/src/Part.cpp
index e529ef34..ee19a3b1 100644
--- a/src/Part.cpp
+++ b/src/Part.cpp
@@ -69,8 +69,6 @@ Part::Part(QWidget* parentWidget , QObject* parent)
 {
     setXMLFile("konsole/konsoleui.rc");
 
-    setupActions();
-
     // setup global managers
     if ( SessionManager::instance() == 0 )
         SessionManager::setInstance( new SessionManager() );
@@ -81,7 +79,7 @@ Part::Part(QWidget* parentWidget , QObject* parent)
 
     // create view widget
     _viewManager = new ViewManager(this,actionCollection());
-    _viewManager->setNavigationMethod( ViewManager::TabbedNavigation );
+    _viewManager->setNavigationMethod( ViewManager::NoNavigation );
 
     connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this ,
            SLOT(activeViewChanged(SessionController*)) );
@@ -118,16 +116,6 @@ void Part::newTab()
     createSession( QString() );
     showShellInDir( QString() );
 }
-void Part::setupActions()
-{
-    KActionCollection* collection = actionCollection();
-
-    KAction* newTabAction = collection->addAction("new-tab");
-    newTabAction->setIcon( KIcon("utilities-terminal") );
-    newTabAction->setText( i18n("New &Tab") );
-    newTabAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_N) );
-    connect( newTabAction , SIGNAL(triggered()) , this , SLOT(newTab()) );
-}
 Session* Part::activeSession() const
 {
     if ( _pluggedController )
diff --git a/src/Part.h b/src/Part.h
index a6d54337..96f0d1be 100644
--- a/src/Part.h
+++ b/src/Part.h
@@ -82,7 +82,6 @@ private slots:
     void newTab();
 
 private:
-    void setupActions();
     Session* activeSession() const;
 
 private: