diff --git a/src/librssguard/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp old mode 100644 new mode 100755 index 3d1b2747c..046bbfc95 --- a/src/librssguard/gui/messagepreviewer.cpp +++ b/src/librssguard/gui/messagepreviewer.cpp @@ -9,6 +9,7 @@ #include "network-web/webfactory.h" #include "services/abstract/serviceroot.h" +#include #include #include #include diff --git a/src/librssguard/miscellaneous/iconfactory.cpp b/src/librssguard/miscellaneous/iconfactory.cpp old mode 100644 new mode 100755 index ad001688c..5683aa023 --- a/src/librssguard/miscellaneous/iconfactory.cpp +++ b/src/librssguard/miscellaneous/iconfactory.cpp @@ -86,7 +86,7 @@ void IconFactory::loadCurrentIconTheme() { else { // Desired icon theme is not currently available. // Install "default" icon theme instead. - qWarning("Icon theme '%s' cannot be loaded because it is not installed. No icon theme (or default icon theme) is loaded now.", + qWarning("Icon theme '%s' cannot be loaded because it is not installed. No icon theme (or default/system icon theme) is loaded now.", qPrintable(theme_name_from_settings)); QIcon::setThemeName(APP_NO_THEME); } diff --git a/src/librssguard/miscellaneous/iofactory.cpp b/src/librssguard/miscellaneous/iofactory.cpp old mode 100644 new mode 100755 index 117ef9259..a8587377e --- a/src/librssguard/miscellaneous/iofactory.cpp +++ b/src/librssguard/miscellaneous/iofactory.cpp @@ -26,7 +26,9 @@ bool IOFactory::isFolderWritable(const QString& folder) { } QString IOFactory::getSystemFolder(QStandardPaths::StandardLocation location) { - return QStandardPaths::writableLocation(location); + QStringList locations = QStandardPaths::standardLocations(location); + + return locations.isEmpty() ? QString() : locations.at(0); } QString IOFactory::ensureUniqueFilename(const QString& name, const QString& append_format) { diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp old mode 100644 new mode 100755 index 1fe17cc32..6b9132e38 --- a/src/librssguard/miscellaneous/settings.cpp +++ b/src/librssguard/miscellaneous/settings.cpp @@ -247,7 +247,7 @@ DVALUE(bool) Downloads::AlwaysPromptForFilenameDef = false; DKEY Downloads::TargetDirectory = "target_directory"; -DVALUE(QString) Downloads::TargetDirectoryDef = IOFactory::getSystemFolder(QStandardPaths::DesktopLocation); +DVALUE(QString) Downloads::TargetDirectoryDef = IOFactory::getSystemFolder(QStandardPaths::DownloadLocation); DKEY Downloads::RemovePolicy = "remove_policy"; @@ -255,7 +255,7 @@ DVALUE(int) Downloads::RemovePolicyDef = DownloadManager::Never; DKEY Downloads::TargetExplicitDirectory = "target_explicit_directory"; -DVALUE(QString) Downloads::TargetExplicitDirectoryDef = IOFactory::getSystemFolder(QStandardPaths::DesktopLocation); +DVALUE(QString) Downloads::TargetExplicitDirectoryDef = IOFactory::getSystemFolder(QStandardPaths::DownloadLocation); DKEY Downloads::ShowDownloadsWhenNewDownloadStarts = "show_downloads_on_new_download_start"; diff --git a/src/librssguard/services/abstract/feed.cpp b/src/librssguard/services/abstract/feed.cpp old mode 100644 new mode 100755 index 4e51cd6e6..e6a3a64b3 --- a/src/librssguard/services/abstract/feed.cpp +++ b/src/librssguard/services/abstract/feed.cpp @@ -67,7 +67,7 @@ QVariant Feed::data(int column, int role) const { case Qt::ForegroundRole: switch (status()) { case NewMessages: - return QColor(Qt::blue); + return qApp->palette().color(QPalette::Active, QPalette::BrightText); case NetworkError: case ParsingError: diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp old mode 100644 new mode 100755 index 7bbea4781..f4c53ed29 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -26,9 +26,17 @@ int main(int argc, char* argv[]) { } } + QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + // Ensure that ini format is used as application settings storage on Mac OS. QSettings::setDefaultFormat(QSettings::IniFormat); +#if defined (Q_OS_MAC) + QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); + disableWindowTabbing(); +#endif + // Instantiate base application object. Application application(APP_LOW_NAME, argc, argv); @@ -44,13 +52,6 @@ int main(int argc, char* argv[]) { // Load localization and setup locale before any widget is constructed. qApp->localization()->loadActiveLanguage(); qApp->setFeedReader(new FeedReader(&application)); - QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - -#if defined (Q_OS_MAC) - QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); - disableWindowTabbing(); -#endif // Register needed metatypes. qRegisterMetaType>("QList");