dialer: use QRC instead of the kpackage

And tidy up the code as well

dialer/CMakeLists.txt

@@ -1,7 +1,6 @@
-
+install(FILES metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.phone.dialer.desktop)
-kpackage_install_package(package org.kde.phone.dialer genericqml)
-install(FILES package/metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.phone.dialer.desktop)
 
 include_directories(${TELEPATHY_QT5_INCLUDE_DIR})
+# 
 
 add_subdirectory(src)

dialer/metadata.desktop

@@ -45,17 +45,6 @@ Name[zh_CN]=手机
 Name[zh_TW]=電話
 Type=Application
 Icon=call-start
-X-KDE-ParentApp=
-X-KDE-PluginInfo-Author=Marco Martin
-X-KDE-PluginInfo-Category=Communications
-X-KDE-PluginInfo-Email=mart@kde.org
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-Name=org.kde.phone.dialer
-X-KDE-PluginInfo-Version=
-X-KDE-PluginInfo-Website=
-X-KDE-ServiceTypes=KPackage/Generic
 Exec=plasmaphonedialer %u
 
-X-Plasma-MainScript=ui/main.qml
-X-Plasma-RemoteLocation=
 MimeType=x-scheme-handler/call

dialer/src/CMakeLists.txt

@@ -4,11 +4,10 @@ set(plasmaphonedialer_SRCS
     call-handler.cpp
     call-manager.cpp
 )
-
+qt5_add_resources(RESOURCES resources.qrc)
-add_executable(plasmaphonedialer ${plasmaphonedialer_SRCS})
+add_executable(plasmaphonedialer ${plasmaphonedialer_SRCS} ${RESOURCES})
 target_compile_definitions(plasmaphonedialer PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
 
-#find_package(ActiveApp REQUIRED)
 find_package(PhoneNumber COMPONENTS PhoneNumber REQUIRED)
 
 target_link_libraries(plasmaphonedialer
@@ -18,7 +17,6 @@ target_link_libraries(plasmaphonedialer
  Qt5::Widgets
  KF5::Declarative
  KF5::I18n
- KF5::Package
  KF5::QuickAddons
  KF5::DBusAddons
  KF5::Notifications

dialer/src/main.cpp

@@ -33,15 +33,10 @@
 #include <klocalizedstring.h>
 #include <qcommandlineparser.h>
 #include <qcommandlineoption.h>
-#include <QQuickItem>
 #include <QtQml>
 
-#include <kpackage/package.h>
-#include <kpackage/packageloader.h>
 #include <QQmlContext>
 #include <QQmlEngine>
-#include <QQmlExpression>
-#include <QQmlProperty>
 #include <QQuickWindow>
 #include <kdeclarative/qmlobject.h>
 #include <KAboutData>
@@ -152,7 +147,7 @@ int main(int argc, char **argv)
     auto *obj = new KDeclarative::QmlObject();
     obj->setTranslationDomain(packagePath);
     obj->setInitializationDelayed(true);
-    obj->loadPackage(packagePath);
+    obj->setSource(QUrl("qrc:///main.qml"));
     obj->engine()->rootContext()->setContextProperty("commandlineArguments", parser.positionalArguments());
 
     auto *dialerUtils = new DialerUtils(simAccount);
@@ -160,20 +155,13 @@ int main(int argc, char **argv)
 
     obj->completeInitialization();
 
-    if (!obj->package().metadata().isValid()) {
-        return -1;
-    }
-
     Tp::SharedPtr<CallHandler> callHandler(new CallHandler(dialerUtils));
     registrar->registerClient(Tp::AbstractClientPtr::dynamicCast(callHandler), "Plasma.Dialer");
 
-    KPluginMetaData data = obj->package().metadata();
+    KAboutData aboutData("dialer", i18n("Dialer"), "0.9", i18n("Plasma phone dialer"), KAboutLicense::GPL);
-    // About data
+    aboutData.setDesktopFileName("org.kde.phone.dialer");
-    KAboutData aboutData(data.pluginId(), data.name(), data.version(), data.description(), KAboutLicense::byKeyword(data.license()).key());
     
-    for (auto author : data.authors()) {
+    KAboutData::setApplicationData(aboutData);
-        aboutData.addAuthor(author.name(), author.task(), author.emailAddress(), author.webAddress(), author.ocsUsername());
-    }
 
     //The root is not a window?
     //have to use a normal QQuickWindow since the root item is already created

dialer/src/resources.qrc

@@ -0,0 +1,20 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="main.qml">contents/ui/main.qml</file>
+        <file alias="Call/AnswerSwipe.qml">contents/ui/Call/AnswerSwipe.qml</file>
+        <file alias="Call/CallPage.qml">contents/ui/Call/CallPage.qml</file>
+        <file alias="Call/Avatar.qml">contents/ui/Call/Avatar.qml</file>
+        <file alias="Dialer/Dialer.qml">contents/ui/Dialer/Dialer.qml</file>
+        <file alias="Dialer/ContactsList.qml">contents/ui/Dialer/ContactsList.qml</file>
+        <file alias="Dialer/DialPage.qml">contents/ui/Dialer/DialPage.qml</file>
+        <file alias="Dialer/private/SectionScroller.js">contents/ui/Dialer/private/SectionScroller.js</file>
+        <file alias="Dialer/RoundImage.qml">contents/ui/Dialer/RoundImage.qml</file>
+        <file alias="Dialer/History.qml">contents/ui/Dialer/History.qml</file>
+        <file alias="Dialer/CustomSectionScroller.qml">contents/ui/Dialer/CustomSectionScroller.qml</file>
+        <file alias="Dialer/HistoryDelegate.qml">contents/ui/Dialer/HistoryDelegate.qml</file>
+        <file alias="Dialpad/Dialpad.qml">contents/ui/Dialpad/Dialpad.qml</file>
+        <file alias="Dialpad/PhoneNumberInput.qml">contents/ui/Dialpad/PhoneNumberInput.qml</file>
+        <file alias="Dialpad/DialerButton.qml">contents/ui/Dialpad/DialerButton.qml</file>
+        <file alias="Dialpad/DialerIconButton.qml">contents/ui/Dialpad/DialerIconButton.qml</file>
+    </qresource>
+</RCC>