Commit graph

188 commits

Author SHA1 Message Date
Weixuan Xiao
6672e3eef5 Fix system tray icon on macOS 2019-06-18 20:51:13 +00:00
Weixuan Xiao
4f4b6c309f Allow to use private DBus 2019-06-18 01:21:31 +00:00
Nicolas Fella
e601755644 Force usage of QStringLiteral and port remaining offenders 2019-06-10 14:40:28 +00:00
Weixuan Xiao
86b82677a1 Allow kdeconnectd auto launch from kdeconnect-indicator on macOS 2019-06-09 21:36:42 +00:00
Weixuan Xiao
5431073844 Add wrapper for macos dbus connection 2019-06-09 15:28:49 +00:00
Albert Vaca Cintora
b776617646 Added new indicator icons for dark and clear backgrounds
Default to dark because it's more common (Windows, Gnome) but we need to
implement a way to chose automatically between the dark and clear icon
(and this is gonna be platform-specific).

Note that dashes in names have a special meaning when loading icons. The
new icon file names are ugly for this reason.
2019-06-08 13:07:01 +02:00
Nicolas Fella
d4026861ab Clean up includes 2019-04-30 19:03:24 +02:00
Nicolas Fella
3b8fedea1a Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
Nicolas Fella
18e0eee564 Forward declare 2019-03-11 18:50:14 +01:00
Nicolas Fella
7e39c5df8f [indicator] Remove stray includes 2019-03-11 18:48:25 +01:00
l10n daemon script
1d3368532a 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-02-26 05:29:15 +01:00
l10n daemon script
41e13c2e84 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-01-31 05:44:46 +01:00
Nicolas Fella
63a353550c Add icons to indicator
Reviewers: #kde_connect, albertvaka

Reviewed By: #kde_connect, albertvaka

Subscribers: kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D17407
2018-12-07 17:32:03 +01:00
l10n daemon script
283211b4eb 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"
2018-10-10 06:19:16 +02:00
l10n daemon script
fb39f01440 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"
2018-08-30 05:46:27 +02:00
l10n daemon script
932b7e2834 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"
2018-08-18 05:41:47 +02:00
l10n daemon script
027c147671 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"
2018-08-05 05:29:07 +02:00
l10n daemon script
e40312bf5e 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"
2018-06-18 05:27:46 +02:00
l10n daemon script
82d0f2dc0b 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"
2018-06-17 05:29:14 +02:00
l10n daemon script
c42829a7d6 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"
2018-04-07 05:22:03 +02:00
Friedrich W. H. Kossebau
bb3ab8b631 Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5
Summary:
* cmake 2.8.12 is really outdated, 3.0 is minimum in plasma & kf5
* cmake_minimum_required should be at begin of toplevel CMakeLists.txt
* bump qt version to 5.7, matching the min Qt version of kf5 5.42
* with ecm being part of kf5 since early versions, share ${KF5_MIN_VERSION}
* use QT_MIN_VERSION & KF5_MIN_VERSION also for separate find_package calls
* deduplicate all KF5 components searched for in unconditionally included
  subdirs

Test Plan: Still configures and builds with all options OFF & ON

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella

