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

Minor change on names

Browse Source 
- rename "activate_menu" to "activiate-menu"
  - use the "action" local variable consistently
This commit is contained in:
Jekyll Wu
2011-10-26 08:33:30 +08:00
parent 1aac391849
commit 1cbe3c3104
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/MainWindow.cpp
View File

@@ -249,6 +249,7 @@ IncrementalSearchBar* MainWindow::searchBar() const
void MainWindow::setupActions()
{
KActionCollection* collection = actionCollection();
KAction* action = 0;
// File Menu
_newTabMenuAction = new KActionMenu(KIcon("tab-new"), i18n("&New Tab"), collection);
@@ -258,7 +259,7 @@ void MainWindow::setupActions()
connect(_newTabMenuAction, SIGNAL(triggered()), this, SLOT(newTab()));
collection->addAction("new-tab", _newTabMenuAction);
KAction* action = collection->addAction("new-window");
action = collection->addAction("new-window");
action->setIcon( KIcon("window-new") );
action->setText( i18n("New &Window") );
action->setShortcut( QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_N) );
@@ -277,10 +278,6 @@ void MainWindow::setupActions()
connect( _bookmarkHandler , SIGNAL(openUrls(QList<KUrl>)) , this , SLOT(openUrls(QList<KUrl>)) );
//TODO: The 'Add Bookmark' menu action currently has a Ctrl+B shortcut by
// default which cannot be overridden
//NOTE: This is currently handled by correctShortcuts()
// View Menu
_toggleMenuBarAction = KStandardAction::showMenubar(menuBar(), SLOT(setVisible(bool)), collection);
_toggleMenuBarAction->setShortcut( QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_M) );
@@ -299,10 +296,10 @@ void MainWindow::setupActions()
connect( action, SIGNAL(triggered()) , this , SLOT(showManageProfilesDialog()) );
// Set up an action and shortcut for activating menu bar.
KAction* menuBarAction = collection->addAction("activate_menu");
menuBarAction->setText(i18n("Activate Menu"));
menuBarAction->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_F10));
connect(menuBarAction, SIGNAL(triggered()), this, SLOT(activateMenuBar()));
action = collection->addAction("activate-menu");
action->setText(i18n("Activate Menu"));
action->setShortcut(QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_F10));
connect(action, SIGNAL(triggered()), this, SLOT(activateMenuBar()));
}
void MainWindow::viewFullScreen(bool fullScreen)