Merge branch 'master' into stable

CMakeLists.txt

@@ -17,5 +17,6 @@ add_subdirectory(libkdeconnect)
 add_subdirectory(kcm)
 #add_subdirectory(kio)
 add_subdirectory(plasmoid)
+add_subdirectory(icon)
 
 add_subdirectory(tests)

icon/CMakeLists.txt

@@ -0,0 +1,2 @@
+
+kde4_install_icons(${ICON_INSTALL_DIR})

kcm/kcm_kdeconnect.desktop

@@ -1,7 +1,7 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Exec=kcmshell4 kcm_kdeconnect
-Icon=smartphone
+Icon=kdeconnect
 Type=Service
 
 X-KDE-ServiceTypes=KCModule

kcm/kdeconnect.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Icon=smartphone
+Icon=kdeconnect
 Terminal=false
 Exec=kcmshell4 kcm_kdeconnect
 Name=KDE Connect

kded/kdeconnect.notifyrc

@@ -1,5 +1,5 @@
 [Global]
-IconName=smartphone
+IconName=kdeconnect
 Name=KDE Connect
 Name[bs]=Konekcija KDE
 Name[da]=KDE Connect

kded/plugins/sftp/sftpplugin.cpp

@@ -74,7 +74,7 @@ void SftpPlugin::addToDolphin()
 {
     removeFromDolphin();
     KUrl kioUrl("kdeconnect://"+device()->id()+"/");
-    m_d->placesModel->addPlace(device()->name(), kioUrl, "smartphone");
+    m_d->placesModel->addPlace(device()->name(), kioUrl, "kdeconnect");
     kDebug(kdeconnect_kded()) << "add to dolphin";
 }
 

kio/kdeconnect.protocol

@@ -11,6 +11,6 @@ writing=false
 makedir=false
 deleting=false
 moving=false
-Icon=smartphone
+Icon=kdeconnect
 maxInstances=2
 

kio/kiokdeconnect.cpp

@@ -105,7 +105,7 @@ void KioKdeconnect::listAllDevices()
 
         const QString target = QString("kdeconnect://").append(deviceId).append("/");
         const QString name = interface.name();
-        const QString icon = "smartphone";
+        const QString icon = "kdeconnect";
 
         KIO::UDSEntry entry;
         entry.insert(KIO::UDSEntry::UDS_NAME, name);

plasmoid/package/contents/ui/CompactRepresentation.qml

@@ -32,7 +32,7 @@ Item {
 
     PlasmaCore.IconItem {
         id: icon
-        source: "smartphone"
+        source: "kdeconnect"
         anchors.fill: parent
     }
 
@@ -44,7 +44,7 @@ Item {
         PlasmaCore.ToolTip {
             id: tooltip
             target: mouseArea
-            image: QIcon("smartphone")
+            image: QIcon("kdeconnect")
             subText: i18n("KDE Connect device notifications")
         }
     }

plasmoid/package/metadata.desktop

@@ -35,7 +35,7 @@ Comment[tr]=KDE Bağlan kullanılarak cihazınızdan bildirimleri görüntüleyi
 Comment[uk]=Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»
 Comment[x-test]=xxShow notifications from your devices using KDE Connectxx
 
-Icon=smartphone
+Icon=kdeconnect
 Type=Service
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet