From bbab20a2d4eda1cc04f5bf68de10f161e2bc173c Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 12 Feb 2016 17:44:49 +0100
Subject: [PATCH] Fixes in main application menu for tacos
---
GUI/coregui/mainwindow/actionmanager.cpp | 26 ++++++++++++------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/coregui/mainwindow/actionmanager.cpp
index f8302161852..edf85923b56 100644
--- a/GUI/coregui/mainwindow/actionmanager.cpp
+++ b/GUI/coregui/mainwindow/actionmanager.cpp
@@ -56,44 +56,44 @@ void ActionManager::createActions()
Q_ASSERT(projectManager);
// new project action
- QIcon icon = QIcon::fromTheme(QLatin1String("document-new"), QIcon(QLatin1String(Constants::ICON_NEWFILE)));
- m_newAction = new QAction(icon, tr("&New Project"), m_mainWindow);
+// QIcon icon = QIcon::fromTheme(QLatin1String("document-new"), QIcon(QLatin1String(Constants::ICON_NEWFILE)));
+ m_newAction = new QAction(tr("&New Project"), m_mainWindow);
m_newAction->setShortcuts(QKeySequence::New);
m_newAction->setStatusTip(tr("Create a new project"));
connect(m_newAction, SIGNAL(triggered()), projectManager, SLOT(newProject()) );
// open project action
- icon = QIcon::fromTheme(QLatin1String("document-open"), QIcon(QLatin1String(Constants::ICON_OPENFILE)));
- m_openAction = new QAction(icon, tr("&Open Project"), m_mainWindow);
+// icon = QIcon::fromTheme(QLatin1String("document-open"), QIcon(QLatin1String(Constants::ICON_OPENFILE)));
+ m_openAction = new QAction(tr("&Open Project"), m_mainWindow);
m_openAction->setShortcuts(QKeySequence::Open);
m_openAction->setStatusTip(tr("Open an existing project"));
connect(m_openAction, SIGNAL(triggered()), projectManager, SLOT(openProject()) );
// save project action
- icon = QIcon::fromTheme(QLatin1String("document-save"), QIcon(QLatin1String(Constants::ICON_SAVEFILE)));
- m_saveAction = new QAction(icon, tr("&Save Project"), m_mainWindow);
+// icon = QIcon::fromTheme(QLatin1String("document-save"), QIcon(QLatin1String(Constants::ICON_SAVEFILE)));
+ m_saveAction = new QAction(tr("&Save Project"), m_mainWindow);
m_saveAction->setShortcuts(QKeySequence::Save);
m_saveAction->setStatusTip(tr("Save project"));
m_saveAction->setShortcutContext(Qt::ApplicationShortcut);
connect(m_saveAction, SIGNAL(triggered()), projectManager, SLOT(saveProject()) );
// save-as project action
- icon = QIcon::fromTheme(QLatin1String("document-save-as"));
- m_saveAsAction = new QAction(icon, tr("Save &As..."), m_mainWindow);
+// icon = QIcon::fromTheme(QLatin1String("document-save-as"));
+ m_saveAsAction = new QAction(tr("Save &As..."), m_mainWindow);
m_saveAsAction->setShortcuts(QKeySequence::SaveAs);
m_saveAsAction->setStatusTip(tr("Save project under different name"));
connect(m_saveAsAction, SIGNAL(triggered()), projectManager, SLOT(saveProjectAs()) );
// exit application action
- icon = QIcon::fromTheme(QLatin1String("application-exit"));
- m_exitAction = new QAction(icon, tr("E&xit Application"), this);
+// icon = QIcon::fromTheme(QLatin1String("application-exit"));
+ m_exitAction = new QAction(tr("E&xit Application"), this);
m_exitAction->setShortcuts(QKeySequence::Quit);
m_exitAction->setStatusTip(tr("Exit the application"));
connect(m_exitAction, SIGNAL(triggered()), m_mainWindow, SLOT(close()));
// about application action
- icon = QIcon::fromTheme(QLatin1String("help-about"));
- m_aboutAction = new QAction(icon, tr("About &BornAgain"), this);
+// icon = QIcon::fromTheme(QLatin1String("help-about"));
+ m_aboutAction = new QAction(tr("About &BornAgain"), this);
//m_aboutAction->setShortcuts(QKeySequence::HelpContents);
m_aboutAction->setStatusTip(tr("About the application"));
connect(m_aboutAction, SIGNAL(triggered()), m_mainWindow, SLOT(onAboutApplication()));
@@ -124,7 +124,7 @@ void ActionManager::createMenus()
m_fileMenu->addAction(m_exitAction);
// Settings Menu
- m_settingsMenu = m_menuBar->addMenu(tr("&Settings"));
+ m_settingsMenu = m_menuBar->addMenu(tr("&Preferences"));
connect(m_settingsMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowSettings()));
--
GitLab