summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-05 10:07:13 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-05 10:07:13 +0200
commite78224a7d9ccf70aadde8c0bff1cab72e8cb7438 (patch)
tree57afeef37640051a8d28d614c33345e509ce387b
parentbfba957a7ebc64925bc553200616724cba9b1e37 (diff)
downloadkube-e78224a7d9ccf70aadde8c0bff1cab72e8cb7438.tar.gz
kube-e78224a7d9ccf70aadde8c0bff1cab72e8cb7438.zip
Moved theme to framework
-rw-r--r--components/theme/contents/ui/main.qml23
-rw-r--r--components/theme/metadata.desktop8
-rw-r--r--components/theme/qmldir5
-rw-r--r--framework/domain/settings/CMakeLists.txt6
-rw-r--r--framework/qml/Colors.qml (renamed from components/theme/contents/ui/Colors.qml)0
-rw-r--r--framework/qml/Icons.qml (renamed from components/theme/contents/ui/Icons.qml)0
-rw-r--r--framework/qml/Units.qml (renamed from components/theme/contents/ui/Units.qml)0
-rw-r--r--framework/qmldir3
8 files changed, 9 insertions, 36 deletions
diff --git a/components/theme/contents/ui/main.qml b/components/theme/contents/ui/main.qml
deleted file mode 100644
index c3c7ac8f..00000000
--- a/components/theme/contents/ui/main.qml
+++ /dev/null
@@ -1,23 +0,0 @@
1
2import QtQuick 2.7
3import QtQuick.Layouts 1.2
4
5import org.kube.components.theme 1.0 as KubeTheme
6
7Item {
8 height: 200
9 width: 200
10
11 RowLayout {
12
13 anchors.fill: parent
14
15 Rectangle {
16
17 height: 50
18 width: 50
19
20 color: KubeTheme.Colors.text
21 }
22 }
23}
diff --git a/components/theme/metadata.desktop b/components/theme/metadata.desktop
deleted file mode 100644
index 359990d1..00000000
--- a/components/theme/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
1[Desktop Entry]
2Name=Kube Theme
3X-KDE-PluginInfo-Name=org.kube.components.theme
4Exec=kpackagelauncherqml -a org.kube.components.theme
5X-Plasma-MainScript=ui/main.qml
6X-KDE-ServiceTypes=KPackage/GenericQML
7Icon=kmail2
8Type=Service
diff --git a/components/theme/qmldir b/components/theme/qmldir
deleted file mode 100644
index 16b385ab..00000000
--- a/components/theme/qmldir
+++ /dev/null
@@ -1,5 +0,0 @@
1module org.kube.components.theme
2
3singleton Colors 1.0 Colors.qml
4singleton Icons 1.0 Icons.qml
5singleton Units 1.0 Units.qml
diff --git a/framework/domain/settings/CMakeLists.txt b/framework/domain/settings/CMakeLists.txt
new file mode 100644
index 00000000..dc9d01b1
--- /dev/null
+++ b/framework/domain/settings/CMakeLists.txt
@@ -0,0 +1,6 @@
1include_directories(${CMAKE_CURRENT_BINARY_DIR})
2cmake_policy(SET CMP0063 NEW)
3add_executable(sinkactiontest sinkactiontest.cpp)
4add_test(sinkactiontest sinkactiontest)
5qt5_use_modules(sinkactiontest Core Test Concurrent)
6target_link_libraries(sinkactiontest sink actionplugin KF5::Mime mailplugin)
diff --git a/components/theme/contents/ui/Colors.qml b/framework/qml/Colors.qml
index 9d1737d1..9d1737d1 100644
--- a/components/theme/contents/ui/Colors.qml
+++ b/framework/qml/Colors.qml
diff --git a/components/theme/contents/ui/Icons.qml b/framework/qml/Icons.qml
index 0b161635..0b161635 100644
--- a/components/theme/contents/ui/Icons.qml
+++ b/framework/qml/Icons.qml
diff --git a/components/theme/contents/ui/Units.qml b/framework/qml/Units.qml
index 96216f82..96216f82 100644
--- a/components/theme/contents/ui/Units.qml
+++ b/framework/qml/Units.qml
diff --git a/framework/qmldir b/framework/qmldir
index f258f5cc..ad148543 100644
--- a/framework/qmldir
+++ b/framework/qmldir
@@ -15,6 +15,9 @@ Notification 1.0 Notification.qml
15Icon 1.0 Icon.qml 15Icon 1.0 Icon.qml
16Button 1.0 Button.qml 16Button 1.0 Button.qml
17PositiveButton 1.0 PositiveButton.qml 17PositiveButton 1.0 PositiveButton.qml
18singleton Colors 1.0 Colors.qml
19singleton Icons 1.0 Icons.qml
20singleton Units 1.0 Units.qml
18 21
19plugin mailplugin 22plugin mailplugin
20plugin actionplugin 23plugin actionplugin