redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 11:47:46 +00:00
Code Activity

Use KIconTheme::initTheme()

Browse source 
See https://invent.kde.org/frameworks/kiconthemes/-/issues/3 for more
information of what this does
This commit is contained in:
Joshua Goins 2024-08-22 21:46:04 -04:00
parent b801a73265
commit 0dde52a5cc
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -55,7 +55,7 @@ if (LINUX)
find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS DBus) find_package(Qt6 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS DBus)
endif () endif ()
find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami I18n Config CoreAddons Archive) find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami I18n Config CoreAddons Archive IconThemes)
find_package(KF6KirigamiAddons 1.2.1 REQUIRED) find_package(KF6KirigamiAddons 1.2.1 REQUIRED)
find_package(QCoro6 REQUIRED COMPONENTS Core Network Qml) find_package(QCoro6 REQUIRED COMPONENTS Core Network Qml)
qcoro_enable_coroutines() qcoro_enable_coroutines()

6
launcher/CMakeLists.txt
View file

@ -3,7 +3,7 @@
add_library(astra_static STATIC) add_library(astra_static STATIC)
ecm_add_qml_module(astra_static ecm_add_qml_module(astra_static GENERATE_PLUGIN_SOURCE
URI zone.xiv.astra URI zone.xiv.astra
VERSION 1.0) VERSION 1.0)
@ -183,7 +183,8 @@ target_link_libraries(astra PRIVATE
KDAB::kdsingleapplication KDAB::kdsingleapplication
Qt6::Widgets Qt6::Widgets
Qt6::QuickControls2 Qt6::QuickControls2
KF6::Kirigami) KF6::Kirigami
KF6::IconThemes)
if (BUILD_WEBVIEW) if (BUILD_WEBVIEW)
target_link_libraries(astra PRIVATE target_link_libraries(astra PRIVATE
@ -208,7 +209,6 @@ install(TARGETS astra ${KF6_INSTALL_TARGETS_DEFAULT_ARGS})
ecm_add_app_icon(astra ecm_add_app_icon(astra
ICONS ICONS
${CMAKE_SOURCE_DIR}/zone.xiv.astra.svg
${CMAKE_SOURCE_DIR}/resources/16-astra.png ${CMAKE_SOURCE_DIR}/resources/16-astra.png
${CMAKE_SOURCE_DIR}/resources/32-astra.png ${CMAKE_SOURCE_DIR}/resources/32-astra.png
${CMAKE_SOURCE_DIR}/resources/48-astra.png ${CMAKE_SOURCE_DIR}/resources/48-astra.png

6
launcher/src/main.cpp
View file

@ -2,6 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include <KAboutData> #include <KAboutData>
#include <KIconTheme>
#include <KLocalizedContext> #include <KLocalizedContext>
#include <KLocalizedString> #include <KLocalizedString>
#include <QGuiApplication> // NOTE: do not remove this, if your IDE suggests to do so #include <QGuiApplication> // NOTE: do not remove this, if your IDE suggests to do so
@ -32,10 +33,7 @@ int main(int argc, char *argv[])
QtWebView::initialize(); QtWebView::initialize();
#endif #endif
#ifdef Q_OS_WIN KIconTheme::initTheme();
BreezeIcons::initIcons();
QIcon::setThemeName(QStringLiteral("Breeze"));
#endif
if (Utility::isSteamDeck()) { if (Utility::isSteamDeck()) {
qputenv("QT_SCALE_FACTOR", "1.25"); qputenv("QT_SCALE_FACTOR", "1.25");