tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.x'

Browse source
This commit is contained in:
Fabian Vogt 2017-07-12 11:37:41 +02:00
commit 0667c6556f
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/kdeconnectd.cpp
View file

@ -47,7 +47,7 @@ public:
KNotification* notification = new KNotification(QStringLiteral("pairingRequest")); KNotification* notification = new KNotification(QStringLiteral("pairingRequest"));
notification->setIconName(QStringLiteral("dialog-information")); notification->setIconName(QStringLiteral("dialog-information"));
notification->setComponentName(QStringLiteral("kdeconnect")); notification->setComponentName(QStringLiteral("kdeconnect"));
notification->setText(i18n("Pairing request from %1", device->name())); notification->setText(i18n("Pairing request from %1", device->name().toHtmlEscaped()));
notification->setActions(QStringList() << i18n("Accept") << i18n("Reject")); notification->setActions(QStringList() << i18n("Accept") << i18n("Reject"));
// notification->setTimeout(PairingHandler::pairingTimeoutMsec()); // notification->setTimeout(PairingHandler::pairingTimeoutMsec());
connect(notification, &KNotification::action1Activated, device, &Device::acceptPairing); connect(notification, &KNotification::action1Activated, device, &Device::acceptPairing);

3
kcm/kcm.ui
View file

@ -156,6 +156,9 @@
<property name="text"> <property name="text">
<string>Device</string> <string>Device</string>
</property> </property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>

1
plasmoid/package/contents/ui/DeviceDelegate.qml
View file

@ -102,6 +102,7 @@ PlasmaComponents.ListItem
elide: Text.ElideRight elide: Text.ElideRight
text: display text: display
Layout.fillWidth: true Layout.fillWidth: true
textFormat: Text.PlainText
} }
//Find my phone //Find my phone