FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to minimize problems arising from #418.

Browse Source
This commit is contained in:
Martin Rotter 2021-05-31 07:25:30 +02:00
parent bc739ca9fa
commit 0fd3a6c8d3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.9.2" date="2021-05-28"/> <release version="3.9.2" date="2021-05-31"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

10
src/librssguard/gui/dialogs/formmain.cpp
View File

@ -463,7 +463,15 @@ void FormMain::updateFeedButtonsAvailability() {
void FormMain::switchVisibility(bool force_hide) { void FormMain::switchVisibility(bool force_hide) {
if (force_hide || isVisible()) { if (force_hide || isVisible()) {
if (SystemTrayIcon::isSystemTrayDesired() && SystemTrayIcon::isSystemTrayAreaAvailable()) { if (SystemTrayIcon::isSystemTrayDesired() && SystemTrayIcon::isSystemTrayAreaAvailable()) {
hide();
if (QApplication::activeModalWidget() != nullptr) {
qApp->showGuiMessage(QSL(APP_LONG_NAME),
tr("Close opened modal dialogs first."),
QSystemTrayIcon::Warning, qApp->mainFormWidget(), true);
}
else {
hide();
}
} }
else { else {
// Window gets minimized in single-window mode. // Window gets minimized in single-window mode.

2
src/librssguard/gui/systemtrayicon.cpp
View File

@ -15,7 +15,7 @@
TrayIconMenu::TrayIconMenu(const QString& title, QWidget* parent) : QMenu(title, parent) {} TrayIconMenu::TrayIconMenu(const QString& title, QWidget* parent) : QMenu(title, parent) {}
bool TrayIconMenu::event(QEvent* event) { bool TrayIconMenu::event(QEvent* event) {
if (event->type() == QEvent::Show && Application::activeModalWidget() != nullptr) { if (event->type() == QEvent::Type::Show && Application::activeModalWidget() != nullptr) {
QTimer::singleShot(0, this, &TrayIconMenu::hide); QTimer::singleShot(0, this, &TrayIconMenu::hide);
qApp->showGuiMessage(QSL(APP_LONG_NAME), qApp->showGuiMessage(QSL(APP_LONG_NAME),
tr("Close opened modal dialogs first."), tr("Close opened modal dialogs first."),