novist
2a8cbd189d
Added typing notification support and enabled by default
2015-01-04 13:21:56 +02:00
krepa098
64f7f7c45e
use resolveToxID
2015-01-03 20:38:06 +01:00
krepa098
8a1ea18ed4
fixed history
2015-01-03 14:08:04 +01:00
krepa098
d88aa965fa
fixup merge
2015-01-03 13:13:12 +01:00
apprb
64e0116476
honouring aliases in the loaded history
...
Conflicts:
src/widget/form/chatform.cpp
2015-01-03 13:10:19 +01:00
krepa098
b76e9a295d
disabled group joined/left messages
...
Conflicts:
src/widget/widget.cpp
2015-01-03 10:23:50 +01:00
krepa098
2828a97d54
styled chatlog, cleanup
2015-01-03 10:21:15 +01:00
krepa098
b0c3b4032f
chatlog: save chat log
2015-01-03 10:20:40 +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
Dubslow
f7bef8d5c3
Merge branch 'pr966'
2014-12-31 00:55:59 -06:00
Dubslow
75331af311
Merge branch 'pr965'
2014-12-31 00:50:03 -06:00
apprb
1194df2f78
renaming: Direct Connect -> None
2014-12-30 22:02:26 +06:00
apprb
f8bdaac121
messages splitting fix
2014-12-28 23:32:19 +06:00
apprb
a14da15d79
fix #963
2014-12-28 18:32:25 +06:00
novist
30d9862c4f
Removed explanations from tray menu
2014-12-18 20:32:28 +02:00
Dubslow
54e8be75d2
Merge branch 'pr938'
2014-12-17 14:43:34 -06:00
agilob
5861c6daa5
removing fixed size from mic/volume buttons so they align nicely
2014-12-17 12:36:34 +01:00
agilob
f8d870f374
removing spacing from microphone layout
2014-12-17 12:00:41 +01:00
Dubslow
fc749880eb
minor style tweaks
2014-12-16 18:05:13 -06:00
Maximilian Wuttke
e0cb122abe
Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio
...
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
qtox.pro
Conflicts:
src/coreav.cpp
2014-12-14 10:55:38 +01:00
krepa098
3190530686
filling the gaps
2014-12-13 21:11:03 +01:00
Dubslow
84dea5e12c
Revert "fix #902 "
...
@apprb #932
This reverts commit 13306031e238258a3faf2909a01987cf093765dc.
2014-12-13 12:18:43 -06:00
Dubslow
a8b1f60256
Merge branch 'pr923'
2014-12-12 18:40:24 -06:00
Dubslow
cc4cc7d7a8
Merge branch 'pr922'
2014-12-12 18:37:06 -06:00
novist
e2bf37c139
Light tray icon option
2014-12-12 12:12:12 +02:00
lumirayz
f469e1b892
fix more consistency issues
2014-12-11 19:11:21 +01:00
Zetok Zalbavar
e0993a72f6
Style corrections
...
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
apprb
13306031e2
fix #902
2014-12-11 21:33:38 +06:00
lumirayz
038b4cedcb
make the code style more consistent
2014-12-11 15:31:01 +01:00
lumirayz
c73b07db72
added a compact layout for the friends list
2014-12-11 13:02:45 +01: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
Sascha Brendel
17bcd969b2
Update chatform.cpp
...
Improved that line of code.
Thanks to @dubslow
2014-12-08 20:28:34 +01:00
Lednerb
dfb51d7d29
Added Translation for error message on sending a file. Also included the German Version.
2014-12-08 19:07:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
983c0b7e6b
Merge branch 'pr857'
2014-12-06 14:02:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
53d7bc9dc1
Push to talk with input msgedit focused
2014-12-06 13:59:19 +01:00
Simon Vermeersch
424af0505e
Focus the text input area when clicking on the text area
2014-12-06 13:54:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
324d075cfe
Change push to talk shortcut to CTRL+P
2014-12-06 13:49:04 +01:00
apprb
c0303e7a0f
password strength meter
2014-12-06 12:27:54 +06:00
Dubslow
7c7c603045
word wrap the privacy tab string
2014-12-05 21:24:03 -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
7f12c267e1
turns out the password code saving Configuration was useless anyways
...
would have avoided the bug I just "fixed"
2014-12-04 13:35:34 -06:00
apprb
4c85f92e7d
plain db encryption
2014-12-04 23:44:45 +06:00
Dubslow
dccb0a9951
finishing touches
2014-12-04 10:55:14 -06:00
apprb
bac485400e
small code unification
2014-12-04 22:07:16 +06:00
