diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-09 16:08:56 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-03-09 16:08:56 +0100 |
commit | a1e175fc5da8be34ad0324d89480f85b1d9f8939 (patch) | |
tree | b7cc4a844aa420ccd7f611b702664ca31b18824b | |
parent | 1aeac7aa7519cc667d4937cc9eb0df3f7c083028 (diff) | |
download | kube-a1e175fc5da8be34ad0324d89480f85b1d9f8939.tar.gz kube-a1e175fc5da8be34ad0324d89480f85b1d9f8939.zip |
Renamed the framework plugins
-rw-r--r-- | components/mail/contents/ui/main.qml | 4 | ||||
-rw-r--r-- | components/mail/metadata.desktop | 4 | ||||
-rw-r--r-- | components/package/contents/ui/Composer.qml | 2 | ||||
-rw-r--r-- | components/package/contents/ui/FolderListView.qml | 2 | ||||
-rw-r--r-- | components/package/contents/ui/MailListView.qml | 2 | ||||
-rw-r--r-- | components/package/contents/ui/MailViewer.qml | 2 | ||||
-rw-r--r-- | components/package/contents/ui/Settings.qml | 2 | ||||
-rw-r--r-- | components/package/contents/ui/SingleMailView.qml | 2 | ||||
-rw-r--r-- | framework/actions/CMakeLists.txt | 4 | ||||
-rw-r--r-- | framework/actions/actionplugin.cpp | 2 | ||||
-rw-r--r-- | framework/actions/qmldir | 2 | ||||
-rw-r--r-- | framework/domain/CMakeLists.txt | 4 | ||||
-rw-r--r-- | framework/domain/mailplugin.cpp | 2 | ||||
-rw-r--r-- | framework/domain/qmldir | 2 | ||||
-rw-r--r-- | framework/settings/CMakeLists.txt | 4 | ||||
-rw-r--r-- | framework/settings/qmldir | 2 | ||||
-rw-r--r-- | framework/settings/settingsplugin.cpp | 2 |
17 files changed, 22 insertions, 22 deletions
diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml index 95729954..8f2d3c52 100644 --- a/components/mail/contents/ui/main.qml +++ b/components/mail/contents/ui/main.qml | |||
@@ -20,8 +20,8 @@ import QtQuick.Controls 1.3 | |||
20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
21 | import org.kde.plasma.components 2.0 as PlasmaComponents | 21 | import org.kde.plasma.components 2.0 as PlasmaComponents |
22 | 22 | ||
23 | import org.kde.kube.actions 1.0 as KubeAction | 23 | import org.kube.framework.actions 1.0 as KubeAction |
24 | import org.kde.kube.settings 1.0 as KubeSettings | 24 | import org.kube.framework.settings 1.0 as KubeSettings |
25 | import org.kube.components 1.0 as KubeComponents | 25 | import org.kube.components 1.0 as KubeComponents |
26 | 26 | ||
27 | ApplicationWindow { | 27 | ApplicationWindow { |
diff --git a/components/mail/metadata.desktop b/components/mail/metadata.desktop index 630cc133..470ad18c 100644 --- a/components/mail/metadata.desktop +++ b/components/mail/metadata.desktop | |||
@@ -1,7 +1,7 @@ | |||
1 | [Desktop Entry] | 1 | [Desktop Entry] |
2 | Name=Kube Mail | 2 | Name=Kube Mail |
3 | X-KDE-PluginInfo-Name=org.kde.kube.mail | 3 | X-KDE-PluginInfo-Name=org.kube.components.mail |
4 | Exec=kpackagelauncherqml -a org.kde.kube.mail | 4 | Exec=kpackagelauncherqml -a org.kube.components.mail |
5 | X-Plasma-MainScript=ui/main.qml | 5 | X-Plasma-MainScript=ui/main.qml |
6 | X-KDE-ServiceTypes=KPackage/GenericQML | 6 | X-KDE-ServiceTypes=KPackage/GenericQML |
7 | Icon=kmail2 | 7 | Icon=kmail2 |
diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml index 1a6a4cc4..b64d64db 100644 --- a/components/package/contents/ui/Composer.qml +++ b/components/package/contents/ui/Composer.qml | |||
@@ -20,7 +20,7 @@ import QtQuick.Controls 1.4 | |||
20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
21 | import org.kde.plasma.components 2.0 as PlasmaComponents | 21 | import org.kde.plasma.components 2.0 as PlasmaComponents |
22 | 22 | ||
23 | import org.kde.kube.mail 1.0 as Mail | 23 | import org.kube.framework.domain 1.0 as Mail |
24 | 24 | ||
25 | 25 | ||
26 | Item { | 26 | Item { |
diff --git a/components/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml index 1934932c..b63235bb 100644 --- a/components/package/contents/ui/FolderListView.qml +++ b/components/package/contents/ui/FolderListView.qml | |||
@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.1 | |||
23 | import org.kde.plasma.core 2.0 as PlasmaCore | 23 | import org.kde.plasma.core 2.0 as PlasmaCore |
24 | import org.kde.plasma.components 2.0 as PlasmaComponents | 24 | import org.kde.plasma.components 2.0 as PlasmaComponents |
25 | 25 | ||
26 | import org.kde.kube.mail 1.0 as Mail | 26 | import org.kube.framework.domain 1.0 as Mail |
27 | 27 | ||
28 | Item { | 28 | Item { |
29 | id: root | 29 | id: root |
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml index ff773e0e..22f5eb81 100644 --- a/components/package/contents/ui/MailListView.qml +++ b/components/package/contents/ui/MailListView.qml | |||
@@ -23,7 +23,7 @@ import QtQml 2.2 | |||
23 | 23 | ||
24 | import org.kde.plasma.components 2.0 as PlasmaComponents | 24 | import org.kde.plasma.components 2.0 as PlasmaComponents |
25 | 25 | ||
26 | import org.kde.kube.mail 1.0 as Mail | 26 | import org.kube.framework.domain 1.0 as Mail |
27 | 27 | ||
28 | ScrollView { | 28 | ScrollView { |
29 | id: root | 29 | id: root |
diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml index 1d305297..f42ec8de 100644 --- a/components/package/contents/ui/MailViewer.qml +++ b/components/package/contents/ui/MailViewer.qml | |||
@@ -3,7 +3,7 @@ import QtQuick.Controls 1.3 | |||
3 | import QtQuick.Layouts 1.1 | 3 | import QtQuick.Layouts 1.1 |
4 | import QtWebKit 3.0 | 4 | import QtWebKit 3.0 |
5 | 5 | ||
6 | import org.kde.kube.mail 1.0 as Mail | 6 | import org.kube.framework.domain 1.0 as Mail |
7 | 7 | ||
8 | Item { | 8 | Item { |
9 | id: root | 9 | id: root |
diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml index da44d331..6d653c7b 100644 --- a/components/package/contents/ui/Settings.qml +++ b/components/package/contents/ui/Settings.qml | |||
@@ -19,7 +19,7 @@ import QtQuick 2.4 | |||
19 | import QtQuick.Controls 1.4 | 19 | import QtQuick.Controls 1.4 |
20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
21 | 21 | ||
22 | import org.kde.kube.settings 1.0 as KubeSettings | 22 | import org.kube.framework.settings 1.0 as KubeSettings |
23 | import org.kde.kube.accounts.maildir 1.0 as Maildir | 23 | import org.kde.kube.accounts.maildir 1.0 as Maildir |
24 | 24 | ||
25 | Rectangle { | 25 | Rectangle { |
diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml index d6ae4bfa..7fadc960 100644 --- a/components/package/contents/ui/SingleMailView.qml +++ b/components/package/contents/ui/SingleMailView.qml | |||
@@ -19,7 +19,7 @@ import QtQuick 2.4 | |||
19 | import QtQuick.Controls 1.3 | 19 | import QtQuick.Controls 1.3 |
20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
21 | 21 | ||
22 | import org.kde.kube.mail 1.0 as Mail | 22 | import org.kube.framework.domain 1.0 as Mail |
23 | 23 | ||
24 | Item { | 24 | Item { |
25 | id: root | 25 | id: root |
diff --git a/framework/actions/CMakeLists.txt b/framework/actions/CMakeLists.txt index 1151878c..a09445b0 100644 --- a/framework/actions/CMakeLists.txt +++ b/framework/actions/CMakeLists.txt | |||
@@ -10,5 +10,5 @@ add_library(actionplugin SHARED ${SRCS}) | |||
10 | 10 | ||
11 | qt5_use_modules(actionplugin Core Quick Qml) | 11 | qt5_use_modules(actionplugin Core Quick Qml) |
12 | 12 | ||
13 | install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/actions) | 13 | install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions) |
14 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/actions) | 14 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions) |
diff --git a/framework/actions/actionplugin.cpp b/framework/actions/actionplugin.cpp index 710ba08a..87bc4d7b 100644 --- a/framework/actions/actionplugin.cpp +++ b/framework/actions/actionplugin.cpp | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | void KubePlugin::registerTypes (const char *uri) | 9 | void KubePlugin::registerTypes (const char *uri) |
10 | { | 10 | { |
11 | Q_ASSERT(uri == QLatin1String("org.kde.kube.actions")); | 11 | Q_ASSERT(uri == QLatin1String("org.kube.framework.actions")); |
12 | qmlRegisterType<Kube::Context>(uri, 1, 0, "Context"); | 12 | qmlRegisterType<Kube::Context>(uri, 1, 0, "Context"); |
13 | qmlRegisterType<Kube::Action>(uri, 1, 0, "Action"); | 13 | qmlRegisterType<Kube::Action>(uri, 1, 0, "Action"); |
14 | qmlRegisterType<Kube::ActionHandler>(uri, 1, 0, "ActionHandler"); | 14 | qmlRegisterType<Kube::ActionHandler>(uri, 1, 0, "ActionHandler"); |
diff --git a/framework/actions/qmldir b/framework/actions/qmldir index de2e4b46..f6dccbda 100644 --- a/framework/actions/qmldir +++ b/framework/actions/qmldir | |||
@@ -1,3 +1,3 @@ | |||
1 | module org.kde.kube.actions | 1 | module org.kube.framework.actions |
2 | 2 | ||
3 | plugin actionplugin | 3 | plugin actionplugin |
diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt index 822b2981..b14e410e 100644 --- a/framework/domain/CMakeLists.txt +++ b/framework/domain/CMakeLists.txt | |||
@@ -28,5 +28,5 @@ qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets) | |||
28 | 28 | ||
29 | target_link_libraries(mailplugin actionplugin settingsplugin sink KF5::Otp KF5::Codecs ${CURL_LIBRARIES}) | 29 | target_link_libraries(mailplugin actionplugin settingsplugin sink KF5::Otp KF5::Codecs ${CURL_LIBRARIES}) |
30 | 30 | ||
31 | install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) | 31 | install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain) |
32 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail) | 32 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain) |
diff --git a/framework/domain/mailplugin.cpp b/framework/domain/mailplugin.cpp index 2d19a437..eaebd843 100644 --- a/framework/domain/mailplugin.cpp +++ b/framework/domain/mailplugin.cpp | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | void MailPlugin::registerTypes (const char *uri) | 31 | void MailPlugin::registerTypes (const char *uri) |
32 | { | 32 | { |
33 | Q_ASSERT(uri == QLatin1String("org.kde.kube.mail")); | 33 | Q_ASSERT(uri == QLatin1String("org.kube.framework.domain")); |
34 | 34 | ||
35 | qmlRegisterType<FolderListModel>(uri, 1, 0, "FolderListModel"); | 35 | qmlRegisterType<FolderListModel>(uri, 1, 0, "FolderListModel"); |
36 | qmlRegisterType<MailListModel>(uri, 1, 0, "MailListModel"); | 36 | qmlRegisterType<MailListModel>(uri, 1, 0, "MailListModel"); |
diff --git a/framework/domain/qmldir b/framework/domain/qmldir index fd54e5ee..54a3a98b 100644 --- a/framework/domain/qmldir +++ b/framework/domain/qmldir | |||
@@ -1,3 +1,3 @@ | |||
1 | module org.kde.kube.mail | 1 | module org.kube.framework.domain |
2 | 2 | ||
3 | plugin mailplugin | 3 | plugin mailplugin |
diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt index 15ab7584..9d876850 100644 --- a/framework/settings/CMakeLists.txt +++ b/framework/settings/CMakeLists.txt | |||
@@ -12,5 +12,5 @@ qt5_use_modules(settingsplugin Core Quick Qml) | |||
12 | 12 | ||
13 | target_link_libraries(settingsplugin) | 13 | target_link_libraries(settingsplugin) |
14 | 14 | ||
15 | install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/settings) | 15 | install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings) |
16 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/settings) | 16 | install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings) |
diff --git a/framework/settings/qmldir b/framework/settings/qmldir index 7b756aea..22fec334 100644 --- a/framework/settings/qmldir +++ b/framework/settings/qmldir | |||
@@ -1,3 +1,3 @@ | |||
1 | module org.kde.kube.settings | 1 | module org.kube.framework.settings |
2 | 2 | ||
3 | plugin settingsplugin | 3 | plugin settingsplugin |
diff --git a/framework/settings/settingsplugin.cpp b/framework/settings/settingsplugin.cpp index a1888669..3a582d1f 100644 --- a/framework/settings/settingsplugin.cpp +++ b/framework/settings/settingsplugin.cpp | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | void SettingsPlugin::registerTypes (const char *uri) | 10 | void SettingsPlugin::registerTypes (const char *uri) |
11 | { | 11 | { |
12 | Q_ASSERT(uri == QLatin1String("org.kde.kube.settings")); | 12 | Q_ASSERT(uri == QLatin1String("org.kube.framework.settings")); |
13 | 13 | ||
14 | // qmlRegisterType<ResourceListModel>(); | 14 | // qmlRegisterType<ResourceListModel>(); |
15 | // qmlRegisterType<ResourcesController>(uri, 1, 0, "Resources"); | 15 | // qmlRegisterType<ResourcesController>(uri, 1, 0, "Resources"); |