diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp index 62e965bfe53312c950554c319d77426fc44153e0..2ddc33462058db4ea96fec0ea132c08ab9730d40 100644 --- a/GUI/coregui/Views/WelcomeView.cpp +++ b/GUI/coregui/Views/WelcomeView.cpp @@ -159,6 +159,11 @@ void WelcomeView::setNotificationText(const QString& text) m_updateNotification->setText(text); } +void WelcomeView::showEvent(QShowEvent*) +{ + updateRecentProjectPanel(); +} + QWidget* WelcomeView::createProjectWidget() { auto layout = new QHBoxLayout; @@ -176,27 +181,23 @@ QWidget* WelcomeView::createProjectWidget() QBoxLayout* WelcomeView::createButtonLayout() { - QFont buttonFont; - buttonFont.setPointSize(DesignerHelper::getLabelFontSize()); - buttonFont.setBold(false); - m_newProjectButton = new QPushButton("New Project"); m_newProjectButton->setMinimumWidth(buttonWidth); m_newProjectButton->setMinimumHeight(buttonHeight); - m_newProjectButton->setFont(buttonFont); + m_newProjectButton->setFont(StyleUtils::labelFont()); m_newProjectButton->setToolTip("Create new project"); m_newProjectButton->setAttribute(Qt::WA_MacShowFocusRect, false); m_openProjectButton = new QPushButton("Open Project"); m_openProjectButton->setMinimumWidth(buttonWidth); m_openProjectButton->setMinimumHeight(buttonHeight); - m_openProjectButton->setFont(buttonFont); + m_openProjectButton->setFont(StyleUtils::labelFont()); m_openProjectButton->setToolTip("Open existing project"); m_newUsertButton = new QPushButton("New to BornAgain?"); m_newUsertButton->setMinimumWidth(buttonWidth); m_newUsertButton->setMinimumHeight(buttonHeight); - m_newUsertButton->setFont(buttonFont); + m_newUsertButton->setFont(StyleUtils::labelFont()); m_newUsertButton->setToolTip("Open BornAgain web site"); auto buttonLayout = new QVBoxLayout; @@ -217,11 +218,8 @@ QBoxLayout* WelcomeView::createCurrentProjectLayout() auto result = new QVBoxLayout; result->setContentsMargins(30, 0, 0, 0); - QFont titleFont; - titleFont.setPointSize(DesignerHelper::getSectionFontSize()); - titleFont.setBold(true); auto label = new QLabel("Current Project:"); - label->setFont(titleFont); + label->setFont(StyleUtils::sectionFont()); m_currentProjectLabel = new FancyLabel("Untitled"); result->addWidget(label); diff --git a/GUI/coregui/Views/WelcomeView.h b/GUI/coregui/Views/WelcomeView.h index efdeba8bd0829c1fedc4ed41f1beb767668e78ad..ad6f74fb82816ed19888e014957a34ee855013fa 100644 --- a/GUI/coregui/Views/WelcomeView.h +++ b/GUI/coregui/Views/WelcomeView.h @@ -39,6 +39,9 @@ public slots: void updateRecentProjectPanel(); void setNotificationText(const QString& text); +protected: + void showEvent(QShowEvent*); + private: QWidget* createProjectWidget(); QBoxLayout* createButtonLayout(); diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp index a3ee08f743d4f7b4d3e896d44e6ec2ee2df9a891..2e4345b8d97267b3ad0c4f288b2b3eac1ef601fe 100644 --- a/GUI/coregui/mainwindow/mainwindow.cpp +++ b/GUI/coregui/mainwindow/mainwindow.cpp @@ -107,13 +107,6 @@ UpdateNotifier* MainWindow::updateNotifier() return m_updateNotifier; } -//! updates views which depend on others -void MainWindow::onChangeTabWidget(int index) -{ - if (index == WELCOME) - m_welcomeView->updateRecentProjectPanel(); -} - void MainWindow::onFocusRequest(int index) { m_tabWidget->setCurrentIndex(index); @@ -277,8 +270,6 @@ void MainWindow::writeSettings() void MainWindow::initConnections() { - connect(m_tabWidget, &Manhattan::FancyTabWidget::currentChanged, - this, &MainWindow::onChangeTabWidget); connect(m_jobView, &JobView::focusRequest, this, &MainWindow::onFocusRequest); connect(m_updateNotifier, &UpdateNotifier::onUpdateNotification, m_welcomeView, &WelcomeView::setNotificationText); diff --git a/GUI/coregui/mainwindow/mainwindow.h b/GUI/coregui/mainwindow/mainwindow.h index f6689b0d45cf939a66f4c6f72584200c89f66f49..b926731dfb9eaea262294ab017ee544f4c591934 100644 --- a/GUI/coregui/mainwindow/mainwindow.h +++ b/GUI/coregui/mainwindow/mainwindow.h @@ -66,7 +66,6 @@ public: UpdateNotifier* updateNotifier(); public slots: - void onChangeTabWidget(int index); void onFocusRequest(int index); void openRecentProject(); void onRunSimulationShortcut(); diff --git a/GUI/coregui/utils/StyleUtils.cpp b/GUI/coregui/utils/StyleUtils.cpp index 66c6d13ea5eb8d6d925bf5fe5cfaf287c9715727..dea72a1591730265eca47415417d2b58d25d87ff 100644 --- a/GUI/coregui/utils/StyleUtils.cpp +++ b/GUI/coregui/utils/StyleUtils.cpp @@ -72,9 +72,7 @@ QFont StyleUtils::sectionFont(bool bold) { QFont result; result.setPointSize(DesignerHelper::getSectionFontSize()); - - if (bold) - result.setBold(true); + result.setBold(bold); return result; } @@ -83,9 +81,7 @@ QFont StyleUtils::labelFont(bool bold) { QFont result; result.setPointSize(DesignerHelper::getLabelFontSize()); - - if (bold) - result.setBold(true); + result.setBold(bold); return result; }