Move ColorSchemer to settings module
This commit is contained in:
@@ -87,8 +87,6 @@ add_library(neochat STATIC
|
|||||||
jobs/neochatgetcommonroomsjob.h
|
jobs/neochatgetcommonroomsjob.h
|
||||||
mediasizehelper.cpp
|
mediasizehelper.cpp
|
||||||
mediasizehelper.h
|
mediasizehelper.h
|
||||||
colorschemer.cpp
|
|
||||||
colorschemer.h
|
|
||||||
models/notificationsmodel.cpp
|
models/notificationsmodel.cpp
|
||||||
models/notificationsmodel.h
|
models/notificationsmodel.h
|
||||||
proxycontroller.cpp
|
proxycontroller.cpp
|
||||||
@@ -319,10 +317,11 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
|
target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
|
||||||
target_link_libraries(neochat PRIVATE settingsplugin Timelineplugin devtoolsplugin loginplugin chatbarplugin)
|
target_link_libraries(neochat PRIVATE Settingsplugin Timelineplugin devtoolsplugin loginplugin chatbarplugin)
|
||||||
target_link_libraries(neochat PUBLIC
|
target_link_libraries(neochat PUBLIC
|
||||||
LibNeoChat
|
LibNeoChat
|
||||||
Timeline
|
Timeline
|
||||||
|
Settings
|
||||||
Qt::Core
|
Qt::Core
|
||||||
Qt::Quick
|
Qt::Quick
|
||||||
Qt::Qml
|
Qt::Qml
|
||||||
@@ -338,7 +337,6 @@ target_link_libraries(neochat PUBLIC
|
|||||||
KF6::CoreAddons
|
KF6::CoreAddons
|
||||||
KF6::SonnetCore
|
KF6::SonnetCore
|
||||||
KF6::IconThemes
|
KF6::IconThemes
|
||||||
KF6::ColorScheme
|
|
||||||
KF6::ItemModels
|
KF6::ItemModels
|
||||||
QuotientQt6
|
QuotientQt6
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
|
# SPDX-FileCopyrightText: 2024 James Graham <james.h.graham@protonmail.com>
|
||||||
# SPDX-License-Identifier: BSD-2-Clause
|
# SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
|
||||||
qt_add_library(settings STATIC)
|
qt_add_library(Settings STATIC)
|
||||||
|
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
RoomSettingsView.qml
|
RoomSettingsView.qml
|
||||||
@@ -10,7 +10,7 @@ set_source_files_properties(
|
|||||||
QT_QML_SINGLETON_TYPE TRUE
|
QT_QML_SINGLETON_TYPE TRUE
|
||||||
)
|
)
|
||||||
|
|
||||||
ecm_add_qml_module(settings GENERATE_PLUGIN_SOURCE
|
ecm_add_qml_module(Settings GENERATE_PLUGIN_SOURCE
|
||||||
URI org.kde.neochat.settings
|
URI org.kde.neochat.settings
|
||||||
OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/settings
|
OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat/settings
|
||||||
QML_FILES
|
QML_FILES
|
||||||
@@ -44,4 +44,10 @@ ecm_add_qml_module(settings GENERATE_PLUGIN_SOURCE
|
|||||||
ExportKeysDialog.qml
|
ExportKeysDialog.qml
|
||||||
RoomSortParameterDialog.qml
|
RoomSortParameterDialog.qml
|
||||||
RoomProfile.qml
|
RoomProfile.qml
|
||||||
|
SOURCES
|
||||||
|
colorschemer.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(Settings PRIVATE
|
||||||
|
KF6::ColorScheme
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
ColorSchemer::ColorSchemer(QObject *parent)
|
ColorSchemer::ColorSchemer(QObject *parent)
|
||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
{
|
{
|
||||||
|
KColorSchemeManager::instance();
|
||||||
}
|
}
|
||||||
|
|
||||||
ColorSchemer::~ColorSchemer()
|
ColorSchemer::~ColorSchemer()
|
||||||
Reference in New Issue
Block a user