From 0ff50e4cf70518f7fd960fd8fcf846fc7bec2709 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 12 Mar 2015 10:05:27 +0100
Subject: [PATCH] Tooltips for WelcomeView buttons, fix in logic when clearing
recent project list.
---
GUI/coregui/Views/WelcomeView.cpp | 3 +++
GUI/coregui/mainwindow/projectmanager.cpp | 17 ++++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index c16fe86fdbc..e9a0501a957 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -60,18 +60,21 @@ WelcomeView::WelcomeView(MainWindow *parent)
button_palette.setColor(QPalette::Button, QColor(Constants::BUTTON_COLOR));
button_palette.setColor(QPalette::ButtonText, QColor(Constants::BUTTON_TEXT_COLOR));
m_newProjectButton->setPalette(button_palette);
+ m_newProjectButton->setToolTip("Create new project");
m_openProjectButton = new QPushButton(tr("Open Project"));
m_openProjectButton->setMinimumWidth(buttonWidth);
m_openProjectButton->setMinimumHeight(buttonHeight);
m_openProjectButton->setFont(buttonFont);
m_openProjectButton->setPalette(button_palette);
+ m_openProjectButton->setToolTip("Open existing project");
m_newUsertButton = new QPushButton(tr("New to BornAgain?"));
m_newUsertButton->setMinimumWidth(buttonWidth);
m_newUsertButton->setMinimumHeight(buttonHeight);
m_newUsertButton->setFont(buttonFont);
m_newUsertButton->setPalette(button_palette);
+ m_newUsertButton->setToolTip("Open BornAgain web site");
QVBoxLayout *buttonLayout = new QVBoxLayout;
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index ada7820b330..5fde266ce39 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -201,15 +201,15 @@ void ProjectManager::openProject(QString fileName)
qDebug() << "ProjectManager::openProject()" << fileName;
if( !closeCurrentProject()) return;
-// if(fileName.isEmpty()) {
-// fileName = QFileDialog::getOpenFileName(m_mainWindow, tr("Open project file"),
-// getDefaultProjectPath(),
-// tr("BornAgain project Files (*.pro)"));
-// }
+ if(fileName.isEmpty()) {
+ fileName = QFileDialog::getOpenFileName(m_mainWindow, tr("Open project file"),
+ getDefaultProjectPath(),
+ tr("BornAgain project Files (*.pro)"));
+ }
if(fileName.isEmpty()) {
- QMessageBox::warning(m_mainWindow, tr("Error while opening project file"),
- tr("File name is empty."));
+// QMessageBox::warning(m_mainWindow, tr("Error while opening project file"),
+// tr("File name is empty."));
return;
}
@@ -230,6 +230,8 @@ void ProjectManager::openProject(QString fileName)
m_project_document = 0;
m_mainWindow->resetModels();
createNewProject();
+ } else {
+ addToRecentProjects();
}
emit modified();
}
@@ -286,6 +288,7 @@ QStringList ProjectManager::getRecentProjects()
void ProjectManager::clearRecentProjects()
{
m_recentProjects.clear();
+ modified();
}
--
GitLab