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

63 Commits

Author SHA1 Message Date
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
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
Dubslow
358a56c555
Confirm decrypt data, various ui/txt tweaks 2015-01-23 07:07:52 -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
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
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
novist
2a8cbd189d Added typing notification support and enabled by default 2015-01-04 13:21:56 +02: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
apprb
a9fb75b5ed proper encrypted history loading 2014-12-03 18:01:31 -06:00
Dubslow
4781c8cfbb
Merge branch 'pr862'
Conflicts:
	src/widget/widget.cpp
2014-12-01 15:37:09 -06:00
Dubslow
173eda7700
Merge branch 'pr870'
Conflicts:
	src/widget/form/settings/generalform.cpp
2014-12-01 14:47:54 -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
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
dubslow
d533c4089d remember status when disconnected (should help with #715) 2014-11-17 19:40:36 -06:00
dubslow
40addf9155 "overhaul" window title, fix #753 2014-11-16 15:17:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2f452b6eff
Add GUI to change theme color 2014-11-15 21:30:20 +01:00
dubslow
71c34b9d69 group title support 2014-11-14 18:23:54 +01:00
Maximilian
11f9cb0cbf I implemented a new setting, which toggles the visibility of the system tray icon.
Background: On Ubuntu 14.04, system trays in Qt5 don't integrate into Unity.
2014-11-13 21:33:11 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4bb91143d7
Fix use after free of groupchat invites
Fixes #728, fixes #706, fixes #394
2014-11-13 00:13:11 +01:00
dubslow
3dd15f0a5f fix minor switching bug introduced by 07ea2e 2014-11-11 17:00:24 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
8fceb4b78b
Accept and default to AV groupchats
We don't send or play any audio yet, though
2014-11-11 16:05:01 +01:00
apprb
5d50ea36d0
Faux offline messaging: enable/disable 2014-11-10 22:06:35 +09:00
apprb
694cd90ee4
read receipt infrastructure 2014-11-10 20:49:38 +09:00
dubslow
f2d358f222 switch to relevant chat room when minimized
fixes #688, except that for me it doesn't actually unminimize
2014-11-10 10:37:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
fbbffc0806
Merge branch 'pr686' 2014-11-10 01:17:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0054787826
Add an option for auto-updates on Windows
With the update server hosted on my laptop...

Fun fact: Updates are really easy to mess up right now. If I forget to update the update server, everyone gets downgraded. Upload a bad file and everyone will crash. Fun stuff.

Upates Are Experimental™ and off by default.
2014-11-10 00:31:29 +01:00
saneki
55bb6ac367 Additional error info for failedToAddFriend, checks if friend is added already 2014-11-09 13:23:43 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
77edbb668e
Fix #599 2014-11-02 12:24:14 +01:00
apprb
99507465be
proper sending/receiving group actions 2014-11-01 22:00:43 +09:00
dubslow
7260fdd38d fixed encryption, major testing required 2014-10-24 06:35:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
5fae61c4e8
Don't show msgboxes outside of the GUI thread
Fixes #511
2014-10-23 20:39:28 +02:00
apprb
6caa9f1e9f
Merge remote-tracking branch 'upstream/master' into history
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/identityform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/messageaction.h
	src/widget/widget.cpp
2014-10-22 23:05:04 +09:00
apprb
5c0370eaed
Tox datafile/encrypted history: different passwords 2014-10-22 22:36:36 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
590ca8dc5a
Merge branch 'pr492' into HEAD 2014-10-20 20:21:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
50e1ecf46b
Merge branch 'pr482' into HEAD 2014-10-20 20:21:36 +02:00
agilob
7ad723a656
tryicon is made in widget.cpp now 2014-10-20 19:09:35 +01:00
agilob
6e5068840d minimize to tray 2014-10-20 14:11:03 +01:00
dubslow
eaf01aadc3 added new profiles, default name/status (fixes #465 and fixes #460) 2014-10-19 22:07:51 -05:00
apprb
6febde3167
Load encrypted history log/tox datafile 2014-10-19 16:35:11 +09:00
agilob
f8f5a3ca29
all form are translatable now
changed type of main tabs to pointers to fix that
2014-10-18 15:54:52 +01:00
dubslow
4e7a183360 add choose translations (restart required, dynamic changing is lots of work) 2014-10-17 18:06:30 -05:00