From c162599b95e16ce57c1903d08cf98c2a0001d763 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 21 Apr 2015 11:28:29 +0200 Subject: [PATCH] move dialer in a subdir, prepare for the c++ part --- CMakeLists.txt | 4 +--- dialer/CMakeLists.txt | 3 +++ dialer/{ => package}/contents/ui/Call/AnswerSwipe.qml | 0 dialer/{ => package}/contents/ui/Call/Avatar.qml | 0 dialer/{ => package}/contents/ui/Call/CallPage.qml | 0 dialer/{ => package}/contents/ui/Dialer/Contacts.qml | 0 dialer/{ => package}/contents/ui/Dialer/DialPage.qml | 0 dialer/{ => package}/contents/ui/Dialer/Dialer.qml | 0 dialer/{ => package}/contents/ui/Dialer/History.qml | 0 dialer/{ => package}/contents/ui/Dialpad/DialerButton.qml | 0 dialer/{ => package}/contents/ui/Dialpad/DialerIconButton.qml | 0 dialer/{ => package}/contents/ui/Dialpad/Dialpad.qml | 0 dialer/{ => package}/contents/ui/main.qml | 0 dialer/{ => package}/metadata.desktop | 0 14 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 dialer/CMakeLists.txt rename dialer/{ => package}/contents/ui/Call/AnswerSwipe.qml (100%) rename dialer/{ => package}/contents/ui/Call/Avatar.qml (100%) rename dialer/{ => package}/contents/ui/Call/CallPage.qml (100%) rename dialer/{ => package}/contents/ui/Dialer/Contacts.qml (100%) rename dialer/{ => package}/contents/ui/Dialer/DialPage.qml (100%) rename dialer/{ => package}/contents/ui/Dialer/Dialer.qml (100%) rename dialer/{ => package}/contents/ui/Dialer/History.qml (100%) rename dialer/{ => package}/contents/ui/Dialpad/DialerButton.qml (100%) rename dialer/{ => package}/contents/ui/Dialpad/DialerIconButton.qml (100%) rename dialer/{ => package}/contents/ui/Dialpad/Dialpad.qml (100%) rename dialer/{ => package}/contents/ui/main.qml (100%) rename dialer/{ => package}/metadata.desktop (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4927a9cd..aa8d86b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,9 +37,6 @@ plasma_install_package(look-and-feel org.kde.satellite.phone look-and-feel) plasma_install_package(shell org.kde.satellite.phone shells) install(DIRECTORY wallpaper/ DESTINATION "${WALLPAPER_INSTALL_DIR}/org.kde.satellite.lockers") -kpackage_install_package(dialer org.kde.phone.dialer genericqml) -install(FILES dialer/metadata.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.phone.dialer.desktop) - install(DIRECTORY compositor/ DESTINATION ${DATA_INSTALL_DIR}/greenisland/org.kde.satellite.compositor.phone PATTERN .svn EXCLUDE @@ -53,3 +50,4 @@ add_subdirectory(services) add_subdirectory(settingsmodules) add_subdirectory(applets) add_subdirectory(containments) +add_subdirectory(dialer) diff --git a/dialer/CMakeLists.txt b/dialer/CMakeLists.txt new file mode 100644 index 00000000..c2adad8f --- /dev/null +++ b/dialer/CMakeLists.txt @@ -0,0 +1,3 @@ + +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) diff --git a/dialer/contents/ui/Call/AnswerSwipe.qml b/dialer/package/contents/ui/Call/AnswerSwipe.qml similarity index 100% rename from dialer/contents/ui/Call/AnswerSwipe.qml rename to dialer/package/contents/ui/Call/AnswerSwipe.qml diff --git a/dialer/contents/ui/Call/Avatar.qml b/dialer/package/contents/ui/Call/Avatar.qml similarity index 100% rename from dialer/contents/ui/Call/Avatar.qml rename to dialer/package/contents/ui/Call/Avatar.qml diff --git a/dialer/contents/ui/Call/CallPage.qml b/dialer/package/contents/ui/Call/CallPage.qml similarity index 100% rename from dialer/contents/ui/Call/CallPage.qml rename to dialer/package/contents/ui/Call/CallPage.qml diff --git a/dialer/contents/ui/Dialer/Contacts.qml b/dialer/package/contents/ui/Dialer/Contacts.qml similarity index 100% rename from dialer/contents/ui/Dialer/Contacts.qml rename to dialer/package/contents/ui/Dialer/Contacts.qml diff --git a/dialer/contents/ui/Dialer/DialPage.qml b/dialer/package/contents/ui/Dialer/DialPage.qml similarity index 100% rename from dialer/contents/ui/Dialer/DialPage.qml rename to dialer/package/contents/ui/Dialer/DialPage.qml diff --git a/dialer/contents/ui/Dialer/Dialer.qml b/dialer/package/contents/ui/Dialer/Dialer.qml similarity index 100% rename from dialer/contents/ui/Dialer/Dialer.qml rename to dialer/package/contents/ui/Dialer/Dialer.qml diff --git a/dialer/contents/ui/Dialer/History.qml b/dialer/package/contents/ui/Dialer/History.qml similarity index 100% rename from dialer/contents/ui/Dialer/History.qml rename to dialer/package/contents/ui/Dialer/History.qml diff --git a/dialer/contents/ui/Dialpad/DialerButton.qml b/dialer/package/contents/ui/Dialpad/DialerButton.qml similarity index 100% rename from dialer/contents/ui/Dialpad/DialerButton.qml rename to dialer/package/contents/ui/Dialpad/DialerButton.qml diff --git a/dialer/contents/ui/Dialpad/DialerIconButton.qml b/dialer/package/contents/ui/Dialpad/DialerIconButton.qml similarity index 100% rename from dialer/contents/ui/Dialpad/DialerIconButton.qml rename to dialer/package/contents/ui/Dialpad/DialerIconButton.qml diff --git a/dialer/contents/ui/Dialpad/Dialpad.qml b/dialer/package/contents/ui/Dialpad/Dialpad.qml similarity index 100% rename from dialer/contents/ui/Dialpad/Dialpad.qml rename to dialer/package/contents/ui/Dialpad/Dialpad.qml diff --git a/dialer/contents/ui/main.qml b/dialer/package/contents/ui/main.qml similarity index 100% rename from dialer/contents/ui/main.qml rename to dialer/package/contents/ui/main.qml diff --git a/dialer/metadata.desktop b/dialer/package/metadata.desktop similarity index 100% rename from dialer/metadata.desktop rename to dialer/package/metadata.desktop