Tux3 / Mlkj / !Lev.uXFMLA
f9df6fc8f6
Fix small memory leaks
...
Mostly to make valgrind happy
2014-10-28 00:01:02 +01:00
dubslow
8153a3e8c3
add reconnect button for connection settings
...
some ui guru should make it not stretch to width
2014-10-24 12:35:01 -05:00
dubslow
576fd7269e
disable switching buttons during calls
...
fixes #436 , fixes #500
(well, "fixes" by preventing users from doing dumb things)
2014-10-24 12:33:46 -05:00
krepa098
15851604cd
moved video stuff to src/video
2014-10-24 16:02:55 +02:00
krepa098
c5dfb33999
non-blocking cam communication, fixed CameraWorker::probeResolutions ...
...
called from wrong thread, try fix #408 and #495
2014-10-24 16:02:07 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
87f1ae2ccb
Disable history encryption again
...
For some reason it didn't work the first time, thanks @agilob for reporting that
2014-10-23 23:01:50 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fa44956010
Disable encryption options for the moment
2014-10-23 22:11:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f1601f389f
Merge branch 'pr423'
2014-10-23 18:47:35 +02:00
agilob
bb9f7b8b63
minimum size for camera preview 160x120
2014-10-22 17:11:55 +01:00
agilob
575e57cd00
profile settings in scrollarea
2014-10-22 17:09:59 +01:00
agilob
5eec74c032
scrollbar in generalsettings
2014-10-22 16:57:41 +01:00
agilob
28d1287b18
implemented krepas suggestions about style
2014-10-22 16:27:15 +01:00
agilob
9bc1568c0d
Merge remote-tracking branch 'upsteam/master' into style
2014-10-22 16:21:01 +01: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
50e1ecf46b
Merge branch 'pr482' into HEAD
2014-10-20 20:21:36 +02:00
agilob
68309ef55e
a/v setting tab redesign
2014-10-20 14:54:27 +01:00
agilob
6e5068840d
minimize to tray
2014-10-20 14:11:03 +01:00
agilob
df03a0df5a
more styles
2014-10-20 13:26:49 +01:00
dubslow
c1cef51d56
check for existing profile ( fixes #466 )
2014-10-19 22:36:39 -05:00
dubslow
eaf01aadc3
added new profiles, default name/status ( fixes #465 and fixes #460 )
2014-10-19 22:07:51 -05:00
agilob
d268360c51
closing to tray, gui and settings
2014-10-19 20:47:06 +01:00
apprb
dfd5b6411a
Tox datafile encryption: check
2014-10-19 23:59:58 +09:00
apprb
f413f14055
warn user about old encrypted history
2014-10-19 18:02:15 +09:00
apprb
eaa315eddb
various fixes
2014-10-19 17:48:10 +09:00
apprb
1a37c1c421
History: almost correct handling encrypted history load/save
...
Things are left to do:
1. load/save encrypted tox datafile
2. incorrect passwords processing (ask to retype, wipe everything, etc.)
3. reencryp history log with new password
2014-10-19 02:38:47 +09:00
dubslow
ee0f94a890
fix #461 , cleanup
2014-10-17 20:15:26 -05:00
dubslow
4e7a183360
add choose translations (restart required, dynamic changing is lots of work)
2014-10-17 18:06:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
26eb08aa00
Merge branch 'pr452'
2014-10-17 21:00:24 +02:00
agilob
2cbae5265b
max value in autoAway time, tooltip for spinbox
2014-10-17 17:57:02 +01:00
Zetok Zalbavar
c42b31fb45
Remove redundancy from settings tabs
2014-10-17 16:27:28 +01:00
krepa098
8ccadaad26
avsettings.ui layout changes
2014-10-17 16:18:34 +02:00
apprb
177b27882b
Merge branch 'history_fx' into history
...
Conflicts:
src/misc/db/encrypteddb.cpp
src/misc/db/encrypteddb.h
2014-10-17 22:14:27 +09:00
apprb
1ce4820aa4
clenup
2014-10-17 21:33:00 +09:00
dubslow
9207dfc888
ui tweaks
2014-10-17 07:11:26 -05:00
dubslow
41365ce057
Merge branch 'master' into history
...
Conflicts:
src/widget/form/genericchatform.h
src/widget/widget.cpp
2014-10-17 03:56:59 -05:00
dubslow
3e8557466c
fix #445
2014-10-17 03:02:19 -05:00
krepa098
5ae2afb5c6
moved src/widget/camera.* to src/camera.*
2014-10-17 09:11:39 +02:00
krepa098
6e61da68e4
Settings: use QTabWidget, IdentityForm: cleanup
2014-10-17 09:11:38 +02:00
krepa098
c4529d4062
fixed css, comments, cleanup
2014-10-17 09:09:59 +02:00
krepa098
e8416a98a2
fixed compilation error + warning
2014-10-17 09:09:59 +02:00
krepa098
f2b730cdb9
NetVideoSource, YUV shader, fixes
2014-10-17 09:09:59 +02:00
krepa098
8b8a541826
simplified VideoSource, interface, BRG->YUV conversion changes + more
2014-10-17 09:09:59 +02:00
krepa098
1d4055858f
VideoSurface: aspect ratio
2014-10-17 09:09:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2a401a7e3b
Merge branch 'pr447'
2014-10-16 20:57:36 +02:00
agilob
f854d0e90f
set idle timer in widget.cpp
2014-10-16 19:48:45 +01:00
agilob
db6b488515
UI for autoaway
2014-10-16 18:49:50 +01:00
agilob
6bda375a7e
fixes regression sent by apprb
2014-10-16 18:24:16 +01:00
agilob
815314330e
Merge branch 'master' of https://github.com/tux3/qTox into style
2014-10-16 17:17:41 +01:00
agilob
5538167a46
fix for #442
2014-10-16 17:17:25 +01:00
dubslow
8be4725acd
cleanup "sign in change", since it's unnecessary
2014-10-16 17:52:45 +02:00
agilob
698902a8dc
status changes messages and sign in notifications
...
sign in notifications available only in settings and as a message in chat
2014-10-16 17:47:18 +02:00
agilob
14ea88c070
style selector
...
Unfortunately Qt developers removed some old native skins from support, only 3 skins are supported on Linux.
Number of native skins depends on OS and Qt built system.
2014-10-16 15:18:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d96ef1a970
Merge branch 'pr419'
2014-10-16 14:05:05 +02:00
dubslow
63671ae3ff
I learned some things: improve thread safety
2014-10-14 21:06:44 -05:00
dubslow
a0ca379c1b
fix #436
2014-10-14 20:04:53 -05:00
dubslow
68de366738
fix #431 , fix export cancels, and more debug prints
2014-10-13 16:17:42 -05:00
agilob
db5c115a91
removed duplicated emoticons
2014-10-13 19:50:54 +01:00
apprb
fc9f8a16f3
Merge branch 'master' into history
...
Conflicts:
qtox.pro
src/widget/form/chatform.cpp
src/widget/form/settings/privacyform.cpp
2014-10-12 19:24:05 +09:00
agilob
45c60a17c0
Merge remote-tracking branch 'upsteam/master' into emoticon-preview
2014-10-12 11:12:10 +01:00
agilob
5abf693611
Merge remote-tracking branch 'upsteam/master' into style
2014-10-12 11:08:10 +01:00
dubslow
235d6609b9
Merge branch 'master' into profiles
...
Conflicts:
src/widget/form/settings/identityform.cpp
2014-10-12 04:58:56 -05:00
dubslow
bf75750166
Merge branch 'master' into src
...
Conflicts:
qtox.pro
src/widget/form/settings/avform.h
src/widget/selfcamview.cpp
src/widget/selfcamview.h
src/widget/widget.cpp
widget/selfcamview.h
widget/videosurface.h
2014-10-10 17:21:54 -05:00
dubslow
3ba95d82ae
Move code into src/
2014-10-07 23:26:25 -05:00