Differential Revision: https://phabricator.kde.org/D11418
2018-03-17 23:34:33 +01:00
l10n daemon script
ba5e3ab2f8 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"
2017-11-27 04:56:48 +01:00
l10n daemon script
fc13865911 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"
2017-11-10 04:50:10 +01:00
l10n daemon script
a543e39c81 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"
2017-10-30 04:45:10 +01:00
l10n daemon script
03439dcecb 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"
2017-09-25 04:48:46 +02:00
l10n daemon script
057a114629 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"
2017-09-19 04:58:52 +02:00
Albert Vaca
efaa7cbab1 Fix warning 2017-09-18 20:07:33 +02:00
l10n daemon script
749cf63244 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"
2017-09-04 06:08:28 +02:00
Albert Vaca
84bba9429f Merge branch 'master' into 1.x
# Conflicts:
#	core/backends/lan/downloadjob.cpp
#	core/backends/lan/downloadjob.h
#	core/filetransferjob.cpp
#	core/filetransferjob.h
#	plugins/notifications/sendreplydialog.cpp
#	plugins/notifications/sendreplydialog.h
#	plugins/telephony/sendsmsdialog.cpp
#	plugins/telephony/sendsmsdialog.h
2017-09-03 22:05:54 +02:00
Jean Vincent
72535ecf48 Make member variable names, & placement and * placement more coherent
Summary:
Change all member variables to the form m_fooBar because it is the preferred form in Qt (it was half and half between this and mFooBar, and a minority didn't have anything).
Place all references and pointers on the side of the type since it is the majority.

Basically:
 - mFoo -> m_foo
 - foo -> m_foo (if it is a member variable)
 - Type &ref -> Type& ref
 - Type *ptr -> Type* ptr

Reviewers: #kde_connect, nicolasfella, albertvaka

Reviewed By: #kde_connect, nicolasfella, albertvaka

Subscribers: albertvaka, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D7312
2017-09-03 21:45:08 +02:00
l10n daemon script
815c2fe910 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"
2017-08-07 06:08:34 +02:00
l10n daemon script
dadcc76841 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"
2017-08-06 06:02:06 +02:00
l10n daemon script
0356908fc8 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"
2017-08-06 04:42:32 +02:00
l10n daemon script
473a6c14ac 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"
2017-07-30 04:49:43 +02:00
Albert Vaca
ef0e80c91f Merge branch 'master' into 1.x
# Conflicts:
#	indicator/org.kde.kdeconnect.nonplasma.desktop
#	org.kde.kdeconnect.kcm.appdata.xml
#	plugins/runcommand/kdeconnect_runcommand.json
#	urlhandler/org.kde.kdeconnect.telhandler.desktop
2017-07-24 16:49:06 +02:00
l10n daemon script
470fdfef81 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"
2017-07-24 05:53:15 +02:00
l10n daemon script
7ba311fc78 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"
2017-07-24 04:32:05 +02:00
l10n daemon script
9f313f94c2 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"
2017-07-23 05:44:59 +02:00
l10n daemon script
d276a7eb37 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"
2017-07-23 04:32:09 +02:00
l10n daemon script
631880083d 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"
2017-07-19 09:50:22 +02:00
l10n daemon script
e6f3b5bd27 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"
2017-07-18 05:56:58 +02:00
l10n daemon script
d8c578edc9 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"
2017-07-17 06:00:54 +02:00
l10n daemon script
322fcd47a5 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"
2017-07-16 06:03:07 +02:00
l10n daemon script
d513d9e37e 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"
2017-07-15 05:39:16 +02:00
l10n daemon script
cc43a72884 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"
2017-07-14 05:43:50 +02:00
l10n daemon script
a4c0a8fb96 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"
2017-06-30 04:28:23 +02:00
l10n daemon script
bb3722b144 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"
2017-06-28 08:22:58 +02:00
l10n daemon script
fbd7e6d383 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"
2017-06-21 08:21:46 +02:00
l10n daemon script
36269e6506 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"
2017-06-20 04:26:54 +02:00
l10n daemon script
72162bf8c9 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"
2017-06-08 04:52:02 +02:00
l10n daemon script
6305de985b 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"
2017-06-06 04:28:16 +02:00
l10n daemon script
47b4aadaa3 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"
2017-06-05 04:09:27 +02:00
l10n daemon script
c070b4d445 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"
2017-06-04 04:17:49 +02:00
l10n daemon script
ece098ac3b 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"
2017-05-31 08:06:19 +02:00
l10n daemon script
0d217c58e1 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"
2017-05-27 04:22:53 +02:00
l10n daemon script
0711dac538 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"
2017-05-26 04:21:11 +02:00
Aleix Pol
ecd4f81840 Don't block the process while showing the dialog
Otherwise it's not possible to interact with the system tray while the
dialog is open.
2017-05-25 00:16:05 +02:00
Aleix Pol
3e794dd4c7 Fix name 2017-05-24 23:25:18 +02:00
Albert Vaca
e3c4592577 Doesn't seem to like starting a process in the callback 2017-05-24 23:22:30 +02:00
Albert Vaca
cd3341ecc0 Add icon to executable for Windows and Mac 2017-05-24 22:57:37 +02:00
Albert Vaca
9f95d8c4d3 Launch daemon with indicator on Windows
Since Dbus activation doesn't work on Windows
2017-05-24 22:57:36 +02:00
Albert Vaca
58f9045bfa Don't allow more than one indicator 2017-05-24 22:57:36 +02:00
Albert Vaca
35a9bde458 Get the correct icon 2017-05-24 22:57:36 +02:00
Aleix Pol
139bac55bc Fix desktop file
Have it open kdeconnect-indicator rather than plasmawindowed
2017-05-24 21:57:06 +02:00
Aleix Pol
a30adbe465 Hardcode a path to find the icon in on Windows 2017-05-24 20:53:12 +02:00
Albert Astals Cid
f01f751708 Use a KCMultiDialog instead of calling kcmshell directly
Reviewed by Aleix
2017-05-24 19:59:04 +02:00
Aleix Pol
32002e3c46 Use KStatusNotifierItem on the indicator
Seems to work a bit better than QSystemTrayIcon
2017-03-27 20:44:36 +02:00
Albert Vaca
636a4507cc Actually, just set the tooltip to the icon
The tooltip within the menus behaved weird, and didn't add any info.
2017-02-28 22:08:40 +01:00
Albert Vaca
44aec35996 Use the device name as tooltip 2017-02-28 22:04:20 +01:00
Albert Vaca
51e4116886 Fixed crash 2017-02-21 00:08:03 +01:00
Aleix Pol
1cbc067205 Remove disabled plugins
No need to show it's not available
2017-02-20 23:27:42 +01:00
Aleix Pol
a000f82475 Remove unpair from the indicator menu
It's never an urgent action, should be done from the KCM
2017-02-20 23:27:03 +01:00
Albert Vaca
1d09ee78a5 Naming 2017-02-05 15:54:38 +01:00
Albert Astals Cid
c2739f94f1 Do not create a new menu on every refreshMenu call
Seems to work better under Unity

Reviewed by Aleix Pol
2017-01-31 00:53:26 +01:00
Aleix Pol
b416c18916 Make sure that the menu is initialized upon start.
Otherwise it won't be initialized until some devices are added.
2017-01-27 00:54:57 +01:00
Aleix Pol
80a12e506a Let the indicator accept and reject pairings 2017-01-25 01:19:44 +01:00
Aleix Pol
c822ef8104 Set the device's announcedName when it's available
No need to block on it
2017-01-13 17:48:37 +01:00
Aleix Pol
8ac7922252 Implement send file for kdeconnect-indicator 2017-01-11 18:04:01 +01:00
Aleix Pol
d517dcea48 Only make actions enabled if they're available 2017-01-11 18:03:44 +01:00
Aleix Pol
e83c707ad2 Recreate the menu when devices change
Instead of trying to be overly smart.
Qt wasn't updating the StatusNotifier properly anyway, this makes the
whole thing work.
2017-01-11 17:19:17 +01:00
Albert Vaca
3a558984b9 Fix for qt 5.6 2016-11-23 20:27:09 +01:00
Aleix Pol
89d6152b3b Install kdeconnect-indicator 2016-11-23 19:45:35 +01:00
Aleix Pol
7960cb2ca7 Have a tooltip with the number of connected devices 2016-11-23 19:45:35 +01:00
Aleix Pol
7b87af16df Properly iterate over devices 2016-11-23 19:45:35 +01:00
Aleix Pol
6aa41a6ab9 Display a configure entry on the menu 2016-11-23 19:45:35 +01:00
Aleix Pol
afa299266e Only display connected devices 2016-11-23 19:45:35 +01:00
Aleix Pol
22e08095ce Let the menu actually do things 2016-11-23 19:45:35 +01:00
Aleix Pol
b67b0e6c2c First approach to a tool that sits on the system tray
Hopefully will better integrate in all platforms
2016-11-23 19:45:35 +01:00