tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4526 commits 81 branches 117 tags 12 MiB
Commit graph

367 commits

Author SHA1 Message Date
l10n daemon script
b7982c3724 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-08-29 01:36:14 +00:00
l10n daemon script
ee94eb4b83 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-08-23 01:37:46 +00:00
l10n daemon script
e3257907ab SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-08-20 01:37:53 +00:00
l10n daemon script
22c423575e SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-08-07 01:50:26 +00:00
l10n daemon script
b0a122089d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-08-01 01:39:50 +00:00
l10n daemon script
5485f743e0 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-31 01:39:24 +00:00
Phani Pavan Kambhampati
c5b955fe10 Changed KCM to launch in system settings 
KCM used to open in a separate window, changed that behaviour to launch in system settings when launched via the plasmoid.

BUG: 446337
 2023-07-30 07:30:52 +00:00
l10n daemon script
1ff98bc580 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-30 01:37:54 +00:00
l10n daemon script
297bc8cd73 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-29 01:37:09 +00:00
l10n daemon script
885d311b31 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-28 01:41:47 +00:00
l10n daemon script
d9f7fc6918 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-27 01:37:50 +00:00
l10n daemon script
a0b0477b13 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-26 01:38:38 +00:00
l10n daemon script
7efcc8bbda SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-25 01:37:00 +00:00
l10n daemon script
9bb076584b SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-07-24 08:31:14 +00:00
Alexander Lohnau
f1c2202591 Port plasmoid metadata to JSON format 
This is needed for Plasma6 and avoids deprecation warnings/performance penalties in Plasma5
 2023-07-22 20:51:19 +00:00
Alexander Lohnau
afaac2d1b0 Use undeprecated ECM install variable 2023-07-20 11:15:50 +03:00
l10n daemon script
09f38caec5 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-06-20 01:54:21 +00:00
Albert Vaca Cintora
144a60b58a Allow disabling clipboard auto-share and add option to share manually 
Continues the work started in !396 by rebasing it onto latest master and
making the "send clipboard" button from the plasmoid invisible when
automatic syncing is enabled.
    
I didn't find a way to do the same in kdeconnect-indicator and
kdeconnect-app (why do we have 3 UIs???), so in those we always show the
option for now.
 2023-06-07 19:48:25 +00:00
Nicolas Fella
c486bb9d2c [plasmoid] Remove unneeded panel icon size handling 2023-03-14 20:35:13 +00:00
l10n daemon script
9ee562cac3 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-03-05 01:58:22 +00:00
l10n daemon script
c4495d5855 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-02-04 02:05:14 +00:00
l10n daemon script
b5ab505074 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2023-02-02 02:03:13 +00:00
Joshua Goins
abbaa1575b Fix "Pair a Device..." button in plasmoid 2023-01-18 10:29:25 -05:00
l10n daemon script
6acbcd628d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-12-15 01:56:04 +00:00
l10n daemon script
4656144ac9 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-11-19 01:48:52 +00:00
l10n daemon script
e712748881 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-11-17 01:47:30 +00:00
Volker Krause
002848efa8 Adapt build system to also support Qt 6 
This is complicated by the Qt 5.6 requirement of SailfishOS, hopefully
that didn't get broken by this.
 2022-10-29 16:51:41 +02:00
l10n daemon script
e77ba5b542 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-10-20 02:01:51 +00:00
l10n daemon script
f556dc721b SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-09-30 01:47:48 +00:00
Kareem Abduljaleel
4ecf463cd1 [plasmoid] Add Photo to Plasmoid menu 
Adds a menu entry to ask the remote device to take a photo to the Plasmoid menu
 2022-09-28 13:03:48 +00:00
Bharadwaj Raju
1f5fd06924 [plasmoid] Add inline reply for notifications instead of opening a dialog 
Instead of opening the reply dialog when clicking Reply in the plasmoid, it opens an inline reply UI.
 2022-09-26 19:51:28 +00:00
l10n daemon script
34da0ad9e1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-09-05 01:43:43 +00:00
l10n daemon script
b25f7e07a8 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-08-27 01:49:35 +00:00
l10n daemon script
3819d96ee1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-08-24 01:49:19 +00:00
Nicolas Fella
ad01ef1695 Fix activating existing settings window on Wayland 
Add the necessary bits for XDG activation to work

Move the code for launching the settings from the daemon to the respective processes so that we don't need to pass activation tokens over another process boundary
 2022-07-06 12:55:39 +00:00
Fushan Wen
5f94c49503 plasmoid: fix missing device name 
display is not defined, use model.name instead.
 2022-06-23 09:40:39 +00:00
Aleix Pol
084bfebcc8 Introduce the VirtualMonitor plugin 
It allows to use other paired devices as external displays
transparently.
 2022-05-25 00:04:47 +02:00
Fushan Wen
2c9af9874e
plasmoid: Give PlaceholderMessage an icon 
"edit-none": No paired devices

"network-disconnect": All paired devices are unavailable

"kdeconnect": pairedDevicesModel.count < 0
 2022-05-09 08:51:04 +08:00
