Commit 5183376f authored by Hamish Rodda's avatar Hamish Rodda

Remove associateWidget that was too effective (obviously not working before,...

Remove associateWidget that was too effective (obviously not working before, the patched version prevented the actions from being invoked)

Commit results of setShortcut() audit

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=730686
parent ad6e197d
...@@ -62,7 +62,6 @@ MainWindow::MainWindow() ...@@ -62,7 +62,6 @@ MainWindow::MainWindow()
setXMLFile("konsole/konsoleui.rc"); setXMLFile("konsole/konsoleui.rc");
setupActions(); setupActions();
actionCollection()->associateWidget(this);
// create view manager // create view manager
_viewManager = new ViewManager(this,actionCollection()); _viewManager = new ViewManager(this,actionCollection());
...@@ -168,19 +167,19 @@ void MainWindow::setupActions() ...@@ -168,19 +167,19 @@ void MainWindow::setupActions()
KActionCollection* collection = actionCollection(); KActionCollection* collection = actionCollection();
// File Menu // File Menu
QAction* newTabAction = collection->addAction("new-tab"); KAction* newTabAction = collection->addAction("new-tab");
newTabAction->setIcon( KIcon("openterm") ); newTabAction->setIcon( KIcon("openterm") );
newTabAction->setText( i18n("New &Tab") ); newTabAction->setText( i18n("New &Tab") );
newTabAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_N) ); newTabAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_N) );
connect( newTabAction , SIGNAL(triggered()) , this , SLOT(newTab()) ); connect( newTabAction , SIGNAL(triggered()) , this , SLOT(newTab()) );
QAction* newWindowAction = collection->addAction("new-window"); KAction* newWindowAction = collection->addAction("new-window");
newWindowAction->setIcon( KIcon("window-new") ); newWindowAction->setIcon( KIcon("window-new") );
newWindowAction->setText( i18n("New &Window") ); newWindowAction->setText( i18n("New &Window") );
newWindowAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_M) ); newWindowAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_M) );
connect( newWindowAction , SIGNAL(triggered()) , this , SLOT(newWindow()) ); connect( newWindowAction , SIGNAL(triggered()) , this , SLOT(newWindow()) );
QAction* remoteConnectionAction = collection->addAction("remote-connection"); KAction* remoteConnectionAction = collection->addAction("remote-connection");
remoteConnectionAction->setText( i18n("Remote Connection...") ); remoteConnectionAction->setText( i18n("Remote Connection...") );
remoteConnectionAction->setIcon( KIcon("network") ); remoteConnectionAction->setIcon( KIcon("network") );
remoteConnectionAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_R) ); remoteConnectionAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_R) );
...@@ -188,7 +187,7 @@ void MainWindow::setupActions() ...@@ -188,7 +187,7 @@ void MainWindow::setupActions()
#ifndef KONSOLE_PART #ifndef KONSOLE_PART
QAction* quitAction = KStandardAction::quit( this , SLOT(close()) , collection ); KAction* quitAction = KStandardAction::quit( this , SLOT(close()) , collection );
// the default shortcut for quit is typically Ctrl+[Some Letter, usually Q] but that is reserved for // the default shortcut for quit is typically Ctrl+[Some Letter, usually Q] but that is reserved for
// use by terminal applications // use by terminal applications
quitAction->setShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_Q); quitAction->setShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_Q);
...@@ -226,7 +225,7 @@ void MainWindow::setupActions() ...@@ -226,7 +225,7 @@ void MainWindow::setupActions()
KStandardAction::configureNotifications( this , SLOT(configureNotifications()) , collection ); KStandardAction::configureNotifications( this , SLOT(configureNotifications()) , collection );
KStandardAction::keyBindings( this , SLOT(showShortcutsDialog()) , collection ); KStandardAction::keyBindings( this , SLOT(showShortcutsDialog()) , collection );
QAction* manageProfilesAction = collection->addAction("manage-profiles"); KAction* manageProfilesAction = collection->addAction("manage-profiles");
manageProfilesAction->setText( i18n("Manage Profiles...") ); manageProfilesAction->setText( i18n("Manage Profiles...") );
manageProfilesAction->setIcon( KIcon("configure") ); manageProfilesAction->setIcon( KIcon("configure") );
connect( manageProfilesAction , SIGNAL(triggered()) , this , SLOT(showManageProfilesDialog()) ); connect( manageProfilesAction , SIGNAL(triggered()) , this , SLOT(showManageProfilesDialog()) );
......
...@@ -392,7 +392,7 @@ void SessionController::setShowMenuAction(QAction* action) ...@@ -392,7 +392,7 @@ void SessionController::setShowMenuAction(QAction* action)
void SessionController::setupActions() void SessionController::setupActions()
{ {
QAction* action = 0; KAction* action = 0;
KToggleAction* toggleAction = 0; KToggleAction* toggleAction = 0;
KActionCollection* collection = actionCollection(); KActionCollection* collection = actionCollection();
......
...@@ -226,8 +226,8 @@ private: ...@@ -226,8 +226,8 @@ private:
RegExpFilter* _searchFilter; RegExpFilter* _searchFilter;
KAction* _searchToggleAction; KAction* _searchToggleAction;
QAction* _findNextAction; KAction* _findNextAction;
QAction* _findPreviousAction; KAction* _findPreviousAction;
static KIcon _activityIcon; static KIcon _activityIcon;
static KIcon _silenceIcon; static KIcon _silenceIcon;
......
...@@ -150,7 +150,7 @@ void ViewManager::setupActions() ...@@ -150,7 +150,7 @@ void ViewManager::setupActions()
multiViewOnlyActions << closeOtherAction; multiViewOnlyActions << closeOtherAction;
QAction* detachViewAction = collection->addAction("detach-view"); KAction* detachViewAction = collection->addAction("detach-view");
detachViewAction->setIcon( KIcon("tab-detach") ); detachViewAction->setIcon( KIcon("tab-detach") );
detachViewAction->setText( i18n("&Detach View") ); detachViewAction->setText( i18n("&Detach View") );
// Ctrl+Shift+D is not used as a shortcut by default because it is too close // Ctrl+Shift+D is not used as a shortcut by default because it is too close
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment