[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=3e74a97

The following commit has been merged in the master branch:
commit 3e74a973044bf6d49286eb5520306dbc1f586946
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Jun 18 02:35:48 2014 +0200

    Port plasmoid to Plasma Next
---
 plasmoid/declarativeplugin/CMakeLists.txt             |  5 ++---
 plasmoid/package/contents/ui/Battery.qml              |  6 +++---
 .../package/contents/ui/CompactRepresentation.qml     | 19 ++-----------------
 plasmoid/package/contents/ui/DeviceDelegate.qml       |  6 +++---
 .../ui/{kdeconnect.qml => FullRepresentation.qml}     | 16 ++++++----------
 plasmoid/package/contents/ui/Sftp.qml                 |  6 +++---
 .../package/contents/ui/main.qml                      | 13 ++++++++-----
 plasmoid/package/metadata.desktop                     |  2 +-
 8 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/plasmoid/declarativeplugin/CMakeLists.txt b/plasmoid/declarativeplugin/CMakeLists.txt
index 54c6bf0..b9e827c 100644
--- a/plasmoid/declarativeplugin/CMakeLists.txt
+++ b/plasmoid/declarativeplugin/CMakeLists.txt
@@ -17,8 +17,7 @@ qt5_wrap_cpp(kdeconnectdeclarativeplugin_SRC ${kdeconnectdeclarativeplugin_MOC})
 add_library(kdeconnectdeclarativeplugin SHARED ${kdeconnectdeclarativeplugin_SRC})
 target_link_libraries(kdeconnectdeclarativeplugin
     Qt5::Qml
-    Qt5::Gui
     kdeconnectinterfaces
 )
-install(TARGETS kdeconnectdeclarativeplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kdeconnect)
-install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kdeconnect)
+install(TARGETS kdeconnectdeclarativeplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kdeconnect)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kdeconnect)
diff --git a/plasmoid/package/contents/ui/Battery.qml b/plasmoid/package/contents/ui/Battery.qml
index 6fcb7c4..fa78c28 100644
--- a/plasmoid/package/contents/ui/Battery.qml
+++ b/plasmoid/package/contents/ui/Battery.qml
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.1
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.plasma.components 0.1 as PlasmaComponents
+import QtQuick 2.1
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kdeconnect 1.0
 
 QtObject {
diff --git a/plasmoid/package/contents/ui/CompactRepresentation.qml b/plasmoid/package/contents/ui/CompactRepresentation.qml
index 7614893..c814f7d 100644
--- a/plasmoid/package/contents/ui/CompactRepresentation.qml
+++ b/plasmoid/package/contents/ui/CompactRepresentation.qml
@@ -18,12 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.1
-import org.kde.plasma.core 0.1 as PlasmaCore
+import QtQuick 2.1
+import org.kde.plasma.core 2.0 as PlasmaCore
 
 Item {
     id: view
-    anchors.fill: parent
 
     //TODO: Use this to detect if we should be iconized or full size
     function isConstrained() {
@@ -35,18 +34,4 @@ Item {
         source: "kdeconnect"
         anchors.fill: parent
     }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: plasmoid.togglePopup()
-
-        PlasmaCore.ToolTip {
-            id: tooltip
-            target: mouseArea
-            image: QIcon("kdeconnect")
-            subText: i18n("KDE Connect device notifications")
-        }
-    }
-
 }
diff --git a/plasmoid/package/contents/ui/DeviceDelegate.qml b/plasmoid/package/contents/ui/DeviceDelegate.qml
index 372a1b6..d774f66 100644
--- a/plasmoid/package/contents/ui/DeviceDelegate.qml
+++ b/plasmoid/package/contents/ui/DeviceDelegate.qml
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.1
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.plasma.components 0.1 as PlasmaComponents
+import QtQuick 2.1
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kdeconnect 1.0
 
 PlasmaComponents.ListItem
diff --git a/plasmoid/package/contents/ui/kdeconnect.qml b/plasmoid/package/contents/ui/FullRepresentation.qml
similarity index 84%
rename from plasmoid/package/contents/ui/kdeconnect.qml
rename to plasmoid/package/contents/ui/FullRepresentation.qml
index e58cc4e..20baa13 100644
--- a/plasmoid/package/contents/ui/kdeconnect.qml
+++ b/plasmoid/package/contents/ui/FullRepresentation.qml
@@ -18,21 +18,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.1
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.plasma.components 0.1 as PlasmaComponents
-import org.kde.plasma.extras 0.1 as PlasmaExtras
-import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
+import QtQuick 2.1
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.kdeconnect 1.0 as KdeConnect
 
 Item {
     id: kdeconnect
 
-    property int minimumWidth: 290
-    property int minimumHeight: 340
-
-    //TODO: Show the full widget when it is not docked
-    property Component compactRepresentation: CompactRepresentation { }
+    implicitWidth: 290
+    implicitHeight: 340
 
     PlasmaComponents.Label {
         visible: devicesView.count==0
diff --git a/plasmoid/package/contents/ui/Sftp.qml b/plasmoid/package/contents/ui/Sftp.qml
index 5a2437b..9ef4f41 100644
--- a/plasmoid/package/contents/ui/Sftp.qml
+++ b/plasmoid/package/contents/ui/Sftp.qml
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.1
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.plasma.components 0.1 as PlasmaComponents
+import QtQuick 2.1
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kdeconnect 1.0
 
 QtObject {
diff --git a/core/backends/linkprovider.cpp b/plasmoid/package/contents/ui/main.qml
similarity index 74%
copy from core/backends/linkprovider.cpp
copy to plasmoid/package/contents/ui/main.qml
index 1d6c0bf..5cb1fbb 100644
--- a/core/backends/linkprovider.cpp
+++ b/plasmoid/package/contents/ui/main.qml
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
+ * Copyright 2014 Aleix Pol Gonzalez <aleixpol at kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,10 +18,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "linkprovider.h"
+import QtQuick 2.1
+import org.kde.plasma.plasmoid 2.0
 
-LinkProvider::LinkProvider()
+Item
 {
-    //gcc complains if we don't add something to compile on a class with virtual functions
-}
+    Plasmoid.compactRepresentation: CompactRepresentation { }
+    Plasmoid.fullRepresentation: FullRepresentation {}
 
+    Plasmoid.preferredRepresentation: fullRepresentation
+}
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 8fd4ee7..29d67c0 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -50,7 +50,7 @@ Type=Service
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
 
 X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/kdeconnect.qml
+X-Plasma-MainScript=ui/main.qml
 X-Plasma-NotificationArea=true
 X-Plasma-ConfigPlugins=kcm_kdeconnect
 

-- 
kdeconnect packaging