diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-05 10:07:13 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-04-05 10:07:13 +0200 |
commit | e78224a7d9ccf70aadde8c0bff1cab72e8cb7438 (patch) | |
tree | 57afeef37640051a8d28d614c33345e509ce387b | |
parent | bfba957a7ebc64925bc553200616724cba9b1e37 (diff) | |
download | kube-e78224a7d9ccf70aadde8c0bff1cab72e8cb7438.tar.gz kube-e78224a7d9ccf70aadde8c0bff1cab72e8cb7438.zip |
Moved theme to framework
-rw-r--r-- | components/theme/contents/ui/main.qml | 23 | ||||
-rw-r--r-- | components/theme/metadata.desktop | 8 | ||||
-rw-r--r-- | components/theme/qmldir | 5 | ||||
-rw-r--r-- | framework/domain/settings/CMakeLists.txt | 6 | ||||
-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/qmldir | 3 |
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 | |||
2 | import QtQuick 2.7 | ||
3 | import QtQuick.Layouts 1.2 | ||
4 | |||
5 | import org.kube.components.theme 1.0 as KubeTheme | ||
6 | |||
7 | Item { | ||
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] | ||
2 | Name=Kube Theme | ||
3 | X-KDE-PluginInfo-Name=org.kube.components.theme | ||
4 | Exec=kpackagelauncherqml -a org.kube.components.theme | ||
5 | X-Plasma-MainScript=ui/main.qml | ||
6 | X-KDE-ServiceTypes=KPackage/GenericQML | ||
7 | Icon=kmail2 | ||
8 | Type=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 @@ | |||
1 | module org.kube.components.theme | ||
2 | |||
3 | singleton Colors 1.0 Colors.qml | ||
4 | singleton Icons 1.0 Icons.qml | ||
5 | singleton 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 @@ | |||
1 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | ||
2 | cmake_policy(SET CMP0063 NEW) | ||
3 | add_executable(sinkactiontest sinkactiontest.cpp) | ||
4 | add_test(sinkactiontest sinkactiontest) | ||
5 | qt5_use_modules(sinkactiontest Core Test Concurrent) | ||
6 | target_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 | |||
15 | Icon 1.0 Icon.qml | 15 | Icon 1.0 Icon.qml |
16 | Button 1.0 Button.qml | 16 | Button 1.0 Button.qml |
17 | PositiveButton 1.0 PositiveButton.qml | 17 | PositiveButton 1.0 PositiveButton.qml |
18 | singleton Colors 1.0 Colors.qml | ||
19 | singleton Icons 1.0 Icons.qml | ||
20 | singleton Units 1.0 Units.qml | ||
18 | 21 | ||
19 | plugin mailplugin | 22 | plugin mailplugin |
20 | plugin actionplugin | 23 | plugin actionplugin |