[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:19:13 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=1ae201e
The following commit has been merged in the master branch:
commit 1ae201e61447fd7d5872887d3df0b0ebf4f08638
Author: Aleix Pol <aleixpol at kde.org>
Date: Sat Apr 12 20:52:43 2014 +0200
Make the Plasmoids "startable" on plasma 2
---
CMakeLists.txt | 34 ++---
.../contents/ui/ActionDelegate.qml | 6 +-
chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 23 +---
.../contents/ui/ConversationDelegate.qml | 6 +-
.../contents/ui/ConversationDelegateButton.qml | 32 ++---
.../contents/ui/{main.qml => FullChatList.qml} | 35 +++--
.../contents/ui/OutgoingDelegate.qml | 2 +-
chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml | 4 +-
chat/org.kde.ktp-chat/contents/ui/main.qml | 141 ++-------------------
chat/org.kde.ktp-chat/metadata.desktop.cmake | 1 -
contact/src/declarative/contents/ui/Avatar.qml | 4 +-
contact/src/declarative/contents/ui/Contact.qml | 2 +-
.../src/declarative/contents/ui/DropDownMenu.qml | 2 +-
contact/src/declarative/contents/ui/main.qml | 2 +-
contact/src/telepathy-contact.cpp | 4 +-
.../contents/ui/ContactList.qml | 6 +-
.../contents/ui/ExternalLabel.qml | 4 +-
.../contents/ui/ListContactDelegate.qml | 8 +-
.../org.kde.ktp-contactlist/contents/ui/main.qml | 2 +-
19 files changed, 83 insertions(+), 235 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64614e4..ccbd7b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,35 +1,17 @@
project(ktp-desktop-applets)
-set(CMAKE_MODULE_PATH
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
- ${CMAKE_MODULE_PATH}
-)
-cmake_policy(SET CMP0002 OLD)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-set(IS_KTP_INTERNAL_MODULE TRUE)
-set(KDE_MIN_VERSION "4.7.0")
-set(KTP_DESKTOP_APPLETS_VERSION "0.8.0")
+find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
-find_package(TelepathyQt4 0.8.90 REQUIRED)
-find_package(KTp REQUIRED)
-
-include(KDE4Defaults)
-
-add_definitions(${QT_DEFINITIONS}
- ${KDE4_DEFINITIONS}
-)
-
-include_directories(${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
- ${KDE4_INCLUDES}
- ${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTP_INCLUDE_DIR}
-)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
add_subdirectory(chat)
-add_subdirectory(contact)
+# add_subdirectory(contact)
add_subdirectory(contactlist)
-add_subdirectory(presence)
+# add_subdirectory(presence)
install(FILES 50-renameKTpApplets.js DESTINATION ${DATA_INSTALL_DIR}/plasma-desktop/updates)
diff --git a/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
index c0aaf80..df9fbc3 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
@@ -17,9 +17,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import org.kde.plasma.components 0.1 as PlasmaComponents
-import org.kde.plasma.core 0.1 as PlasmaCore
+import QtQuick 2.1
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.telepathy 0.1
PlasmaComponents.Label {
diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 7f84daa..dba3f47 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -18,11 +18,10 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
+import QtQuick 2.1
import org.kde.telepathy 0.1
-import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
-import org.kde.qtextracomponents 0.1 as ExtraComponents
-import org.kde.plasma.components 0.1 as PlasmaComponents
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
FocusScope {
id: chatWidget
@@ -40,7 +39,7 @@ FocusScope {
}
height: 24
- ExtraComponents.QIconItem {
+ PlasmaCore.IconItem {
id: contactIcon
anchors {
top: parent.top
@@ -50,7 +49,7 @@ FocusScope {
}
width: height
- icon: conv.presenceIcon
+ source: conv.presenceIcon
}
PlasmaComponents.Label {
@@ -129,22 +128,12 @@ FocusScope {
}
}
- PlasmaWidgets.Separator {
- id: space
- anchors {
- top: titleArea.bottom
- left: parent.left
- right: parent.right
- }
- orientation: Qt.Horizontal
- }
-
ListView {
id: view
property bool followConversation: true
anchors {
- top: space.bottom
+ top: titleArea.bottom
left: parent.left
right: parent.right
bottom: disconnectedLabel.top
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index 58677ba..ca39040 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -18,8 +18,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-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
import org.kde.telepathy 0.1
ConversationDelegateButton {
@@ -48,7 +48,7 @@ ConversationDelegateButton {
//FIXME: put in a loader to not slow down the model
PlasmaCore.Dialog {
id: dialog
- windowFlags: Qt.WindowStaysOnTopHint
+// windowFlags: Qt.WindowStaysOnTopHint
visible: base.currentIndex==index
mainItem: ChatWidget {
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
index 5c621e0..fb3621c 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegateButton.qml
@@ -18,11 +18,11 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.1
-import org.kde.plasma.components 0.1 as PlasmaComponents
-import org.kde.qtextracomponents 0.1 as ExtraComponents
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.draganddrop 1.0 as DnD
+import QtQuick 2.1
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.kquickcontrolsaddons 2.0 as ExtraComponents
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.draganddrop 2.0 as DnD
import org.kde.telepathy 0.1
PlasmaComponents.ToolButton
@@ -30,8 +30,8 @@ PlasmaComponents.ToolButton
property variant account
property variant contact
property alias avatar: icon.icon
- property alias title: tooltip.mainText
- property alias presenceIconName: tooltip.image
+ property string title
+ property var presenceIconName
property alias overlay: overlayLoader.sourceComponent
checked: base.currentIndex==index
@@ -45,15 +45,15 @@ PlasmaComponents.ToolButton
Behavior on opacity { SmoothedAnimation { duration: 250; velocity: 0.01 } }
}
- //The MouseArea is just a workaround because otherwise the ToolTip steals the mouse hover events
- //and the button doesn't get painted properly
- MouseArea {
- PlasmaCore.ToolTip {
- id: tooltip
- target: parent
- }
- acceptedButtons: null
- }
+// //The MouseArea is just a workaround because otherwise the ToolTip steals the mouse hover events
+// //and the button doesn't get painted properly
+// MouseArea {
+// PlasmaCore.ToolTip {
+// id: tooltip
+// target: parent
+// }
+// acceptedButtons: null
+// }
DnD.DropArea {
id: dropArea
diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
similarity index 78%
copy from chat/org.kde.ktp-chat/contents/ui/main.qml
copy to chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
index b6fdfd6..7dce3f1 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
@@ -18,11 +18,11 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.0
+import QtQuick 2.1
import org.kde.telepathy 0.1 as KTp
-import org.kde.plasma.components 0.1 as PlasmaComponents
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.qtextracomponents 0.1 as ExtraComponents
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.kquickcontrolsaddons 2.0 as ExtraComponents
Grid {
id: base
@@ -39,12 +39,15 @@ Grid {
clip: true
spacing: 2
- flow: (plasmoid.formFactor === Vertical ? Flow.TopToBottom :
- plasmoid.formFactor === Horizontal ? Flow.LeftToRight :
+ flow: (plasmoid.formFactor === PlasmaCore.Types.Vertical ? Flow.TopToBottom :
+ plasmoid.formFactor === PlasmaCore.Types.Horizontal ? Flow.LeftToRight :
width<height ? Flow.TopToBottom : Flow.LeftToRight)
rows: flow===Flow.LeftToRight ? 1 : -1
columns: flow===Flow.LeftToRight ? -1 : 1
+ function activate() {
+ base.currentIndex = conversationsModel.nextActiveConversation(base.currentIndex+1 % conversationsModel.count)
+ }
KTp.ConversationsModel {
id: conversationsModel
@@ -57,19 +60,15 @@ Grid {
Binding {
target: plasmoid
property: "status"
- value: (base.currentIndex >= 0 ? AcceptingInputStatus
- : conversationsModel.totalUnreadCount>0 ? NeedsAttentionStatus
- : conversationsView.count>0 ? ActiveStatus
- : PassiveStatus)
+ value: (base.currentIndex >= 0 ? PlasmaCore.Types.AcceptingInputStatus
+ : conversationsModel.totalUnreadCount>0 ? PlasmaCore.Types.NeedsAttentionStatus
+ : conversationsView.count>0 ? PlasmaCore.Types.ActiveStatus
+ : PlasmaCore.Types.PassiveStatus)
}
Component.onCompleted: {
telepathyManager.addTextChatFeatures();
telepathyManager.registerClient(conversationsModel, "KTp.ChatPlasmoid");
- plasmoid.aspectRatioMode = plasmoid.IgnoreAspectRatio
- plasmoid.addEventListener('activate', function() {
- base.currentIndex = conversationsModel.nextActiveConversation(base.currentIndex+1 % conversationsModel.count)
- });
}
Component.onDestruction: {
telepathyManager.unregisterClient(conversationsModel);
@@ -110,10 +109,10 @@ Grid {
}
}
}
- property variant popupSide: plasmoid.location === TopEdge ?Qt.AlignBottom
- : plasmoid.location === BottomEdge ? Qt.AlignTop
- : plasmoid.location === LeftEdge ? Qt.AlignRight
- : plasmoid.location === RightEdge ? Qt.AlignLeft
+ property variant popupSide: plasmoid.location === PlasmaCore.Types.TopEdge ?Qt.AlignBottom
+ : plasmoid.location === PlasmaCore.Types.BottomEdge ? Qt.AlignTop
+ : plasmoid.location === PlasmaCore.Types.LeftEdge ? Qt.AlignRight
+ : plasmoid.location === PlasmaCore.Types.RightEdge ? Qt.AlignLeft
: base.flow === Flow.LeftToRight ? Qt.AlignBottom : Qt.AlignRight
Repeater {
diff --git a/chat/org.kde.ktp-chat/contents/ui/OutgoingDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/OutgoingDelegate.qml
index d713958..2144b5a 100644
--- a/chat/org.kde.ktp-chat/contents/ui/OutgoingDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/OutgoingDelegate.qml
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.0
+import QtQuick 2.1
TextDelegate {
Rectangle {
diff --git a/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
index a8234fc..ab686a6 100644
--- a/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-import QtQuick 1.0
-import org.kde.plasma.components 0.1 as PlasmaComponents
+import QtQuick 2.1
+import org.kde.plasma.components 2.0 as PlasmaComponents
PlasmaComponents.Label {
id: body
diff --git a/chat/org.kde.ktp-chat/contents/ui/main.qml b/chat/org.kde.ktp-chat/contents/ui/main.qml
index b6fdfd6..164557e 100644
--- a/chat/org.kde.ktp-chat/contents/ui/main.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/main.qml
@@ -1,132 +1,11 @@
-/*
- Copyright (C) 2012 Lasath Fernando <kde at lasath.org>
- Copyright (C) 2012 David Edmundson <kde at davidedmundson.co.uk>
- Copyright (C) 2012 Aleix Pol <aleixpol at kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-import QtQuick 1.0
-import org.kde.telepathy 0.1 as KTp
-import org.kde.plasma.components 0.1 as PlasmaComponents
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.qtextracomponents 0.1 as ExtraComponents
-
-Grid {
- id: base
- property real minimumItemSize: 12
- property real implicitItemSize: Math.max(0, Math.min(width, height))
- property real implicitHeight: flow===Flow.TopToBottom ? itemsCount*implicitItemSize : itemsCount==0 ? 0 : implicitItemSize
- property real implicitWidth: flow===Flow.LeftToRight ? itemsCount*implicitItemSize : itemsCount==0 ? 0 : implicitItemSize
- property real minimumHeight: flow===Flow.TopToBottom ? itemsCount*minimumItemSize : itemsCount==0 ? 0 : minimumItemSize
- property real minimumWidth: flow===Flow.LeftToRight ? itemsCount*minimumItemSize : itemsCount==0 ? 0 : minimumItemSize
- property int currentIndex: -1
- property int itemsCount: pinnedView.count + conversationsView.count
- property real itemWidth: Math.max(0, flow===Flow.LeftToRight ? Math.min(height, width/itemsCount) : width)
- property real itemHeight:Math.max(0, flow===Flow.TopToBottom ? Math.min(width, height/itemsCount) : height)
-
- clip: true
- spacing: 2
- flow: (plasmoid.formFactor === Vertical ? Flow.TopToBottom :
- plasmoid.formFactor === Horizontal ? Flow.LeftToRight :
- width<height ? Flow.TopToBottom : Flow.LeftToRight)
- rows: flow===Flow.LeftToRight ? 1 : -1
- columns: flow===Flow.LeftToRight ? -1 : 1
-
-
- KTp.ConversationsModel {
- id: conversationsModel
- }
-
- KTp.HideWindowComponent {
- id: windowHide
- }
-
- Binding {
- target: plasmoid
- property: "status"
- value: (base.currentIndex >= 0 ? AcceptingInputStatus
- : conversationsModel.totalUnreadCount>0 ? NeedsAttentionStatus
- : conversationsView.count>0 ? ActiveStatus
- : PassiveStatus)
- }
-
- Component.onCompleted: {
- telepathyManager.addTextChatFeatures();
- telepathyManager.registerClient(conversationsModel, "KTp.ChatPlasmoid");
- plasmoid.aspectRatioMode = plasmoid.IgnoreAspectRatio
- plasmoid.addEventListener('activate', function() {
- base.currentIndex = conversationsModel.nextActiveConversation(base.currentIndex+1 % conversationsModel.count)
- });
- }
- Component.onDestruction: {
- telepathyManager.unregisterClient(conversationsModel);
- }
-
- Repeater {
- id: pinnedView
- delegate: ConversationDelegateButton {
- width: base.itemWidth
- height: base.itemHeight
- onClicked: telepathyManager.startChat(account, contact)
- avatar: decoration
- overlay: ExtraComponents.QIconItem {
- anchors.fill: parent
- anchors.margins: parent.width/3
- icon: presenceIcon
- }
- account: model.account
- contact: model.contact
- }
- model: KTp.FilteredPinnedContactsProxyModel {
- sourceModel: KTp.PinnedContactsModel {
- id: pinnedModel
- conversations: conversationsModel
- accountManager: telepathyManager.accountManager
-
- Component.onCompleted: plasmoid.addEventListener('ConfigChanged',
- function() {
- var v = plasmoid.readConfig("pinnedContacts");
- console.log("loading state", v)
- if(v!="")
- pinnedModel.state = v
- });
- onCountChanged: {
- plasmoid.writeConfig("pinnedContacts", pinnedModel.state)
- console.log("saving state", pinnedModel.state)
- }
- }
- }
- }
- property variant popupSide: plasmoid.location === TopEdge ?Qt.AlignBottom
- : plasmoid.location === BottomEdge ? Qt.AlignTop
- : plasmoid.location === LeftEdge ? Qt.AlignRight
- : plasmoid.location === RightEdge ? Qt.AlignLeft
- : base.flow === Flow.LeftToRight ? Qt.AlignBottom : Qt.AlignRight
-
- Repeater {
- id: conversationsView
- delegate: ConversationDelegate {
- width: base.itemWidth
- height: base.itemHeight
- popupSide: base.popupSide
- }
- model: conversationsModel
- onCountChanged: if(base.currentIndex>=conversationsView.count) {
- base.currentIndex = -1;
- }
- }
+import QtQuick 2.1
+import org.kde.plasma.plasmoid 2.0
+
+QtObject
+{
+ Plasmoid.switchWidth: 0
+ Plasmoid.switchHeight: 0
+ Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
+ Plasmoid.fullRepresentation: FullChatList {}
+ Plasmoid.onExpandedChanged: Plasmoid.fullRepresentationItem.activate()
}
-
diff --git a/chat/org.kde.ktp-chat/metadata.desktop.cmake b/chat/org.kde.ktp-chat/metadata.desktop.cmake
index abb388c..0b2505b 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -96,7 +96,6 @@ X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
# X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
-#X-KDE-ServiceTypes=Plasma/PopupApplet
X-KDE-ServiceTypes=Plasma/Applet
#not entirely sure why this is there, I just know everything implodes without it
diff --git a/contact/src/declarative/contents/ui/Avatar.qml b/contact/src/declarative/contents/ui/Avatar.qml
index 77c9774..eac487f 100644
--- a/contact/src/declarative/contents/ui/Avatar.qml
+++ b/contact/src/declarative/contents/ui/Avatar.qml
@@ -17,9 +17,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.1
import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
-import org.kde.draganddrop 1.0 as DnD
+import org.kde.draganddrop 2.0 as DnD
Item {
id: container;
diff --git a/contact/src/declarative/contents/ui/Contact.qml b/contact/src/declarative/contents/ui/Contact.qml
index c14671c..6b4af75 100644
--- a/contact/src/declarative/contents/ui/Contact.qml
+++ b/contact/src/declarative/contents/ui/Contact.qml
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.1
Item {
id: wrapper;
diff --git a/contact/src/declarative/contents/ui/DropDownMenu.qml b/contact/src/declarative/contents/ui/DropDownMenu.qml
index 44bfc25..07baa2d 100644
--- a/contact/src/declarative/contents/ui/DropDownMenu.qml
+++ b/contact/src/declarative/contents/ui/DropDownMenu.qml
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.1
import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
Item {
diff --git a/contact/src/declarative/contents/ui/main.qml b/contact/src/declarative/contents/ui/main.qml
index 346a747..3b8ab49 100644
--- a/contact/src/declarative/contents/ui/main.qml
+++ b/contact/src/declarative/contents/ui/main.qml
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.1
Item {
id: mainWidget;
diff --git a/contact/src/telepathy-contact.cpp b/contact/src/telepathy-contact.cpp
index 861f783..1dc65c9 100644
--- a/contact/src/telepathy-contact.cpp
+++ b/contact/src/telepathy-contact.cpp
@@ -23,8 +23,8 @@
#include <KConfig>
#include <KStandardDirs>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
+#include <QQmlEngine>
+#include <QQmlContext>
#include <QtGui/QPainter>
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
index 7829899..1eba304 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
@@ -17,10 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.1
import org.kde.telepathy 0.1 as KTp
-import org.kde.plasma.components 0.1 as PlasmaComponents
-import org.kde.plasma.extras 0.1 as PlasmaExtras
+import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.extras 2.0 as PlasmaExtras
Item {
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml
index 0022095..3674211 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-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
import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
Item {
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
index 9549501..b4c1e11 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
@@ -17,10 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-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.qtextracomponents 0.1 as ExtraComponents
+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.kquickcontrolsaddons 2.0 as ExtraComponents
PlasmaComponents.ListItem {
id: delegate
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
index b2bde28..2787820 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-import QtQuick 1.1
+import QtQuick 2.1
import org.kde.telepathy 0.1 as KTp
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list