tux3
41d8e2dd53
Attempt at fixing #1187
2015-02-18 21:22:19 +01:00
dubslow
7c0fa46b42
Merge pull request #1221 from TheLastProject/offlineTypingFix
...
Hide is typing status when friend disconnects
2015-02-18 11:57:42 -06:00
TheLastProject
3116e84095
Hide is typing status when friend disconnects
2015-02-18 14:02:10 +01:00
Dubslow
ec6bed5a99
Fix #1169
2015-02-17 21:07:56 -06:00
TheLastProject
ac9904face
Turn group invite warning into question. Fixes #1199
2015-02-16 23:53:33 +01:00
Dubslow
03168a02d2
Merge branches 'pr1134', 'pr1157' and 'pr1171'
2015-02-15 17:36:45 -06:00
Dubslow
07b87616a2
Refactor image filter as discussed
2015-02-15 17:35:27 -06:00
Dubslow
dcf87f7475
Ask before joining group
...
Fixes #1101 , closes #1177
2015-02-15 17:25:27 -06:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
...
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
Chloe
484fb2e89c
Update widget.cpp
...
Added support for dynamically generating supported format list.
2015-02-13 09:23:21 -05:00
Dubslow
11d4ec2599
Refactor OfflineMsgEngine, fix potential segfault
...
(@apprb take note please)
2015-02-13 00:02:52 -06:00
Chloe
eb3d5ea27d
Update widget.cpp
...
Selected all normally-available formats (from [here](http://doc.qt.io/qt-5/qpixmap.html ), verify they're all _actually_ functional.
2015-02-09 23:09:29 -05:00
Chloe
b2ba58ed61
Avatar Choosing Dialog
...
Explicitly filtering out images for the avatar selection dialog.
2015-02-09 22:54:31 -05:00
krepa098
5506379a97
Merge branch 'master' into chatlog_v3_1
2015-02-07 18:49:06 +01:00
apprb
bf2ebe9220
Offline messaging refactoring: Separated class for this purpose + more reliable resenging
2015-02-08 01:59:10 +09:00
novist
de6bf6c029
Fixed busy and invisible taskbar icons
...
Updated other status icons
Removed duplicate status icons from ui/statusButton
2015-02-07 12:47:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
659a0bf2c4
First draft of the Android GUI
...
Very much not finished and non-functional
2015-02-07 12:46:55 +01:00
Dubslow
830f0ddc13
Cleanup 331baa7447
2015-02-06 14:03:34 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
3b9d4eba2e
Assert that Widget isn't used on Android
...
That would cause horrible conflicts and apreciable slowdowns
2015-02-06 19:54:09 +01:00
tux3/mlkj
331baa7447
Use GUI instead of Widget for common GUI tasks
2015-02-06 19:01:36 +01:00
tux3/mlkj
46bba3f2f1
Initial Android support
...
We create a GUI class to abstract common GUI needs (showing a message box, asking a question, ...) from the actual GUI backend.
We also create a Nexus class to manage the startup and lifetime of our main systems (Core, GUI, ...) instead of delegating that to Widget.
Eventually, Widget will only be in charge of the Desktop GUI and AndroidGUI of the mobile GUI. Nexus will overview the system and GUI will provide a clean platform-independant interface.
2015-02-06 12:28:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2225fcaf9d
Initial android support
2015-02-06 01:27:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
72bb66334e
Check icon for nullity in Widget
2015-02-05 21:42:10 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
dc5e32a26c
Try to prevent nullptr dereference of icon
2015-02-05 18:29:40 +01:00
Dubslow
82c881ff49
Merge branch 'pr1087'
...
Conflicts:
src/widget/widget.h
2015-02-04 17:45:04 -06:00
Dubslow
aa122bf246
Implement hack to make closing the history dialog not disable history
...
Also word wrap the extra long text
2015-02-04 16:11:21 -06:00
Dubslow
864d1297e7
More descriptive dialog text
2015-02-03 18:22:05 -06:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/historykeeper.h
2015-02-03 10:21:59 -06:00
krepa098
0af05929f7
fixup! Merge branch 'master' into chatlog_v3_1
2015-02-03 16:15:51 +01:00
novist
b7dd4bf829
Tray icon notification of new messages
2015-02-03 12:20:26 +02:00
Dubslow
9c1cbb7a4d
Reword opening password dialog per srkunze's suggestion
2015-02-02 21:31:56 -06:00
Dubslow
8d999efae7
Fix the previous todo
2015-02-02 17:56:51 -06:00
krepa098
52f220c9e4
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
qtox.pro
res.qrc
src/widget/form/chatform.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
src/widget/tool/chatactions/chataction.h
src/widget/tool/chatactions/messageaction.cpp
src/widget/widget.cpp
ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
novist
6c477a0a19
Use svg for taskbar/tray icons
2015-02-02 08:07:36 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8ccd3bb3bf
Fix spurious quitting when dialog closed and in tray
2015-02-01 00:03:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7574569b3d
Fix some systray issues on windows
...
Fix qTox not hiding when clicking on systray icon due to losing focus when clicking on the system tray
Fix the icon not being properly hidden on exit
Thanks to @toweI for reporting those issues
2015-01-30 13:44:41 -06: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
Dubslow
31ac5dbe46
Fix SPE
2015-01-27 18:45:15 -06:00
Dubslow
2dc5cea1d2
Merge branch 'encryption' into master
...
Conflicts:
src/autoupdate.cpp
src/core.cpp
src/core.h
src/misc/settings.cpp
src/widget/widget.cpp
2015-01-27 18:29:39 -06:00
Dubslow
03fe9a355f
Merge branch 'pr1052'
2015-01-26 07:25:23 -06:00
Dubslow
e90293b47a
Make compact contact layout dynamically changeable
...
There was some various minor incidental cleanups as well
2015-01-26 07:13:35 -06:00
novist
3a5a94c666
Fixed showing window when clicking tray icon / shortcut and window is minimized
...
Double-clicking tray icon shows window
Middle-clicking tray icon hides window
2015-01-26 12:43:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
279debdab9
CallConfirmWidget: track anchor's position
2015-01-25 18:43:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32bf56c7d9
Implement new call confirm widget logic
...
Works, but does not have any styling at the moment
2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
33ac7deee0
Fix #1040
2015-01-24 22:46:11 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
6e1484252a
Fix possible crashes on exit, add debug info
2015-01-24 19:32:15 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d35ebb22f0
Fix some memory leaks and fix #1038
2015-01-24 15:31:50 +01:00
Dubslow
f6ff421aff
Fix two minor bugs
2015-01-23 08:31:13 -06:00
Dubslow
7fb7ae1fc8
oops, fortunately this wasn't a bug yet...
2015-01-23 08:00:50 -06:00
