[SCM] ktp-contact-applet packaging branch, master, updated. debian/0.7.0-1-80-g44af4f4
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Feb 1 10:12:37 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=dd4c203
The following commit has been merged in the master branch:
commit dd4c203a77756c1456f4d7bda3be5cc5f9a9b766
Author: Diane Trout <diane at ghic.org>
Date: Sun Aug 9 14:29:54 2015 -0700
Imported Upstream version 15.07.90
---
CMakeLists.txt | 7 +++-
chat/org.kde.ktp-chat/contents/ui/FullChatList.qml | 12 +++----
chat/org.kde.ktp-chat/metadata.desktop.cmake | 4 ++-
.../contents/ui/ContactList.qml | 37 ++++++++++++++++++----
.../org.kde.ktp-contactlist/metadata.desktop.cmake | 10 ++++++
person/org.kde.person/metadata.desktop.cmake | 10 ++++++
6 files changed, 65 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84aa659..a05214f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,12 @@ project(ktp-desktop-applets)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-set(KTP_DESKTOP_APPLETS_VERSION "15.04.2")
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "15")
+set (KDE_APPLICATIONS_VERSION_MINOR "07")
+set (KDE_APPLICATIONS_VERSION_MICRO "90")
+
+set(KTP_DESKTOP_APPLETS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
find_package(ECM 0.0.11 REQUIRED NO_MODULE)
set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff --git a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
index b8763d7..fcb0c57 100644
--- a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
@@ -58,6 +58,7 @@ Grid {
}
function closeAllConversations() {
+ base.currentIndex = -1
conversationsModel.closeAllConversations()
}
@@ -92,14 +93,12 @@ Grid {
width: base.itemWidth
height: base.itemHeight
onClicked: {
- telepathyManager.startChat(account, contact, "org.freedesktop.Telepathy.Client.KTp.chatPlasmoid")
+ telepathyManager.startChat(account, contact, "org.freedesktop.Telepathy.Client.KTp.ChatPlasmoid")
}
avatar: decoration
- overlay: ExtraComponents.QIconItem {
- anchors.fill: parent
- anchors.margins: parent.width/3
- icon: presenceIcon
- }
+ title: display
+ overlay: PlasmaCore.IconItem { source: "rating" }
+ presenceIcon: model.presenceIcon
account: model.account
contact: model.contact
}
@@ -107,7 +106,6 @@ Grid {
sourceModel: KTp.PinnedContactsModel {
id: pinnedModel
conversations: conversationsModel
- accountManager: telepathyManager.accountManager
Component.onCompleted: {
state = plasmoid.configuration.pinnedContacts
diff --git a/chat/org.kde.ktp-chat/metadata.desktop.cmake b/chat/org.kde.ktp-chat/metadata.desktop.cmake
index 4c15fd0..dca6381 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=Quick Chat
+Name[ar]=محادثة سريعة
Name[ast]=Charra rápida
Name[bs]=Brzo ćaskanje
Name[ca]=Xat ràpid
@@ -44,6 +45,7 @@ Name[x-test]=xxQuick Chatxx
Name[zh_CN]=快捷聊天
Name[zh_TW]=快速聊天
Comment=Simple chats from your workspace
+Comment[ar]=محادثات بسيطة من مساحة العمل
Comment[ast]=Charres simples dende la to estaya de trabayu
Comment[bs]=Prosta ćaskanja iz radnog prostora
Comment[ca]=Xats normals des de l'espai de treball
@@ -51,7 +53,7 @@ Comment[ca at valencia]=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[el]=Απλές συνομιλίες από τον χώρο εργασίας σας
Comment[en_GB]=Simple chats from your workspace
Comment[es]=Charlas rápidas desde el espacio de trabajo
Comment[et]=Lihtne vestlus otse töölaualt
diff --git a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
index 9b8e71a..70f6c51 100644
--- a/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
@@ -39,9 +39,34 @@ Item {
}
Column {
+ id: addAccountItem
+ anchors.centerIn: parent
+ width: parent.width
+ visible: !ktpPresence.hasEnabledAccounts
+
+ PlasmaComponents.Label {
+ anchors.left: parent.left
+ anchors.right: parent.right
+
+ text: i18n("It appears that you do not have any accounts configured");
+
+ wrapMode: Text.WordWrap
+ horizontalAlignment: Text.AlignHCenter
+ }
+
+ PlasmaComponents.Button {
+ id: addAccountItemButton
+ anchors.horizontalCenter: parent.horizontalCenter
+
+ text: i18n("Configure Now...")
+ onClicked: telepathyManager.showSettingsKCM();
+ }
+ }
+
+ Column {
id: goOnlineItem
anchors.centerIn: parent
- visible: ktpPresence.presenceType == KTp.GlobalPresence.Offline
+ visible: ktpPresence.presenceType == KTp.GlobalPresence.Offline && ktpPresence.hasEnabledAccounts
PlasmaCore.IconItem {
anchors.horizontalCenter: parent.horizontalCenter
@@ -53,7 +78,7 @@ Item {
PlasmaComponents.Button {
id: goOnlineButton
- text: i18n("Go online")
+ text: i18n("Go Online")
onClicked: ktpPresence.setPresence(KTp.GlobalPresence.Available, "")
}
}
@@ -66,11 +91,11 @@ Item {
top:parent.top
}
- visible: !goOnlineItem.visible
+ visible: !goOnlineItem.visible && !addAccountItem.visible
focus: true
clearButtonShown: true
- placeholderText: i18n("Search contacts...")
+ placeholderText: i18n("Search Contacts...")
Keys.onDownPressed: contactsList.incrementCurrentIndex();
Keys.onUpPressed: contactsList.decrementCurrentIndex();
@@ -80,7 +105,7 @@ Item {
}
PlasmaExtras.ScrollArea {
- visible: !goOnlineItem.visible
+ visible: !goOnlineItem.visible && !addAccountItem.visible
anchors {
top:filterLineEdit.bottom
left:parent.left
@@ -107,7 +132,7 @@ Item {
height: root.delegateHeight
onClicked: {
plasmoid.expanded = false;
- telepathyManager.startChat(model.account, model.contact, "org.freedesktop.Telepathy.Client.KTp.chatPlasmoid");
+ telepathyManager.startChat(model.account, model.contact, "org.freedesktop.Telepathy.Client.KTp.ChatPlasmoid");
filterLineEdit.text = "";
}
MouseArea {
diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 14c55f1..d98c59f 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -1,16 +1,20 @@
[Desktop Entry]
Name=Instant Messaging
+Name[ar]=التّراسل المباشر
Name[ast]=Mensaxería nel intre
Name[ca]=Missatgeria instantània
Name[cs]=Instant Messaging
Name[da]=Instant messaging
Name[de]=Instant-Messaging
+Name[el]=Στιγμιαία μηνύματα
Name[en_GB]=Instant Messaging
Name[es]=Mensajería instantánea
Name[fi]=Pikaviestintä
Name[fr]=Messagerie instantanée
+Name[gl]=Mensaxaría instantánea
Name[hu]=Azonnali üzenetküldés
Name[it]=Messaggistica istantanea
+Name[ko]=인스턴트 메시징
Name[nb]=Lynmelding
Name[nl]=Instant Messaging
Name[pl]=Komunikator internetowy
@@ -25,6 +29,7 @@ Name[sr at ijekavian]=Брзо гласништво
Name[sr at ijekavianlatin]=Brzo glasništvo
Name[sr at latin]=Brzo glasništvo
Name[sv]=Direktmeddelande
+Name[tr]=Anında Mesajlaşma
Name[uk]=Миттєвий обмін повідомленнями
Name[x-test]=xxInstant Messagingxx
Name[zh_CN]=即时通讯
@@ -35,12 +40,15 @@ Comment[ca]=Mostra la vostra presència i els contactes
Comment[cs]=Zobrazuje vaši dostupnost a kontakty
Comment[da]=Viser din tilstedeværelse og kontakter
Comment[de]=Zeigt Ihre Anwesenheit und Kontakte
+Comment[el]=Εμφανίζει τις επαφές και την παρουσία σας
Comment[en_GB]=Displays your presence and contacts
Comment[es]=Muestra su estado y sus contactos
Comment[fi]=Näyttää läsnäolon ja yhteystiedot
Comment[fr]=Affiche votre présence et vos contacts
+Comment[gl]=Mostra a súa presenza e contactos.
Comment[hu]=Megjeleníti a jelenlétét és partnereit
Comment[it]=Mostra la tua presenza e i tuoi contatti
+Comment[ko]=온라인 상태와 대화 상대 표시
Comment[nl]=Toont uw aanwezigheid en contactpersonen
Comment[pl]=Wyświetla twoją dostępności i kontakty
Comment[pt]=Mostra a sua presença e contactos
@@ -54,6 +62,7 @@ Comment[sr at ijekavian]=Приказ вашег присуства и контак
Comment[sr at ijekavianlatin]=Prikaz vašeg prisustva i kontakata
Comment[sr at latin]=Prikaz vašeg prisustva i kontakata
Comment[sv]=Visar din närvaro och kontakter
+Comment[tr]=Kimliğini ve bağlantılarını görüntüler
Comment[uk]=Показувати дані щодо вашої присутності та контактів
Comment[x-test]=xxDisplays your presence and contactsxx
Comment[zh_CN]=显示您的状态和联系人
@@ -66,6 +75,7 @@ X-Plasma-API=declarativeappletscript
X-Plasma-MainScript=ui/main.qml
X-Plasma-DefaultSize=200,300
X-Plasma-NotificationArea=true
+X-Plasma-NotificationAreaCategory=Communications
X-Plasma-DBusActivationService=org.freedesktop.Telepathy.MissionControl5
X-KDE-PluginInfo-Name=org.kde.ktp-contactlist
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index b92c39b..bd93796 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -1,15 +1,19 @@
[Desktop Entry]
Name=Person
+Name[ar]=شخص
Name[ast]=Persona
Name[ca]=Persona
Name[cs]=Osoba
Name[da]=Person
Name[de]=Person
+Name[el]=Πρόσωπο
Name[en_GB]=Person
Name[es]=Persona
Name[fi]=Henkilö
Name[fr]=Personne
+Name[gl]=Persoa
Name[it]=Persona
+Name[ko]=사람
Name[nl]=Persoon
Name[pl]=Osoba
Name[pt]=Pessoa
@@ -23,6 +27,7 @@ Name[sr at ijekavian]=Особа
Name[sr at ijekavianlatin]=Osoba
Name[sr at latin]=Osoba
Name[sv]=Person
+Name[tr]=Kişi
Name[uk]=Особа
Name[x-test]=xxPersonxx
Name[zh_CN]=个人
@@ -33,11 +38,14 @@ Comment[ca]=Fa accessible una persona fàcilment
Comment[cs]=Usnadňuje přístup k osobám
Comment[da]=Gør en person nemt tilgængelig
Comment[de]=Ermöglicht den einfachen Zugriff auf eine Person
+Comment[el]=Καθιστά ένα πρόσωπο προσβάσιμο εύκολα
Comment[en_GB]=Makes a person easily accessible
Comment[es]=Hace a una persona fácilmente accesible
Comment[fi]=Helppo pääsy henkilöön
Comment[fr]=Rendre une personne facilement accessible
+Comment[gl]=Permite acceder facilmente a unha persoa.
Comment[it]=Rende una persona facilmente accessibile
+Comment[ko]=특정 사람과 빠르게 대화합니다
Comment[nl]=Maakt een persoon gemakkelijk toegankelijk
Comment[pl]=Czyni osobę łatwo dostępną
Comment[pt]=Torna uma pessoa facilmente acessível
@@ -51,6 +59,7 @@ Comment[sr at ijekavian]=Чини особу лако доступном
Comment[sr at ijekavianlatin]=Čini osobu lako dostupnom
Comment[sr at latin]=Čini osobu lako dostupnom
Comment[sv]=Gör en person lätt tillgänglig
+Comment[tr]=Bir kişiyi kolay erişilebilir yapar
Comment[uk]=Спрощує доступ до особи
Comment[x-test]=xxMakes a person easily accessiblexx
Comment[zh_CN]=访问他人变得简单
@@ -63,6 +72,7 @@ X-Plasma-API=declarativeappletscript
X-KDE-PluginInfo-Author=Aleix Pol Gonzalez
X-KDE-PluginInfo-Email=aleixpol at blue-systems.com
+X-KDE-PluginInfo-Name=person
X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Category=Utilities
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list