pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect DE icon for app.

Browse source
This commit is contained in:
Martin Rotter 2020-12-02 08:02:34 +01:00
parent 6b1cd82dcb
commit a3e6485739
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/librssguard/gui/dialogs/formmain.cpp
View file

@ -58,6 +58,7 @@ FormMain::FormMain(QWidget* parent, Qt::WindowFlags f)
m_ui->setupUi(this);
qApp->setMainForm(this);
setWindowIcon(qApp->desktopAwareIcon());
setWindowTitle(APP_LONG_NAME);
#if defined (USE_WEBENGINE)

11
src/librssguard/miscellaneous/application.cpp
View file

@ -426,6 +426,17 @@ NetworkUrlInterceptor* Application::urlIinterceptor() {
#endif
QIcon Application::desktopAwareIcon() const {
auto from_theme = m_icons->fromTheme(APP_LOW_NAME);
if (!from_theme.isNull()) {
return from_theme;
}
else {
return QIcon(APP_ICON_PATH);
}
}
void Application::showTrayIcon() {
// Display tray icon if it is enabled and available.
if (SystemTrayIcon::isSystemTrayActivated()) {

2
src/librssguard/miscellaneous/application.h
View file

@ -85,6 +85,8 @@ class RSSGUARD_DLLSPEC Application : public QtSingleApplication {
NetworkUrlInterceptor* urlIinterceptor();
#endif
QIcon desktopAwareIcon() const;
QString tempFolder() const;
QString documentsFolder() const;
QString homeFolder() const;

2
src/rssguard/main.cpp
View file

@ -69,7 +69,7 @@ int main(int argc, char* argv[]) {
Application::setApplicationName(APP_NAME);
Application::setApplicationVersion(APP_VERSION);
Application::setOrganizationDomain(APP_URL);
Application::setWindowIcon(QIcon(APP_ICON_PATH));
Application::setWindowIcon(qApp->desktopAwareIcon());
qApp->reactOnForeignNotifications();