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

928 Commits

Author SHA1 Message Date
Tux3 / Mlkj / !Lev.uXFMLA
f2f572273c Merge pull request #433 from dubslow/master
fix #431, fix export cancels, and more debug prints
2014-10-14 13:36:57 +02:00
dubslow
48faffaa3e fix compile warning, they are fatal to Qt Creator 2014-10-13 19:27:24 -05:00
dubslow
3b32727d9e We handle .tox files (still need actual command line support) 2014-10-13 17:45:52 -05:00
krepa098
cbf8d610c8 fixed #425 2014-10-13 16:35:57 -05:00
dubslow
68de366738 fix #431, fix export cancels, and more debug prints 2014-10-13 16:17:42 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
a8ca4aeadb Merge pull request #430 from apprb/ftrans
FileTransferWidget improvements
2014-10-13 20:07:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
259a1d042b Merge pull request #414 from dubslow/profiles
Profiles -- they actually work!!!!!!!
2014-10-13 19:54:16 +02:00
apprb
339afafa05
magic number removed in FileTransferInstance 2014-10-13 16:43:20 +09:00
apprb
57943e2435
FileTransferWidget improvements 2014-10-13 00:02:55 +09:00
dubslow
235d6609b9 Merge branch 'master' into profiles
Conflicts:
	src/widget/form/settings/identityform.cpp
2014-10-12 04:58:56 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
e33a37c52c Merge pull request #405 from dubslow/src
Move code into src/
2014-10-12 11:45:42 +02:00
dubslow
6eeec77cce Merge branch 'master' into profiles
Conflicts:
	misc/settings.cpp
	misc/settings.h
	widget/widget.cpp
2014-10-10 17:43:15 -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
6ab90d4516 read tox_save if no data; if no profiles, no popup 2014-10-10 17:07:18 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
4e9d802d1f Merge pull request #410 from krepa098/camera
Improved (self) camera
2014-10-10 21:03:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f8057c8046 Merge pull request #409 from agilob/trayicon
support for hiding in tray
2014-10-10 21:01:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
66b8e57776 Merge pull request #413 from burunduk/master
Update Ukrainian translation
2014-10-10 21:00:32 +02:00
dubslow
a99e7d2b94 tweaks 2014-10-09 04:26:32 -05:00
dubslow
983879e799 IT WORKS, IT FINALLY WORKS 2014-10-09 03:59:35 -05:00
dubslow
0050589cde (Re)implement profiles UI, using some of the old code.
Avatars aren't handled on switching, and also something about friends disappearing...
2014-10-09 03:07:26 -05:00
dubslow
eb687b2bfe readd profiles ui 2014-10-09 01:23:33 -05:00
Olexandr Nesterenko
be9b9dd4c9 Update Ukrainian translation 2014-10-09 09:01:41 +03:00
dubslow
7ce7da0776 properly implement clearing contacts list 2014-10-09 00:58:35 -05:00
dubslow
2181313d37 add startup profile detection 2014-10-09 00:40:05 -05:00
dubslow
1bacd2da7a Merge branch 'master' into profiles... yikes
Conflicts:
	core.cpp
	core.h
	misc/settings.cpp
	misc/settings.h
	widget/form/settings/generalform.h
	widget/form/settingsform.cpp
	widget/widget.cpp
	widget/widget.h
2014-10-08 20:25:26 -05:00
krepa098
a5b6f15358 fix 2014-10-08 17:08:11 +02:00
krepa098
e29865bf3f protect Camera::getLastVPXImage() 2014-10-08 16:57:30 +02:00
krepa098
88ece1b213 renamed SelfCamView to VideoSurface 2014-10-08 16:44:32 +02:00
krepa098
de1445cdd8 cleanup, split 2014-10-08 16:37:42 +02:00
krepa098
c5f5e4ffa9 volume stubs 2014-10-08 16:25:21 +02:00
krepa098
8ddb1329c9 cleanup 2014-10-08 16:19:42 +02:00
agilob
1d31244273
support for hiding in tray
also new setting, autostart in tray
2014-10-08 15:17:05 +01:00
krepa098
200b7bc395 set/get props, cleanup 2014-10-08 15:48:02 +02:00
krepa098
3e234bd076 progress 2014-10-08 14:25:32 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
20f2dac755 Merge pull request #404 from dubslow/ringtone
add ringtone (not well done, but still better than status quo)
2014-10-08 14:18:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7ba9ac69dc
Embed pirate translation 2014-10-08 14:08:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d036f5e061
Merge pull request #407 from zetok/translation-pirate
Add initial Pirate translation
2014-10-08 14:08:12 +02:00
Zetok Zalbavar
1919967082
Add initial Pirate translation 2014-10-08 11:57:41 +01:00
dubslow
3ba95d82ae Move code into src/ 2014-10-07 23:26:25 -05:00
dubslow
54eb425238 add ringtone (not well done, but still better than status quo) 2014-10-07 22:33:55 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
f441ffd74a
Try to link opencv statically in linux packages 2014-10-08 00:41:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
aa11caa63b
debian: Exclude libs from source package 2014-10-07 23:05:05 +02:00
agilob
afc77f63db
css styles for mainHead and mainContent in widget.cpp
fixes problems with ugly UI on non-standard system theme.
before: https://i.imgur.com/XJ0mbpi.png
after: https://imgur.com/a/UbgNz
2014-10-07 21:55:20 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f962391757
Merge commit 'refs/pull/399/head' of https://github.com/tux3/qTox 2014-10-07 21:40:44 +02:00
Zetok Zalbavar
b7dcbdc474
Update Polish translation 2014-10-07 20:33:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32c56cbba4
Update french translation 2014-10-07 21:21:13 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6aa974c764 Merge pull request #395 from apprb/chat
Reduction of CPU usage on new message insert
2014-10-07 19:58:18 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
da53c29bcd Merge pull request #398 from Ansa89/italian-translation
Italian translation: update
2014-10-07 17:43:44 +02:00
krepa098
7f839b473b camera controls 2014-10-07 16:59:21 +02:00
Ansa89
938325bd2a Italian translation: update 2014-10-07 14:54:58 +02:00