Dubslow
c7b110f902
Add svg to dependencies
2015-02-04 15:19:43 -06:00
krepa098
038a7fcd55
add svg to CONFIG (link against the svg module)
2015-02-04 14:50:03 +01:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/historykeeper.h
2015-02-03 10:21:59 -06:00
krepa098
52f220c9e4
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
qtox.pro
res.qrc
src/widget/form/chatform.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
src/widget/tool/chatactions/chataction.h
src/widget/tool/chatactions/messageaction.cpp
src/widget/widget.cpp
ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
krepa098
53ba982203
optimizations and tweaks
2015-02-02 11:11:09 +01:00
Tux3/Mlkj
fe83dd9445
Implement SystemTrayIcon Unity backend
...
With some limitations and some awful hacks, since appindicators can not differentiate left click, right click and middle click. It's already a massive pain to just get a signal when the menu is shown, without actually knowing what opened it.
I love ubuntu.
2015-01-29 17:33:17 +01:00
Tux3/Mlkj
f75e32e1e3
Implement SystemTrayIcon with Qt backend and Unity stub
2015-01-29 14:56:53 +01:00
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
krepa098
d04e356a0c
cleanup previous commit
2015-01-26 14:06:05 +01:00
krepa098
5be6caca68
[HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent
...
This does not enable HiDPI support!
issue #975
2015-01-26 14:01:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32bf56c7d9
Implement new call confirm widget logic
...
Works, but does not have any styling at the moment
2015-01-25 17:39:26 +01:00
krepa098
6719ebebae
Added Timestamp class, moved output generation while saving to
...
GenericChatForm and changed the generated layout
2015-01-25 14:34:36 +01:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
...
Conflicts:
src/main.cpp
2015-01-23 01:51:39 -06:00
krepa098
bb29536df1
NotificationIcon
2015-01-19 19:04:19 +01:00
krepa098
85568337e3
cleanup
2015-01-11 12:02:24 +01:00
krepa098
d9e15fb0ba
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
src/widget/chatareawidget.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
2015-01-09 19:41:16 +01:00
novist
46cc81b482
Updated linked libs for win32:
...
* Removed libs that were not used
* Reordered few libs to make mingw happy
* Updated version of opencv libs to 249
2015-01-08 13:59:06 +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
Tux3 / Mlkj / !Lev.uXFMLA
ab2f70e452
Fix windows builds: Link with filter_audio
2015-01-04 00:42:54 +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
Dubslow
9bc6ae57fa
try mac fix
2014-12-17 16:49:17 -06:00
Dubslow
5cbe175ddc
update the build system
2014-12-16 18:50:52 -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
Dubslow
2e6b0f7b2b
remove files that I shouldn't have added in the first place
2014-12-05 19:17:02 -06:00
dubslow
bafca96554
Incremental work, starting to take shape
2014-12-03 18:14:28 -06:00
dubslow
dde410bb9c
incremental
2014-12-03 18:10:07 -06:00
dubslow
4567f8e5c6
move encryption to separate file for sanity
2014-12-03 18:10:07 -06:00
Dubslow
3f234fb2eb
disabling platform extensions now affects linking, and can be set from cmd line
...
`qmake DISABLE_PLATFORM_EXT=YES`
2014-12-02 15:03:29 -06:00
Dubslow
1c78cbc0c9
add a basic platform-disabling define
2014-12-01 18:18:27 -06:00
novist
a71e98abbb
Switched places platform name and file name
2014-11-28 11:41:45 +02:00
novist
677058eb65
Reorganized platform-dependent code
...
Auto-away timer check reduced to 1s
2014-11-28 11:41:45 +02:00
Sean
985c25f77e
Can't forget CoreFoundation
2014-11-28 11:41:44 +02:00
Sean
fb375cd07e
Link against IOKit
2014-11-28 11:41:44 +02:00
novist
99fa5d9e19
Global auto-away
2014-11-28 11:41:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6afe34fe02
Fix zlib link order on windows x64
2014-11-18 20:04:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c1f2e9a71d
Refactor audio out of code, better resource management
...
Fixes #739 and fixes #777
2014-11-16 19:04:45 +01:00
krepa098
74bd802863
progress
2014-11-16 12:40:44 +01:00
Sean
d607c089d8
Update for new folder
2014-11-14 17:30:47 -08:00
Tux3 / Mlkj / !Lev.uXFMLA
c4f9baf04b
Merge branch 'pr750'
2014-11-14 18:32:03 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d834eaca33
Horrible hack to get timestamps not to hang on windows
...
Turns out date is a valid command on windowndows, and running it waits for user input. That hangs qmake. This hack is a valid batch command that returns 0 and at the same time a valid bash command that tries to run date or return 0
I'm so sorry.
2014-11-14 18:12:00 +01:00
apprb
08f523b8ff
AdvancedSettings tab introduced
2014-11-15 01:18:17 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
d0dae300cc
Remember compile time timestamp
...
Will be used to guarantee we don't downgrade if there's a bad update
2014-11-13 13:59:04 +01:00
krepa098
de52bad1db
initial commit
2014-11-12 14:11:25 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
45e20187cc
Download and applying updates, qtox-updater
...
The auto-updater is essentially done, except for the GUI. For now this is only an API.
The API works, but the tools to manage the update server would need some love
2014-11-09 23:24:39 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
965254d151
Teach the AutoUpdater to read a flist
...
We can now read the list of files in an update, along with the install path, file size, and signature
Everything, metadata and files, is signed with ed25519, but not encrypted
2014-11-09 17:55:38 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
747fd33592
Create AutoUpdater, teach it to check new updates
...
It can't read a diff or apply an update yet, just check.
2014-11-09 15:51:00 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
740446522a
Build .qm files in qmake, before RCC runs
...
Otherwise the resource compiler complains that it can't find our translations
Fixes #668
2014-11-08 13:27:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5e906d1767
Merge branch 'pr664'
2014-11-07 23:19:27 +01:00
dubslow
7a20254dd1
handle tox save files, also fix IdentForm bug
2014-11-07 15:45:21 -06:00
Olexandr Nesterenko
cd24e97ebd
remove *.qm files
2014-11-07 15:46:31 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e1b301eb83
Merge branch 'toxuri'
2014-11-06 15:12:56 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a035cc5576
Implement IPC, Tox URI, refactor Tox DNS
2014-11-06 15:12:10 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0bee0fa4b9
Merge branch 'pr641'
2014-11-06 12:59:00 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8e8c54a49f
Merge branch pr640
...
Fixes conflicts manually
2014-11-06 12:57:48 +01:00
Sean
7256147800
Add info.plist install, fix @dubslow
2014-11-05 22:57:46 -08:00
Sean
93231dff5a
Add identifier, prepare for code signing on OS X
2014-11-05 21:57:04 -08:00
dubslow
9e5f7cdba8
reorder libs
2014-11-05 23:44:34 -06:00
dubslow
6656ab58b0
fix qtox.pro for jenkins
2014-11-05 23:35:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
291a1ec282
Merge branch 'pr632'
2014-11-05 23:30:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0b6a4a6481
Implement tox3 support, keep tox1 as silent fallback
2014-11-05 23:27:51 +01:00
willeponken
5af8ea6858
Swedish translation
2014-11-05 23:19:14 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
41237a9bbc
Release, enable bulgarian translation
2014-11-04 20:10:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
330ea59618
Fix #96 with a flow layout for groupchat user list
2014-11-02 10:41:58 +01:00
dubslow
9c8beeef6e
fix git_version issue without git
2014-11-01 01:17:50 -05:00
dubslow
b78737632e
add logging to file; should make bug reports easier to handle
...
(it's a bit of a hack, but it works)
2014-11-01 00:28:37 -05:00
dubslow
973904addd
fix jenkins git issue
2014-10-31 21:03:45 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
0ad4860e3b
Add icon on windows
2014-10-26 16:35:42 +01:00
krepa098
f05e2ba9c9
refactoring
2014-10-24 16:04:47 +02:00
krepa098
15851604cd
moved video stuff to src/video
2014-10-24 16:02:55 +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
dubslow
30e2afcc92
add alerts on user mention (could use some tweaking, but is plenty fine for now)
2014-10-20 06:05:45 -05:00
dubslow
5b85f79055
tab completion for groupchats ( fixes #486 )
2014-10-20 05:01:22 -05:00
Sean Qureshi
04ef356a32
OS X icon support
2014-10-19 12:12:10 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
b1705a9def
Linux: Do not link with rtmp, tbb, gnutls, avfilter
...
We really just don't need those rigth now, as lintian helpfully pointed out
2014-10-18 22:25:14 +02: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
agilob
65780941ce
version in debug message based on git HEAD
2014-10-18 08:47:42 +01:00
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
