From e31a498c9b70abebe50bdeaeec661545eab4bc40 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 9 Aug 2019 06:35:40 -0400
Subject: [PATCH] [calamares] Move DebugWindow

 - This is a fairly specialized class, for use only in the
   whole-application where it ties in with the module system.
   Move it to the application directory and slim down the UI library.
 - Include it from the new location.
 - Add UIC to Calamares (the application) because there's now
   a designer-based widget in it.
---
 src/calamares/CMakeLists.txt                            | 3 +++
 src/calamares/CalamaresWindow.cpp                       | 2 +-
 src/{libcalamaresui/utils => calamares}/DebugWindow.cpp | 0
 src/{libcalamaresui/utils => calamares}/DebugWindow.h   | 0
 src/{libcalamaresui/utils => calamares}/DebugWindow.ui  | 0
 src/libcalamaresui/CMakeLists.txt                       | 6 ------
 6 files changed, 4 insertions(+), 7 deletions(-)
 rename src/{libcalamaresui/utils => calamares}/DebugWindow.cpp (100%)
 rename src/{libcalamaresui/utils => calamares}/DebugWindow.h (100%)
 rename src/{libcalamaresui/utils => calamares}/DebugWindow.ui (100%)

diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index 5dbf137bb..92521f17a 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -5,6 +5,8 @@ set( calamaresSources
     CalamaresApplication.cpp
     CalamaresWindow.cpp
 
+    DebugWindow.cpp
+
     progresstree/ProgressTreeDelegate.cpp
     progresstree/ProgressTreeItem.cpp
     progresstree/ProgressTreeModel.cpp
@@ -35,6 +37,7 @@ set_target_properties(calamares_bin
         RUNTIME_OUTPUT_NAME calamares
 )
 calamares_automoc( calamares_bin )
+calamares_autouic( calamares_bin )
 
 target_link_libraries( calamares_bin
     PRIVATE
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index d80b6cb67..68f29ef18 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -26,7 +26,7 @@
 #include "ViewManager.h"
 #include "progresstree/ProgressTreeView.h"
 #include "utils/CalamaresUtilsGui.h"
-#include "utils/DebugWindow.h"
+#include "DebugWindow.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
diff --git a/src/libcalamaresui/utils/DebugWindow.cpp b/src/calamares/DebugWindow.cpp
similarity index 100%
rename from src/libcalamaresui/utils/DebugWindow.cpp
rename to src/calamares/DebugWindow.cpp
diff --git a/src/libcalamaresui/utils/DebugWindow.h b/src/calamares/DebugWindow.h
similarity index 100%
rename from src/libcalamaresui/utils/DebugWindow.h
rename to src/calamares/DebugWindow.h
diff --git a/src/libcalamaresui/utils/DebugWindow.ui b/src/calamares/DebugWindow.ui
similarity index 100%
rename from src/libcalamaresui/utils/DebugWindow.ui
rename to src/calamares/DebugWindow.ui
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 89a50e2ec..111113a47 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -14,7 +14,6 @@ set( calamaresui_SOURCES
     modulesystem/ViewModule.cpp
 
     utils/CalamaresUtilsGui.cpp
-    utils/DebugWindow.cpp
     utils/ImageRegistry.cpp
     utils/Paste.cpp
 
@@ -38,10 +37,6 @@ mark_thirdparty_code(
     ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
 )
 
-set( calamaresui_UI
-    utils/DebugWindow.ui
-)
-
 if( WITH_PYTHON )
     list( APPEND calamaresui_SOURCES
         modulesystem/PythonJobModule.cpp
@@ -69,7 +64,6 @@ endif()
 
 calamares_add_library( calamaresui
     SOURCES ${calamaresui_SOURCES}
-    UI ${calamaresui_UI}
     EXPORT_MACRO UIDLLEXPORT_PRO
     LINK_PRIVATE_LIBRARIES
         ${OPTIONAL_PYTHON_LIBRARIES}