Commit c9d49ab7 authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Fixed a bunch of accelerator keys in the File menu

There were three missing and one duplicate. Committed to master since
1.3 is currently in a hard string freeze.

Task-number: QTCREATORBUG-261
Task-number: QTCREATORBUG-262
Task-number: QTCREATORBUG-263
Task-number: QTCREATORBUG-264
parent d151493a
...@@ -385,7 +385,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) : ...@@ -385,7 +385,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
cmd->setDefaultKeySequence(QKeySequence(tr("Alt+V,Alt+I"))); cmd->setDefaultKeySequence(QKeySequence(tr("Alt+V,Alt+I")));
advancedMenu->addAction(cmd, Constants::G_EDIT_EDITOR); advancedMenu->addAction(cmd, Constants::G_EDIT_EDITOR);
connect(m_d->m_openInExternalEditorAction, SIGNAL(triggered()), this, SLOT(openInExternalEditor())); connect(m_d->m_openInExternalEditorAction, SIGNAL(triggered()), this, SLOT(openInExternalEditor()));
// Connect to VariableManager for CURRENT_DOCUMENT variable setting // Connect to VariableManager for CURRENT_DOCUMENT variable setting
VariableManager *vm = VariableManager::instance(); VariableManager *vm = VariableManager::instance();
connect(this, SIGNAL(currentEditorChanged(Core::IEditor *)), connect(this, SIGNAL(currentEditorChanged(Core::IEditor *)),
...@@ -1472,7 +1472,7 @@ void EditorManager::updateActions() ...@@ -1472,7 +1472,7 @@ void EditorManager::updateActions()
QString quotedName; QString quotedName;
if (!fName.isEmpty()) if (!fName.isEmpty())
quotedName = '"' + fName + '"'; quotedName = '"' + fName + '"';
m_d->m_saveAsAction->setText(tr("Save %1 As...").arg(quotedName)); m_d->m_saveAsAction->setText(tr("Save %1 &As...").arg(quotedName));
m_d->m_saveAction->setText(tr("&Save %1").arg(quotedName)); m_d->m_saveAction->setText(tr("&Save %1").arg(quotedName));
m_d->m_revertToSavedAction->setText(tr("Revert %1 to Saved").arg(quotedName)); m_d->m_revertToSavedAction->setText(tr("Revert %1 to Saved").arg(quotedName));
......
...@@ -575,7 +575,7 @@ void MainWindow::registerDefaultActions() ...@@ -575,7 +575,7 @@ void MainWindow::registerDefaultActions()
connect(m_openAction, SIGNAL(triggered()), this, SLOT(openFile())); connect(m_openAction, SIGNAL(triggered()), this, SLOT(openFile()));
// Open With Action // Open With Action
m_openWithAction = new QAction(tr("&Open File With..."), this); m_openWithAction = new QAction(tr("Open File &With..."), this);
cmd = am->registerAction(m_openWithAction, Constants::OPEN_WITH, m_globalContext); cmd = am->registerAction(m_openWithAction, Constants::OPEN_WITH, m_globalContext);
mfile->addAction(cmd, Constants::G_FILE_OPEN); mfile->addAction(cmd, Constants::G_FILE_OPEN);
connect(m_openWithAction, SIGNAL(triggered()), this, SLOT(openFileWith())); connect(m_openWithAction, SIGNAL(triggered()), this, SLOT(openFileWith()));
...@@ -583,7 +583,7 @@ void MainWindow::registerDefaultActions() ...@@ -583,7 +583,7 @@ void MainWindow::registerDefaultActions()
// File->Recent Files Menu // File->Recent Files Menu
ActionContainer *ac = am->createMenu(Constants::M_FILE_RECENTFILES); ActionContainer *ac = am->createMenu(Constants::M_FILE_RECENTFILES);
mfile->addMenu(ac, Constants::G_FILE_OPEN); mfile->addMenu(ac, Constants::G_FILE_OPEN);
ac->menu()->setTitle(tr("Recent Files")); ac->menu()->setTitle(tr("Recent &Files"));
// Save Action // Save Action
QAction *tmpaction = new QAction(QIcon(Constants::ICON_SAVEFILE), tr("&Save"), this); QAction *tmpaction = new QAction(QIcon(Constants::ICON_SAVEFILE), tr("&Save"), this);
......
...@@ -505,7 +505,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er ...@@ -505,7 +505,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
// recent projects menu // recent projects menu
Core::ActionContainer *mrecent = Core::ActionContainer *mrecent =
am->createMenu(Constants::M_RECENTPROJECTS); am->createMenu(Constants::M_RECENTPROJECTS);
mrecent->menu()->setTitle(tr("Recent Projects")); mrecent->menu()->setTitle(tr("Recent P&rojects"));
mfile->addMenu(mrecent, Core::Constants::G_FILE_OPEN); mfile->addMenu(mrecent, Core::Constants::G_FILE_OPEN);
connect(mfile->menu(), SIGNAL(aboutToShow()), connect(mfile->menu(), SIGNAL(aboutToShow()),
this, SLOT(updateRecentProjectMenu())); this, SLOT(updateRecentProjectMenu()));
......
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