aboutsummaryrefslogtreecommitdiff
path: root/src/ui/mainwindow.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-11-04 20:17:13 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-11-04 20:17:13 +0000
commit40c82a8a1d3e65788451022249d984d3166c3aca (patch)
treed6205444e71f1f103af8d8ddf13136602eebb6da /src/ui/mainwindow.cpp
parent1963054966e3a2514fb481c8159c09834a1a12fa (diff)
downloadqmmp-40c82a8a1d3e65788451022249d984d3166c3aca.tar.gz
qmmp-40c82a8a1d3e65788451022249d984d3166c3aca.tar.bz2
qmmp-40c82a8a1d3e65788451022249d984d3166c3aca.zip
completed shortcut editor
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1980 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui/mainwindow.cpp')
-rw-r--r--src/ui/mainwindow.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 9af7537b9..09940f012 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -374,6 +374,7 @@ void MainWindow::showSettings()
confDialog->exec();
updateSettings();
confDialog->deleteLater();
+ ActionManager::instance()->saveActions();
}
void MainWindow::toggleVisibility()
@@ -445,15 +446,12 @@ void MainWindow::createActions()
m_mainMenu->addMenu(m_visMenu);
m_mainMenu->addMenu(m_generalHandler->createMenu(GeneralHandler::TOOLS_MENU, tr("Tools"), this));
m_mainMenu->addSeparator();
- m_mainMenu->addAction(QIcon::fromTheme("configure"), tr("&Settings"),
- this, SLOT(showSettings()), tr("Ctrl+P"));
+ m_mainMenu->addAction(ACTION(ActionManager::SETTINGS, this, SLOT(showSettings())));
m_mainMenu->addSeparator();
- m_mainMenu->addAction(QIcon(":/32x32/qmmp.png"), tr("&About"), this, SLOT(about()));
- m_mainMenu->addAction(tr("&About Qt"), qApp, SLOT(aboutQt()));
- Dock::instance()->addActions(m_mainMenu->actions());
+ m_mainMenu->addAction(ACTION(ActionManager::ABOUT, this, SLOT(about())));
+ m_mainMenu->addAction(ACTION(ActionManager::ABOUT_QT, qApp, SLOT(aboutQt())));
m_mainMenu->addSeparator();
- m_mainMenu->addAction(QIcon::fromTheme("application-exit"), tr("&Exit"),
- this, SLOT(close ()), tr("Ctrl+Q"));
+ m_mainMenu->addAction(ACTION(ActionManager::QUIT, this, SLOT(close())));
QAction* forward = new QAction(this);
forward->setShortcut(QKeySequence(Qt::Key_Right));