1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

50 Commits

Author SHA1 Message Date
Colomban Wendling
a13c566736 fix(systemtrayicon): don't set an invalid and useless icon on GTK
* The initial status icon to set on GTK didn't exist (anymore?).
* GTK resources aren't compatible with Qt's, so the resource lookup
  couldn't work anyway, even if it did exist.
* The caller calls SystemTryIcon::setIcon() right after instancing it
  anyway, so there's no need for an initial icon.

This fixes a runtime critical warning from GTK as we tried to unref a
NULL icon, which is invalid.

Fixes #3154.
2016-06-14 19:52:33 +02:00
Colomban Wendling
cf4c46ff0b refactor(systemtrayicon): unify QIcon to GdkPixbuf conversion
Also simplify the memory management by using the C++ allocator and by
using the bytes directly as passed to the free callback instead of
passing it again as user data.
2016-06-14 19:50:38 +02:00
PafXUS
f997d51b66
fix(systemtrayicon): delete qtIcon in destructor 2016-06-08 22:31:03 +03:00
Diadlo
25cec623fa
refactor(systemtrayicon, genericchatform): Replace C-style cast to static_cast 2016-04-20 22:53:27 +03:00
sudden6
f95728a037 revert: fix(systemtrayicon, widget): Added deallocate memory
Revert commit cbb7eeca62

fixes #3144
2016-04-15 00:57:03 +02:00
sudden6
fa1f26354b revert: fix(systemtrayicon): only delete the systray backend that was used
Revert commit 1d6f32c9f9
2016-04-15 00:57:03 +02:00
sudden6
1d6f32c9f9 fix(systemtrayicon): only delete the systray backend that was used
Fixes qTox not closing cleanly after
4fd0446f96
2016-04-13 22:32:45 +02:00
Diadlo
cbb7eeca62 fix(systemtrayicon, widget): Added deallocate memory 2016-04-13 19:46:38 +03:00
tux3
18484cb950
Fix Unity systray compile error
Thanks to @aszinovyev
2015-12-11 13:32:26 +01:00
sudden6
17e43d9835 treat x-cinnamon the same as gnome 2015-11-29 13:23:08 +01:00
Zetok Zalbavar
cd4b02ce6a
Remove ~duplicated code for tray backed selection
`else` clause already handles KDE5 case
2015-10-23 16:13:44 +01:00
agilob
f2866ecc44 remove unused code, better logging for systray, removed KDE5 from enum 2015-10-23 16:21:05 +02:00
agilob
7d8e0644ce remove dependency injection from systemtrayicon
as it was used as experiment only
fix compilation warning about unchecked switch case
2015-10-23 16:21:05 +02:00
agilob
521b55f776 use Qt backend of KDE5
commit fixes problem with usage of GTK3 fallback menu action used on KDE5, probably to a bug in status notifier
- allows using Qt backend on KDE5 and other plasma related env.
- icon in tray menu and tray icon are loaded from svg, their size is not limited to 50px now
- plasma adds extra actionmenu to tray so quit was renamed to exit
- exit action usues system-default icon for quit and system default keyboard shourtcut to close qtox
2015-10-23 16:21:04 +02:00
Dmytro Shynkevych
b887072bc4 systemtrayicon: switched to manual memory management for pixmap data 2015-10-21 23:42:14 -04:00
Dmytro Shynkevych
e4ebe8b7a7 systemtrayicon: optimized QImage <-> GdkPixbuf conversion
Switched to gdk_pixbuf_new_from_resource() for loading from file
QImages are now stack-allocated, contents copied to GBytes
2015-10-17 12:44:33 -03:00
Dmytro Shynkevych
88cce4e137 systemtrayicon: fixed multiple small leaks 2015-10-04 19:51:51 -04:00
Dmytro Shynkevych
45a3d7ca30 systemtrayicon: fixed multiple gdk_pixbuf memory leaks
Note: QImages **must** be heap-allocated, their data are used
until the corresponding gdk_pixmap is finalized
2015-10-04 16:58:24 -04:00
Dmytro Shynkevych
7b1b4655a5 systemtrayicon: image is now stack-allocated 2015-09-30 18:00:25 -04:00
Dmytro Shynkevych
d548b51e1d systemtrayicon: fixed minor memory leak 2015-09-27 23:19:21 -04:00
Zetok Zalbavar
67e9aeec63
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any way, with the
exception of "qTox" using the Tox Projet's "toxcore" collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's
"qTox" collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox
contributors, and no partiular rights are granted to the Tox Project.
2015-06-06 14:51:28 +01:00
tux3
20f254651d
Reorganize files 2015-06-06 01:44:47 +02:00
Sean
a0ecf86c20 Revert "Fixing tray icon visibility issue on OS X"
This reverts commit a4df4125e3.
2015-05-18 13:54:58 -07:00
tux3
57871c9270
Use GTK systray backend on MATE 2015-05-13 14:43:45 +02:00
sudden6
1506a9a30e Change log messages to fit new log format 2015-05-11 15:37:56 +02:00
Ilya Kowalewski
a4df4125e3 Fixing tray icon visibility issue on OS X
Some quirking since Qt doesn't render SVG tray icons on OS X.
2015-05-10 21:54:21 +03:00
tux3
19d0465efe
Merge branch 'pr1574' 2015-05-07 21:21:04 +02:00
Mario Preksavec
b874f31b0d Fallback XFCE detection 2015-05-04 01:03:58 +02:00
Mario Preksavec
f88f8dc3cb Remove StatusNotifier dependency 2015-04-28 17:28:21 +02:00
novist
95649f2476 Support for theming qTox tray and window icons
This patch adds ability to override qTox window and tray icons with ones from user's desktop theme. Some people prefer keeping tray icons consistent to achieve best looks.

