[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.
This commit is contained in:
parent
85d28af1e2
commit
e31a498c9b
@ -5,6 +5,8 @@ set( calamaresSources
|
|||||||
CalamaresApplication.cpp
|
CalamaresApplication.cpp
|
||||||
CalamaresWindow.cpp
|
CalamaresWindow.cpp
|
||||||
|
|
||||||
|
DebugWindow.cpp
|
||||||
|
|
||||||
progresstree/ProgressTreeDelegate.cpp
|
progresstree/ProgressTreeDelegate.cpp
|
||||||
progresstree/ProgressTreeItem.cpp
|
progresstree/ProgressTreeItem.cpp
|
||||||
progresstree/ProgressTreeModel.cpp
|
progresstree/ProgressTreeModel.cpp
|
||||||
@ -35,6 +37,7 @@ set_target_properties(calamares_bin
|
|||||||
RUNTIME_OUTPUT_NAME calamares
|
RUNTIME_OUTPUT_NAME calamares
|
||||||
)
|
)
|
||||||
calamares_automoc( calamares_bin )
|
calamares_automoc( calamares_bin )
|
||||||
|
calamares_autouic( calamares_bin )
|
||||||
|
|
||||||
target_link_libraries( calamares_bin
|
target_link_libraries( calamares_bin
|
||||||
PRIVATE
|
PRIVATE
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include "ViewManager.h"
|
#include "ViewManager.h"
|
||||||
#include "progresstree/ProgressTreeView.h"
|
#include "progresstree/ProgressTreeView.h"
|
||||||
#include "utils/CalamaresUtilsGui.h"
|
#include "utils/CalamaresUtilsGui.h"
|
||||||
#include "utils/DebugWindow.h"
|
#include "DebugWindow.h"
|
||||||
#include "utils/Logger.h"
|
#include "utils/Logger.h"
|
||||||
#include "utils/Retranslator.h"
|
#include "utils/Retranslator.h"
|
||||||
|
|
||||||
|
@ -14,7 +14,6 @@ set( calamaresui_SOURCES
|
|||||||
modulesystem/ViewModule.cpp
|
modulesystem/ViewModule.cpp
|
||||||
|
|
||||||
utils/CalamaresUtilsGui.cpp
|
utils/CalamaresUtilsGui.cpp
|
||||||
utils/DebugWindow.cpp
|
|
||||||
utils/ImageRegistry.cpp
|
utils/ImageRegistry.cpp
|
||||||
utils/Paste.cpp
|
utils/Paste.cpp
|
||||||
|
|
||||||
@ -38,10 +37,6 @@ mark_thirdparty_code(
|
|||||||
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
|
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set( calamaresui_UI
|
|
||||||
utils/DebugWindow.ui
|
|
||||||
)
|
|
||||||
|
|
||||||
if( WITH_PYTHON )
|
if( WITH_PYTHON )
|
||||||
list( APPEND calamaresui_SOURCES
|
list( APPEND calamaresui_SOURCES
|
||||||
modulesystem/PythonJobModule.cpp
|
modulesystem/PythonJobModule.cpp
|
||||||
@ -69,7 +64,6 @@ endif()
|
|||||||
|
|
||||||
calamares_add_library( calamaresui
|
calamares_add_library( calamaresui
|
||||||
SOURCES ${calamaresui_SOURCES}
|
SOURCES ${calamaresui_SOURCES}
|
||||||
UI ${calamaresui_UI}
|
|
||||||
EXPORT_MACRO UIDLLEXPORT_PRO
|
EXPORT_MACRO UIDLLEXPORT_PRO
|
||||||
LINK_PRIVATE_LIBRARIES
|
LINK_PRIVATE_LIBRARIES
|
||||||
${OPTIONAL_PYTHON_LIBRARIES}
|
${OPTIONAL_PYTHON_LIBRARIES}
|
||||||
|
Loading…
Reference in New Issue
Block a user