kube-mail is now kube

15 files changed, 26 insertions, 24 deletions

diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index f7e6f1d6..1c4b36aa 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(mail)
+add_subdirectory(kube)
diff --git a/applications/mail/CMakeLists.txt b/applications/kube/CMakeLists.txt
index 56bbf98a..36ce6a34 100644
--- a/applications/mail/CMakeLists.txt
+++ b/applications/kube/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kube-mail)
+project(kube)
 
 cmake_minimum_required(VERSION 2.8.12)
 cmake_policy(SET CMP0063 NEW)
@@ -32,15 +32,15 @@ set (QT_MIN_VERSION "5.6.0")
 find_package(KF5 REQUIRED COMPONENTS Package)
 
 # install executable
-set(kube_mail_SRCS main.cpp)
+set(SRCS main.cpp)
 
 if(APPLE OR WIN32)
     # Sets the icon on Windows and OSX
     file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../../icons/*-apps-kube_icon.*")
-    ecm_add_app_icon(kube_mail_SRCS ICONS ${ICONS_SRCS})
+    ecm_add_app_icon(SRCS ICONS ${ICONS_SRCS})
 endif()
 
-add_executable(${PROJECT_NAME} ${kube_mail_SRCS})
+add_executable(${PROJECT_NAME} ${SRCS})
 qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets WebEngine)
 target_link_libraries(${PROJECT_NAME} KF5::Package)
 
diff --git a/applications/mail/main.cpp b/applications/kube/main.cpp
index b02c62d2..c893e029 100644
--- a/applications/mail/main.cpp
+++ b/applications/kube/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     QQuickWebEngineProfile::defaultProfile()->setRequestInterceptor(wuri);
     QIcon::setThemeName("kube");
 
-    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.mail");
+    auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.kube");
     Q_ASSERT(package.isValid());
     QQmlApplicationEngine engine;
     engine.addImageProvider(QLatin1String("kube"), new KubeImageProvider);
diff --git a/applications/mail/org.kde.kube.appdata.xml b/applications/kube/org.kde.kube.appdata.xml
index 90bef45b..1946cac5 100644
--- a/applications/mail/org.kde.kube.appdata.xml
+++ b/applications/kube/org.kde.kube.appdata.xml
@@ -18,6 +18,6 @@
   </screenshots>
   <project_group>KDE</project_group>
   <provides>
-    <binary>kube-mail</binary>
+    <binary>kube</binary>
   </provides>
 </component>
diff --git a/applications/mail/org.kde.kube.desktop b/applications/kube/org.kde.kube.desktop
index 83d57dd8..290fd503 100755
--- a/applications/mail/org.kde.kube.desktop
+++ b/applications/kube/org.kde.kube.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Kube
 Type=Application
-Exec=kube-mail
+Exec=kube
 Icon=kube_icon
 GenericName=Mail Client
 Comment=Send, receive and manage your mail with Kube
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index e339a700..3283286f 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -29,6 +29,6 @@ macro(install_component name)
     kpackage_install_package(${name} org.kube.components.${name} "genericqml")
 endmacro(install_component)
 
-install_component(mail)
+install_component(kube)
 install_component(accounts)
 install_component(mailviewer)
diff --git a/components/mail/contents/ui/Mail.qml b/components/kube/contents/ui/Kube.qml
index 7cabf9a9..7cabf9a9 100644
--- a/components/mail/contents/ui/Mail.qml
+++ b/components/kube/contents/ui/Kube.qml
diff --git a/components/mail/contents/ui/main.qml b/components/kube/contents/ui/main.qml
index abf0465d..4391ebe5 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/kube/contents/ui/main.qml
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.7
-import org.kube.components.mail 1.0 as MailComponent
+import org.kube.components.kube 1.0 as KubeComponent
 
-MailComponent.Mail {
+KubeComponent.Kube {
 
 }
diff --git a/components/kube/metadata.desktop b/components/kube/metadata.desktop
new file mode 100644
index 00000000..581bbdf4
--- /dev/null
+++ b/components/kube/metadata.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Kube
+X-KDE-PluginInfo-Name=org.kube.components.kube
+Exec=kpackagelauncherqml -a org.kube.components.kube
+X-Plasma-MainScript=ui/main.qml
+X-KDE-ServiceTypes=KPackage/GenericQML
+Icon=kmail2
+Type=Service
diff --git a/components/kube/qmldir b/components/kube/qmldir
new file mode 100644
index 00000000..f663c916
--- /dev/null
+++ b/components/kube/qmldir
@@ -0,0 +1,3 @@
+module org.kube.components.kube
+
+Kube 1.0 Kube.qml
diff --git a/components/mail/metadata.desktop b/components/mail/metadata.desktop
deleted file mode 100644
index 470ad18c..00000000
--- a/components/mail/metadata.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kube Mail
-X-KDE-PluginInfo-Name=org.kube.components.mail
-Exec=kpackagelauncherqml -a org.kube.components.mail
-X-Plasma-MainScript=ui/main.qml
-X-KDE-ServiceTypes=KPackage/GenericQML
-Icon=kmail2
-Type=Service
diff --git a/components/mail/qmldir b/components/mail/qmldir
deleted file mode 100644
index 2c0088f6..00000000
--- a/components/mail/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
-module org.kube.components.mail
-
-Mail 1.0 Mail.qml
diff --git a/framework/qml/AutocompleteLineEdit.qml b/framework/qml/AutocompleteLineEdit.qml
index c9b8e708..a232ee68 100644
--- a/framework/qml/AutocompleteLineEdit.qml
+++ b/framework/qml/AutocompleteLineEdit.qml
@@ -21,6 +21,7 @@ import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.1
 
 import org.kde.kirigami 1.0 as Kirigami
+import org.kube.framework 1.0 as Kube
 
 Controls2.TextField {
     id: textField
diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml
index 37ddae51..9e23ee5d 100644
--- a/framework/qml/PositiveButton.qml
+++ b/framework/qml/PositiveButton.qml
@@ -18,6 +18,7 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.0 as Controls
+import org.kube.framework 1.0 as Kube
 
 Controls.AbstractButton {
     id: root
diff --git a/tests/tst_applicationstart.qml b/tests/tst_applicationstart.qml
index 15809395..b5d7a396 100644
--- a/tests/tst_applicationstart.qml
+++ b/tests/tst_applicationstart.qml
@@ -21,7 +21,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Window 2.1
 import QtTest 1.0
-import org.kube.components.mail 1.0 as KubeMail
+import org.kube.components.kube 1.0 as Kube
 
 
 TestCase {
@@ -30,7 +30,7 @@ TestCase {
     height: 400
     name: "ApplicationStart"
 
-    KubeMail.Mail {
+    Kube.Kube {
     }
 
     function test_stuff() {