Add new static lib: konsolecolorscheme

src/CMakeLists.txt

@@ -81,6 +81,7 @@ add_library(konsoleprivate_core STATIC ${konsoleprivate_core_SRCS})
 
 target_link_libraries(konsoleprivate_core ${konsole_LIBS})
 
+add_subdirectory(colorscheme)
 add_subdirectory(profile)
 
 set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
@@ -88,13 +89,8 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
                         hsluv.c
                         BookmarkHandler.cpp
                         BookmarkMenu.cpp
-                        ColorScheme.cpp
-                        ColorSchemeWallpaper.cpp
-                        ColorSchemeManager.cpp
-                        ColorSchemeEditor.cpp
                         CopyInputDialog.cpp
                         CheckableSessionModel.cpp
-                        ColorSchemeViewDelegate.cpp
                         LabelsAligner.cpp
                         FontDialog.cpp
                         Emulation.cpp
@@ -179,20 +175,21 @@ kconfig_add_kcfg_files(konsoleprivate_SRCS settings/KonsoleSettings.kcfgc)
 
 ### Konsole Application
 
-ki18n_wrap_ui(konsoleprivate_SRCS ColorSchemeEditor.ui
-                                CopyInputDialog.ui
-                                KeyBindingEditor.ui
-                                RenameTabDialog.ui
-                                widgets/RenameTabWidget.ui
-                                HistorySizeDialog.ui
-                                widgets/HistorySizeWidget.ui
-                                PrintOptions.ui
-                                settings/TemporaryFilesSettings.ui
-                                settings/GeneralSettings.ui
-                                settings/PartInfo.ui
-                                settings/ProfileSettings.ui
-                                settings/TabBarSettings.ui
-                                settings/ThumbnailsSettings.ui)
+ki18n_wrap_ui(konsoleprivate_SRCS
+    CopyInputDialog.ui
+    KeyBindingEditor.ui
+    RenameTabDialog.ui
+    widgets/RenameTabWidget.ui
+    HistorySizeDialog.ui
+    widgets/HistorySizeWidget.ui
+    PrintOptions.ui
+    settings/TemporaryFilesSettings.ui
+    settings/GeneralSettings.ui
+    settings/PartInfo.ui
+    settings/ProfileSettings.ui
+    settings/TabBarSettings.ui
+    settings/ThumbnailsSettings.ui
+)
 
 # add the resource files for the ui files
 qt5_add_resources( konsoleprivate_SRCS ../desktop/konsole.qrc)
@@ -203,6 +200,7 @@ generate_export_header(konsoleprivate BASE_NAME konsoleprivate)
 target_link_libraries(konsoleprivate
     PUBLIC
     konsoleprivate_core
+    konsolecolorscheme
     konsoleprofile
     ${konsole_LIBS}
 )

src/HTMLDecoder.cpp

@@ -23,7 +23,7 @@
 #include "HTMLDecoder.h"
 
 // Konsole
-#include "ColorSchemeManager.h"
+#include "colorscheme/ColorSchemeManager.h"
 #include "ExtendedCharTable.h"
 
 // Qt

src/ViewManager.cpp

@@ -34,15 +34,18 @@
 // Konsole
 #include <windowadaptor.h>
 
-#include "ColorScheme.h"
-#include "ColorSchemeManager.h"
+#include "colorscheme/ColorScheme.h"
+#include "colorscheme/ColorSchemeManager.h"
+
+#include "profile/ProfileManager.h"
+
 #include "session/Session.h"
-#include "widgets/TerminalDisplay.h"
 #include "session/SessionController.h"
 #include "session/SessionManager.h"
-#include "profile/ProfileManager.h"
-#include "widgets/ViewSplitter.h"
+
+#include "widgets/TerminalDisplay.h"
 #include "widgets/ViewContainer.h"
+#include "widgets/ViewSplitter.h"
 
 using namespace Konsole;
 

src/colorscheme/CMakeLists.txt

+set(konsole_colorscheme_SRCS
+    ColorScheme.cpp
+    ColorSchemeManager.cpp
+    ColorSchemeWallpaper.cpp
+    ColorSchemeEditor.cpp
+    ColorSchemeViewDelegate.cpp
+)
+
+ki18n_wrap_ui(konsoleprofile_SRCS
+    ColorSchemeEditor.ui
+)
+
+add_library(konsolecolorscheme
+    STATIC
+    ${konsole_colorscheme_SRCS}
+)
+
+target_link_libraries(
+    konsolecolorscheme
+    ${konsole_LIBS}
+    konsoleprivate_core
+)

src/profile/CMakeLists.txt

@@ -25,4 +25,5 @@ target_link_libraries(
     konsoleprofile
     ${konsole_LIBS}
     konsoleprivate_core
+    konsolecolorscheme
 )

src/profile/EditProfileDialog.cpp

@@ -51,7 +51,8 @@
 #include "ui_EditProfileKeyboardPage.h"
 #include "ui_EditProfileMousePage.h"
 #include "ui_EditProfileAdvancedPage.h"
-#include "ColorSchemeManager.h"
+
+#include "colorscheme/ColorSchemeManager.h"
 #include "KeyBindingEditor.h"
 #include "KeyboardTranslator.h"
 #include "KeyboardTranslatorManager.h"

src/profile/EditProfileDialog.h

@@ -26,14 +26,15 @@
 #include <KNS3/Entry>
 
 // Konsole
+#include "colorscheme/ColorScheme.h"
+#include "colorscheme/ColorSchemeEditor.h"
+#include "colorscheme/ColorSchemeViewDelegate.h"
+
 #include "Profile.h"
 #include "ProfileGroup.h"
 #include "Enumeration.h"
-#include "ColorScheme.h"
-#include "ColorSchemeEditor.h"
 #include "KeyboardTranslatorManager.h"
 #include "FontDialog.h"
-#include "ColorSchemeViewDelegate.h"
 #include "LabelsAligner.h"
 
 class KPluralHandlingSpinBox;

src/widgets/TerminalDisplay.h

@@ -30,7 +30,7 @@
 #include "Character.h"
 #include "konsoleprivate_export.h"
 #include "ScreenWindow.h"
-#include "ColorScheme.h"
+#include "colorscheme/ColorScheme.h"
 #include "Enumeration.h"
 #include "ScrollState.h"
 #include "TerminalHeaderBar.h"