diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index fbb76b581..d562efebc 100644 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -244,20 +244,21 @@ #define APP_SKIN_METADATA_FILE "metadata.xml" #define APP_STYLE_DEFAULT "Fusion" -#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(FORCE_BUNDLE_ICONS) -#define APP_THEME_DEFAULT "" -#else -#define APP_THEME_DEFAULT "Breeze" -#endif +// #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(FORCE_BUNDLE_ICONS) +// #define APP_ICON_THEME_DEFAULT "" +// #else +// #define APP_ICON_THEME_DEFAULT "Breeze" +// #endif #if defined(FORCE_BUNDLE_ICONS) // Forcibly bundle icons. -#define APP_THEME_DEFAULT "Breeze" +#define APP_ICON_THEME_DEFAULT "Breeze" #elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) -#define APP_THEME_DEFAULT "" +// Do not force default theme on Linux. +#define APP_ICON_THEME_DEFAULT "" #else -// Bundle icons otherwise. -#define APP_THEME_DEFAULT "Breeze" +// Use some default theme otherwise. +#define APP_ICON_THEME_DEFAULT "Breeze" #endif #define APP_LOCAL_ICON_THEME_FOLDER "icons" diff --git a/src/librssguard/gui/dialogs/formaddaccount.ui b/src/librssguard/gui/dialogs/formaddaccount.ui index a7a5b8eb0..d99c36433 100644 --- a/src/librssguard/gui/dialogs/formaddaccount.ui +++ b/src/librssguard/gui/dialogs/formaddaccount.ui @@ -7,7 +7,7 @@ 0 0 405 - 305 + 390 diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp index 2bfc3c20b..784993514 100644 --- a/src/librssguard/miscellaneous/settings.cpp +++ b/src/librssguard/miscellaneous/settings.cpp @@ -386,7 +386,7 @@ DKEY GUI::DefaultSortOrderFeeds = "default_sort_order_feeds"; DVALUE(Qt::SortOrder) GUI::DefaultSortOrderFeedsDef = Qt::AscendingOrder; DKEY GUI::IconTheme = "icon_theme_name"; -DVALUE(char*) GUI::IconThemeDef = APP_THEME_DEFAULT; +DVALUE(char*) GUI::IconThemeDef = APP_ICON_THEME_DEFAULT; DKEY GUI::Skin = "skin"; DVALUE(char*) GUI::SkinDef = APP_SKIN_DEFAULT;