[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:23:07 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=cb378ba
The following commit has been merged in the master branch:
commit cb378ba2f8b0fe31874b8b2ca7b210cc5ad9045a
Author: Dan Vrátil <dvratil at redhat.com>
Date: Fri Jan 4 17:24:26 2013 +0100
Move chatplasmoid to ktp-contact-applet (ktp-desktop-applets)
---
CMakeLists.txt | 1 -
plasmoid/CMakeLists.txt | 7 -
.../contents/ui/ActionDelegate.qml | 27 ---
.../contents/ui/ChatWidget.qml | 202 ---------------------
.../contents/ui/ConversationDelegate.qml | 72 --------
.../contents/ui/OutgoingDelegate.qml | 29 ---
.../contents/ui/TextDelegate.qml | 61 -------
.../org.kde.ktp-chatplasmoid/contents/ui/main.qml | 104 -----------
plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop | 87 ---------
9 files changed, 590 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93cf43f..f9f9791 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,5 +46,4 @@ add_subdirectory(config)
add_subdirectory(data)
add_subdirectory(adiumxtra-protocol-handler)
add_subdirectory(logviewer)
-add_subdirectory(plasmoid)
add_subdirectory(filters)
diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt
deleted file mode 100644
index edee846..0000000
--- a/plasmoid/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-install(DIRECTORY org.kde.ktp-chatplasmoid
- DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/)
-
-
-install(FILES org.kde.ktp-chatplasmoid/metadata.desktop
- DESTINATION ${SERVICES_INSTALL_DIR}
- RENAME plasma-applet-ktpchat.desktop)
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ActionDelegate.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ActionDelegate.qml
deleted file mode 100644
index 2d1fa55..0000000
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ActionDelegate.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Copyright (C) 2012 Lasath Fernando <kde at lasath.org>
- Copyright (C) 2012 David Edmundson <kde at davidedmundson.co.uk>
-
- 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.1
-import org.kde.plasma.components 0.1 as PlasmaComponents
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.telepathy.chat 0.1
-
-PlasmaComponents.Label {
- text: "<i>* " + model.user + " " + model.text + "</i>"
-}
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
deleted file mode 100644
index ea68f41..0000000
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ChatWidget.qml
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- 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.1
-import org.kde.telepathy.chat 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
-
-Item {
- id: chatWidget
- property Conversation conv
-
- signal closeRequested
-
- Item {
- id: titleArea
- anchors {
- margins: 5
- top: parent.top
- left: parent.left
- right: parent.right
- }
- height: 24
-
- ExtraComponents.QIconItem {
- id: contactIcon
- anchors {
- top: parent.top
- left: parent.left
- bottom: parent.bottom
- margins: 3
- }
- width: height
-
- icon: conv.target.presenceIcon
- }
-
- PlasmaComponents.Label {
- id: contactName
- anchors {
- left: contactIcon.right
- right: minimizeButton.left
- top: parent.top
- bottom: parent.bottom
- leftMargin: 5
- }
- text: conv.target.nick
- elide: Text.ElideRight
- }
-
- PlasmaComponents.ToolButton {
- id: minimizeButton
-
- anchors {
- top: parent.top
- right: popoutButton.left
- bottom: parent.bottom
- }
-
- iconSource: "arrow-down"
- onClicked: closeRequested()
- }
-
- PlasmaComponents.ToolButton {
- id: popoutButton
-
- anchors {
- top: parent.top
- right: closeButton.left
- bottom: parent.bottom
- }
-
- iconSource: "view-conversation-balloon"
-
- onClicked: {
- conv.delegateToProperClient();
- closeRequested();
- }
- }
-
- PlasmaComponents.ToolButton {
- id: closeButton
-
- anchors {
- top: parent.top
- right: parent.right
- bottom: parent.bottom
- }
-
- iconSource: "dialog-close"
-
- onClicked: conv.requestClose()
- }
- }
-
- 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
- left: parent.left
- right: parent.right
- bottom: input.top
- topMargin: 3
- rightMargin: viewScrollBar.width+5
- leftMargin: 5
- }
- boundsBehavior: Flickable.StopAtBounds
- section.property: "user"
- section.delegate: PlasmaComponents.Label { text: section; font.bold: true; anchors.right: parent.right}
- clip: true
-
- delegate: Loader {
- Component.onCompleted: {
- switch(model.type) {
- case MessagesModel.MessageTypeOutgoing:
-// console.log("Type: MessagesModel::MessageTypeOutgoing");
- source = "OutgoingDelegate.qml"
- break;
- case MessagesModel.MessageTypeAction:
-// console.log("Type: MessagesModel::MessageTypeAction");
- source = "ActionDelegate.qml";
- break;
- case MessagesModel.MessageTypeIncoming:
- default:
- source = "TextDelegate.qml";
- }
- }
- }
-
- model: conv.messages
- onMovementEnded: followConversation = atYEnd //we only follow the conversation if moved to the end
-
- onCountChanged: {
- if(!moving && followConversation && contentHeight>height) {
- view.positionViewAtEnd(); view.positionViewAtEnd() //see https://bugreports.qt-project.org/browse/QTBUG-27529
- }
- }
- }
-
- PlasmaComponents.ScrollBar {
- id: viewScrollBar
- anchors {
- top: view.top
- bottom: view.bottom
- right: parent.right
- }
-
- flickableItem: view
- width: 16
- orientation: Qt.Vertical
- opacity: view.atYEnd ? 0.3 : 1
-
- Behavior on width { NumberAnimation { duration: 250 } }
- Behavior on opacity { NumberAnimation { duration: 250 } }
- }
-
- PlasmaComponents.TextField {
- id: input
- focus: true
-
- anchors {
- left: parent.left
- right: parent.right
- bottom: parent.bottom
- }
-
- Keys.onReturnPressed: {
- view.model.sendNewMessage(text);
- text = "";
- }
- }
-}
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
deleted file mode 100644
index 8a8d851..0000000
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/ConversationDelegate.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- 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.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
-
-PlasmaComponents.ToolButton {
- id: base
- width: height
-
- checked: ListView.isCurrentItem
-
- ExtraComponents.QIconItem {
- id: icon
- icon: model.conversation.target.avatar
- anchors {
- fill: parent
- margins: 5
- }
- }
-
- PlasmaCore.ToolTip {
- target: icon
- mainText: model.conversation.target.nick
- image: model.conversation.target.presenceIconName
- }
-
-
- Rectangle {
- anchors {
- right: parent.right
- top: parent.top
- }
- width: parent.width / 3
- height: parent.height / 3
- color: "red"
- radius: 3
-
- Text {
- id: text
- anchors.fill: parent
-
- font.pixelSize: parent.height
- text: model.conversation.messages.unreadCount
- color: "white"
-
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- }
-
- visible: model.conversation.messages.unreadCount !== 0
- }
-}
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/OutgoingDelegate.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/OutgoingDelegate.qml
deleted file mode 100644
index d713958..0000000
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/OutgoingDelegate.qml
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Copyright (C) 2012 Lasath Fernando <kde at lasath.org>
- Copyright (C) 2012 David Edmundson <kde at davidedmundson.co.uk>
-
- 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
-
-TextDelegate {
- Rectangle {
- color: theme.viewBackgroundColor
- anchors.fill: parent
- z: parent.z-1
- opacity: 0.7
- }
-}
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml
deleted file mode 100644
index 4ae8977..0000000
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/TextDelegate.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- Copyright (C) 2012 Lasath Fernando <kde at lasath.org>
- Copyright (C) 2012 David Edmundson <kde at davidedmundson.co.uk>
-
- 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.plasma.components 0.1 as PlasmaComponents
-
-PlasmaComponents.Label {
- id: body
- wrapMode: Text.Wrap
- width: view.width
-
- text: model.text
- textFormat: Text.RichText
- height: paintedHeight
-
- onLinkActivated: {
- console.log("opening link: " + link);
- plasmoid.openUrl(link);
- }
-
- //Hover to display the time when hovering a message
- PlasmaComponents.Label {
- text: Qt.formatTime(model.time)
- anchors {
- top: parent.top
- right: parent.right
- }
- Rectangle {
- color: theme.backgroundColor
- anchors.fill: parent
- z: parent.z-1
- opacity: 0.8
- radius: 5
- }
- visible: mouseArea.containsMouse
- }
-
- MouseArea {
- id: mouseArea
- anchors.fill: parent
- hoverEnabled: true
- //we just want to know if the mouse is there, otherwise prevents links from being clicked
- acceptedButtons: Qt.NoButton
- }
-}
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml b/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
deleted file mode 100644
index feb766b..0000000
--- a/plasmoid/org.kde.ktp-chatplasmoid/contents/ui/main.qml
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- 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 Qt 4.7
-import org.kde.telepathy.chat 0.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
-
-ListView {
- id: base
- anchors.fill: parent
- property alias minimumHeight: base.contentHeight
- property alias minimumWidth: base.contentWidth
- orientation: (plasmoid.formFactor === Vertical ? ListView.Vertical
- : plasmoid.formFactor === Horizontal ? ListView.Horizontal
- : width>height ? ListView.Horizontal : ListView.Vertical)
-
- model: handler.conversations
- currentIndex: -1
- interactive: false
- spacing: 2
-
- TelepathyTextObserver {
- id: handler
- }
-
- HideWindowComponent {
- id: windowHide
- }
-
- delegate : ConversationDelegate {
- id: convButton
- height: Math.min(base.width, base.height)
- onClicked: {
- if(base.currentIndex == index)
- base.currentIndex = -1
- else
- base.currentIndex = index
- }
-
- //FIXME: put in a loader to not slow down the model
- PlasmaCore.Dialog {
- id: dialog
- windowFlags: Qt.WindowStaysOnTopHint
- visible: base.currentIndex==index
-
- mainItem: ChatWidget {
- width: 250
- height: 350
- conv: model.conversation
-
- onCloseRequested: {
- base.currentIndex = -1
- }
- }
-
- onVisibleChanged: {
- if(visible) {
- windowHide.hideWindowFromTaskbar(dialog.windowId)
- var point = dialog.popupPosition(convButton, Qt.AlignBottom);
- console.log("Showing dialog at (" + point.x + "," + point.y + ")");
-
- dialog.x = point.x;
- dialog.y = point.y;
- dialog.activateWindow()
- }
-
- }
- }
-
- Connections {
- target: model.conversation.messages
- onPopoutRequested: {
- base.currentIndex = -1
- }
- }
-
- // needed to let MessageModel know when messages are visible
- // so that it can acknowledge them properly
- Binding {
- target: model.conversation.messages
- property: "visibleToUser"
- value: dialog.visible
- }
- }
-}
diff --git a/plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop b/plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop
deleted file mode 100644
index c7a1e3c..0000000
--- a/plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop
+++ /dev/null
@@ -1,87 +0,0 @@
-[Desktop Entry]
-Name=Quick Chat
-Name[bs]=Brzo ćaskanje
-Name[ca]=Xat ràpid
-Name[cs]=Rychlý rozhovor
-Name[da]=Kvikchat
-Name[de]=Schnell-Chat
-Name[el]=Γρήγορη συνομιλία
-Name[es]=Charla rápida
-Name[et]=Kiirvestlus
-Name[fi]=Pikachat
-Name[fr]=Discussion rapide
-Name[hu]=Gyors csevegés
-Name[it]=Chat veloce
-Name[kk]=Жедел чат-әңгіме
-Name[km]=ជជែករហ័ស
-Name[lt]=Greitasis pokalbis
-Name[nb]=Kjapp prat
-Name[nl]=Snelle chat
-Name[pl]=Szybka rozmowa
-Name[pt]=Conversa Rápida
-Name[pt_BR]=Conversa rápida
-Name[ro]=Discuție rapidă
-Name[ru]=Быстрое общение
-Name[sk]=Rýchly rozhovor
-Name[sr]=Брзо ћаскање
-Name[sr at ijekavian]=Брзо ћаскање
-Name[sr at ijekavianlatin]=Brzo ćaskanje
-Name[sr at latin]=Brzo ćaskanje
-Name[sv]=Snabbchatt
-Name[uk]=Швидке спілкування
-Name[x-test]=xxQuick Chatxx
-Name[zh_CN]=快捷聊天
-Name[zh_TW]=快速聊天
-Comment=Simple chats from your workspace
-Comment[bs]=Prosta ćaskanja iz radnog prostora
-Comment[ca]=Xats normals des de l'espai de treball
-Comment[cs]=Jednoduché rozhovory z Vaší pracovní plochy
-Comment[da]=Simple chats fra dit arbejdsområde
-Comment[de]=Einfache Chats von Ihrer Arbeitsfläche
-Comment[el]=Απλές συνομιλίες από το χώρο εργασίας σας
-Comment[es]=Charla rápida desde su espacio de trabajo
-Comment[et]=Lihtne vestlus otse töötsoonist
-Comment[fr]=Discussions simples depuis votre espace de travail
-Comment[hu]=Egyszerű csevegés az asztalán
-Comment[it]=Chat semplici per l'ambiente di lavoro
-Comment[kk]=Жұмыс орыннан қарапайым чаты
-Comment[km]=ជជែកសាមញ្ញពីតំបន់ធ្វើការរបស់អ្នក
-Comment[lt]=Paprasti pokalbiai iš Jūsų darbo srities
-Comment[nb]=Enkel prat fra arbeidsflaten
-Comment[nl]=Eenvoudige chats vanaf uw werkplek
-Comment[pl]=Proste rozmowy z twojej przestrzeni roboczej
-Comment[pt]=Conversas simples a partir do seu ambiente de trabalho
-Comment[pt_BR]=Conversas simples a partir do seu ambiente de trabalho
-Comment[ro]=Discuții simple de pe spațiul de lucru
-Comment[ru]=Простой виджет для общения
-Comment[sk]=Jednoduché rozhovory z vašej plochy
-Comment[sr]=Једноставна ћаскања са радног простора
-Comment[sr at ijekavian]=Једноставна ћаскања са радног простора
-Comment[sr at ijekavianlatin]=Jednostavna ćaskanja sa radnog prostora
-Comment[sr at latin]=Jednostavna ćaskanja sa radnog prostora
-Comment[sv]=Enkel chatt från arbetsytan
-Comment[uk]=Прості вікна спілкування з вашого робочого простору
-Comment[x-test]=xxSimple chats from your workspacexx
-Comment[zh_CN]=从您的工作区方便进行聊天
-Comment[zh_TW]=從您的工作空間發起聊天
-Icon=telepathy-kde
-
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-X-Plasma-RequiredExtensions=LaunchApp
-
-X-KDE-PluginInfo-Author=Lasath Fernando
-X-KDE-PluginInfo-Email=kde at lasath.org
-# X-KDE-PluginInfo-Website=http://plasma.kde.org/
-X-KDE-PluginInfo-Category=Online Services
-X-KDE-PluginInfo-Name=org.kde.ktp-chatplasmoid
-X-KDE-PluginInfo-Version=0.5.2
-
-# 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
-Type=Service
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list