Fix call to undefined restoreWindowGeometry

Simply remove it, a proper solution would be to expose WindowsController
to qml and then call the replacement for that but none seems to care
about the tray support and I wish we could drop it.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

.kde-ci.yml

@@ -13,7 +13,6 @@ Dependencies:
     'frameworks/kitemmodels': '@stable'
     'frameworks/kquickcharts': '@stable'
     'frameworks/knotifications': '@stable'
-    'frameworks/kconfigwidgets': '@stable'
     'libraries/kquickimageeditor': '@stable'
     'frameworks/sonnet': '@stable'
     'libraries/kirigami-addons': '@latest'
@@ -26,6 +25,7 @@ Dependencies:
     'frameworks/qqc2-desktop-style': '@stable'
     'frameworks/kio': '@stable'
     'frameworks/kwindowsystem': '@stable'
+    'frameworks/kconfigwidgets': '@stable'
 - 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
   'require':
     'frameworks/kdbusaddons': '@stable'

CMakeLists.txt

@@ -82,7 +82,7 @@ set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
 )
-find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels ConfigWidgets)
+find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
 set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
     TYPE REQUIRED
     PURPOSE "Basic application components"
@@ -105,7 +105,7 @@ if(ANDROID)
     )
 else()
     find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle KIO WindowSystem)
+    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
     set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
         TYPE RUNTIME
     )

src/CMakeLists.txt

@@ -136,7 +136,6 @@ add_library(neochat STATIC
     mediasizehelper.h
     eventhandler.cpp
     enums/delegatetype.h
-    colorschemer.cpp
 )
 
 ecm_qt_declare_logging_category(neochat
@@ -176,6 +175,7 @@ ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
 target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
 
 if(NOT ANDROID)
+    target_sources(neochat PRIVATE colorschemer.cpp colorschemer.h)
     if (NOT WIN32 AND NOT APPLE)
         target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
         if(QT_MAJOR_VERSION STREQUAL "6")
@@ -184,7 +184,8 @@ if(NOT ANDROID)
     else()
         target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
     endif()
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::WindowSystem)
+    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
+    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
     target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()
 
@@ -198,7 +199,7 @@ else()
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels KF${QT_MAJOR_VERSION}::ConfigWidgets Quotient${QUOTIENT_SUFFIX} cmark::cmark QCoro::Core)
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels Quotient${QUOTIENT_SUFFIX} cmark::cmark QCoro::Core)
 
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)
 

src/main.cpp

@@ -45,7 +45,6 @@
 #include "blurhashimageprovider.h"
 #include "chatdocumenthandler.h"
 #include "clipboard.h"
-#include "colorschemer.h"
 #include "controller.h"
 #include "delegatesizehelper.h"
 #include "enums/delegatetype.h"
@@ -92,6 +91,9 @@
 #include "urlhelper.h"
 #include "windowcontroller.h"
 
+#ifdef HAVE_COLORSCHEME
+#include "colorschemer.h"
+#endif
 #include "models/completionmodel.h"
 #include "models/statemodel.h"
 
@@ -226,11 +228,13 @@ int main(int argc, char *argv[])
     Login *login = new Login();
     UrlHelper urlHelper;
 
+#ifdef HAVE_COLORSCHEME
     ColorSchemer colorScheme;
     qmlRegisterSingletonInstance<ColorSchemer>("org.kde.neochat", 1, 0, "ColorSchemer", &colorScheme);
     if (!config->colorScheme().isEmpty()) {
         colorScheme.apply(config->colorScheme());
     }
+#endif
 
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance());
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "NotificationsManager", &NotificationsManager::instance());

src/qml/main.qml

@@ -160,13 +160,32 @@ Kirigami.ApplicationWindow {
 
     Component.onCompleted: {
         Controller.setBlur(pageStack, Config.blur && !Config.compactLayout);
-        if (Config.minimizeToSystemTrayOnStartup && !Kirigami.Settings.isMobile && Controller.supportSystemTray && Config.systemTray) {
-            restoreWindowGeometryConnections.enabled = true; // To restore window size and position
+        if (Config.minimizeToSystemTrayOnStartup && !Kirigami.Settings.isMobile
+            && Controller.supportSystemTray && Config.systemTray) {
+            // To restore window size and position
+            restoreWindowGeometryConnections.enabled = true;
         } else {
             visible = true;
             saveWindowGeometryConnections.enabled = true;
         }
     }
+
+    Connections {
+        id: restoreWindowGeometryConnections
+        enabled: false
+        target: root
+
+        function onVisibleChanged() {
+            if (!visible) {
+                return;
+            }
+            // Only restore window geometry for the first time
+            restoreWindowGeometryConnections.enabled = false;
+            saveWindowGeometryConnections.enabled = true;
+        }
+    }
+
+
     Connections {
         target: Config
         function onBlurChanged() {
@@ -184,7 +203,7 @@ Kirigami.ApplicationWindow {
     background: Rectangle {
         color: Config.blur && !Config.compactLayout ? Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 1 - Config.transparency) : "transparent"
     }
-    
+
     Component {
         id: roomListComponent
         RoomList.Page {
@@ -259,21 +278,6 @@ Kirigami.ApplicationWindow {
         }
     }
 
-    Connections {
-        id: restoreWindowGeometryConnections
-        enabled: false
-        target: root
-
-        function onVisibleChanged() {
-            if (!visible) {
-                return;
-            }
-            Controller.restoreWindowGeometry(root);
-            restoreWindowGeometryConnections.enabled = false; // Only restore window geometry for the first time
-            saveWindowGeometryConnections.enabled = true;
-        }
-    }
-
     Component {
         id: keyVerificationDialogComponent
         KeyVerificationDialog { }