Nicolas Fella
f7f3c01ec8 Use undeprecated install dirs 
Using kde-dev-scripts/kf5/cmakelists_install_vars.pl
 2022-04-21 00:50:14 +02:00
l10n daemon script
872e213010 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-03-31 01:41:19 +00:00
l10n daemon script
1c67f4eccf SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2022-03-29 02:08:15 +00:00
Nate Graham
9c303fee79 plasmoid: Don't show redundant configure button in placeholder message 
It's not really needed.

BUG: 448457
 2022-01-14 16:08:39 -07:00
Carl Schwan
127992b49d Port ScrollArea to ScrollView 
Visually a new scrollbar is now displayed and in terms of behavior
changes the scrolling is now consistent with the other plasmoid.

![image](/uploads/76d7c4e73636be11a78c4e9be22a8027/image.png)
 2022-01-04 22:24:28 +00:00
l10n daemon script
c630a3de90 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-11-04 01:16:42 +00:00
l10n daemon script
61b2e607b4 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-09-26 01:12:22 +00:00
l10n daemon script
9d78e17e42 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-09-02 01:17:46 +00:00
l10n daemon script
e213eb509c SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-08-09 01:10:05 +00:00
Nicolas Fella
ab7b805da1 Use KPackage macro for installing plasmoid 
The macro does some extra stuff under the hood, like converting the metadata.desktop to json, which makes loading the plasmoid a bit faster
 2021-07-29 16:00:29 +02:00
Kai Uwe Broulik
4320789a04 [DeviceDelegate] Improve interaction with overflow menu 
* Right-align relative to menu button
* Highlight button while menu is open
* Open on press rather than on click like a toolbar menu
 2021-07-23 20:42:22 +02:00
Simon Redman
cec5d8086a [Plasmoid] Use icon for battery and connectivity status 
## Summary

Use a pretty, granular icon for battery and connectivity status instead of whacking it into the device name.

## Test Plan

It looks so nice!

![image](/uploads/7e64d1339507e1dae90ee70c02327aa6/image.png)

Tested all provided icon states by hacking Battery.qml and Connectivity.qml to provide different values.
 2021-07-14 03:30:25 +00:00
l10n daemon script
f4211e0431 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-04-22 01:12:28 +00:00
Karl Ove Hufthammer
903f4ec92a Don’t extract QML strings as Java printf strings 
The percentage sign in strings like ‘%1% charging’ couldn’t
be properly translated in the resulting POT file. For example,
translating it to ‘%1 % charging’ (some languages use a space
before the percentage sign) resulted in an invalid Java printf
string (but a valid QML string), which was reject by msgfmt.

(cherry picked from commit 6811816ac0)
 2021-04-06 21:09:48 +02:00
Albert Astals Cid
d93c028727 Add missing ) 2021-03-13 18:58:26 +01:00
David Shlemayev
a75da62f4d Add backend for ConnectivityReport plugin 2021-03-12 23:27:16 +00:00
Nicolas Fella
7193cfc927 [plasmoid] Use PlaceholderMessage from PlasmaExtras instead of Kirigami 
Otherwise the style may be incorrect

BUG: 434197
 2021-03-09 19:20:05 +01:00
l10n daemon script
a558af4dd3 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-01-16 06:40:31 +01:00
l10n daemon script
38afb807bf SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-12-07 06:11:38 +01:00
Nicolas Fella
1060c1a81a Add API for opening the KCM to daemon 
We have a few places that open the KCM, with different arguments.

Centralize the implementation in one place.

