This commit is contained in:
Martin Rotter 2024-03-25 09:06:01 +01:00
parent 43ffeed391
commit 80d3783701
3 changed files with 12 additions and 11 deletions

View file

@ -244,20 +244,21 @@
#define APP_SKIN_METADATA_FILE "metadata.xml" #define APP_SKIN_METADATA_FILE "metadata.xml"
#define APP_STYLE_DEFAULT "Fusion" #define APP_STYLE_DEFAULT "Fusion"
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(FORCE_BUNDLE_ICONS) // #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(FORCE_BUNDLE_ICONS)
#define APP_THEME_DEFAULT "" // #define APP_ICON_THEME_DEFAULT ""
#else // #else
#define APP_THEME_DEFAULT "Breeze" // #define APP_ICON_THEME_DEFAULT "Breeze"
#endif // #endif
#if defined(FORCE_BUNDLE_ICONS) #if defined(FORCE_BUNDLE_ICONS)
// Forcibly 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) #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 #else
// Bundle icons otherwise. // Use some default theme otherwise.
#define APP_THEME_DEFAULT "Breeze" #define APP_ICON_THEME_DEFAULT "Breeze"
#endif #endif
#define APP_LOCAL_ICON_THEME_FOLDER "icons" #define APP_LOCAL_ICON_THEME_FOLDER "icons"

View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>405</width> <width>405</width>
<height>305</height> <height>390</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

View file

@ -386,7 +386,7 @@ DKEY GUI::DefaultSortOrderFeeds = "default_sort_order_feeds";
DVALUE(Qt::SortOrder) GUI::DefaultSortOrderFeedsDef = Qt::AscendingOrder; DVALUE(Qt::SortOrder) GUI::DefaultSortOrderFeedsDef = Qt::AscendingOrder;
DKEY GUI::IconTheme = "icon_theme_name"; 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"; DKEY GUI::Skin = "skin";
DVALUE(char*) GUI::SkinDef = APP_SKIN_DEFAULT; DVALUE(char*) GUI::SkinDef = APP_SKIN_DEFAULT;