Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove GTK Style flag; fix #2117. Default to Fusion theme on Windows #2664

Merged
merged 3 commits into from
Jul 15, 2024
Merged

Remove GTK Style flag; fix #2117. Default to Fusion theme on Windows #2664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3351807
Remove the remnants of GTK Style
ctrlaltca Jul 15, 2024
74e609b
Add a Qt6 entry in build info; keep Qt5 since some scripts may need it
ctrlaltca Jul 15, 2024
b162bff
Default to Fusion style on windows
ctrlaltca Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,19 +1056,6 @@ if(WANT_BEER)
message(STATUS "Opening the beer... - done")
endif()

############################################################################
# By default we disable QGtkStyle since it messes up with our theming
# Some users want it anyway, and we sometimes need to check it
############################################################################

option(WANT_GTKSTYLE "Enable QGtkStyle" OFF)
if(WANT_GTKSTYLE)
set(COMPILE_ENABLE_GTKSTYLE 1)
set(CMAKE_STATUS_GTK_SUPPORT "Yes")
else()
set(CMAKE_STATUS_GTK_SUPPORT "No")
endif()

###############################################################################
# Translation (gettext) checks
###############################################################################
Expand Down Expand Up @@ -1371,7 +1358,6 @@ message(STATUS " KDE support : ${CMAKE_STATUS_KDE_SUPPORT}")
if(CMAKE_RESULT_USING_KDE)
message(STATUS " KDE version : ${CMAKE_STATUS_KDE_VERSION}")
endif()
message(STATUS " GTK support : ${CMAKE_STATUS_GTK_SUPPORT}")
message(STATUS " IPv6 support : ${CMAKE_STATUS_IPV6_SUPPORT}")
message(STATUS " Pseudo-transparency support : ${CMAKE_STATUS_TRANSPARENCY_SUPPORT}")
message(STATUS " Spell-checker support : ${CMAKE_STATUS_SPELLCHECKER_SUPPORT}")
Expand Down
1 change: 0 additions & 1 deletion cmake/kvi_sysconfig.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#cmakedefine COMPILE_WEBENGINE_SUPPORT 1
#cmakedefine COMPILE_DBUS_SUPPORT 1
#cmakedefine COMPILE_ZLIB_SUPPORT 1
#cmakedefine COMPILE_ENABLE_GTKSTYLE 1

#cmakedefine COMPILE_PHONON_SUPPORT 1
#cmakedefine COMPILE_ESD_SUPPORT 1
Expand Down
6 changes: 3 additions & 3 deletions src/kvilib/config/KviBuildInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ const QStringList feature_list{
#endif
#ifdef COMPILE_ENCHANT_SUPPORT
"Enchant",
#endif
#ifdef COMPILE_ENABLE_GTKSTYLE
"GTK",
#endif
"Qt5",
ctrlaltca marked this conversation as resolved.
Show resolved Hide resolved
#if(QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
"Qt6",
#endif
"KVS"
};

Expand Down
4 changes: 4 additions & 0 deletions src/kvirc/kernel/KviOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,11 @@ KviStringOption g_stringOptionsTable[KVI_NUM_STRING_OPTIONS] = {
STRING_OPTION("LogsPath", "", KviOption_sectFlagUser | KviOption_encodePath),
STRING_OPTION("LogsDynamicPath", "", KviOption_sectFlagUser | KviOption_encodePath),
STRING_OPTION("LogsExportPath", "", KviOption_sectFlagUser | KviOption_encodePath),
#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
STRING_OPTION("QtStyle", "Fusion", KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme | KviOption_resetReloadImages)
#else
STRING_OPTION("QtStyle", "", KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme | KviOption_resetReloadImages)
#endif
};

#define STRINGLIST_OPTION(_txt, _flags) \
Expand Down
Loading