This makes it easier to switch to invoking systemsettings5 in the future (once https://invent.kde.org/plasma/systemsettings/-/merge_requests/11 is in).

It also makes sure the relevant device is selected when clicking on a pairing notification.

The function is exposed to DBus for the Plasmoid and potential third-party users.

CCBUG: 425660
 2020-10-18 18:40:48 +00:00
l10n daemon script
e57fd79f26 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-09-19 06:10:24 +02:00
l10n daemon script
b7bdc75ff9 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-09-17 06:15:05 +02:00
Nicolas Fella
b88927a641 Drop empty X-KDE-PluginInfo-Depends 
The whole concept is almost unused and there's no point in having it there but empty

See also https://phabricator.kde.org/T13553
 2020-09-01 10:46:22 +00:00
Nicolas Fella
f90d6a019f Rework the battery plugin 
Instead of having the DBus stuff in a separate class expose the plugin class itself like we do for the other plugins.

Replace the method-based API with properties.

Change the path to <device>/battery for consistency with other plugins
 2020-08-27 15:04:40 +00:00
Nicolas Fella
87db95b22f Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
l10n daemon script
90a3ded076 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-08-09 05:37:05 +02:00
l10n daemon script
10de7b3763 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-07-23 09:50:37 +02:00
Nicolas Fella
6cd0a92ca2 Fix file dialog usage in app and plasmoid 
fileDialog.open() does *not* block, so we need to move the sending to onAccepted. Not sure why I thought this ever worked.

BUG: 423975
(cherry picked from commit 198789e6fc)
 2020-07-18 23:59:07 +02:00
l10n daemon script
0c32010a28 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-07-06 05:30:08 +02:00
Nicolas Fella
c8a87db367 Merge branch 'release/20.04' 2020-07-05 15:49:58 +02:00
l10n daemon script
e44e4a4c19 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-06-20 05:10:40 +02:00
l10n daemon script
373557cd26 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-06-18 08:27:38 +02:00
l10n daemon script
653a708727 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-06-18 05:39:20 +02:00
l10n daemon script
5fe8d7ea90 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-06-17 16:50:11 +02:00
l10n daemon script
e873eddcde SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-06-17 14:06:59 +02:00
l10n daemon script
046a572542 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-06-07 08:58:38 +02:00
Nate Graham
a9d0cb64b7 [applet] Port to Kirigami.PlaceholderMessage 
This new Kirigami component was just introduced with
https://phabricator.kde.org/D29057.

ref T13021
 2020-04-22 22:49:26 +00:00
l10n daemon script
baf52b49ac SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-04-08 11:04:09 +02:00
l10n daemon script
43ea8052fe SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-04-08 06:32:15 +02:00
l10n daemon script
1634126eb5 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-04-07 10:16:35 +02:00
l10n daemon script
0e04769a43 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-04-07 06:11:40 +02:00
l10n daemon script
87d58643a2 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-03-17 10:05:04 +01:00
l10n daemon script
201be5d898 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-03-16 10:21:09 +01:00
Nate Graham
8e0cfd3899 [applet] Standardize presentation on the "devices unavailable" view 
Summary:
This patch makes the "devilces unavailable" page follow the general style used in other
similar views throughout Plasma and other KDE software. It also improves the wording
of various buttons and headers to make them more context-sensitive and thus more relevant
to what the user needs to do to solve the problem.

Test Plan:
{F8149680}

{F8149679}

Reviewers:
#VDG, #kde-connect

Subscribers:
 2020-03-15 19:53:53 +00:00
l10n daemon script
7eee223dfc SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2020-03-02 05:46:53 +01:00
George Vogiatzis
875cf16a40 [Plasmoid]Make device menu use PC ContextMenu 
Summary:
Change the three dotted menu to use PlasmaComponents ContextMenu.
This prevents menu from staying open on other system tray's applets.
Wayland still has that issue, happens in other menus too.
BUG: 415142

And change menu icon into a hamburger menu.

Test Plan:
Before:
Open the menu, and then open an other applet. Menu will stay open on
the left. Even if change windows and open the system tray, will still
be there.
After:
Use X11. By clicking, for example volume applet, menu will minimize.
Will need to click again to open the applet.
 2020-02-21 11:42:31 +02:00
l10n daemon script
cb307e16b2 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2019-11-17 05:06:27 +01:00
Aleix Pol
36bcade705 plasmoid: move plasmoid buttons into a menu 
This way we get to see what they do together with the icon.
Removes some visual clutter as well.

Reviewed by Albert Vaca
 2019-10-12 20:06:12 +02:00
Aleix Pol
8a919a8015 Remove clipboard integration on the plasmoid 
It's redundant to the clipboard plugin and remote keyboard.
It clutters the UI.

Reviewed by Albert Vaca
 2019-10-12 19:44:09 +02:00
l10n daemon script
7d27ef1417 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2019-09-30 05:04:12 +02:00
Albert Vaca Cintora
db626fa4bd Hide the install buttons if you have already paired some device 2019-09-20 12:24:30 +02:00
Albert Vaca Cintora
7eeed141f0 Add a button to open the settings 
If you already have kdeconnect on your phone, the call to action to install
it doesn't make sense.

This doesn't add a string because it reuses one that was already in the
plasmoid
 2019-09-19 18:48:58 +02:00
Albert Vaca Cintora
9f8928513d Don't hide the plasmoid, otherwise the install buttons don't make sense 2019-09-19 18:39:45 +02:00
Nicolas Fella
6c40364490 Fix SMS icon in plasmoid 2019-08-15 19:22:29 +02:00
l10n daemon script
392d287b64 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2019-08-11 04:47:22 +02:00
l10n daemon script
5427754e21 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2019-08-01 04:51:32 +02:00
Aleix Pol
20f4ed3e9b sms: forgot to add the file 2019-07-21 20:13:10 +02:00
Aleix Pol
c17972881b sms: Added opening kdeconnect-sms on the plasmoid and indicator 
Add a menu entry on the kdeconnect-indicator within devices' submenu that opens kdeconnect-sms.
Also add it in the plasmoid in the device delegate.
 2019-07-21 18:30:41 +02:00
Matthijs Tijink
24eb0799f1 Show install instructions for Android when there are no devices 2019-07-20 18:21:41 +02:00
l10n daemon script
3d0acf15a5 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2019-06-27 05:13:07 +02:00
Matthijs Tijink
f8184f84bc Make more of the device name/battery show up in the plasmoid 2019-06-25 16:40:10 +00:00
Nicolas Fella
f9dee192b5 Completely hide plamoid in system tray if no device is connected 2019-06-20 16:22:43 +00:00