Files
haikuports/kde-base/kwrite/patches/kwrite-25.08.3.patchset
Schrijvers Luc 1b11687d48 KDE_utilities, bump to 25.12.0 (#13471)
bump kwrite to 25.08.3
2025-12-23 08:00:33 +01:00

46 lines
1.6 KiB
Plaintext

From 826360a57e9bc9521b96a266268be1a8301733bd Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 19 Apr 2025 18:59:39 +0200
Subject: Use Haiku's icon/color schemes
diff --git a/apps/lib/kateapp.cpp b/apps/lib/kateapp.cpp
index cddbd9c..8e3465f 100644
--- a/apps/lib/kateapp.cpp
+++ b/apps/lib/kateapp.cpp
@@ -158,9 +158,11 @@ void KateApp::initPreApplicationCreation(bool detach)
* trigger initialisation of proper icon theme
* see https://invent.kde.org/frameworks/kiconthemes/-/merge_requests/136
*/
+#if !defined(Q_OS_HAIKU)
#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
KIconTheme::initTheme();
#endif
+#endif
#if defined(Q_OS_WIN)
// try to attach to console for terminal detection and output
diff --git a/apps/lib/katemainwindow.cpp b/apps/lib/katemainwindow.cpp
index 09a2552..0d1bfac 100644
--- a/apps/lib/katemainwindow.cpp
+++ b/apps/lib/katemainwindow.cpp
@@ -287,6 +287,7 @@ void KateMainWindow::setupImportantActions()
#endif
// Load themes
+#if !defined(Q_OS_HAIKU)
#if KCOLORSCHEME_VERSION < QT_VERSION_CHECK(6, 6, 0)
auto manager = new KColorSchemeManager(this);
#else
@@ -295,6 +296,7 @@ void KateMainWindow::setupImportantActions()
KActionMenu *colorSelectionMenu = KColorSchemeMenu::createMenu(manager, this);
colorSelectionMenu->menu()->setTitle(i18n("&Window Color Scheme"));
ac->addAction(QStringLiteral("colorscheme_menu"), colorSelectionMenu);
+#endif
QAction *a = ac->addAction(KStandardAction::Back, QStringLiteral("view_prev_tab"));
a->setText(i18n("&Previous Tab"));
--
2.48.1