Commit e197db27 authored by Albert Vaca Cintora's avatar Albert Vaca Cintora

Merge branch 'master' into stable

parents 08e97242 29719ccc
......@@ -17,5 +17,6 @@ add_subdirectory(libkdeconnect)
add_subdirectory(kcm)
#add_subdirectory(kio)
add_subdirectory(plasmoid)
add_subdirectory(icon)
add_subdirectory(tests)
kde4_install_icons(${ICON_INSTALL_DIR})
\ No newline at end of file
#!/usr/bin/env xdg-open
[Desktop Entry]
Exec=kcmshell4 kcm_kdeconnect
Icon=smartphone
Icon=kdeconnect
Type=Service
X-KDE-ServiceTypes=KCModule
......
[Desktop Entry]
Type=Application
Icon=smartphone
Icon=kdeconnect
Terminal=false
Exec=kcmshell4 kcm_kdeconnect
Name=KDE Connect
......
[Global]
IconName=smartphone
IconName=kdeconnect
Name=KDE Connect
Name[bs]=Konekcija KDE
Name[da]=KDE Connect
......
......@@ -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";
}
......
......@@ -11,6 +11,6 @@ writing=false
makedir=false
deleting=false
moving=false
Icon=smartphone
Icon=kdeconnect
maxInstances=2
......@@ -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);
......
......@@ -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")
}
}
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment