Merge branch 'master' into stable

This commit is contained in:
Albert Vaca 2014-02-19 21:11:47 +01:00
commit e197db274f
19 changed files with 12 additions and 9 deletions

View file

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

2
icon/CMakeLists.txt Normal file
View file

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 951 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

View file

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

View file

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

View file

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

View file

@ -74,7 +74,7 @@ void SftpPlugin::addToDolphin()
{ {
removeFromDolphin(); removeFromDolphin();
KUrl kioUrl("kdeconnect://"+device()->id()+"/"); 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"; kDebug(kdeconnect_kded()) << "add to dolphin";
} }

View file

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

View file

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

View file

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

View file

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