diff --git a/dialer/CMakeLists.txt b/dialer/CMakeLists.txt index c4a392e1..06a952da 100644 --- a/dialer/CMakeLists.txt +++ b/dialer/CMakeLists.txt @@ -1,7 +1,6 @@ - -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) +install(FILES metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.phone.dialer.desktop) include_directories(${TELEPATHY_QT5_INCLUDE_DIR}) +# add_subdirectory(src) diff --git a/dialer/package/metadata.desktop b/dialer/metadata.desktop similarity index 79% rename from dialer/package/metadata.desktop rename to dialer/metadata.desktop index bc77cb6a..432f6aac 100644 --- a/dialer/package/metadata.desktop +++ b/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 diff --git a/dialer/src/CMakeLists.txt b/dialer/src/CMakeLists.txt index fe6de818..99a72bd0 100644 --- a/dialer/src/CMakeLists.txt +++ b/dialer/src/CMakeLists.txt @@ -4,11 +4,10 @@ set(plasmaphonedialer_SRCS call-handler.cpp call-manager.cpp ) - -add_executable(plasmaphonedialer ${plasmaphonedialer_SRCS}) +qt5_add_resources(RESOURCES resources.qrc) +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 diff --git a/dialer/package/contents/ui/Call/AnswerSwipe.qml b/dialer/src/contents/ui/Call/AnswerSwipe.qml similarity index 100% rename from dialer/package/contents/ui/Call/AnswerSwipe.qml rename to dialer/src/contents/ui/Call/AnswerSwipe.qml diff --git a/dialer/package/contents/ui/Call/Avatar.qml b/dialer/src/contents/ui/Call/Avatar.qml similarity index 100% rename from dialer/package/contents/ui/Call/Avatar.qml rename to dialer/src/contents/ui/Call/Avatar.qml diff --git a/dialer/package/contents/ui/Call/CallPage.qml b/dialer/src/contents/ui/Call/CallPage.qml similarity index 100% rename from dialer/package/contents/ui/Call/CallPage.qml rename to dialer/src/contents/ui/Call/CallPage.qml diff --git a/dialer/package/contents/ui/Dialer/ContactsList.qml b/dialer/src/contents/ui/Dialer/ContactsList.qml similarity index 100% rename from dialer/package/contents/ui/Dialer/ContactsList.qml rename to dialer/src/contents/ui/Dialer/ContactsList.qml diff --git a/dialer/package/contents/ui/Dialer/CustomSectionScroller.qml b/dialer/src/contents/ui/Dialer/CustomSectionScroller.qml similarity index 100% rename from dialer/package/contents/ui/Dialer/CustomSectionScroller.qml rename to dialer/src/contents/ui/Dialer/CustomSectionScroller.qml diff --git a/dialer/package/contents/ui/Dialer/DialPage.qml b/dialer/src/contents/ui/Dialer/DialPage.qml similarity index 100% rename from dialer/package/contents/ui/Dialer/DialPage.qml rename to dialer/src/contents/ui/Dialer/DialPage.qml diff --git a/dialer/package/contents/ui/Dialer/Dialer.qml b/dialer/src/contents/ui/Dialer/Dialer.qml similarity index 100% rename from dialer/package/contents/ui/Dialer/Dialer.qml rename to dialer/src/contents/ui/Dialer/Dialer.qml diff --git a/dialer/package/contents/ui/Dialer/History.qml b/dialer/src/contents/ui/Dialer/History.qml similarity index 100% rename from dialer/package/contents/ui/Dialer/History.qml rename to dialer/src/contents/ui/Dialer/History.qml diff --git a/dialer/package/contents/ui/Dialer/HistoryDelegate.qml b/dialer/src/contents/ui/Dialer/HistoryDelegate.qml similarity index 100% rename from dialer/package/contents/ui/Dialer/HistoryDelegate.qml rename to dialer/src/contents/ui/Dialer/HistoryDelegate.qml diff --git a/dialer/package/contents/ui/Dialer/RoundImage.qml b/dialer/src/contents/ui/Dialer/RoundImage.qml similarity index 100% rename from dialer/package/contents/ui/Dialer/RoundImage.qml rename to dialer/src/contents/ui/Dialer/RoundImage.qml diff --git a/dialer/package/contents/ui/Dialer/private/SectionScroller.js b/dialer/src/contents/ui/Dialer/private/SectionScroller.js similarity index 100% rename from dialer/package/contents/ui/Dialer/private/SectionScroller.js rename to dialer/src/contents/ui/Dialer/private/SectionScroller.js diff --git a/dialer/package/contents/ui/Dialpad/DialerButton.qml b/dialer/src/contents/ui/Dialpad/DialerButton.qml similarity index 100% rename from dialer/package/contents/ui/Dialpad/DialerButton.qml rename to dialer/src/contents/ui/Dialpad/DialerButton.qml diff --git a/dialer/package/contents/ui/Dialpad/DialerIconButton.qml b/dialer/src/contents/ui/Dialpad/DialerIconButton.qml similarity index 100% rename from dialer/package/contents/ui/Dialpad/DialerIconButton.qml rename to dialer/src/contents/ui/Dialpad/DialerIconButton.qml diff --git a/dialer/package/contents/ui/Dialpad/Dialpad.qml b/dialer/src/contents/ui/Dialpad/Dialpad.qml similarity index 100% rename from dialer/package/contents/ui/Dialpad/Dialpad.qml rename to dialer/src/contents/ui/Dialpad/Dialpad.qml diff --git a/dialer/package/contents/ui/Dialpad/PhoneNumberInput.qml b/dialer/src/contents/ui/Dialpad/PhoneNumberInput.qml similarity index 100% rename from dialer/package/contents/ui/Dialpad/PhoneNumberInput.qml rename to dialer/src/contents/ui/Dialpad/PhoneNumberInput.qml diff --git a/dialer/package/contents/ui/main.qml b/dialer/src/contents/ui/main.qml similarity index 100% rename from dialer/package/contents/ui/main.qml rename to dialer/src/contents/ui/main.qml diff --git a/dialer/src/main.cpp b/dialer/src/main.cpp index 742f06a5..44486355 100644 --- a/dialer/src/main.cpp +++ b/dialer/src/main.cpp @@ -33,15 +33,10 @@ #include #include #include -#include #include -#include -#include #include #include -#include -#include #include #include #include @@ -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(new CallHandler(dialerUtils)); registrar->registerClient(Tp::AbstractClientPtr::dynamicCast(callHandler), "Plasma.Dialer"); - KPluginMetaData data = obj->package().metadata(); - // About data - KAboutData aboutData(data.pluginId(), data.name(), data.version(), data.description(), KAboutLicense::byKeyword(data.license()).key()); - - for (auto author : data.authors()) { - aboutData.addAuthor(author.name(), author.task(), author.emailAddress(), author.webAddress(), author.ocsUsername()); - } + KAboutData aboutData("dialer", i18n("Dialer"), "0.9", i18n("Plasma phone dialer"), KAboutLicense::GPL); + aboutData.setDesktopFileName("org.kde.phone.dialer"); + + KAboutData::setApplicationData(aboutData); //The root is not a window? //have to use a normal QQuickWindow since the root item is already created diff --git a/dialer/src/resources.qrc b/dialer/src/resources.qrc new file mode 100644 index 00000000..57992488 --- /dev/null +++ b/dialer/src/resources.qrc @@ -0,0 +1,20 @@ + + + contents/ui/main.qml + contents/ui/Call/AnswerSwipe.qml + contents/ui/Call/CallPage.qml + contents/ui/Call/Avatar.qml + contents/ui/Dialer/Dialer.qml + contents/ui/Dialer/ContactsList.qml + contents/ui/Dialer/DialPage.qml + contents/ui/Dialer/private/SectionScroller.js + contents/ui/Dialer/RoundImage.qml + contents/ui/Dialer/History.qml + contents/ui/Dialer/CustomSectionScroller.qml + contents/ui/Dialer/HistoryDelegate.qml + contents/ui/Dialpad/Dialpad.qml + contents/ui/Dialpad/PhoneNumberInput.qml + contents/ui/Dialpad/DialerButton.qml + contents/ui/Dialpad/DialerIconButton.qml + +