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
wilder-portage
Robert Knight 18 years ago
parent 3de6fb7295
commit 09a6a5975d
  1. 14
      src/Part.cpp
  2. 1
      src/Part.h

@ -69,8 +69,6 @@ Part::Part(QWidget* parentWidget , QObject* parent)
{ {
setXMLFile("konsole/konsoleui.rc"); setXMLFile("konsole/konsoleui.rc");
setupActions();
// setup global managers // setup global managers
if ( SessionManager::instance() == 0 ) if ( SessionManager::instance() == 0 )
SessionManager::setInstance( new SessionManager() ); SessionManager::setInstance( new SessionManager() );
@ -81,7 +79,7 @@ Part::Part(QWidget* parentWidget , QObject* parent)
// create view widget // create view widget
_viewManager = new ViewManager(this,actionCollection()); _viewManager = new ViewManager(this,actionCollection());
_viewManager->setNavigationMethod( ViewManager::TabbedNavigation ); _viewManager->setNavigationMethod( ViewManager::NoNavigation );
connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this , connect( _viewManager , SIGNAL(activeViewChanged(SessionController*)) , this ,
SLOT(activeViewChanged(SessionController*)) ); SLOT(activeViewChanged(SessionController*)) );
@ -118,16 +116,6 @@ void Part::newTab()
createSession( QString() ); createSession( QString() );
showShellInDir( 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 Session* Part::activeSession() const
{ {
if ( _pluggedController ) if ( _pluggedController )

@ -82,7 +82,6 @@ private slots:
void newTab(); void newTab();
private: private:
void setupActions();
Session* activeSession() const; Session* activeSession() const;
private: private:

Loading…
Cancel
Save