Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

ui: hide news widget if no news are available #1160

Merged
merged 2 commits into from
Mar 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/app/data/gui/startscreen/startscreen.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
color: black;
font-size: 12px;
font-weight: bold;
min-width: 200px;
}

#textField {
Expand Down
2 changes: 1 addition & 1 deletion src/lib_gui/qt/element/dialog/QtNewsWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void QtNewsWidget::updateNews()
resetFlags();

ApplicationSettings* appSettings = ApplicationSettings::getInstance().get();
std::string newsRaw = appSettings->getUpdateNews();
const std::string newsRaw = appSettings->getUpdateNews();
if (!newsRaw.size())
{
setNews(QLatin1String(""));
Expand Down
28 changes: 21 additions & 7 deletions src/lib_gui/qt/window/QtStartScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@ void QtStartScreen::updateButtons()
}
i++;
}
setStyleSheet(utility::getStyleSheet(
ResourcePaths::getGuiDirectoryPath().concatenate(L"startscreen/startscreen.css"))
setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiDirectoryPath().concatenate(
L"startscreen/startscreen.css"))
.c_str());
}

void QtStartScreen::setupStartScreen()
{
setStyleSheet(utility::getStyleSheet(
ResourcePaths::getGuiDirectoryPath().concatenate(L"startscreen/startscreen.css"))
setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiDirectoryPath().concatenate(
L"startscreen/startscreen.css"))
.c_str());
addLogo();

Expand Down Expand Up @@ -230,8 +230,21 @@ void QtStartScreen::setupStartScreen()
QtNewsWidget* newsWidget = new QtNewsWidget(this);
col->addWidget(newsWidget);

connect(
checker, &QtUpdateCheckerWidget::updateReceived, newsWidget, &QtNewsWidget::updateNews);
std::function<void()> updateNews = [newsHeader, newsWidget]() {
const bool newsAvailable =
ApplicationSettings::getInstance()->getAutomaticUpdateCheck() &&
!ApplicationSettings::getInstance()->getUpdateNews().empty();
newsHeader->setVisible(newsAvailable);
newsWidget->setVisible(newsAvailable);
if (newsAvailable)
{
newsWidget->updateNews();
}
};

updateNews();

QObject::connect(checker, &QtUpdateCheckerWidget::updateReceived, updateNews);
}

col->addSpacing(35);
Expand Down Expand Up @@ -274,7 +287,8 @@ void QtStartScreen::setupStartScreen()
button->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac
button->setIcon(m_projectIcon);
button->setIconSize(QSize(30, 30));
button->setMinimumSize(button->fontMetrics().boundingRect(button->text()).width() + 45, 40);
button->setMinimumSize(
button->fontMetrics().boundingRect(button->text()).width() + 45, 40);
button->setObjectName(QStringLiteral("recentButtonMissing"));
button->minimumSizeHint(); // force font loading
m_recentProjectsButtons.push_back(button);
Expand Down