From bb825fed8da79a8a0331126b0142e704947fd69b Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Fri, 6 Sep 2013 21:12:14 +0200 Subject: [PATCH 01/18] Prettifying plasmoid Text is no longer over the dismiss button but wrapped in two lines --- plasmoid/package/contents/ui/DeviceDelegate.qml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plasmoid/package/contents/ui/DeviceDelegate.qml b/plasmoid/package/contents/ui/DeviceDelegate.qml index cd4784950..0ba38e6b8 100644 --- a/plasmoid/package/contents/ui/DeviceDelegate.qml +++ b/plasmoid/package/contents/ui/DeviceDelegate.qml @@ -60,8 +60,14 @@ PlasmaComponents.ListItem delegate: PlasmaComponents.ListItem { PlasmaComponents.Label { text: appName + ": " + display + anchors.right: dismissButton.left + anchors.left: parent.left + elide: Text.ElideRight + maximumLineCount: 2 + wrapMode: Text.WordWrap } PlasmaComponents.ToolButton { + id: dismissButton visible: notificationsModel.isAnyDimissable; enabled: dismissable anchors.right: parent.right From 87e949e3a389f30cf11a79f3b02531170bcd5418 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Fri, 6 Sep 2013 21:14:20 +0200 Subject: [PATCH 02/18] Changed plasmoid description Old text was a stub :P --- plasmoid/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 422f0cce0..ab5a761f5 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=KdeConnect -Comment=KdeConnect awesome plasmoid +Comment=Show notifications from your devices using KDE Connect Icon=smartphone Type=Service From 7b01ce2d8af57509631206be8494a16577f8f68e Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sun, 8 Sep 2013 19:05:27 +0200 Subject: [PATCH 03/18] Incorrect comments --- kded/daemon.cpp | 3 +-- kded/daemon.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kded/daemon.cpp b/kded/daemon.cpp index 0fad8c729..cb3e62c86 100644 --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -82,9 +82,8 @@ Daemon::Daemon(QObject *parent, const QList&) Q_EMIT deviceAdded(id); } + //Listen to connectivity changes QNetworkSession* network = new QNetworkSession(QNetworkConfigurationManager().defaultConfiguration()); - - //Listen to incomming connections Q_FOREACH (LinkProvider* a, mLinkProviders) { connect(network, SIGNAL(stateChanged(QNetworkSession::State)), a, SLOT(onNetworkChange(QNetworkSession::State))); diff --git a/kded/daemon.h b/kded/daemon.h index f0a00f08d..467df2e45 100644 --- a/kded/daemon.h +++ b/kded/daemon.h @@ -77,4 +77,4 @@ private: }; -#endif // UDP_WIRELESS_H +#endif From 2106adaf3bbe32593b46695133907ae4dbf933d8 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sun, 8 Sep 2013 19:06:13 +0200 Subject: [PATCH 04/18] Incorrect include --- kded/networkpackage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kded/networkpackage.cpp b/kded/networkpackage.cpp index 107a76900..75f54299c 100644 --- a/kded/networkpackage.cpp +++ b/kded/networkpackage.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -100,7 +100,7 @@ void NetworkPackage::encrypt (QCA::PublicKey& key) chunks.append( encryptedChunk.toBase64() ); } - qDebug() << chunks.size() << "chunks"; + //qDebug() << chunks.size() << "chunks"; mId = QString::number(QDateTime::currentMSecsSinceEpoch()); mType = PACKAGE_TYPE_ENCRYPTED; From 50dc5be5df0544d96ff4820052efb2fd0689b1fb Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sun, 8 Sep 2013 19:07:09 +0200 Subject: [PATCH 05/18] Unused forward declaration --- kded/networkpackage.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/kded/networkpackage.h b/kded/networkpackage.h index 322d67fd2..6cbdafa9d 100644 --- a/kded/networkpackage.h +++ b/kded/networkpackage.h @@ -33,8 +33,6 @@ #include "default_args.h" -class EncryptedNetworkPackage; - class NetworkPackage : public QObject { Q_OBJECT From b2c8a22815bab24c9df0feee2f89e2a58e299d32 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sun, 8 Sep 2013 19:26:13 +0200 Subject: [PATCH 06/18] Removed letsgo script as it was confusing users --- letsgo.sh | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100755 letsgo.sh diff --git a/letsgo.sh b/letsgo.sh deleted file mode 100755 index 232072aba..000000000 --- a/letsgo.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -#Source bashrc to define kdebuild and environment variables -#http://techbase.kde.org/Getting_Started/Build/Environment -. ~/.bashrc - -KDE_BUILD_CONFIRMATION=false -export VERBOSE=1 - -if kdebuild; then - - echo "--------BUILD DONE--------------" - - kbuildsycoca4 - - killall kded4 2> /dev/null - while killall -9 kded4 2> /dev/null; do - true - done - - #qdbus org.kde.kded /kded unloadModule kdeconnect - #qdbus org.kde.kded /kded loadModule kdeconnect - - echo "--------STARTING KDED--------------" - - kded4 --nofork # 2>&1 | grep -v "^kded(" & - -fi - From faf2b61f1d370f1653b649de7f957d09e0e77e00 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 9 Sep 2013 18:24:32 +0200 Subject: [PATCH 07/18] Plasmoid settings show kcm --- plasmoid/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index ab5a761f5..71b0bf02d 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -10,6 +10,7 @@ X-Plasma-API=declarativeappletscript X-Plasma-MainScript=ui/kdeconnect.qml X-Plasma-DefaultSize=290,340 X-Plasma-NotificationArea=true +X-Plasma-ConfigPlugins=kcm_kdeconnect X-KDE-PluginInfo-Author=Albert Vaca Cintora X-KDE-PluginInfo-Email=albertvaka@gmail.com From b61c518d528204048254b98c674c9e0af7074938 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 9 Sep 2013 18:28:52 +0200 Subject: [PATCH 08/18] Less verbosity: commented lots of QDebugs --- kded/daemon.cpp | 10 ++++++---- kded/device.cpp | 6 +++--- kded/networkpackage.cpp | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/kded/daemon.cpp b/kded/daemon.cpp index cb3e62c86..a69245d7b 100644 --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -134,14 +134,14 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink* { const QString& id = identityPackage.get("deviceId"); - qDebug() << "Device discovered" << id << "via" << dl->provider()->name(); + //qDebug() << "Device discovered" << id << "via" << dl->provider()->name(); if (mDevices.contains(id)) { - qDebug() << "It is a known device"; + //qDebug() << "It is a known device"; Device* device = mDevices[id]; device->addLink(dl); } else { - qDebug() << "It is a new device"; + //qDebug() << "It is a new device"; Device* device = new Device(identityPackage, dl); connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceReachableStatusChanged())); @@ -162,10 +162,12 @@ void Daemon::onDeviceReachableStatusChanged() Q_EMIT deviceVisibilityChanged(id, device->isReachable()); + qDebug() << "Device" << device->name() << "reachable status changed:" << device->isReachable(); + if (!device->isReachable()) { if (!device->isPaired()) { - qDebug() << "Destroying device"; + qDebug() << "Destroying device" << device->name(); Q_EMIT deviceRemoved(id); mDevices.remove(id); device->deleteLater(); diff --git a/kded/device.cpp b/kded/device.cpp index 5b90dbda4..b67b3dafa 100644 --- a/kded/device.cpp +++ b/kded/device.cpp @@ -195,7 +195,7 @@ static bool lessThan(DeviceLink* p1, DeviceLink* p2) void Device::addLink(DeviceLink* link) { - qDebug() << "Adding link to" << id() << "via" << link->provider(); + //qDebug() << "Adding link to" << id() << "via" << link->provider(); connect(link, SIGNAL(destroyed(QObject*)), this, SLOT(linkDestroyed(QObject*))); @@ -230,7 +230,7 @@ void Device::removeLink(DeviceLink* link) { m_deviceLinks.removeOne(link); - qDebug() << "RemoveLink" << m_deviceLinks.size() << "links remaining"; + //qDebug() << "RemoveLink" << m_deviceLinks.size() << "links remaining"; if (m_deviceLinks.empty()) { reloadPlugins(); @@ -259,7 +259,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np) { if (np.type() == PACKAGE_TYPE_PAIR) { - qDebug() << "Pair package"; + //qDebug() << "Pair package"; bool wantsPair = np.get("pair"); diff --git a/kded/networkpackage.cpp b/kded/networkpackage.cpp index 75f54299c..9443c73d8 100644 --- a/kded/networkpackage.cpp +++ b/kded/networkpackage.cpp @@ -58,7 +58,7 @@ QByteArray NetworkPackage::serialize() const if (!ok) { qDebug() << "Serialization error:" << serializer.errorMessage(); } else { - qDebug() << "Serialized package:" << json; + //qDebug() << "Serialized package:" << json; json.append('\n'); } @@ -67,7 +67,7 @@ QByteArray NetworkPackage::serialize() const bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np) { - qDebug() << "Unserialize: " << a; + //qDebug() << "Unserialize: " << a; //Json -> QVariant QJson::Parser parser; From b22dee3e7ee2615a3ee0931d06cacd2ccfe0d601 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 9 Sep 2013 18:29:24 +0200 Subject: [PATCH 09/18] Include clean-up --- kcm/kcm.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp index 7dc286a64..61d41da43 100644 --- a/kcm/kcm.cpp +++ b/kcm/kcm.cpp @@ -19,8 +19,6 @@ */ #include "kcm.h" -#include "ui_kcm.h" -#include "libkdeconnect/dbusinterfaces.h" #include #include @@ -30,14 +28,16 @@ #include #include #include - -#include "devicessortproxymodel.h" +#include #include #include -#include -#include -#include +#include +#include + +#include "ui_kcm.h" +#include "libkdeconnect/dbusinterfaces.h" +#include "devicessortproxymodel.h" K_PLUGIN_FACTORY(KdeConnectKcmFactory, registerPlugin();) K_EXPORT_PLUGIN(KdeConnectKcmFactory("kdeconnect-kcm", "kdeconnect-kcm")) From 3cf3c54222852202ddb874acbfd6710e3973f22c Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Tue, 10 Sep 2013 15:04:08 +0200 Subject: [PATCH 10/18] Fixed a bug that caused notification spam when a notification was updated BUG: 324744 --- kded/plugins/notifications/notificationsdbusinterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kded/plugins/notifications/notificationsdbusinterface.cpp b/kded/plugins/notifications/notificationsdbusinterface.cpp index 3b9eabde4..24466a403 100644 --- a/kded/plugins/notifications/notificationsdbusinterface.cpp +++ b/kded/plugins/notifications/notificationsdbusinterface.cpp @@ -50,9 +50,9 @@ void NotificationsDbusInterface::processPackage(const NetworkPackage& np) removeNotification(np.get("id")); } else { Notification* noti = new Notification(np, this); - addNotification(noti); - if (!np.get("requestAnswer", false)) { //Do not show notifications for answers to a initial request + //Do not show updates to existent notification nor answers to a initialization request + if (!mInternalIdToPublicId.contains(noti->internalId()) && !np.get("requestAnswer", false)) { KNotification* notification = new KNotification("notification"); notification->setPixmap(KIcon("preferences-desktop-notification").pixmap(48, 48)); notification->setComponentData(KComponentData("kdeconnect", "kdeconnect")); @@ -61,7 +61,7 @@ void NotificationsDbusInterface::processPackage(const NetworkPackage& np) notification->sendEvent(); } - + addNotification(noti); } } From 32a343fe6bfa43295c6fb9ecbc17004cfd3b1a97 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 10 Sep 2013 15:18:32 +0100 Subject: [PATCH 11/18] add missing licence file --- COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..d159169d1 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. From 006a0b8dadaa7c0ed595b26b953d76179720bd6d Mon Sep 17 00:00:00 2001 From: Tim Creech Date: Thu, 12 Sep 2013 20:49:32 +0200 Subject: [PATCH 12/18] Didn't build on FreeBSD because it does not define SOL_TCP Replaced SOL_TCP with getprotobyname("TCP")->p_proto BUG: 324766 --- kded/devicelinks/landevicelink.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kded/devicelinks/landevicelink.cpp b/kded/devicelinks/landevicelink.cpp index 38fa110dc..c10d599fe 100644 --- a/kded/devicelinks/landevicelink.cpp +++ b/kded/devicelinks/landevicelink.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "linkproviders/linkprovider.h" #include "networkpackage.h" @@ -40,10 +41,10 @@ LanDeviceLink::LanDeviceLink(const QString& d, LinkProvider* a, QTcpSocket* sock setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &maxIdle, sizeof(maxIdle)); int count = 3; // send up to 3 keepalive packets out, then disconnect if no response - setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &count, sizeof(count)); + setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPCNT, &count, sizeof(count)); int interval = 5; // send a keepalive packet out every 2 seconds (after the 5 second idle period) - setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &interval, sizeof(interval)); + setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPINTVL, &interval, sizeof(interval)); connect(mSocket, SIGNAL(disconnected()), this, SLOT(deleteLater())); From 028fc3047065e44d88c2d5550e92b6cf2dcfb3f8 Mon Sep 17 00:00:00 2001 From: Simon Cadman Date: Fri, 13 Sep 2013 19:20:24 +0200 Subject: [PATCH 13/18] SMS message notification didn't show any text QString content was shadowing a previously declared variable BUG: 324857 --- kded/plugins/telephony/telephonyplugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kded/plugins/telephony/telephonyplugin.cpp b/kded/plugins/telephony/telephonyplugin.cpp index ecc2b7161..ab5c8075a 100644 --- a/kded/plugins/telephony/telephonyplugin.cpp +++ b/kded/plugins/telephony/telephonyplugin.cpp @@ -55,8 +55,8 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np) } else if (event == "sms") { type = "smsReceived"; icon = "mail-receive"; - QString content = np.get("messageBody",""); - content = i18n("SMS from %1: %2", phoneNumber, content); + QString messageBody = np.get("messageBody",""); + content = i18n("SMS from %1: %2", phoneNumber, messageBody); } else if (event == "talking") { return NULL; } else { From cc8261b84926663d911b3c5cdcd83387c8e1a929 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Sep 2013 04:02:16 +0000 Subject: [PATCH 14/18] SVN_SILENT made messages (.desktop file) --- kcm/kcm_kdeconnect.desktop | 18 ++++ kded/kdeconnect.desktop | 12 +++ kded/kdeconnect.notifyrc | 96 +++++++++++++++++++ .../battery/kdeconnect_battery.desktop | 12 +++ .../clipboard/kdeconnect_clipboard.desktop | 12 +++ .../kdeconnect_filetransfer.desktop | 11 +++ kded/plugins/kdeconnect_plugin.desktop | 6 ++ .../kdeconnect_mpriscontrol.desktop | 11 +++ .../kdeconnect_notifications.desktop | 11 +++ .../pausemusic/kdeconnect_pausemusic.desktop | 10 ++ kded/plugins/ping/kdeconnect_ping.desktop | 12 +++ .../telephony/kdeconnect_telephony.desktop | 12 +++ plasmoid/package/metadata.desktop | 12 +++ 13 files changed, 235 insertions(+) diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index 1fbf6aa77..295128e63 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -12,9 +12,27 @@ X-KDE-ParentApp=kcontrol X-KDE-System-Settings-Parent-Category=hardware Name=Devices +Name[de]=Geräte +Name[pt]=Dispositivos +Name[pt_BR]=Dispositivos +Name[sv]=Apparater +Name[uk]=Пристрої +Name[x-test]=xxDevicesxx Comment=Connect and sync your devices with KDE +Comment[de]=Verbinden und Abgleichen Ihrer Geräte mit KDE +Comment[pt]=Ligue e sincronize os seus dispositivos com o KDE +Comment[pt_BR]=Conecta e sincroniza seus dispositivos com o KDE +Comment[sv]=Anslut och synkronisera dina apparater med KDE +Comment[uk]=З’єднання і синхронізація ваших пристроїв з KDE +Comment[x-test]=xxConnect and sync your devices with KDExx X-KDE-Keywords=Network,Android,Devices +X-KDE-Keywords[de]=Netzwerk,Android,Geräte +X-KDE-Keywords[pt]=Rede,Android,Dispositivos +X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos +X-KDE-Keywords[sv]=Nätverk, Android, apparater +X-KDE-Keywords[uk]=Network;Android;Devices;мережа;андроїд;пристрої +X-KDE-Keywords[x-test]=xxNetwork,Android,Devicesxx Categories=Qt;KDE;X-KDE-settings-kdeconnect; diff --git a/kded/kdeconnect.desktop b/kded/kdeconnect.desktop index b8610c6a5..3532d5f83 100644 --- a/kded/kdeconnect.desktop +++ b/kded/kdeconnect.desktop @@ -9,5 +9,17 @@ X-KDE-Kded-load-on-demand=false X-KDE-Kded-phase=1 Name=KDE Connect +Name[de]=KDE Connect +Name[pt]=KDE Connect +Name[pt_BR]=KDE Connect +Name[sv]=KDE anslut +Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx Comment=Connect KDE with your smartphone +Comment[de]=KDE mit Ihren Smartphone verbinden +Comment[pt]=Ligue o KDE ao seu telemóvel +Comment[pt_BR]=Conecte o KDE ao seu celular +Comment[sv]=Anslut KDE till din smartphone +Comment[uk]=З’єднання KDE з вашим смартфоном +Comment[x-test]=xxConnect KDE with your smartphonexx diff --git a/kded/kdeconnect.notifyrc b/kded/kdeconnect.notifyrc index 1137d692d..b4391f6d8 100644 --- a/kded/kdeconnect.notifyrc +++ b/kded/kdeconnect.notifyrc @@ -1,39 +1,135 @@ [Global] IconName=smartphone Name=KDE Connect +Name[de]=KDE Connect +Name[pt]=KDE Connect +Name[pt_BR]=KDE Connect +Name[sv]=KDE anslut +Name[uk]=З’єднання KDE +Name[x-test]=xxKDE Connectxx Comment=Notifications from your devices +Comment[de]=Benachrichtigungen von Ihren Geräten +Comment[pt]=Notificações dos seus dispositivos +Comment[pt_BR]=Notificações dos seus dispositivos +Comment[sv]=Underrättelser från dina apparater +Comment[uk]=Сповіщення з вашого пристрою +Comment[x-test]=xxNotifications from your devicesxx [Event/callReceived] Name=Calling +Name[de]=Anruf +Name[pt]=A Chamar +Name[pt_BR]=Chamando +Name[sv]=Samtal +Name[uk]=Виклик +Name[x-test]=xxCallingxx Comment=Someone is calling you +Comment[de]=Sie werden angerufen +Comment[pt]=Alguém está a ligar-lhe +Comment[pt_BR]=Alguém está chamando você +Comment[sv]=Någon ringer till dig +Comment[uk]=Хтось телефонує вам +Comment[x-test]=xxSomeone is calling youxx Action=Popup [Event/missedCall] Name=Missed +Name[de]=Verpasst +Name[pt]=Não Atendida +Name[pt_BR]=Não atendidas +Name[sv]=Missat +Name[uk]=Пропущено +Name[x-test]=xxMissedxx Comment=You have a missed call +Comment[de]=Sie haben einen Anruf verpasst +Comment[pt]=Tem uma chamada não atendida +Comment[pt_BR]=Você tem uma chamada não atendida +Comment[sv]=Du har missat ett samtal +Comment[uk]=Вами пропущено телефонний дзвінок +Comment[x-test]=xxYou have a missed callxx Action=Popup [Event/smsReceived] Name=SMS +Name[de]=SMS +Name[pt]=SMS +Name[pt_BR]=SMS +Name[sv]=SMS +Name[uk]=SMS +Name[x-test]=xxSMSxx Comment=Someone sent you an SMS +Comment[de]=Jemand hat Ihnen eine SMS gesendet +Comment[pt]=Alguém lhe enviou um SMS +Comment[pt_BR]=Alguém lhe enviou um SMS +Comment[sv]=Någon skickade ett SMS till dig +Comment[uk]=Хтось надіслав вам SMS +Comment[x-test]=xxSomeone sent you an SMSxx Action=Popup [Event/batteryLow] Name=Battery +Name[de]=Akku +Name[pt]=Bateria +Name[pt_BR]=Bateria +Name[sv]=Batteri +Name[uk]=Акумулятор +Name[x-test]=xxBatteryxx Comment=Your battery is in low state +Comment[de]=Der Ladestand Ihres Akkus ist niedrig +Comment[pt]=A sua bateria está fraca +Comment[pt_BR]=Sua bateria está com carga baixa +Comment[sv]=Batteriet är nästan slut +Comment[uk]=Рівень заряду акумулятора є низьким +Comment[x-test]=xxYour battery is in low statexx Action=Popup [Event/pingReceived] Name=Ping +Name[de]=Ping +Name[pt]=Pedido de Rede +Name[pt_BR]=Ping +Name[sv]=Ping +Name[uk]=Луна +Name[x-test]=xxPingxx Comment=Ping received +Comment[de]=Ping empfangen +Comment[pt]=Pedido de rede recebido +Comment[pt_BR]=Ping recebido +Comment[sv]=Ping mottaget +Comment[uk]=Отримано сигнал підтримки зв’язку +Comment[x-test]=xxPing receivedxx Action=Popup [Event/notification] Name=Notification +Name[de]=Benachrichtigung +Name[pt]=Notificação +Name[pt_BR]=Notificação +Name[sv]=Underrättelse +Name[uk]=Сповіщення +Name[x-test]=xxNotificationxx Comment=Notification received +Comment[de]=Benachrichtigung eingegangen +Comment[pt]=Notificação recebida +Comment[pt_BR]=Notificação recebida +Comment[sv]=Underrättelse mottagen +Comment[uk]=Отримано сповіщення +Comment[x-test]=xxNotification receivedxx Action=Popup [Event/unknownEvent] Name=Unknown +Name[de]=Unbekannt +Name[pt]=Desconhecido +Name[pt_BR]=Desconhecido +Name[sv]=Okänt +Name[uk]=Невідомо +Name[x-test]=xxUnknownxx Comment=Something unknown happened +Comment[de]=Etwas unbekanntes ist aufgetreten +Comment[pt]=Algo de inesperado aconteceu +Comment[pt_BR]=Ocorreu algo inesperado +Comment[sv]=Någonting okänt inträffade +Comment[uk]=Сталося щось невідоме програмі +Comment[x-test]=xxSomething unknown happenedxx Action=Popup diff --git a/kded/plugins/battery/kdeconnect_battery.desktop b/kded/plugins/battery/kdeconnect_battery.desktop index 74421b280..3eb0b181f 100644 --- a/kded/plugins/battery/kdeconnect_battery.desktop +++ b/kded/plugins/battery/kdeconnect_battery.desktop @@ -12,4 +12,16 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=battery-100 Name=Battery monitor +Name[de]=Akkuüberwachung +Name[pt]=Monitor da bateria +Name[pt_BR]=Monitor de bateria +Name[sv]=Batteriövervakare +Name[uk]=Монітор акумулятора +Name[x-test]=xxBattery monitorxx Comment=Show your phone battery next to your computer battery +Comment[de]=Zeigt den Akku Ihres Telefons neben dem Akku des Rechners +Comment[pt]=Mostra a bateria do seu telemóvel ao lado da do computador +Comment[pt_BR]=Mostra a bateria do seu celular ao lado da bateria do computador +Comment[sv]=Visa telefonens batteri intill datorbatteriet +Comment[uk]=Показ даних щодо рівня заряду акумулятора на телефоні поряд з даними щодо рівня заряду акумулятора комп’ютера +Comment[x-test]=xxShow your phone battery next to your computer batteryxx diff --git a/kded/plugins/clipboard/kdeconnect_clipboard.desktop b/kded/plugins/clipboard/kdeconnect_clipboard.desktop index 5cb09280b..2132f4f74 100644 --- a/kded/plugins/clipboard/kdeconnect_clipboard.desktop +++ b/kded/plugins/clipboard/kdeconnect_clipboard.desktop @@ -12,4 +12,16 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=edit-paste Name=Clipboard +Name[de]=Zwischenablage +Name[pt]=Área de Transferência +Name[pt_BR]=Área de transferência +Name[sv]=Klippbord +Name[uk]=Буфер обміну +Name[x-test]=xxClipboardxx Comment=Share the clipboard between devices +Comment[de]=Die Zwischenablage mit Geräten teilen +Comment[pt]=Partilhar a área de transferência entre dispositivos +Comment[pt_BR]=Compartilhar a área de transferência entre dispositivos +Comment[sv]=Dela klippbordet mellan apparater +Comment[uk]=Спільне використання буфера обміну даними на пристроях +Comment[x-test]=xxShare the clipboard between devicesxx diff --git a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop index 58fc4da2b..e240cda58 100644 --- a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop +++ b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop @@ -12,4 +12,15 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=folder-downloads Name=(Stub) File transfer +Name[pt]=(Interface) Transferência de ficheiros +Name[pt_BR]=(Interface) Transferência de arquivos +Name[sv]=Filöverföring (markör) +Name[uk]=Модуль передавання файлів (фіктивний) +Name[x-test]=xx(Stub) File transferxx Comment=Send and receive files from dolphin +Comment[de]=Dateien aus Dolphin senden und empfangen +Comment[pt]=Enviar e receber ficheiros a partir do Dolphin +Comment[pt_BR]=Envia e recebe arquivos a partir do Dolphin +Comment[sv]=Skicka och ta emot filer med Dolphin +Comment[uk]=Надсилання і отримання файлів з dolphin +Comment[x-test]=xxSend and receive files from dolphinxx diff --git a/kded/plugins/kdeconnect_plugin.desktop b/kded/plugins/kdeconnect_plugin.desktop index dd76d9243..dc33bcc05 100644 --- a/kded/plugins/kdeconnect_plugin.desktop +++ b/kded/plugins/kdeconnect_plugin.desktop @@ -3,3 +3,9 @@ Type=ServiceType X-KDE-ServiceType=KdeConnect/Plugin X-KDE-Derived=KPluginInfo Name=KDEConnect Plugin +Name[de]=KDEConnect-Modul +Name[pt]='Plugin' do KDEConnect +Name[pt_BR]=Plugin do KDEConnect +Name[sv]=KDE anslutningsinsticksprogram +Name[uk]=Додаток KDEConnect +Name[x-test]=xxKDEConnect Pluginxx diff --git a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop index a93e25606..eab6a542d 100644 --- a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop +++ b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop @@ -12,4 +12,15 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=media-playback-start Name=Multimedia control receiver +Name[pt]=Receptor de controlo multimédia +Name[pt_BR]=Receptor de controle multimídia +Name[sv]=Mottagare av multimediastyrning +Name[uk]=Отримувач команд щодо керування мультимедійними функціями +Name[x-test]=xxMultimedia control receiverxx Comment=Remote control your music and videos +Comment[de]=Fernbedienung für Musik und Videos +Comment[pt]=Comande à distância a sua música e vídeos +Comment[pt_BR]=Controle suas músicas e vídeos remotamente +Comment[sv]=Fjärrstyr musik och videor +Comment[uk]=Віддалене керування відтворенням музики та відео +Comment[x-test]=xxRemote control your music and videosxx diff --git a/kded/plugins/notifications/kdeconnect_notifications.desktop b/kded/plugins/notifications/kdeconnect_notifications.desktop index a30cbb4d1..1b6cef818 100644 --- a/kded/plugins/notifications/kdeconnect_notifications.desktop +++ b/kded/plugins/notifications/kdeconnect_notifications.desktop @@ -12,4 +12,15 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=preferences-desktop-notification Name=Notification sync +Name[pt]=Sincronização de notificações +Name[pt_BR]=Sincronização de notificações +Name[sv]=Synkronisering av underrättelser +Name[uk]=Синхронізація сповіщень +Name[x-test]=xxNotification syncxx Comment=Show phone notifications in KDE and keep them in sync +Comment[de]=Benachrichtigungen in KDE anzeigen und abgleichen +Comment[pt]=Mostrar as notificações do telefone no KDE e mantê-las sincronizadas +Comment[pt_BR]=Mostra as notificações do celular no KDE e as mantem sincronizadas +Comment[sv]=Visa telefonunderrättelser i KDE och håll dem synkroniserade +Comment[uk]=Показ сповіщень з телефону у KDE та підтримання синхронізації даних сповіщень +Comment[x-test]=xxShow phone notifications in KDE and keep them in syncxx diff --git a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop index 67c1f5e20..00b8738bb 100644 --- a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop +++ b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop @@ -12,4 +12,14 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=speaker Name=Pause media during calls +Name[pt]=Pausar os conteúdos durante as chamadas +Name[pt_BR]=Pausar os conteúdos multimídia durante as chamadas +Name[sv]=Pausa media under samtal +Name[uk]=Призупинка відтворення під час дзвінків +Name[x-test]=xxPause media during callsxx Comment=Pause music/videos during a phone call +Comment[pt]=Pausar a música/vídeo durante uma chamada +Comment[pt_BR]=Pausa a música/vídeo durante uma chamada +Comment[sv]=Pausa musik eller videor under ett telefonsamtal +Comment[uk]=Призупинка відтворення музики і відео на час телефонних дзвінків +Comment[x-test]=xxPause music/videos during a phone callxx diff --git a/kded/plugins/ping/kdeconnect_ping.desktop b/kded/plugins/ping/kdeconnect_ping.desktop index c225c8d04..60dedce9f 100644 --- a/kded/plugins/ping/kdeconnect_ping.desktop +++ b/kded/plugins/ping/kdeconnect_ping.desktop @@ -12,4 +12,16 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=dialog-ok Name=Ping +Name[de]=Ping +Name[pt]=Pedido de Rede +Name[pt_BR]=Ping +Name[sv]=Ping +Name[uk]=Луна +Name[x-test]=xxPingxx Comment=Send and receive pings +Comment[de]=Senden und Empfangen von Pings +Comment[pt]=Enviar e receber pedidos de rede +Comment[pt_BR]=Envia e recebe pings +Comment[sv]=Skicka och ta emot ping +Comment[uk]=Надсилання і отримання сигналів підтримання зв’язку +Comment[x-test]=xxSend and receive pingsxx diff --git a/kded/plugins/telephony/kdeconnect_telephony.desktop b/kded/plugins/telephony/kdeconnect_telephony.desktop index e56a12de4..e913b4923 100644 --- a/kded/plugins/telephony/kdeconnect_telephony.desktop +++ b/kded/plugins/telephony/kdeconnect_telephony.desktop @@ -12,4 +12,16 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=call-start Name=Telephony integration +Name[de]=Telefon-Integration +Name[pt]=Integração telefónica +Name[pt_BR]=Integração telefônica +Name[sv]=Integrering av telefoni +Name[uk]=Інтеграція з системою телефонії +Name[x-test]=xxTelephony integrationxx Comment=Show notifications for calls and SMS (answering coming soon) +Comment[de]=Zeigt Benachrichtigungen für Anrufe und SMS +Comment[pt]=Mostrar notificações para as chamadas e SMS's (resposta em breve) +Comment[pt_BR]=Mostra notificações para chamadas e SMS (resposta em breve) +Comment[sv]=Visa underrättelser om samtal och SMS (att svara kommer snart) +Comment[uk]=Показ сповіщень щодо дзвінків і SMS (скоро буде реалізовано і автовідповідач) +Comment[x-test]=xxShow notifications for calls and SMS (answering coming soon)xx diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 71b0bf02d..0bf4f4921 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -1,6 +1,18 @@ [Desktop Entry] Name=KdeConnect +Name[de]=KdeConnect +Name[pt]=KDEConnect +Name[pt_BR]=KdeConnect +Name[sv]=KDE anslut +Name[uk]=KdeConnect +Name[x-test]=xxKdeConnectxx Comment=Show notifications from your devices using KDE Connect +Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect +Comment[pt]=Mostrar notificações dos seus dispositivos usando o KDE Connect +Comment[pt_BR]=Mostrar notificações dos seus dispositivos usando o KDE Connect +Comment[sv]=Visa underrättelser från apparater med KDE anslut +Comment[uk]=Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE» +Comment[x-test]=xxShow notifications from your devices using KDE Connectxx Icon=smartphone Type=Service From 874ac43dab73bae0ee6cc2b2afe1aa3649f51da1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 Sep 2013 04:17:17 +0000 Subject: [PATCH 15/18] SVN_SILENT made messages (.desktop file) --- kcm/kcm_kdeconnect.desktop | 5 ++++ kded/kdeconnect.desktop | 3 +++ kded/kdeconnect.notifyrc | 26 +++++++++++++++++++ .../battery/kdeconnect_battery.desktop | 3 +++ .../clipboard/kdeconnect_clipboard.desktop | 3 +++ .../kdeconnect_filetransfer.desktop | 2 ++ kded/plugins/kdeconnect_plugin.desktop | 2 ++ .../kdeconnect_mpriscontrol.desktop | 2 ++ .../kdeconnect_notifications.desktop | 2 ++ .../pausemusic/kdeconnect_pausemusic.desktop | 2 ++ kded/plugins/ping/kdeconnect_ping.desktop | 3 +++ .../telephony/kdeconnect_telephony.desktop | 2 ++ plasmoid/package/metadata.desktop | 2 ++ 13 files changed, 57 insertions(+) diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index 295128e63..771c27a2c 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -13,14 +13,17 @@ X-KDE-System-Settings-Parent-Category=hardware Name=Devices Name[de]=Geräte +Name[nl]=Apparaten Name[pt]=Dispositivos Name[pt_BR]=Dispositivos +Name[sk]=Zariadenia Name[sv]=Apparater Name[uk]=Пристрої Name[x-test]=xxDevicesxx Comment=Connect and sync your devices with KDE Comment[de]=Verbinden und Abgleichen Ihrer Geräte mit KDE +Comment[nl]=Uw apparaten met KDE verbinden en synchroniseren Comment[pt]=Ligue e sincronize os seus dispositivos com o KDE Comment[pt_BR]=Conecta e sincroniza seus dispositivos com o KDE Comment[sv]=Anslut och synkronisera dina apparater med KDE @@ -29,8 +32,10 @@ Comment[x-test]=xxConnect and sync your devices with KDExx X-KDE-Keywords=Network,Android,Devices X-KDE-Keywords[de]=Netzwerk,Android,Geräte +X-KDE-Keywords[nl]=Netwerk,Android,Apparaten X-KDE-Keywords[pt]=Rede,Android,Dispositivos X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos +X-KDE-Keywords[sk]=Sieť,Android,Zariadenia X-KDE-Keywords[sv]=Nätverk, Android, apparater X-KDE-Keywords[uk]=Network;Android;Devices;мережа;андроїд;пристрої X-KDE-Keywords[x-test]=xxNetwork,Android,Devicesxx diff --git a/kded/kdeconnect.desktop b/kded/kdeconnect.desktop index 3532d5f83..680627cba 100644 --- a/kded/kdeconnect.desktop +++ b/kded/kdeconnect.desktop @@ -10,14 +10,17 @@ X-KDE-Kded-phase=1 Name=KDE Connect Name[de]=KDE Connect +Name[nl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect +Name[sk]=KDE Connect Name[sv]=KDE anslut Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Comment=Connect KDE with your smartphone Comment[de]=KDE mit Ihren Smartphone verbinden +Comment[nl]=KDE met uw smartphone verbinden Comment[pt]=Ligue o KDE ao seu telemóvel Comment[pt_BR]=Conecte o KDE ao seu celular Comment[sv]=Anslut KDE till din smartphone diff --git a/kded/kdeconnect.notifyrc b/kded/kdeconnect.notifyrc index b4391f6d8..b2f6c4527 100644 --- a/kded/kdeconnect.notifyrc +++ b/kded/kdeconnect.notifyrc @@ -2,13 +2,16 @@ IconName=smartphone Name=KDE Connect Name[de]=KDE Connect +Name[nl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect +Name[sk]=KDE Connect Name[sv]=KDE anslut Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Comment=Notifications from your devices Comment[de]=Benachrichtigungen von Ihren Geräten +Comment[nl]=Meldingen van uw apparaten Comment[pt]=Notificações dos seus dispositivos Comment[pt_BR]=Notificações dos seus dispositivos Comment[sv]=Underrättelser från dina apparater @@ -18,15 +21,19 @@ Comment[x-test]=xxNotifications from your devicesxx [Event/callReceived] Name=Calling Name[de]=Anruf +Name[nl]=Oproep Name[pt]=A Chamar Name[pt_BR]=Chamando +Name[sk]=Volanie Name[sv]=Samtal Name[uk]=Виклик Name[x-test]=xxCallingxx Comment=Someone is calling you Comment[de]=Sie werden angerufen +Comment[nl]=Iemand belt u op Comment[pt]=Alguém está a ligar-lhe Comment[pt_BR]=Alguém está chamando você +Comment[sk]=Niekto vám volá Comment[sv]=Någon ringer till dig Comment[uk]=Хтось телефонує вам Comment[x-test]=xxSomeone is calling youxx @@ -35,15 +42,19 @@ Action=Popup [Event/missedCall] Name=Missed Name[de]=Verpasst +Name[nl]=Gemist Name[pt]=Não Atendida Name[pt_BR]=Não atendidas +Name[sk]=Zmeškané Name[sv]=Missat Name[uk]=Пропущено Name[x-test]=xxMissedxx Comment=You have a missed call Comment[de]=Sie haben einen Anruf verpasst +Comment[nl]=U hebt een gemiste oproep Comment[pt]=Tem uma chamada não atendida Comment[pt_BR]=Você tem uma chamada não atendida +Comment[sk]=Máte zmeškaný hovor Comment[sv]=Du har missat ett samtal Comment[uk]=Вами пропущено телефонний дзвінок Comment[x-test]=xxYou have a missed callxx @@ -52,13 +63,16 @@ Action=Popup [Event/smsReceived] Name=SMS Name[de]=SMS +Name[nl]=SMS Name[pt]=SMS Name[pt_BR]=SMS +Name[sk]=SMS Name[sv]=SMS Name[uk]=SMS Name[x-test]=xxSMSxx Comment=Someone sent you an SMS Comment[de]=Jemand hat Ihnen eine SMS gesendet +Comment[nl]=Iemand heeft u een SMS gestuurd Comment[pt]=Alguém lhe enviou um SMS Comment[pt_BR]=Alguém lhe enviou um SMS Comment[sv]=Någon skickade ett SMS till dig @@ -69,13 +83,16 @@ Action=Popup [Event/batteryLow] Name=Battery Name[de]=Akku +Name[nl]=Batterij Name[pt]=Bateria Name[pt_BR]=Bateria +Name[sk]=Batéria Name[sv]=Batteri Name[uk]=Акумулятор Name[x-test]=xxBatteryxx Comment=Your battery is in low state Comment[de]=Der Ladestand Ihres Akkus ist niedrig +Comment[nl]=Uw batterij is bijna leeg Comment[pt]=A sua bateria está fraca Comment[pt_BR]=Sua bateria está com carga baixa Comment[sv]=Batteriet är nästan slut @@ -86,13 +103,16 @@ Action=Popup [Event/pingReceived] Name=Ping Name[de]=Ping +Name[nl]=Ping Name[pt]=Pedido de Rede Name[pt_BR]=Ping +Name[sk]=Ping Name[sv]=Ping Name[uk]=Луна Name[x-test]=xxPingxx Comment=Ping received Comment[de]=Ping empfangen +Comment[nl]=Ping ontvangen Comment[pt]=Pedido de rede recebido Comment[pt_BR]=Ping recebido Comment[sv]=Ping mottaget @@ -103,13 +123,16 @@ Action=Popup [Event/notification] Name=Notification Name[de]=Benachrichtigung +Name[nl]=Melding Name[pt]=Notificação Name[pt_BR]=Notificação +Name[sk]=Upozornenie Name[sv]=Underrättelse Name[uk]=Сповіщення Name[x-test]=xxNotificationxx Comment=Notification received Comment[de]=Benachrichtigung eingegangen +Comment[nl]=Melding ontvangen Comment[pt]=Notificação recebida Comment[pt_BR]=Notificação recebida Comment[sv]=Underrättelse mottagen @@ -120,13 +143,16 @@ Action=Popup [Event/unknownEvent] Name=Unknown Name[de]=Unbekannt +Name[nl]=Onbekend Name[pt]=Desconhecido Name[pt_BR]=Desconhecido +Name[sk]=Neznáme Name[sv]=Okänt Name[uk]=Невідомо Name[x-test]=xxUnknownxx Comment=Something unknown happened Comment[de]=Etwas unbekanntes ist aufgetreten +Comment[nl]=Er is iets onbekends gebeurd Comment[pt]=Algo de inesperado aconteceu Comment[pt_BR]=Ocorreu algo inesperado Comment[sv]=Någonting okänt inträffade diff --git a/kded/plugins/battery/kdeconnect_battery.desktop b/kded/plugins/battery/kdeconnect_battery.desktop index 3eb0b181f..fe98c9fea 100644 --- a/kded/plugins/battery/kdeconnect_battery.desktop +++ b/kded/plugins/battery/kdeconnect_battery.desktop @@ -13,13 +13,16 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=battery-100 Name=Battery monitor Name[de]=Akkuüberwachung +Name[nl]=Batterijmonitor Name[pt]=Monitor da bateria Name[pt_BR]=Monitor de bateria +Name[sk]=Monitor batérie Name[sv]=Batteriövervakare Name[uk]=Монітор акумулятора Name[x-test]=xxBattery monitorxx Comment=Show your phone battery next to your computer battery Comment[de]=Zeigt den Akku Ihres Telefons neben dem Akku des Rechners +Comment[nl]=Uw telefoonbatterij naast uw computerbatterij tonen Comment[pt]=Mostra a bateria do seu telemóvel ao lado da do computador Comment[pt_BR]=Mostra a bateria do seu celular ao lado da bateria do computador Comment[sv]=Visa telefonens batteri intill datorbatteriet diff --git a/kded/plugins/clipboard/kdeconnect_clipboard.desktop b/kded/plugins/clipboard/kdeconnect_clipboard.desktop index 2132f4f74..0abfc11c3 100644 --- a/kded/plugins/clipboard/kdeconnect_clipboard.desktop +++ b/kded/plugins/clipboard/kdeconnect_clipboard.desktop @@ -13,13 +13,16 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=edit-paste Name=Clipboard Name[de]=Zwischenablage +Name[nl]=Klembord Name[pt]=Área de Transferência Name[pt_BR]=Área de transferência +Name[sk]=Schránka Name[sv]=Klippbord Name[uk]=Буфер обміну Name[x-test]=xxClipboardxx Comment=Share the clipboard between devices Comment[de]=Die Zwischenablage mit Geräten teilen +Comment[nl]=Het klembord tussen apparaten delen Comment[pt]=Partilhar a área de transferência entre dispositivos Comment[pt_BR]=Compartilhar a área de transferência entre dispositivos Comment[sv]=Dela klippbordet mellan apparater diff --git a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop index e240cda58..527a86804 100644 --- a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop +++ b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop @@ -12,6 +12,7 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=folder-downloads Name=(Stub) File transfer +Name[nl]=(Stub) bestandsoverdracht Name[pt]=(Interface) Transferência de ficheiros Name[pt_BR]=(Interface) Transferência de arquivos Name[sv]=Filöverföring (markör) @@ -19,6 +20,7 @@ Name[uk]=Модуль передавання файлів (фіктивний) Name[x-test]=xx(Stub) File transferxx Comment=Send and receive files from dolphin Comment[de]=Dateien aus Dolphin senden und empfangen +Comment[nl]=Bestanden verzenden en ontvangen vanuit dolphin Comment[pt]=Enviar e receber ficheiros a partir do Dolphin Comment[pt_BR]=Envia e recebe arquivos a partir do Dolphin Comment[sv]=Skicka och ta emot filer med Dolphin diff --git a/kded/plugins/kdeconnect_plugin.desktop b/kded/plugins/kdeconnect_plugin.desktop index dc33bcc05..231100248 100644 --- a/kded/plugins/kdeconnect_plugin.desktop +++ b/kded/plugins/kdeconnect_plugin.desktop @@ -4,8 +4,10 @@ X-KDE-ServiceType=KdeConnect/Plugin X-KDE-Derived=KPluginInfo Name=KDEConnect Plugin Name[de]=KDEConnect-Modul +Name[nl]=Plug-in van KDEConnect Name[pt]='Plugin' do KDEConnect Name[pt_BR]=Plugin do KDEConnect +Name[sk]=Plugin KDEConnect Name[sv]=KDE anslutningsinsticksprogram Name[uk]=Додаток KDEConnect Name[x-test]=xxKDEConnect Pluginxx diff --git a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop index eab6a542d..351bd4ba8 100644 --- a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop +++ b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop @@ -12,6 +12,7 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=media-playback-start Name=Multimedia control receiver +Name[nl]=Ontvanger van bediening voor multimedia Name[pt]=Receptor de controlo multimédia Name[pt_BR]=Receptor de controle multimídia Name[sv]=Mottagare av multimediastyrning @@ -19,6 +20,7 @@ Name[uk]=Отримувач команд щодо керування мульт Name[x-test]=xxMultimedia control receiverxx Comment=Remote control your music and videos Comment[de]=Fernbedienung für Musik und Videos +Comment[nl]=Op afstand bedienen van uw muziek en video's Comment[pt]=Comande à distância a sua música e vídeos Comment[pt_BR]=Controle suas músicas e vídeos remotamente Comment[sv]=Fjärrstyr musik och videor diff --git a/kded/plugins/notifications/kdeconnect_notifications.desktop b/kded/plugins/notifications/kdeconnect_notifications.desktop index 1b6cef818..09ca60229 100644 --- a/kded/plugins/notifications/kdeconnect_notifications.desktop +++ b/kded/plugins/notifications/kdeconnect_notifications.desktop @@ -12,6 +12,7 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=preferences-desktop-notification Name=Notification sync +Name[nl]=Synchronisatie van meldingen Name[pt]=Sincronização de notificações Name[pt_BR]=Sincronização de notificações Name[sv]=Synkronisering av underrättelser @@ -19,6 +20,7 @@ Name[uk]=Синхронізація сповіщень Name[x-test]=xxNotification syncxx Comment=Show phone notifications in KDE and keep them in sync Comment[de]=Benachrichtigungen in KDE anzeigen und abgleichen +Comment[nl]=Telefoonmeldingen in KDE tonen en ze gesynchroniseerd houden Comment[pt]=Mostrar as notificações do telefone no KDE e mantê-las sincronizadas Comment[pt_BR]=Mostra as notificações do celular no KDE e as mantem sincronizadas Comment[sv]=Visa telefonunderrättelser i KDE och håll dem synkroniserade diff --git a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop index 00b8738bb..3be305e29 100644 --- a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop +++ b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop @@ -12,12 +12,14 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=speaker Name=Pause media during calls +Name[nl]=Media pauzeren tijdens oproepen Name[pt]=Pausar os conteúdos durante as chamadas Name[pt_BR]=Pausar os conteúdos multimídia durante as chamadas Name[sv]=Pausa media under samtal Name[uk]=Призупинка відтворення під час дзвінків Name[x-test]=xxPause media during callsxx Comment=Pause music/videos during a phone call +Comment[nl]=Muziek/video's pauzeren tijdens een telefoongesprek Comment[pt]=Pausar a música/vídeo durante uma chamada Comment[pt_BR]=Pausa a música/vídeo durante uma chamada Comment[sv]=Pausa musik eller videor under ett telefonsamtal diff --git a/kded/plugins/ping/kdeconnect_ping.desktop b/kded/plugins/ping/kdeconnect_ping.desktop index 60dedce9f..267c4cadd 100644 --- a/kded/plugins/ping/kdeconnect_ping.desktop +++ b/kded/plugins/ping/kdeconnect_ping.desktop @@ -13,13 +13,16 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=dialog-ok Name=Ping Name[de]=Ping +Name[nl]=Ping Name[pt]=Pedido de Rede Name[pt_BR]=Ping +Name[sk]=Ping Name[sv]=Ping Name[uk]=Луна Name[x-test]=xxPingxx Comment=Send and receive pings Comment[de]=Senden und Empfangen von Pings +Comment[nl]=Pings verzenden en ontvangen Comment[pt]=Enviar e receber pedidos de rede Comment[pt_BR]=Envia e recebe pings Comment[sv]=Skicka och ta emot ping diff --git a/kded/plugins/telephony/kdeconnect_telephony.desktop b/kded/plugins/telephony/kdeconnect_telephony.desktop index e913b4923..0b61770c7 100644 --- a/kded/plugins/telephony/kdeconnect_telephony.desktop +++ b/kded/plugins/telephony/kdeconnect_telephony.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=call-start Name=Telephony integration Name[de]=Telefon-Integration +Name[nl]=Telefoonintegratie Name[pt]=Integração telefónica Name[pt_BR]=Integração telefônica Name[sv]=Integrering av telefoni @@ -20,6 +21,7 @@ Name[uk]=Інтеграція з системою телефонії Name[x-test]=xxTelephony integrationxx Comment=Show notifications for calls and SMS (answering coming soon) Comment[de]=Zeigt Benachrichtigungen für Anrufe und SMS +Comment[nl]=Meldingen tonen van oproepen en SMSjes (beantwoorden komt spoedig) Comment[pt]=Mostrar notificações para as chamadas e SMS's (resposta em breve) Comment[pt_BR]=Mostra notificações para chamadas e SMS (resposta em breve) Comment[sv]=Visa underrättelser om samtal och SMS (att svara kommer snart) diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 0bf4f4921..c6f76f294 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=KdeConnect Name[de]=KdeConnect +Name[nl]=KdeConnect Name[pt]=KDEConnect Name[pt_BR]=KdeConnect Name[sv]=KDE anslut @@ -8,6 +9,7 @@ Name[uk]=KdeConnect Name[x-test]=xxKdeConnectxx Comment=Show notifications from your devices using KDE Connect Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect +Comment[nl]=Meldingen van uw apparaten met KDE Connect tonen Comment[pt]=Mostrar notificações dos seus dispositivos usando o KDE Connect Comment[pt_BR]=Mostrar notificações dos seus dispositivos usando o KDE Connect Comment[sv]=Visa underrättelser från apparater med KDE anslut From a344022202465e2e0840e9f2ef4894d4b153be60 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 Sep 2013 04:15:35 +0000 Subject: [PATCH 16/18] SVN_SILENT made messages (.desktop file) --- kcm/kcm_kdeconnect.desktop | 3 +++ kded/kdeconnect.desktop | 2 ++ kded/kdeconnect.notifyrc | 16 ++++++++++++++++ kded/plugins/battery/kdeconnect_battery.desktop | 2 ++ .../clipboard/kdeconnect_clipboard.desktop | 2 ++ .../filetransfer/kdeconnect_filetransfer.desktop | 1 + kded/plugins/kdeconnect_plugin.desktop | 1 + .../mpriscontrol/kdeconnect_mpriscontrol.desktop | 2 ++ .../kdeconnect_notifications.desktop | 2 ++ .../pausemusic/kdeconnect_pausemusic.desktop | 2 ++ kded/plugins/ping/kdeconnect_ping.desktop | 2 ++ .../telephony/kdeconnect_telephony.desktop | 2 ++ plasmoid/package/metadata.desktop | 2 ++ 13 files changed, 39 insertions(+) diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index 771c27a2c..6d0d8d909 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=hardware Name=Devices Name[de]=Geräte +Name[es]=Dispositivos Name[nl]=Apparaten Name[pt]=Dispositivos Name[pt_BR]=Dispositivos @@ -23,6 +24,7 @@ Name[x-test]=xxDevicesxx Comment=Connect and sync your devices with KDE Comment[de]=Verbinden und Abgleichen Ihrer Geräte mit KDE +Comment[es]=Conectar y sincronizar dispositivos con KDE Comment[nl]=Uw apparaten met KDE verbinden en synchroniseren Comment[pt]=Ligue e sincronize os seus dispositivos com o KDE Comment[pt_BR]=Conecta e sincroniza seus dispositivos com o KDE @@ -32,6 +34,7 @@ Comment[x-test]=xxConnect and sync your devices with KDExx X-KDE-Keywords=Network,Android,Devices X-KDE-Keywords[de]=Netzwerk,Android,Geräte +X-KDE-Keywords[es]=Red,Android,Dispositivos X-KDE-Keywords[nl]=Netwerk,Android,Apparaten X-KDE-Keywords[pt]=Rede,Android,Dispositivos X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos diff --git a/kded/kdeconnect.desktop b/kded/kdeconnect.desktop index 680627cba..1c603ab86 100644 --- a/kded/kdeconnect.desktop +++ b/kded/kdeconnect.desktop @@ -10,6 +10,7 @@ X-KDE-Kded-phase=1 Name=KDE Connect Name[de]=KDE Connect +Name[es]=KDE Connect Name[nl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect @@ -20,6 +21,7 @@ Name[x-test]=xxKDE Connectxx Comment=Connect KDE with your smartphone Comment[de]=KDE mit Ihren Smartphone verbinden +Comment[es]=Conecte KDE con su teléfono móvil Comment[nl]=KDE met uw smartphone verbinden Comment[pt]=Ligue o KDE ao seu telemóvel Comment[pt_BR]=Conecte o KDE ao seu celular diff --git a/kded/kdeconnect.notifyrc b/kded/kdeconnect.notifyrc index b2f6c4527..3a301a011 100644 --- a/kded/kdeconnect.notifyrc +++ b/kded/kdeconnect.notifyrc @@ -2,6 +2,7 @@ IconName=smartphone Name=KDE Connect Name[de]=KDE Connect +Name[es]=KDE Connect Name[nl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect @@ -11,6 +12,7 @@ Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Comment=Notifications from your devices Comment[de]=Benachrichtigungen von Ihren Geräten +Comment[es]=Notificaciones de sus dispositivos Comment[nl]=Meldingen van uw apparaten Comment[pt]=Notificações dos seus dispositivos Comment[pt_BR]=Notificações dos seus dispositivos @@ -21,6 +23,7 @@ Comment[x-test]=xxNotifications from your devicesxx [Event/callReceived] Name=Calling Name[de]=Anruf +Name[es]=Llamando Name[nl]=Oproep Name[pt]=A Chamar Name[pt_BR]=Chamando @@ -30,6 +33,7 @@ Name[uk]=Виклик Name[x-test]=xxCallingxx Comment=Someone is calling you Comment[de]=Sie werden angerufen +Comment[es]=Alguien le está llamando Comment[nl]=Iemand belt u op Comment[pt]=Alguém está a ligar-lhe Comment[pt_BR]=Alguém está chamando você @@ -42,6 +46,7 @@ Action=Popup [Event/missedCall] Name=Missed Name[de]=Verpasst +Name[es]=Perdida Name[nl]=Gemist Name[pt]=Não Atendida Name[pt_BR]=Não atendidas @@ -51,6 +56,7 @@ Name[uk]=Пропущено Name[x-test]=xxMissedxx Comment=You have a missed call Comment[de]=Sie haben einen Anruf verpasst +Comment[es]=Tiene una llamada perdida Comment[nl]=U hebt een gemiste oproep Comment[pt]=Tem uma chamada não atendida Comment[pt_BR]=Você tem uma chamada não atendida @@ -63,6 +69,7 @@ Action=Popup [Event/smsReceived] Name=SMS Name[de]=SMS +Name[es]=SMS Name[nl]=SMS Name[pt]=SMS Name[pt_BR]=SMS @@ -72,6 +79,7 @@ Name[uk]=SMS Name[x-test]=xxSMSxx Comment=Someone sent you an SMS Comment[de]=Jemand hat Ihnen eine SMS gesendet +Comment[es]=Alguien le ha enviado un SMS Comment[nl]=Iemand heeft u een SMS gestuurd Comment[pt]=Alguém lhe enviou um SMS Comment[pt_BR]=Alguém lhe enviou um SMS @@ -83,6 +91,7 @@ Action=Popup [Event/batteryLow] Name=Battery Name[de]=Akku +Name[es]=Batería Name[nl]=Batterij Name[pt]=Bateria Name[pt_BR]=Bateria @@ -92,6 +101,7 @@ Name[uk]=Акумулятор Name[x-test]=xxBatteryxx Comment=Your battery is in low state Comment[de]=Der Ladestand Ihres Akkus ist niedrig +Comment[es]=La batería está en estado bajo Comment[nl]=Uw batterij is bijna leeg Comment[pt]=A sua bateria está fraca Comment[pt_BR]=Sua bateria está com carga baixa @@ -103,6 +113,7 @@ Action=Popup [Event/pingReceived] Name=Ping Name[de]=Ping +Name[es]=Ping Name[nl]=Ping Name[pt]=Pedido de Rede Name[pt_BR]=Ping @@ -112,6 +123,7 @@ Name[uk]=Луна Name[x-test]=xxPingxx Comment=Ping received Comment[de]=Ping empfangen +Comment[es]=Ping recibido Comment[nl]=Ping ontvangen Comment[pt]=Pedido de rede recebido Comment[pt_BR]=Ping recebido @@ -123,6 +135,7 @@ Action=Popup [Event/notification] Name=Notification Name[de]=Benachrichtigung +Name[es]=Notificación Name[nl]=Melding Name[pt]=Notificação Name[pt_BR]=Notificação @@ -132,6 +145,7 @@ Name[uk]=Сповіщення Name[x-test]=xxNotificationxx Comment=Notification received Comment[de]=Benachrichtigung eingegangen +Comment[es]=Notificación recibida Comment[nl]=Melding ontvangen Comment[pt]=Notificação recebida Comment[pt_BR]=Notificação recebida @@ -143,6 +157,7 @@ Action=Popup [Event/unknownEvent] Name=Unknown Name[de]=Unbekannt +Name[es]=Desconocido Name[nl]=Onbekend Name[pt]=Desconhecido Name[pt_BR]=Desconhecido @@ -152,6 +167,7 @@ Name[uk]=Невідомо Name[x-test]=xxUnknownxx Comment=Something unknown happened Comment[de]=Etwas unbekanntes ist aufgetreten +Comment[es]=Ha ocurrido algo desconocido Comment[nl]=Er is iets onbekends gebeurd Comment[pt]=Algo de inesperado aconteceu Comment[pt_BR]=Ocorreu algo inesperado diff --git a/kded/plugins/battery/kdeconnect_battery.desktop b/kded/plugins/battery/kdeconnect_battery.desktop index fe98c9fea..901c4d265 100644 --- a/kded/plugins/battery/kdeconnect_battery.desktop +++ b/kded/plugins/battery/kdeconnect_battery.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=battery-100 Name=Battery monitor Name[de]=Akkuüberwachung +Name[es]=Monitor de la batería Name[nl]=Batterijmonitor Name[pt]=Monitor da bateria Name[pt_BR]=Monitor de bateria @@ -22,6 +23,7 @@ Name[uk]=Монітор акумулятора Name[x-test]=xxBattery monitorxx Comment=Show your phone battery next to your computer battery Comment[de]=Zeigt den Akku Ihres Telefons neben dem Akku des Rechners +Comment[es]=Muestra la batería de su teléfono junto a la batería de su equipo Comment[nl]=Uw telefoonbatterij naast uw computerbatterij tonen Comment[pt]=Mostra a bateria do seu telemóvel ao lado da do computador Comment[pt_BR]=Mostra a bateria do seu celular ao lado da bateria do computador diff --git a/kded/plugins/clipboard/kdeconnect_clipboard.desktop b/kded/plugins/clipboard/kdeconnect_clipboard.desktop index 0abfc11c3..fc0d63eee 100644 --- a/kded/plugins/clipboard/kdeconnect_clipboard.desktop +++ b/kded/plugins/clipboard/kdeconnect_clipboard.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=edit-paste Name=Clipboard Name[de]=Zwischenablage +Name[es]=Portapapeles Name[nl]=Klembord Name[pt]=Área de Transferência Name[pt_BR]=Área de transferência @@ -22,6 +23,7 @@ Name[uk]=Буфер обміну Name[x-test]=xxClipboardxx Comment=Share the clipboard between devices Comment[de]=Die Zwischenablage mit Geräten teilen +Comment[es]=Compartir el portapapeles entre dispositivos Comment[nl]=Het klembord tussen apparaten delen Comment[pt]=Partilhar a área de transferência entre dispositivos Comment[pt_BR]=Compartilhar a área de transferência entre dispositivos diff --git a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop index 527a86804..1a8149fe7 100644 --- a/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop +++ b/kded/plugins/filetransfer/kdeconnect_filetransfer.desktop @@ -20,6 +20,7 @@ Name[uk]=Модуль передавання файлів (фіктивний) Name[x-test]=xx(Stub) File transferxx Comment=Send and receive files from dolphin Comment[de]=Dateien aus Dolphin senden und empfangen +Comment[es]=Enviar y recibir archivos desde dolphin Comment[nl]=Bestanden verzenden en ontvangen vanuit dolphin Comment[pt]=Enviar e receber ficheiros a partir do Dolphin Comment[pt_BR]=Envia e recebe arquivos a partir do Dolphin diff --git a/kded/plugins/kdeconnect_plugin.desktop b/kded/plugins/kdeconnect_plugin.desktop index 231100248..152350ced 100644 --- a/kded/plugins/kdeconnect_plugin.desktop +++ b/kded/plugins/kdeconnect_plugin.desktop @@ -4,6 +4,7 @@ X-KDE-ServiceType=KdeConnect/Plugin X-KDE-Derived=KPluginInfo Name=KDEConnect Plugin Name[de]=KDEConnect-Modul +Name[es]=Complemento de KDEConnect Name[nl]=Plug-in van KDEConnect Name[pt]='Plugin' do KDEConnect Name[pt_BR]=Plugin do KDEConnect diff --git a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop index 351bd4ba8..a633b30d4 100644 --- a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop +++ b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop @@ -12,6 +12,7 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=media-playback-start Name=Multimedia control receiver +Name[es]=Receptor de control multimedia Name[nl]=Ontvanger van bediening voor multimedia Name[pt]=Receptor de controlo multimédia Name[pt_BR]=Receptor de controle multimídia @@ -20,6 +21,7 @@ Name[uk]=Отримувач команд щодо керування мульт Name[x-test]=xxMultimedia control receiverxx Comment=Remote control your music and videos Comment[de]=Fernbedienung für Musik und Videos +Comment[es]=Controle a distancia su música y sus vídeos Comment[nl]=Op afstand bedienen van uw muziek en video's Comment[pt]=Comande à distância a sua música e vídeos Comment[pt_BR]=Controle suas músicas e vídeos remotamente diff --git a/kded/plugins/notifications/kdeconnect_notifications.desktop b/kded/plugins/notifications/kdeconnect_notifications.desktop index 09ca60229..3651c3707 100644 --- a/kded/plugins/notifications/kdeconnect_notifications.desktop +++ b/kded/plugins/notifications/kdeconnect_notifications.desktop @@ -12,6 +12,7 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=preferences-desktop-notification Name=Notification sync +Name[es]=Sincronizar notificaciones Name[nl]=Synchronisatie van meldingen Name[pt]=Sincronização de notificações Name[pt_BR]=Sincronização de notificações @@ -20,6 +21,7 @@ Name[uk]=Синхронізація сповіщень Name[x-test]=xxNotification syncxx Comment=Show phone notifications in KDE and keep them in sync Comment[de]=Benachrichtigungen in KDE anzeigen und abgleichen +Comment[es]=Mostrar las notificaciones del teléfono en KDE y mantenerlas sincronizadas Comment[nl]=Telefoonmeldingen in KDE tonen en ze gesynchroniseerd houden Comment[pt]=Mostrar as notificações do telefone no KDE e mantê-las sincronizadas Comment[pt_BR]=Mostra as notificações do celular no KDE e as mantem sincronizadas diff --git a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop index 3be305e29..9e8d0abf8 100644 --- a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop +++ b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop @@ -12,6 +12,7 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=speaker Name=Pause media during calls +Name[es]=Pausar multimedia durante las llamadas Name[nl]=Media pauzeren tijdens oproepen Name[pt]=Pausar os conteúdos durante as chamadas Name[pt_BR]=Pausar os conteúdos multimídia durante as chamadas @@ -19,6 +20,7 @@ Name[sv]=Pausa media under samtal Name[uk]=Призупинка відтворення під час дзвінків Name[x-test]=xxPause media during callsxx Comment=Pause music/videos during a phone call +Comment[es]=Pausar la música y los vídeos durante una llamada telefónica Comment[nl]=Muziek/video's pauzeren tijdens een telefoongesprek Comment[pt]=Pausar a música/vídeo durante uma chamada Comment[pt_BR]=Pausa a música/vídeo durante uma chamada diff --git a/kded/plugins/ping/kdeconnect_ping.desktop b/kded/plugins/ping/kdeconnect_ping.desktop index 267c4cadd..c7a1c5e22 100644 --- a/kded/plugins/ping/kdeconnect_ping.desktop +++ b/kded/plugins/ping/kdeconnect_ping.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=dialog-ok Name=Ping Name[de]=Ping +Name[es]=Ping Name[nl]=Ping Name[pt]=Pedido de Rede Name[pt_BR]=Ping @@ -22,6 +23,7 @@ Name[uk]=Луна Name[x-test]=xxPingxx Comment=Send and receive pings Comment[de]=Senden und Empfangen von Pings +Comment[es]=Enviar y recibir pings Comment[nl]=Pings verzenden en ontvangen Comment[pt]=Enviar e receber pedidos de rede Comment[pt_BR]=Envia e recebe pings diff --git a/kded/plugins/telephony/kdeconnect_telephony.desktop b/kded/plugins/telephony/kdeconnect_telephony.desktop index 0b61770c7..9545827ca 100644 --- a/kded/plugins/telephony/kdeconnect_telephony.desktop +++ b/kded/plugins/telephony/kdeconnect_telephony.desktop @@ -13,6 +13,7 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=call-start Name=Telephony integration Name[de]=Telefon-Integration +Name[es]=Integración de telefonía Name[nl]=Telefoonintegratie Name[pt]=Integração telefónica Name[pt_BR]=Integração telefônica @@ -21,6 +22,7 @@ Name[uk]=Інтеграція з системою телефонії Name[x-test]=xxTelephony integrationxx Comment=Show notifications for calls and SMS (answering coming soon) Comment[de]=Zeigt Benachrichtigungen für Anrufe und SMS +Comment[es]=Mostrar notificaciones de llamadas y SMS (en breve se podrá responder) Comment[nl]=Meldingen tonen van oproepen en SMSjes (beantwoorden komt spoedig) Comment[pt]=Mostrar notificações para as chamadas e SMS's (resposta em breve) Comment[pt_BR]=Mostra notificações para chamadas e SMS (resposta em breve) diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index c6f76f294..1a4372504 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=KdeConnect Name[de]=KdeConnect +Name[es]=KdeConnect Name[nl]=KdeConnect Name[pt]=KDEConnect Name[pt_BR]=KdeConnect @@ -9,6 +10,7 @@ Name[uk]=KdeConnect Name[x-test]=xxKdeConnectxx Comment=Show notifications from your devices using KDE Connect Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect +Comment[es]=Mostrar notificaciones de sus dispositivos usando KDE Connect Comment[nl]=Meldingen van uw apparaten met KDE Connect tonen Comment[pt]=Mostrar notificações dos seus dispositivos usando o KDE Connect Comment[pt_BR]=Mostrar notificações dos seus dispositivos usando o KDE Connect From 29271df30e418706b3679f60d98ddf917f754a67 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 16 Sep 2013 15:46:28 +0200 Subject: [PATCH 17/18] Fixed KCM updating the wrong device if selection was changed Info displayed when pairing was always shown in the currently selected device --- kcm/kcm.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp index 61d41da43..b4be11d5a 100644 --- a/kcm/kcm.cpp +++ b/kcm/kcm.cpp @@ -86,7 +86,6 @@ void KdeConnectKcm::resetSelection() kcmUi->deviceList->selectionModel()->setCurrentIndex(sortProxyModel->mapFromSource(currentIndex), QItemSelectionModel::ClearAndSelect); } - void KdeConnectKcm::deviceSelected(const QModelIndex& current) { @@ -182,6 +181,8 @@ void KdeConnectKcm::unpair() void KdeConnectKcm::pairingFailed(const QString& error) { + if (sender() != currentDevice) return; + kcmUi->messages->setText(i18n("Error trying to pair: %1",error)); kcmUi->messages->animatedShow(); kcmUi->progressBar->setVisible(false); @@ -190,14 +191,17 @@ void KdeConnectKcm::pairingFailed(const QString& error) void KdeConnectKcm::pairingSuccesful() { + DeviceDbusInterface* sender = (DeviceDbusInterface*) sender(); + devicesModel->deviceStatusChanged(sender->id()); + + if (sender != currentDevice) return; + kcmUi->progressBar->setVisible(false); kcmUi->unpair_button->setVisible(true); kcmUi->pair_button->setVisible(false); kcmUi->ping_button->setVisible(true); kcmUi->status_label->setText(i18n("(paired)")); - - devicesModel->deviceStatusChanged(currentDevice->id()); } void KdeConnectKcm::pluginsConfigChanged() From 844a92a508f26fd51a231e52f9a4a18e96c43861 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 16 Sep 2013 16:52:40 +0200 Subject: [PATCH 18/18] KCM updated when pairing state changes externally Added an unpaired() signal to KDED's Device exported by dbus --- kcm/kcm.cpp | 64 +++++++++++++++++++++++++++++++++---------------- kcm/kcm.h | 1 + kded/device.cpp | 3 +++ kded/device.h | 1 + 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp index b4be11d5a..7ad6814bc 100644 --- a/kcm/kcm.cpp +++ b/kcm/kcm.cpp @@ -89,6 +89,15 @@ void KdeConnectKcm::resetSelection() void KdeConnectKcm::deviceSelected(const QModelIndex& current) { + if (currentDevice) { + disconnect(currentDevice,SIGNAL(pairingSuccesful()), + this, SLOT(pairingSuccesful())); + disconnect(currentDevice,SIGNAL(pairingFailed(QString)), + this, SLOT(pairingFailed(QString))); + disconnect(currentDevice,SIGNAL(unpaired()), + this, SLOT(unpaired())); + } + //Store previous device config pluginsConfigChanged(); @@ -134,6 +143,13 @@ void KdeConnectKcm::deviceSelected(const QModelIndex& current) kcmUi->name_label->setText(currentDevice->name()); kcmUi->status_label->setText(currentDevice->isPaired()? i18n("(paired)") : i18n("(unpaired)")); + connect(currentDevice,SIGNAL(pairingSuccesful()), + this, SLOT(pairingSuccesful())); + connect(currentDevice,SIGNAL(pairingFailed(QString)), + this, SLOT(pairingFailed(QString))); + connect(currentDevice,SIGNAL(unpaired()), + this, SLOT(unpaired())); + KService::List offers = KServiceTypeTrader::self()->query("KdeConnect/Plugin"); QList scriptinfos = KPluginInfo::fromServices(offers); @@ -143,64 +159,72 @@ void KdeConnectKcm::deviceSelected(const QModelIndex& current) connect(kcmUi->pluginSelector, SIGNAL(changed(bool)), this, SLOT(pluginsConfigChanged())); + } void KdeConnectKcm::requestPair() { - if (!currentDevice) return; + if (!currentDevice) { + return; + } kcmUi->messages->hide(); kcmUi->pair_button->setVisible(false); kcmUi->progressBar->setVisible(true); - connect(currentDevice,SIGNAL(pairingSuccesful()), - this, SLOT(pairingSuccesful())); - connect(currentDevice,SIGNAL(pairingFailed(QString)), - this, SLOT(pairingFailed(QString))); - currentDevice->requestPair(); } void KdeConnectKcm::unpair() { - if (!currentDevice) return; + if (!currentDevice) { + return; + } + + currentDevice->unpair(); +} + +void KdeConnectKcm::unpaired() +{ + DeviceDbusInterface* senderDevice = (DeviceDbusInterface*) sender(); + devicesModel->deviceStatusChanged(senderDevice->id()); + + if (senderDevice != currentDevice) return; kcmUi->pair_button->setVisible(true); kcmUi->unpair_button->setVisible(false); kcmUi->progressBar->setVisible(false); kcmUi->ping_button->setVisible(false); - - currentDevice->unpair(); - kcmUi->status_label->setText(i18n("(unpaired)")); - - devicesModel->deviceStatusChanged(currentDevice->id()); } void KdeConnectKcm::pairingFailed(const QString& error) { if (sender() != currentDevice) return; + kcmUi->pair_button->setVisible(true); + kcmUi->unpair_button->setVisible(false); + kcmUi->progressBar->setVisible(false); + kcmUi->ping_button->setVisible(false); + kcmUi->status_label->setText(i18n("(unpaired)")); + kcmUi->messages->setText(i18n("Error trying to pair: %1",error)); kcmUi->messages->animatedShow(); - kcmUi->progressBar->setVisible(false); - kcmUi->pair_button->setVisible(true); } void KdeConnectKcm::pairingSuccesful() { - DeviceDbusInterface* sender = (DeviceDbusInterface*) sender(); - devicesModel->deviceStatusChanged(sender->id()); + DeviceDbusInterface* senderDevice = (DeviceDbusInterface*) sender(); + devicesModel->deviceStatusChanged(senderDevice->id()); - if (sender != currentDevice) return; + if (senderDevice != currentDevice) return; - kcmUi->progressBar->setVisible(false); - kcmUi->unpair_button->setVisible(true); kcmUi->pair_button->setVisible(false); + kcmUi->unpair_button->setVisible(true); + kcmUi->progressBar->setVisible(false); kcmUi->ping_button->setVisible(true); - kcmUi->status_label->setText(i18n("(paired)")); } diff --git a/kcm/kcm.h b/kcm/kcm.h index 32aac2063..072c544bc 100644 --- a/kcm/kcm.h +++ b/kcm/kcm.h @@ -61,6 +61,7 @@ private Q_SLOTS: void resetSelection(); void pairingSuccesful(); void pairingFailed(const QString& error); + void unpaired(); private: Ui::KdeConnectKcmUi* kcmUi; diff --git a/kded/device.cpp b/kded/device.cpp index b67b3dafa..b13a1bdb2 100644 --- a/kded/device.cpp +++ b/kded/device.cpp @@ -177,6 +177,8 @@ void Device::unpair() reloadPlugins(); //Will unload the plugins + Q_EMIT unpaired(); + } void Device::pairingTimeout() @@ -333,6 +335,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np) KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc"); config->group("trusted_devices").deleteGroup(id()); reloadPlugins(); + Q_EMIT unpaired(); } m_pairStatus = Device::NotPaired; diff --git a/kded/device.h b/kded/device.h index a017db17e..f7e8e6817 100644 --- a/kded/device.h +++ b/kded/device.h @@ -100,6 +100,7 @@ Q_SIGNALS: Q_SCRIPTABLE void pluginsChanged(); Q_SCRIPTABLE void pairingSuccesful(); Q_SCRIPTABLE void pairingFailed(const QString& error); + Q_SCRIPTABLE void unpaired(); private: QString m_deviceId;