mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-05 05:07:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Menubar and actions revamp, see http://reviewboard.kde.org/r/3110/ for details.

Browse Source 
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=1121952
This commit is contained in:
Sascha Peilicke
2010-05-02 19:43:43 +00:00
parent 03a155a9c9
commit 82ddddcc76
7 changed files with 78 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/MainWindow.cpp
View File

@@ -230,11 +230,14 @@ void MainWindow::setupActions()
KActionCollection* collection = actionCollection();
// File Menu
KAction* newTabAction = collection->addAction("new-tab");
newTabAction->setIcon( KIcon("tab-new") );
newTabAction->setText( i18n("New &Tab") );
newTabAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_N) );
connect( newTabAction , SIGNAL(triggered()) , this , SLOT(newTab()) );
_newTabMenuAction = new KActionMenu(KIcon("tab-new"), i18n("New &Tab"), collection);
collection->addAction("new-tab", _newTabMenuAction);
_defaultProfileAction = collection->addAction("default-profile");
_defaultProfileAction->setIcon(KIcon("utilities-terminal"));
_defaultProfileAction->setText(i18n("&Default Profile"));
_defaultProfileAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_N));
connect(_defaultProfileAction, SIGNAL(triggered()), this, SLOT(newTab()));
KAction* newWindowAction = collection->addAction("new-window");
newWindowAction->setIcon( KIcon("window-new") );
@@ -286,8 +289,8 @@ void MainWindow::setupActions()
KStandardAction::configureNotifications( this , SLOT(configureNotifications()) , collection );
KStandardAction::keyBindings( this , SLOT(showShortcutsDialog()) , collection );
KAction* manageProfilesAction = collection->addAction("manage-profiles");
manageProfilesAction->setText( i18n("Manage Profiles...") );
KAction* manageProfilesAction = collection->addAction("configure-profiles");
manageProfilesAction->setText( i18n("Configure Profiles...") );
manageProfilesAction->setIcon( KIcon("configure") );
connect( manageProfilesAction , SIGNAL(triggered()) , this , SLOT(showManageProfilesDialog()) );
@@ -321,6 +324,16 @@ void MainWindow::sessionListChanged(const QList<QAction*>& actions)
{
unplugActionList("favorite-profiles");
plugActionList("favorite-profiles",actions);
// Update the 'New Tab' KActionMenu
KMenu *newTabMenu = _newTabMenuAction->menu();
newTabMenu->clear();
newTabMenu->addAction(_defaultProfileAction);
newTabMenu->setDefaultAction(_defaultProfileAction);
newTabMenu->addSeparator();
foreach (QAction *action, actions) {
newTabMenu->addAction(action);
}
}
QString MainWindow::activeSessionDir() const