Hello community,
here is the log from the commit of package ktp-desktop-applets for
openSUSE:Factory checked in at 2014-09-18 07:56:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ktp-desktop-applets (Old)
and /work/SRC/openSUSE:Factory/.ktp-desktop-applets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-desktop-applets"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ktp-desktop-applets/ktp-desktop-applets.changes
2014-04-26 10:03:50.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ktp-desktop-applets.new/ktp-desktop-applets.changes
2014-09-18 07:56:30.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 16 16:13:14 UTC 2014 - [email protected]
+
+- Update to 0.8.80 (0.9 beta)
+ * OTR support
+ * Improved group chats
+ * Modernised video chats, now based on GStreamer 1.0
+ * Lots of fixes and speed improvements
+
+-------------------------------------------------------------------
Old:
----
ktp-desktop-applets-0.8.1.tar.bz2
New:
----
ktp-desktop-applets-0.8.80.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ktp-desktop-applets.spec ++++++
--- /var/tmp/diff_new_pack.2CyN7r/_old 2014-09-18 07:56:31.000000000 +0200
+++ /var/tmp/diff_new_pack.2CyN7r/_new 2014-09-18 07:56:31.000000000 +0200
@@ -17,13 +17,13 @@
Name: ktp-desktop-applets
-Version: 0.8.1
+Version: 0.8.80
Release: 0
Summary: Telepathy presence applet
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Networking/Instant Messenger
Url:
http://community.kde.org/Real-Time_Communication_and_Collaboration
-Source0:
http://download.kde.org/stable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2
+Source:
http://download.kde.org/unstable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2
BuildRequires: fdupes
BuildRequires: ktp-common-internals-devel >= %{version}
BuildRequires: libkde4-devel >= 4.7.0
++++++ ktp-desktop-applets-0.8.1.tar.bz2 -> ktp-desktop-applets-0.8.80.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ktp-desktop-applets-0.8.1/CMakeLists.txt
new/ktp-desktop-applets-0.8.80/CMakeLists.txt
--- old/ktp-desktop-applets-0.8.1/CMakeLists.txt 2014-04-25
18:32:17.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/CMakeLists.txt 2014-09-15
14:44:28.000000000 +0200
@@ -8,7 +8,7 @@
set(IS_KTP_INTERNAL_MODULE TRUE)
set(KDE_MIN_VERSION "4.7.0")
-set(KTP_DESKTOP_APPLETS_VERSION "0.8.1")
+set(KTP_DESKTOP_APPLETS_VERSION "0.8.80")
find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
find_package(TelepathyQt4 0.8.90 REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
---
old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
2014-04-25 18:30:17.000000000 +0200
+++
new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
2014-09-15 14:42:43.000000000 +0200
@@ -148,7 +148,7 @@
left: parent.left
right: parent.right
bottom: disconnectedLabel.top
- rightMargin: viewScrollBar.width+5
+ rightMargin: 5
leftMargin: 5
}
boundsBehavior: Flickable.StopAtBounds
@@ -188,24 +188,6 @@
}
}
- PlasmaComponents.ScrollBar {
- id: viewScrollBar
- anchors {
- top: view.top
- bottom: view.bottom
- right: parent.right
- }
-
- flickableItem: view
- orientation: Qt.Vertical
- opacity: view.atYEnd ? 0.3 : 1
- stepSize: 0
-
- Behavior on width { NumberAnimation { duration: 250 } }
- Behavior on opacity { NumberAnimation { duration: 250 } }
- }
-
-
PlasmaComponents.Label {
id: disconnectedLabel
visible: !conv.valid
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
---
old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
2014-04-25 18:30:17.000000000 +0200
+++
new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
2014-09-15 14:42:43.000000000 +0200
@@ -89,6 +89,15 @@
value: dialog.visible
}
+ Connections {
+ target: model.conversation.messages
+ onVisibleToUserChanged: {
+ if(!dialog.visible && model.conversation.messages.visibleToUser) {
+ openConversation();
+ }
+ }
+ }
+
overlay: Rectangle {
color: "red"
radius: 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
---
old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
2014-04-25 18:30:17.000000000 +0200
+++
new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml
2014-09-15 14:42:43.000000000 +0200
@@ -31,7 +31,7 @@
onLinkActivated: {
console.log("opening link: " + link);
- plasmoid.openUrl(link);
+ Qt.openUrlExternally(link);
}
//Hover to display the time when hovering a message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/metadata.desktop.cmake
new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/metadata.desktop.cmake
--- old/ktp-desktop-applets-0.8.1/chat/org.kde.ktp-chat/metadata.desktop.cmake
2014-04-25 18:30:17.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/chat/org.kde.ktp-chat/metadata.desktop.cmake
2014-09-15 14:42:43.000000000 +0200
@@ -7,10 +7,11 @@
Name[da]=Kvikchat
Name[de]=Schnell-Chat
Name[el]=Σύντομη συνομιλία
+Name[en_GB]=Quick Chat
Name[es]=Charla rápida
Name[et]=Kiirvestlus
Name[fi]=Pikakeskustelu
-Name[fr]=Forum de discussions instantanées
+Name[fr]=Discussion rapide
Name[gl]=Conversa rápida
Name[hu]=Gyors csevegés
Name[ia]=Conversation rapide
@@ -20,7 +21,9 @@
Name[lt]=Greitas pokalbis
Name[mr]=त्वरित गप्पा
Name[nb]=Kjapp prat
+Name[nds]=Fixklönen
Name[nl]=Snelle chat
+Name[pa]=ਤੁਰੰਤ ਗੱਲਬਾਤ
Name[pl]=Szybka rozmowa
Name[pt]=Conversa Rápida
Name[pt_BR]=Conversa Rápida
@@ -34,6 +37,7 @@
Name[sr@latin]=Brzo ćaskanje
Name[sv]=Snabbchatt
Name[tr]=Hızlı Sohbet
+Name[ug]=تېز پاراڭ
Name[uk]=Швидке спілкування
Name[x-test]=xxQuick Chatxx
Name[zh_CN]=快捷聊天
@@ -46,6 +50,7 @@
Comment[da]=Simple chats fra dit arbejdsområde
Comment[de]=Einfache Chats von Ihrer Arbeitsfläche
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
Comment[fi]=Yksinkertaiset keskustelut työtilastasi
@@ -59,7 +64,9 @@
Comment[lt]=Paprastas pokalbis iš Jūsų darbalaukio
Comment[mr]=तुमच्या कार्यस्थानातून सोप्या गप्पा
Comment[nb]=Enkel prat fra arbeidsflaten
+Comment[nds]=Eenfach Klönen ut Dien Arbeitrebeet
Comment[nl]=Eenvoudige chats vanuit uw werkruimte
+Comment[pa]=ਤੁਹਾਡੇ ਵਰਕਸਪੇਸ ਤੋਂ ਆਮ ਗੱਲਾਬਾਤਾਂ
Comment[pl]=Proste rozmowy z twojej przestrzeni roboczej
Comment[pt]=Conversas simples a partir da sua área de trabalho
Comment[pt_BR]=Conversas simples a partir do seu ambiente de trabalho
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/contact/plasma-applet-ktp-contact.desktop.cmake
new/ktp-desktop-applets-0.8.80/contact/plasma-applet-ktp-contact.desktop.cmake
---
old/ktp-desktop-applets-0.8.1/contact/plasma-applet-ktp-contact.desktop.cmake
2014-04-25 18:30:17.000000000 +0200
+++
new/ktp-desktop-applets-0.8.80/contact/plasma-applet-ktp-contact.desktop.cmake
2014-09-15 14:42:43.000000000 +0200
@@ -7,6 +7,7 @@
Name[da]=Instant messaging-kontakt
Name[de]=Instant-Messaging-Kontakt
Name[el]=Επαφή με στιγμιαίο μήνυμα
+Name[en_GB]=Instant Messaging Contact
Name[es]=Contacto de mensajería instantánea
Name[et]=Kiirsuhtluskontakt
Name[fi]=Pikaviestiyhteystiedot
@@ -24,6 +25,7 @@
Name[nb]=Lynmeldingskontakt
Name[nds]=Kortnarichtenkontakten
Name[nl]=Contactpersoon van Instant Messaging
+Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇ ਸੰਪਰਕ
Name[pl]=Kontakt komunikatora internetowego
Name[pt]=Contacto de Mensagens Instantâneas
Name[pt_BR]=Contato de mensagens instantâneas
@@ -37,6 +39,7 @@
Name[sr@latin]=Brzoglasnički kontakti
Name[sv]=Direktmeddelandekontakt
Name[tr]=Anında Mesajlaşma Kişisi
+Name[ug]=مۇڭداشقۇ ئالاقەدىشى
Name[uk]=Контакт миттєвого обміну повідомленнями
Name[wa]=Soçon del messaedjreye sol moumint
Name[x-test]=xxInstant Messaging Contactxx
@@ -50,6 +53,7 @@
Comment[da]=Applet til en af dine instant messaging-kontakter
Comment[de]=Miniprogramm für einen Ihrer Instant-Messaging-Kontakte
Comment[el]=Μικροεφαρμογή για μία από τις επαφές σας με στιγμιαία μηνύματα
+Comment[en_GB]=Applet for one of your instant messaging contacts
Comment[es]=Miniaplicación para uno de sus contactos de mensajería instantánea
Comment[et]=Aplett mõne sinu kiirsuhtluskontakti jaoks
Comment[fi]=Sovelma yhdelle pikaviestiyhteystiedoistasi
@@ -65,7 +69,9 @@
Comment[lt]=Programėlė vienam iš jūsų pokalbių kontaktų
Comment[mr]=तुमच्या एका त्वरित संदेश संपर्काकरिता एप्लेट
Comment[nb]=Miniprogram for en av dine lynmeldingskontakter
+Comment[nds]=Lüttprogramm för een vun Dien Kortnarichtenkontakten
Comment[nl]=Applet voor één van uw contactpersonen van Instant Messaging
+Comment[pa]=ਤੁਹਾਡੇ ਤੁਰੰਤ ਸੁਨੇਹੇ ਸੰਪਰਕਾਂ ਲਈ ਐਪਲਿਟ
Comment[pl]=Aplet dla jednego z kontaktów twojego komunikatora internetowego
Comment[pt]='Applet' para um dos seus contactos das mensagens instantâneas
Comment[pt_BR]=Exibe um dos seus contatos de mensagens instantâneas
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
new/ktp-desktop-applets-0.8.80/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
---
old/ktp-desktop-applets-0.8.1/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
2014-04-25 18:30:17.000000000 +0200
+++
new/ktp-desktop-applets-0.8.80/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
2014-09-15 14:42:43.000000000 +0200
@@ -7,6 +7,7 @@
Name[da]=Instant messaging-kontaktliste
Name[de]=Instant-Messaging-Kontaktliste
Name[el]=Λίστα επαφών με στιγμιαίο μήνυμα
+Name[en_GB]=Instant Messaging Contact List
Name[es]=Lista de contactos de mensajería instantánea
Name[et]=Kiirsuhtluskontaktide nimekiri
Name[fi]=Pikaviestinnän yhteystietoluettelo
@@ -23,6 +24,7 @@
Name[nb]=Liste over lynmeldingskontakter
Name[nds]=Kortnarichten-Kontaktlist
Name[nl]=Lijst met contactpersoon van Instant Messaging
+Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇ ਸੰਪਰਕ ਸੂਚੀ
Name[pl]=Lista kontaktów komunikatora internetowego
Name[pt]=Lista de Contactos das Mensagens Instantâneas
Name[pt_BR]=Lista de contatos de mensagens instantâneas
@@ -36,6 +38,7 @@
Name[sr@latin]=Lista brzoglasničkih kontakata
Name[sv]=Lista över direktmeddelandekontakter
Name[tr]=Anında Mesajlaşma Kişi Listesi
+Name[ug]=مۇڭداشقۇ ئالاقەداش تىزىمى
Name[uk]=Список контактів миттєвого обміну повідомленнями
Name[wa]=Djivêye des soçons del messaedjreye sol moumint
Name[x-test]=xxInstant Messaging Contact Listxx
@@ -49,6 +52,7 @@
Comment[da]=Oplist instant messaging-kontakter
Comment[de]=Instant-Messaging-Kontakt auflisten
Comment[el]=Φτιάχνει λίστα με επαφές στιγμιαίων μηνυμάτων
+Comment[en_GB]=List instant messaging contacts
Comment[es]=Lista de contactos de mensajería instantánea
Comment[et]=Kiirsuhtluskontaktide nimekiri
Comment[fi]=Luettele pikaviestiyhteystiedot
@@ -63,8 +67,9 @@
Comment[lt]=Rikiuoti kontaktus
Comment[mr]=त्वरित संदेश संपर्कांची यादी करा
Comment[nb]=List opp lynmeldingskontakter
-Comment[nds]=Wiest Kortnarichtenkontakten
+Comment[nds]=Kortnarichtenkontakten wiesen
Comment[nl]=Lijst met contactpersoon van Instant Messaging
+Comment[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇ ਸੰਪਰਕ ਸੂਚੀ
Comment[pl]=Wyszczególnij kontakty komunikatora internetowego
Comment[pt]=Apresenta os contactos das mensagens instantâneas
Comment[pt_BR]=Lista os contatos de mensagens instantâneas
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ktp-desktop-applets-0.8.1/po/CMakeLists.txt
new/ktp-desktop-applets-0.8.80/po/CMakeLists.txt
--- old/ktp-desktop-applets-0.8.1/po/CMakeLists.txt 2014-04-25
18:32:17.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/CMakeLists.txt 2014-09-15
14:44:28.000000000 +0200
@@ -5,6 +5,7 @@
add_subdirectory( da )
add_subdirectory( de )
add_subdirectory( el )
+add_subdirectory( en_GB )
add_subdirectory( es )
add_subdirectory( et )
add_subdirectory( fi )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ktp-desktop-applets-0.8.1/po/en_GB/CMakeLists.txt
new/ktp-desktop-applets-0.8.80/po/en_GB/CMakeLists.txt
--- old/ktp-desktop-applets-0.8.1/po/en_GB/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/ktp-desktop-applets-0.8.80/po/en_GB/CMakeLists.txt 2014-09-15
14:43:05.000000000 +0200
@@ -0,0 +1,2 @@
+file(GLOB _po_files *.po)
+GETTEXT_PROCESS_PO_FILES( en_GB ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR}
${_po_files} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/en_GB/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/en_GB/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/en_GB/plasma_applet_org.kde.ktp-contact.po
1970-01-01 01:00:00.000000000 +0100
+++
new/ktp-desktop-applets-0.8.80/po/en_GB/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:43:05.000000000 +0200
@@ -0,0 +1,31 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Steve Allewell <[email protected]>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
+"POT-Creation-Date: 2014-03-12 05:55+0000\n"
+"PO-Revision-Date: 2014-06-23 18:55+0100\n"
+"Last-Translator: Steve Allewell <[email protected]>\n"
+"Language-Team: British English <[email protected]>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Steve Allewell"
+
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "[email protected]"
+
+#: src/contact-wrapper.cpp:261
+#, kde-format
+msgid "Choose files to send to %1"
+msgstr "Choose files to send to %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/en_GB/plasma_applet_org.kde.ktp-presence.po
new/ktp-desktop-applets-0.8.80/po/en_GB/plasma_applet_org.kde.ktp-presence.po
---
old/ktp-desktop-applets-0.8.1/po/en_GB/plasma_applet_org.kde.ktp-presence.po
1970-01-01 01:00:00.000000000 +0100
+++
new/ktp-desktop-applets-0.8.80/po/en_GB/plasma_applet_org.kde.ktp-presence.po
2014-09-15 14:43:05.000000000 +0200
@@ -0,0 +1,74 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Steve Allewell <[email protected]>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
+"POT-Creation-Date: 2013-09-24 05:32+0000\n"
+"PO-Revision-Date: 2014-06-23 19:09+0100\n"
+"Last-Translator: Steve Allewell <[email protected]>\n"
+"Language-Team: British English <[email protected]>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: src/presence-applet.cpp:184
+msgid "More"
+msgstr "More"
+
+#: src/presence-applet.cpp:227
+msgid "Online"
+msgstr "Online"
+
+#: src/presence-applet.cpp:231
+msgid "Busy"
+msgstr "Busy"
+
+#: src/presence-applet.cpp:235
+msgid "Away"
+msgstr "Away"
+
+#: src/presence-applet.cpp:239
+msgid "Not Available"
+msgstr "Not Available"
+
+#: src/presence-applet.cpp:243
+msgid "Invisible"
+msgstr "Invisible"
+
+#: src/presence-applet.cpp:247
+msgid "Offline"
+msgstr "Offline"
+
+#: src/presence-applet.cpp:258
+msgid "Join Chat Room..."
+msgstr "Join Chat Room..."
+
+#: src/presence-applet.cpp:261
+msgid "Account Manager..."
+msgstr "Account Manager..."
+
+#: src/presence-applet.cpp:262
+msgid "Contact List..."
+msgstr "Contact List..."
+
+#: src/presence-applet.cpp:263
+msgid "Add New Contacts..."
+msgstr "Add New Contacts..."
+
+#: src/presence-applet.cpp:266
+msgid "Make a Call..."
+msgstr "Make a Call..."
+
+#: src/presence-applet.cpp:270
+msgid "Send a File..."
+msgstr "Send a File..."
+
+#: src/presence-applet.cpp:428
+msgid "Connecting..."
+msgstr "Connecting..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/et/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/et/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/et/plasma_applet_org.kde.ktp-contact.po
2014-04-25 18:30:38.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/et/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:43:09.000000000 +0200
@@ -1,20 +1,20 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Marek Laane <[email protected]>, 2012.
+# Marek Laane <[email protected]>, 2012, 2014.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-12 05:55+0000\n"
-"PO-Revision-Date: 2012-01-10 03:45+0200\n"
+"PO-Revision-Date: 2014-06-11 03:48+0300\n"
"Last-Translator: Marek Laane <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
msgctxt "NAME OF TRANSLATORS"
@@ -28,7 +28,7 @@
#: src/contact-wrapper.cpp:261
#, kde-format
msgid "Choose files to send to %1"
-msgstr ""
+msgstr "Kasutajale %1 saadetavate failide valimine"
#~ msgid "Select a contact"
#~ msgstr "Kontakti valik"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/et/plasma_applet_org.kde.ktp-presence.po
new/ktp-desktop-applets-0.8.80/po/et/plasma_applet_org.kde.ktp-presence.po
--- old/ktp-desktop-applets-0.8.1/po/et/plasma_applet_org.kde.ktp-presence.po
2014-04-25 18:30:38.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/et/plasma_applet_org.kde.ktp-presence.po
2014-09-15 14:43:10.000000000 +0200
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Marek Laane <[email protected]>, 2012.
+# Marek Laane <[email protected]>, 2012, 2014.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2013-09-24 05:32+0000\n"
-"PO-Revision-Date: 2012-10-29 13:23+0200\n"
+"PO-Revision-Date: 2014-06-11 03:48+0300\n"
"Last-Translator: Marek Laane <[email protected]>\n"
"Language-Team: Estonian <[email protected]>\n"
"Language: et\n"
@@ -46,9 +46,8 @@
msgstr "Pole võrgus"
#: src/presence-applet.cpp:258
-#, fuzzy
msgid "Join Chat Room..."
-msgstr "Liitu jututoaga"
+msgstr "Liitu jututoaga..."
#: src/presence-applet.cpp:261
msgid "Account Manager..."
@@ -68,7 +67,7 @@
#: src/presence-applet.cpp:270
msgid "Send a File..."
-msgstr ""
+msgstr "Saada fail..."
#: src/presence-applet.cpp:428
msgid "Connecting..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/fr/plasma_applet_org.kde.ktp-presence.po
new/ktp-desktop-applets-0.8.80/po/fr/plasma_applet_org.kde.ktp-presence.po
--- old/ktp-desktop-applets-0.8.1/po/fr/plasma_applet_org.kde.ktp-presence.po
2014-04-25 18:30:57.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/fr/plasma_applet_org.kde.ktp-presence.po
2014-09-15 14:43:15.000000000 +0200
@@ -2,16 +2,16 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
# Joëlle Cornavin <[email protected]>, 2013.
-# xavier <[email protected]>, 2013.
+# xavier <[email protected]>, 2013, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: plasma_applet_org.kde.ktp-presence\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2013-09-24 05:32+0000\n"
-"PO-Revision-Date: 2013-06-28 08:56+0200\n"
-"Last-Translator: xavier <[email protected]>\n"
-"Language-Team: French <[email protected]>\n"
+"PO-Revision-Date: 2014-08-14 12:12+0200\n"
+"Last-Translator: Maxime\n"
+"Language-Team: French <[email protected]>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +52,7 @@
#: src/presence-applet.cpp:258
msgid "Join Chat Room..."
-msgstr "Rejoindre un forum de discussions..."
+msgstr "Rejoindre un salon de discussion..."
#: src/presence-applet.cpp:261
msgid "Account Manager..."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/hu/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/hu/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/hu/plasma_applet_org.kde.ktp-contact.po
2014-04-25 18:31:10.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/hu/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:43:24.000000000 +0200
@@ -2,19 +2,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Kristóf Kiszel <[email protected]>, 2012.
+# Balázs Úr <[email protected]>, 2014.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-12 05:55+0000\n"
-"PO-Revision-Date: 2012-01-17 12:41+0100\n"
-"Last-Translator: Kristóf Kiszel <[email protected]>\n"
+"PO-Revision-Date: 2014-06-15 16:40+0200\n"
+"Last-Translator: Balázs Úr <[email protected]>\n"
"Language-Team: Hungarian <[email protected]>\n"
-"Language: \n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgctxt "NAME OF TRANSLATORS"
@@ -28,7 +29,7 @@
#: src/contact-wrapper.cpp:261
#, kde-format
msgid "Choose files to send to %1"
-msgstr ""
+msgstr "Válassza ki a(z) %1 partnernek küldendő fájlokat"
#~ msgid "Select a contact"
#~ msgstr "Válasszon ki egy partnert"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/ja/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/ja/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/ja/plasma_applet_org.kde.ktp-contact.po
2014-04-25 18:31:15.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/ja/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:43:31.000000000 +0200
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"Project-Id-Version: plasma_applet_telepathy_contact\n"
+"Project-Id-Version: plasma_applet_org.kde.ktp-contact\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-12 05:55+0000\n"
"PO-Revision-Date: 2011-12-04 13:34-0800\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/ja/plasma_applet_org.kde.ktp-presence.po
new/ktp-desktop-applets-0.8.80/po/ja/plasma_applet_org.kde.ktp-presence.po
--- old/ktp-desktop-applets-0.8.1/po/ja/plasma_applet_org.kde.ktp-presence.po
2014-04-25 18:31:19.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/ja/plasma_applet_org.kde.ktp-presence.po
2014-09-15 14:43:31.000000000 +0200
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
-"Project-Id-Version: plasma_applet_org.kde.telepathy-presence\n"
+"Project-Id-Version: plasma_applet_org.kde.ktp-presence\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2013-09-24 05:32+0000\n"
"PO-Revision-Date: 2011-12-04 13:34-0800\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/ko/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/ko/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/ko/plasma_applet_org.kde.ktp-contact.po
2014-04-25 18:31:24.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/ko/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:43:37.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-12 05:55+0000\n"
-"PO-Revision-Date: 2014-03-09 04:50+0900\n"
+"PO-Revision-Date: 2014-03-09 04:32+0900\n"
"Last-Translator: Park Shinjo <[email protected]>\n"
"Language-Team: Korean <[email protected]>\n"
"Language: ko\n"
@@ -15,7 +15,6 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.5\n"
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
@@ -28,4 +27,4 @@
#: src/contact-wrapper.cpp:261
#, kde-format
msgid "Choose files to send to %1"
-msgstr ""
+msgstr "%1 님에게 보낼 파일 선택"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/nds/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/nds/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/nds/plasma_applet_org.kde.ktp-contact.po
2014-04-25 18:31:37.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/nds/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:43:48.000000000 +0200
@@ -2,33 +2,35 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
# Manfred Wiese <[email protected]>, 2011.
+# Sönke Dibbern <[email protected]>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: plasma_applet_telepathy_contact\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-12 05:55+0000\n"
-"PO-Revision-Date: 2011-11-29 21:50+0100\n"
-"Last-Translator: Manfred Wiese <[email protected]>\n"
+"PO-Revision-Date: 2014-06-05 17:37+0200\n"
+"Last-Translator: Sönke Dibbern <[email protected]>\n"
"Language-Team: Low Saxon <[email protected]>\n"
"Language: nds\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr "Manfred Wiese"
+msgstr "Sönke Dibbern"
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr "[email protected]"
+msgstr "Sönke Dibbern"
#: src/contact-wrapper.cpp:261
#, kde-format
msgid "Choose files to send to %1"
-msgstr ""
+msgstr "Dateien utsöken, de Du %1 tostüern wullt"
#~ msgid "Select a contact"
#~ msgstr "Kontakt utsöken"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/nds/plasma_applet_org.kde.ktp-presence.po
new/ktp-desktop-applets-0.8.80/po/nds/plasma_applet_org.kde.ktp-presence.po
--- old/ktp-desktop-applets-0.8.1/po/nds/plasma_applet_org.kde.ktp-presence.po
2014-04-25 18:31:37.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/nds/plasma_applet_org.kde.ktp-presence.po
2014-09-15 14:43:48.000000000 +0200
@@ -2,24 +2,26 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
# Manfred Wiese <[email protected]>, 2011.
+# Sönke Dibbern <[email protected]>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: plasma_applet_org.kde.telepathy-presence\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2013-09-24 05:32+0000\n"
-"PO-Revision-Date: 2011-11-29 21:50+0100\n"
-"Last-Translator: Manfred Wiese <[email protected]>\n"
+"PO-Revision-Date: 2014-06-05 17:56+0200\n"
+"Last-Translator: Sönke Dibbern <[email protected]>\n"
"Language-Team: Low Saxon <[email protected]>\n"
"Language: nds\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.4\n"
#: src/presence-applet.cpp:184
msgid "More"
-msgstr ""
+msgstr "Mehr"
#: src/presence-applet.cpp:227
msgid "Online"
@@ -35,7 +37,7 @@
#: src/presence-applet.cpp:239
msgid "Not Available"
-msgstr ""
+msgstr "Nich verföögbor"
#: src/presence-applet.cpp:243
msgid "Invisible"
@@ -47,34 +49,31 @@
#: src/presence-applet.cpp:258
msgid "Join Chat Room..."
-msgstr ""
+msgstr "Na Klöönruum ringahn..."
#: src/presence-applet.cpp:261
-#, fuzzy
msgid "Account Manager..."
-msgstr "Kontopleger"
+msgstr "Kontopleger..."
#: src/presence-applet.cpp:262
-#, fuzzy
msgid "Contact List..."
-msgstr "Kontaktenlist"
+msgstr "Kontaktenlist..."
#: src/presence-applet.cpp:263
-#, fuzzy
msgid "Add New Contacts..."
-msgstr "Kontaktenlist"
+msgstr "Nieg Kontakten tofögen..."
#: src/presence-applet.cpp:266
msgid "Make a Call..."
-msgstr ""
+msgstr "En Anroop maken..."
#: src/presence-applet.cpp:270
msgid "Send a File..."
-msgstr ""
+msgstr "En Datei loosstüern..."
#: src/presence-applet.cpp:428
msgid "Connecting..."
-msgstr ""
+msgstr "Bi to tokoppeln..."
#, fuzzy
#~| msgid "Account Manager"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/ro/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/ro/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/ro/plasma_applet_org.kde.ktp-contact.po
2014-04-25 18:31:50.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/ro/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:44:00.000000000 +0200
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Sergiu Bivol <[email protected]>, 2012.
+# Sergiu Bivol <[email protected]>, 2012, 2014.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-12 05:55+0000\n"
-"PO-Revision-Date: 2012-10-17 23:59+0300\n"
+"PO-Revision-Date: 2014-07-04 14:45+0300\n"
"Last-Translator: Sergiu Bivol <[email protected]>\n"
"Language-Team: Romanian <[email protected]>\n"
"Language: ro\n"
@@ -16,7 +16,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
@@ -29,7 +29,7 @@
#: src/contact-wrapper.cpp:261
#, kde-format
msgid "Choose files to send to %1"
-msgstr ""
+msgstr "Alegeți fișierele de trimis către %1"
#~ msgid "Select a contact"
#~ msgstr "Alegeți un contact"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/uk/plasma_applet_org.kde.ktp-contact.po
new/ktp-desktop-applets-0.8.80/po/uk/plasma_applet_org.kde.ktp-contact.po
--- old/ktp-desktop-applets-0.8.1/po/uk/plasma_applet_org.kde.ktp-contact.po
2014-04-25 18:32:10.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/uk/plasma_applet_org.kde.ktp-contact.po
2014-09-15 14:44:20.000000000 +0200
@@ -4,7 +4,7 @@
# Yuri Chornoivan <[email protected]>, 2013, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: plasma_applet_org.kde.ktp-contact\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-12 05:55+0000\n"
"PO-Revision-Date: 2014-03-12 21:11+0200\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/po/uk/plasma_applet_org.kde.ktp-presence.po
new/ktp-desktop-applets-0.8.80/po/uk/plasma_applet_org.kde.ktp-presence.po
--- old/ktp-desktop-applets-0.8.1/po/uk/plasma_applet_org.kde.ktp-presence.po
2014-04-25 18:32:10.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/po/uk/plasma_applet_org.kde.ktp-presence.po
2014-09-15 14:44:20.000000000 +0200
@@ -4,7 +4,7 @@
# Yuri Chornoivan <[email protected]>, 2013.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: plasma_applet_org.kde.ktp-presence\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2013-09-24 05:32+0000\n"
"PO-Revision-Date: 2013-09-24 15:46+0300\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/presence/plasma-applet-ktp-presence.desktop.cmake
new/ktp-desktop-applets-0.8.80/presence/plasma-applet-ktp-presence.desktop.cmake
---
old/ktp-desktop-applets-0.8.1/presence/plasma-applet-ktp-presence.desktop.cmake
2014-04-25 18:30:17.000000000 +0200
+++
new/ktp-desktop-applets-0.8.80/presence/plasma-applet-ktp-presence.desktop.cmake
2014-09-15 14:42:43.000000000 +0200
@@ -7,6 +7,7 @@
Name[da]=Instant messaging-tilstedeværelse
Name[de]=Instant-Messenger-Anwesenheit
Name[el]=Παρουσία με στιγμιαίο μήνυμα
+Name[en_GB]=Instant Messaging Presence
Name[es]=Presencia de mensajería instantánea
Name[et]=Kiirsuhtluse olek
Name[fi]=Pikaviestinnän läsnäolo
@@ -20,7 +21,9 @@
Name[lt]=TP matomumas
Name[mr]=त्वरित संदेश उपस्थिती
Name[nb]=Tilstede for lynmeldingssystemet
+Name[nds]=Kortnarichten-Praatschap
Name[nl]=Aanwezigheid van Instant Messaging
+Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹਾ ਮੌਜੂਦਗੀ
Name[pl]=Obecność w komunikatorze internetowym
Name[pt]=Presença nas Mensagens Instantâneas
Name[pt_BR]=Presença nas mensagens instantâneas
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/presence/src/presence-applet.cpp
new/ktp-desktop-applets-0.8.80/presence/src/presence-applet.cpp
--- old/ktp-desktop-applets-0.8.1/presence/src/presence-applet.cpp
2014-04-25 18:30:17.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/presence/src/presence-applet.cpp
2014-09-15 14:42:43.000000000 +0200
@@ -34,8 +34,10 @@
#include <KTp/actions.h>
#include <KTp/global-presence.h>
+#include <KTp/Models/presence-model.h>
#include <KTp/Widgets/add-contact-dialog.h>
#include <KTp/Widgets/join-chat-room-dialog.h>
+#include <KTp/Widgets/settings-kcm-dialog.h>
#include <Plasma/ToolTipManager>
#include <Plasma/Svg>
@@ -50,7 +52,8 @@
TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const
QVariantList &args)
: Plasma::Applet(parent, args),
- m_globalPresence(new KTp::GlobalPresence(this))
+ m_globalPresence(new KTp::GlobalPresence(this)),
+ m_presences(new KTp::PresenceModel(this))
{
s_instanceCount ++;
setupContextMenuActions();
@@ -85,8 +88,8 @@
setMinimumSize(QSize(iconSize, iconSize));
}
- connect(m_globalPresence, SIGNAL(currentPresenceChanged(KTp::Presence)),
SLOT(onPresenceChanged(KTp::Presence)));
- onPresenceChanged(m_globalPresence->currentPresence());
+ connect(m_globalPresence, SIGNAL(requestedPresenceChanged(KTp::Presence)),
SLOT(onPresenceChanged(KTp::Presence)));
+ onPresenceChanged(m_globalPresence->requestedPresence());
connect(m_globalPresence,
SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)),
SLOT(onConnectionStatusChanged(Tp::ConnectionStatus)));
onConnectionStatusChanged(m_globalPresence->connectionStatus());
@@ -161,104 +164,34 @@
}
int TelepathyPresenceApplet::handleCustomPresenceChange() {
+ m_presences->loadPresences();
setupContextMenuActions();
return 0;
}
-void TelepathyPresenceApplet::addPresence(const KTp::Presence &presence)
-{
- if(m_presences.contains(presence)) {
- return;
- }
-
- //Add presence to correct place in list, sorted by presence type
- QList<KTp::Presence>::iterator i = qLowerBound(m_presences.begin(),
m_presences.end(), KTp::Presence(presence));
- m_presences.insert(i, presence);
-}
-
void TelepathyPresenceApplet::setupContextMenuActions()
{
m_contextActions.clear();
- m_presences.clear();
KActionMenu *moreMenu = new KActionMenu(i18n("More"), this);
- KSharedConfigPtr config = KSharedConfig::openConfig("ktelepathyrc");
- KConfigGroup m_presenceGroup = config->group("Custom Presence List");
-
- //add default presences
- addPresence(Tp::Presence::available());
- addPresence(Tp::Presence::busy());
- addPresence(Tp::Presence::away());
- addPresence(Tp::Presence::xa());
- addPresence(Tp::Presence::hidden());
- addPresence(Tp::Presence::offline());
-
- //add custom presences
- Q_FOREACH(const QString &key, m_presenceGroup.keyList()) {
- QVariantList entry = m_presenceGroup.readEntry(key, QVariantList());
-
- if(entry.size()!=2)
- continue;
-
- QString statusMessage = entry.last().toString();
-
- switch (entry.first().toInt()) {
- case Tp::ConnectionPresenceTypeAvailable:
- addPresence(Tp::Presence::available(statusMessage));
- break;
- case Tp::ConnectionPresenceTypeAway:
- addPresence(Tp::Presence::away(statusMessage));
- break;
- case Tp::ConnectionPresenceTypeBusy:
- addPresence(Tp::Presence::busy(statusMessage));
- break;
- case Tp::ConnectionPresenceTypeExtendedAway:
- addPresence(Tp::Presence::xa(statusMessage));
- }
- }
-
//This loops through the all presences and creates a menu, connects to
slot and appends it to the context menu
- Q_FOREACH(const KTp::Presence &presence, m_presences) {
- KAction *action;
- QString menuentry, icon;
- switch (presence.type()) {
- case Tp::ConnectionPresenceTypeAvailable:
- menuentry = (presence.statusMessage()=="") ? i18n("Online") :
presence.statusMessage();
- icon = "user-online";
- break;
- case Tp::ConnectionPresenceTypeBusy:
- menuentry = (presence.statusMessage()=="") ? i18n("Busy") :
presence.statusMessage();
- icon = "user-busy";
- break;
- case Tp::ConnectionPresenceTypeAway:
- menuentry = (presence.statusMessage()=="") ? i18n("Away") :
presence.statusMessage();
- icon = "user-away";
- break;
- case Tp::ConnectionPresenceTypeExtendedAway:
- menuentry = (presence.statusMessage()=="") ? i18n("Not
Available") : presence.statusMessage();
- icon = "user-away-extended";
- break;
- case Tp::ConnectionPresenceTypeHidden:
- menuentry = (presence.statusMessage()=="") ? i18n("Invisible")
: presence.statusMessage();
- icon = "user-invisible";
- break;
- case Tp::ConnectionPresenceTypeOffline:
- menuentry = (presence.statusMessage()=="") ? i18n("Offline") :
presence.statusMessage();
- icon = "user-offline";
- break;
- default: continue;
+ for (int i = 0; i < m_presences->rowCount(); i++) {
+ KTp::Presence presence = m_presences->data(i).value<KTp::Presence>();
+ QString menuentry = m_presences->index(i,
0).data(Qt::DisplayRole).toString();
+ if (menuentry.size() > 60) {
+ menuentry = menuentry.left(60).append("...");
}
- action = new KAction(getThemedIcon(icon), menuentry, this);
+ KAction* action = new KAction(getThemedIcon(presence.iconName(false)),
menuentry, this);
action->setData(QVariant::fromValue(presence));
connect(action, SIGNAL(triggered()), this,
SLOT(onPresenceActionClicked()));
m_contextActions.append(action);
}
- KAction *joinChatroomAction = new KAction(KIcon("user-group-new"),
i18n("Join Chat Room..."), this);
+ KAction *joinChatroomAction = new KAction(KIcon("im-irc"), i18n("Join Chat
Room..."), this);
// application actions
- KAction *showAccountManagerAction = new KAction(KIcon("telepathy-kde"),
i18n("Account Manager..."), this);
+ KAction *showSettingsKCMAction = new KAction(KIcon("telepathy-kde"),
i18n("Instant Messaging Settings..."), this);
KAction *showContactListAction = new KAction(KIcon("meeting-attending"),
i18n("Contact List..."), this);
KAction *addContactAction = new KAction(KIcon("list-add-user"), i18n("Add
New Contacts..."), this);
KAction *makeCallAction = 0;
@@ -271,7 +204,7 @@
}
// connect actions
- connect(showAccountManagerAction, SIGNAL(triggered()), this,
SLOT(startAccountManager()));
+ connect(showSettingsKCMAction, SIGNAL(triggered()), this,
SLOT(showSettingsKCM()));
connect(showContactListAction, SIGNAL(triggered()), this,
SLOT(toggleContactList()));
connect(addContactAction, SIGNAL(triggered()), this,
SLOT(onAddContactRequest()));
connect(joinChatroomAction, SIGNAL(triggered()), this,
SLOT(onJoinChatRoomRequest()));
@@ -283,7 +216,7 @@
}
m_contextActions.append(moreMenu->addSeparator());
- m_contextActions.append(showAccountManagerAction);
+ m_contextActions.append(showSettingsKCMAction);
m_contextActions.append(showContactListAction);
m_contextActions.append(moreMenu->addSeparator());
@@ -321,9 +254,12 @@
}
}
-void TelepathyPresenceApplet::startAccountManager()
+void TelepathyPresenceApplet::showSettingsKCM()
{
- KToolInvocation::startServiceByDesktopName("kcm_ktp_accounts");
+ KTp::SettingsKcmDialog *dialog = new KTp::SettingsKcmDialog();
+ dialog->addGeneralSettingsModule();
+ dialog->addNotificationsModule();
+ dialog->show();
}
void TelepathyPresenceApplet::toggleContactList()
@@ -390,7 +326,7 @@
svgIcon.setImagePath("icons/presence-applet");
if (svgIcon.hasElement(iconBaseName+"-plasma")) {
svgIcon.resize(150,150);
- KIcon icon = KIcon(svgIcon.pixmap(iconBaseName+"-plasma"));
+ KIcon icon(svgIcon.pixmap(iconBaseName+"-plasma"));
m_icon->setIcon(icon);
} else {
m_icon->setIcon(presence.icon());
@@ -419,7 +355,7 @@
Plasma::ToolTipContent content;
KUser user;
- QString presenceMsg =
QString(m_globalPresence->currentPresence().statusMessage());
+ QString presenceMsg(m_globalPresence->requestedPresence().statusMessage());
content.setImage(KIcon("telepathy-kde"));
content.setMainText(user.loginName());
@@ -429,7 +365,7 @@
} else if (!presenceMsg.isEmpty()) {
content.setSubText(presenceMsg);
} else {
-
content.setSubText(m_globalPresence->currentPresence().displayString());
+
content.setSubText(m_globalPresence->requestedPresence().displayString());
}
Plasma::ToolTipManager::self()->setContent(this, content);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktp-desktop-applets-0.8.1/presence/src/presence-applet.h
new/ktp-desktop-applets-0.8.80/presence/src/presence-applet.h
--- old/ktp-desktop-applets-0.8.1/presence/src/presence-applet.h
2014-04-25 18:30:17.000000000 +0200
+++ new/ktp-desktop-applets-0.8.80/presence/src/presence-applet.h
2014-09-15 14:42:43.000000000 +0200
@@ -32,6 +32,7 @@
namespace KTp {
class GlobalPresence;
+ class PresenceModel;
}
namespace Tp {
@@ -68,7 +69,7 @@
void toolTipAboutToShow();
void toolTipHidden();
- void startAccountManager();
+ void showSettingsKCM();
void toggleContactList();
void onAddContactRequest();
void onMakeCallRequest();
@@ -98,8 +99,7 @@
QDBusServiceWatcher *m_contactListWatcher;
bool m_contactListRunning;
- void addPresence(const KTp::Presence &presence);
- QList<KTp::Presence> m_presences;
+ KTp::PresenceModel *m_presences;
};
#endif // KTP_PRESENCE_APPLET_H
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
