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

122 Commits

Author SHA1 Message Date
dubslow
041ed3b998 Merge branch 'corencryption' into history, remove file encryption, store key instead of hash
(I forgot to commit the merge before starting work...)

Conflicts:
	qtox.pro
2014-10-17 04:13:42 -05:00
krepa098
4679b6b7bf fixup! NetVideoSource, YUV shader, fixes 2014-10-17 09:11:39 +02:00
krepa098
5ae2afb5c6 moved src/widget/camera.* to src/camera.* 2014-10-17 09:11:39 +02:00
krepa098
f2b730cdb9 NetVideoSource, YUV shader, fixes 2014-10-17 09:09:59 +02:00
apprb
1b9eb3d239
Encryption: it works! Code cleanup is still required 2014-10-17 00:38:15 +09:00
apprb
172f1181c5
Encrypted Logs: part 1 2014-10-15 22:48:08 +09: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
dubslow
63bb51a089 Merge branch 'master' into corencryption 2014-10-12 04:55:02 -05:00
dubslow
04699c376c finished core functionality, still needs UI from #423
this also depends on irungentoo/toxcore#1114 being merged
2014-10-12 03:27:48 -05:00
apprb
b0ef7e8152
Merge remote-tracking branch 'upstream/master' into history
Conflicts:
	qtox.pro
2014-10-11 18:26:47 +09: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
Tux3 / Mlkj / !Lev.uXFMLA
4e9d802d1f Merge pull request #410 from krepa098/camera
Improved (self) camera
2014-10-10 21:03:01 +02:00
apprb
2ede886c7d
add insert chatlog capability (not finished) 2014-10-11 01:22:57 +09: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
apprb
5c1e3360fe
privacy setting form added 2014-10-08 23:32:19 +09:00
apprb
beed30b156
history: base working implementation 2014-10-08 22:55:00 +09: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
Tux3 / Mlkj / !Lev.uXFMLA
f441ffd74a
Try to link opencv statically in linux packages 2014-10-08 00:41:56 +02:00
krepa098
7f839b473b camera controls 2014-10-07 16:59:21 +02:00
krepa098
af210d4d98 camera: initial PBO support, mode probing 2014-10-07 14:17:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a85372a5c0 Merge pull request #381 from apprb/newsettings_v2
Newsettings v2
2014-10-06 13:29:44 +02:00
apprb
8fa9457305 base refactoring 2014-10-06 01:17:01 +09:00
dubslow
5f106ab618 add receive actions (no one to test with currently) 2014-10-02 01:01:23 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
5b75937819
Update win32 build config 2014-10-01 01:39:53 +02:00
dubslow
e3580fc416 one frickin stinkin merge error 2014-09-30 05:02:49 -05:00
dubslow
6649ae568e Merge branch 'master' into newsettings
Conflicts:
	core.h
	qtox.pro
	widget/form/genericchatform.cpp
	widget/settingsdialog.cpp
	widget/tool/chataction.cpp
	widget/widget.cpp
	widget/widget.h
2014-09-30 04:57:05 -05:00
Olexandr Nesterenko
12c265aa9b Add Ukrainian translation 2014-09-29 22:05:48 +03:00
dubslow
767f164a14 fix file mvs 2014-09-29 13:28:59 -05:00
krepa098
5662aa933f Added MaskablePixmapWidget, improved avatar rendering 2014-09-26 19:13:08 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7ad6ad2731 Avatar support for ourselves 2014-09-24 16:51:16 +02:00
apprb
1551614070 Error messages in the case of message sending problems 2014-09-23 23:38:27 +07:00
Joni Martikainen
5445746bab Finnish translation to qTox
Finnish translation to qTox
2014-09-21 23:28:04 +03:00
Zetok Zalbavar
d0c42533ac
Try fix jenkins windows builds 2014-09-20 20:56:06 +01:00
bill
5ec79fc260 new settings infrastructure done, though there's a double free or something in ~Widget() 2014-09-15 22:42:41 +02:00
dubslow
e4e36dc946 initial new settings widget, subforms not started
also "filing" some files under misc
2014-09-15 22:42:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5e12a5fa3e
Update translations 2014-09-13 11:49:58 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
965c76a315 Add Manol translation
Ayy ! You have mothafucking friend request you little bitch !
2014-09-13 00:07:25 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e9fa8de43d Enable Polish translation 2014-09-12 21:59:49 +02:00
Marcel
28e8406be9 added settingsdialog 2014-09-12 15:41:46 +02:00
Marcel
c3a8cd01f3 removed settingsform, removed selfcamview from widget 2014-09-12 15:35:48 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a7c75e63a5 Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
retux
a37785cce8 fixed pro file for windows 2014-09-09 21:23:29 +02:00
apprb
9970fe293d files renaming 2014-09-07 00:28:26 +07:00
apprb
db4c84a222 cleanup 2014-09-07 00:21:47 +07:00
apprb
25ee6a24d9 new chat beginning 2014-09-07 00:21:39 +07:00
apprb
02da6803f1 initial merging common parts of chatforms' widget 2014-09-05 23:03:08 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
bedc995659 Merge pull request #248 from apprb/chat_widget
FriendWidget and GroupWidget improvements
2014-09-01 21:24:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
532b8cec83 Add Jenkins build config 2014-09-01 20:33:04 +02:00
apprb
35b7ad3a58 Chatroom: common parts moved to the parent class 2014-09-01 23:57:51 +07:00
krepa098
26c028f416 removed ClickableLabel, EditableLabelWidget, ElideLabel, EscLineEdit,
CopyableElideLabel
2014-09-01 11:08:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e8757569d8 Default to non-package builds, unless STATICPKG=YES
Fixes #226
2014-08-31 11:39:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5751e8e4a1 Update install target 2014-08-31 01:55:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
95dedc3759 Link libsodium
So we don't have to package it separately
2014-08-31 00:33:11 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
46fd073ba8 Link toxcore and toxav statically
So we don't have to package them separately, since there are no official Tox debian packages on the main archive
2014-08-31 00:20:38 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f97729261a Clean & remove old code and dependencies
We don't use QtMultimedia and OpenCV_imgproc anymore

Fixes #218
2014-08-30 15:15:23 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
84d6c1063e Update Mac build config 2014-08-29 15:39:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f4b1b64ae6 Switch self cam view to OpenCV 2014-08-29 13:40:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c22c874778 Fix #214 2014-08-29 12:15:20 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
28b1678a88 Remove all AudioBuffer code 2014-08-28 15:58:05 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
1c44f7fdf4 OpenAL init and output
No cleanup yet!
2014-08-28 15:46:11 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
287d50eea4 Split core into core and coreav 2014-08-28 14:30:38 +02:00
apprb
11c6dd7bec sort the friendlist by contact Status 2014-08-23 02:12:37 +07:00
krepa098
1f92ad18a8 CroppingLabel, fixes issue #184 2014-08-16 19:27:16 +02:00
krepa098
921b8478f6 removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
krepa098
af4623695c styling cleanup 2014-08-10 18:14:50 +02:00
krepa098
566402a1bf a shiny new widget 2014-08-01 14:32:51 +02:00
krepa098
e01467e386 basic support for smileys 2014-07-25 14:52:14 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
751f828c3e Fix build settings on Windows
I was missing GetAdaptersInfo@8, linked with iphlpapi
2014-07-23 12:50:12 +02:00
dubslow
4bb2ec3356 Add tooltips to user-provided text (helps to accomodate too-long names and msgs)
Ideally this would be done only if the widget is too small for the message, but
that can be quite difficult
2014-07-15 12:04:26 -04:00