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
Dubslow
18e875ef20
Fix bug with initial password dialogs accepting empty passwords
2015-01-23 07:07:31 -06:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
...
Conflicts:
src/main.cpp
2015-01-23 01:51:39 -06:00
Dubslow
44ddb8789c
In groupchats, check for sanitized name as well
...
Fixes #952
2015-01-23 01:35:21 -06:00
Dubslow
908dafd3b8
Simplify regex
2015-01-22 10:20:38 -06:00
novist
3bec2751e0
Separate setting to show window on new message (without focusing window)
...
Setting to always notify on messages in group chats (like normal chats)
Check for mentioned name only triggers if name is not in the middle of other word
2015-01-21 13:54:51 +02:00
krepa098
d9e15fb0ba
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
src/widget/chatareawidget.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
2015-01-09 19:41:16 +01:00
krepa098
0f52bf3f5c
moved history loading to FriendWidget::setAsActiveChatroom()
2015-01-07 13:16:09 +01:00
Dubslow
139cd3f4a6
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/misc/settings.cpp
src/widget/widget.cpp
src/widget/widget.h
2015-01-05 20:55:47 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
8813d6e4ca
Fix #909
2015-01-05 09:54:03 +01:00
krepa098
b09805f9bf
refactoring
2015-01-04 18:21:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
14ad87069e
Merge branch 'pr979'
2015-01-04 15:18:07 +01:00
Nokta-strigo
1ec40b74b7
Contacts changing status to offline and having new events are not moved to the bottom of the list. (see issue #740 )
2015-01-04 14:54:22 +01:00
novist
2a8cbd189d
Added typing notification support and enabled by default
2015-01-04 13:21:56 +02:00
krepa098
b76e9a295d
disabled group joined/left messages
...
Conflicts:
src/widget/widget.cpp
2015-01-03 10:23:50 +01:00
krepa098
a0ea0675a7
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
qtox.pro
res.qrc
src/misc/smileypack.cpp
src/widget/chatareawidget.cpp
src/widget/chatareawidget.h
src/widget/form/chatform.cpp
src/widget/form/genericchatform.cpp
src/widget/form/genericchatform.h
src/widget/form/settings/generalform.cpp
src/widget/tool/chatactions/messageaction.cpp
src/widget/tool/chatactions/systemmessageaction.cpp
src/widget/widget.cpp
2015-01-03 10:17:53 +01:00
krepa098
f1f42fc237
innerStyle, groupchats
2014-12-31 13:42:06 +01:00
novist
30d9862c4f
Removed explanations from tray menu
2014-12-18 20:32:28 +02:00
krepa098
3190530686
filling the gaps
2014-12-13 21:11:03 +01:00
Dubslow
a8b1f60256
Merge branch 'pr923'
2014-12-12 18:40:24 -06:00
novist
e2bf37c139
Light tray icon option
2014-12-12 12:12:12 +02:00
Zetok Zalbavar
e0993a72f6
Style corrections
...
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
Dubslow
7fc7b57934
refactor/fix switching profile with separate settings
2014-12-09 15:43:43 -06:00
Dubslow
5cb1b6fe8e
check for no systray, fixes #908
...
cant believe it took this long to figure out ;_;
2014-12-09 14:18:12 -06:00
Dubslow
db2d9321e4
fix change profiles button
2014-12-05 20:58:44 -06:00
Dubslow
67027814e5
tweak to popup questions
2014-12-05 19:56:33 -06:00
Dubslow
2e6b0f7b2b
remove files that I shouldn't have added in the first place
2014-12-05 19:17:02 -06:00
Dubslow
4e1a204bc0
Fix threading issue with startup pw popup
...
The GUI is slow to update after accepting a password, but a cursory ten minute investigation didn't yield why
I inserted a processEvents() call before ready = true; at the end of Core::start, but that didn't help.
Define the total time between the password dialog disappearing and the UI updating with your own status is T:
Then my debug statement indicated that this processEvents call happened around 1/3T, raising two questions:
1) What the hell is happening between 0 and 1/3 T? Decryption doesn't take that long...
Note that bad passwords are immediately rejected with a new dialog, so I highly doubt it's the decryption cpu time
2) The remaining 2/3rds: processEvents has been called after the avatar and username signals, yet they
don't update in the UI till time T when everything updates after bootstrapping...
Oh well, like I said, only a cursory investigation
2014-12-05 18:23:13 -06:00
Dubslow
961d5830c3
add fancier tray icons with status, remove relevant option
2014-12-05 17:14:48 -06:00
dubslow
dde410bb9c
incremental
2014-12-03 18:10:07 -06:00
dubslow
8985466ed3
core encryption file is basically complete, I need to verify privacy tab
2014-12-03 18:10:07 -06:00
apprb
3c15909ffc
correct displaying of the targeted messages
2014-12-03 23:47:07 +06:00
Dubslow
1c78cbc0c9
add a basic platform-disabling define
2014-12-01 18:18:27 -06:00
Dubslow
4781c8cfbb
Merge branch 'pr862'
...
Conflicts:
src/widget/widget.cpp
2014-12-01 15:37:09 -06:00
Dubslow
4adfa986b5
touchup, more appropriate legal message
2014-12-01 15:28:53 -06:00
Dubslow
173eda7700
Merge branch 'pr870'
...
Conflicts:
src/widget/form/settings/generalform.cpp
2014-12-01 14:47:54 -06:00
Dubslow
1340e00f69
re-move idle timer construction before restoreGeometry
2014-12-01 14:04:18 -06:00
Dubslow
9df3fdc2a0
move new functions to a more logical location
2014-12-01 14:04:17 -06:00
novist
0810559bcb
Window geometry saved when window is resized Splitter position saved when splitter is moved
...
Fixed restoring of window geometry when "Start in tray" is unchecked
2014-12-01 14:04:17 -06:00
novist
677058eb65
Reorganized platform-dependent code
...
Auto-away timer check reduced to 1s
2014-11-28 11:41:45 +02:00
novist
8e4f69aa79
Added copyright notices to platform.*
...
Changed u_int** to uint**
2014-11-28 11:41:45 +02:00
novist
99fa5d9e19
Global auto-away
2014-11-28 11:41:44 +02:00
novist
479644833e
Option for tray icon to display user status
2014-11-27 19:46:36 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
4c379640b8
Merge branch 'pr854'
2014-11-25 20:00:27 +01:00
novist
beae534d66
Starting client activates existing instance if such exists
2014-11-25 19:11:05 +02:00
apprb
56ea1f1e66
using ToxID in groupchats
2014-11-24 00:58:53 +09:00
apprb
f59a67f08a
Group class refactoring
2014-11-24 00:58:53 +09:00
apprb
92c330b7bd
GroupList refactoring
2014-11-24 00:58:53 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
f8063fc809
Fix idleTimer use before construction
2014-11-20 00:22:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
599c246ec7
Move group audio playing to Audio singletong/thread
...
This is a bit of a quick fix for a new bug, as but part of cleaning up the audio code and moving it to the Audio singleton
2014-11-19 22:26:04 +01:00
dubslow
845216fa2f
set aliases from chat form (half of #780 )
2014-11-17 20:15:44 -06:00
dubslow
d533c4089d
remember status when disconnected (should help with #715 )
2014-11-17 19:40:36 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
cd31812dac
Widget: Don't delete icon, it's a child
2014-11-17 22:49:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c1f2e9a71d
Refactor audio out of code, better resource management
...
Fixes #739 and fixes #777
2014-11-16 19:04:45 +01:00