Following theme icons used:
* qtox: general window icon which is also used in taskbar
* qtox-online, qtox-offline, qtox-busy, qtox-away, qtox-invisible, qtox-event: tray icons

If theme icon is not available then default built-in icon will be used.
2015-03-11 13:01:10 +02:00
tux3
94250d4aea
Use Qt systray again on KDE4
Fixes #1277
2015-02-25 11:42:34 +01:00
tux3
5c92c3b89d
Use GTK status icon on Gnome
Instead of Unity, which has less features and is a hack
2015-02-25 11:30:15 +01:00
tux3
8a83a6114f
Implement GTK systray icon backend
This one is deprecated, but should work much better than any other system tray icon backend we currently have, both in term of supported features and reliability. It justs needs some testing to see where we can enable it now.
2015-02-24 23:27:08 +01:00
tux3
bee584bdb1
Only use StatusNotifier on KDE5 2015-02-24 10:19:40 +01:00
tux3
d89c722b9c
Only use StatusNotifier on KDE
According to the qtox wiki table, Qt's backend works better on non-kde DEs
2015-02-23 23:25:08 +01:00
tux3
925e32f23a
Fix system tray icon on GNOME classic
There doesn't seem to be a system tray icon at all in GNOME shell ?
2015-02-23 20:06:16 +01:00
tux3
84e613c609
SystemTrayIcon: Log what backend is used 2015-02-22 12:14:31 +01:00
tux3
fa57206620
statusnotifier: Handle middle clicks 2015-02-22 01:43:33 +01:00
tux3
c3700fdfec
Create systray statusnotifier ctor icon properly 2015-02-22 01:36:51 +01:00
tux3
18a9955f43
Prioritize Unity sistray backend over StatusNotifier 2015-02-22 01:28:12 +01:00
tux3
55d78698c2
Fix statusnotifier icon color conversion
We were passing premultiplied ARGB data to GTK, where it expected premultiplied RGBA
2015-02-22 00:56:20 +01:00
tux3
d2f10f624d
Generate statusnotifier context menu icons 2015-02-22 00:54:42 +01:00
tux3
4630129dbf
Create statusnotifier main icon via pixbuf
Instead of creating a temporary file
2015-02-22 00:48:06 +01:00
tux3
a98639bc6f
Initial statusnotifier systray context menu support 2015-02-22 00:47:18 +01:00
tux3
d6fcb9faa2
Start StatusNotifier system tray backend
Can show/hide an icon and react to left clicks for now
2015-02-21 22:55:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
39170de667
Disable systray icon on KDE 5
Hopefully fixes #1116
2015-02-07 19:40:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2e7c73dcb0
Cleanup before returning from main 2015-02-06 19:38:08 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4cc9f0f824
Fix some SystemTrayIcon issues with Qt backend 2015-01-29 17:44:23 +01:00
Tux3/Mlkj
fe83dd9445 Implement SystemTrayIcon Unity backend
With some limitations and some awful hacks, since appindicators can not differentiate left click, right click and middle click. It's already a massive pain to just get a signal when the menu is shown, without actually knowing what opened it.

I love ubuntu.
2015-01-29 17:33:17 +01:00
Tux3/Mlkj
f75e32e1e3 Implement SystemTrayIcon with Qt backend and Unity stub 2015-01-29 14:56:53 +01:00