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

98 Commits

Author SHA1 Message Date
Dubslow
7aab85251e Merge branch 'master' into profiles
Holy shit first big merge of my career, I'm mildly amazed it even compiles

Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
	widget/widget.cpp
2014-09-05 03:53:00 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
627f58087c Disable status button when disconnected 2014-09-03 00:01:04 +02: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
apprb
e76464a320 further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
krepa098
26c028f416 removed ClickableLabel, EditableLabelWidget, ElideLabel, EscLineEdit,
CopyableElideLabel
2014-09-01 11:08:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
73309d8b90 Fix #235, Fix #84 2014-08-31 22:26:45 +02:00
apprb
fd4c47cba3 Widget code cleanup: removed isFriendWidgetActive and isGroupWidgetActive 2014-08-31 23:49:15 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
76971f5238 Make notifications consistent
Notify of AV and FT requests if we're selected but not active or minimised, and add sound (consistent with how message notifications work)
2014-08-31 18:30:04 +02:00
apprb
f0c8be43db change status light on incoming file request 2014-08-31 22:02:08 +07:00
apprb
a3785f3c27 Widget::updateFriendStatusLights moved to FriendWidget 2014-08-31 22:02:08 +07: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
3fc9cc0d83 Fix #219, handle av media changes
Can now start or stop video on demand of the peer
2014-08-29 19:20:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2612073842 Fix #215, update translations 2014-08-29 11:56:42 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8602327d16 Term deadlocked threads on exit
To prevent deadlocking the whole thing when we really just want to exit

Qt w/ pulseaudio can deadlock internally on call start if it fails to connect to the PA context. Awesome.
2014-08-28 13:09:26 +02:00
apprb
11c6dd7bec sort the friendlist by contact Status 2014-08-23 02:12:37 +07:00
midnight079
b474ff2c2b realized micButton for calls 2014-08-19 21:49:32 +02:00
krepa098
75f15dd349 fixed null dereference 2014-08-18 17:35:43 +02:00
krepa098
e5f0ac7c91 moved scrollbar to the left, cleanup 2014-08-11 19:46:14 +02:00
krepa098
0d748b93d6 consider scrollbar's width 2014-08-11 17:06:57 +02:00
krepa098
6bb85c65b8 save/restore status of the splitter 2014-08-11 14:07:27 +02:00
krepa098
c9d04748dd put back the not so native window decoration, status panel respects
friendlist width, some tweaks to the layout
2014-08-11 13:56:52 +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
Bill Winslow
08ab94bf5a more incremental commits, compiles and sort of works now 2014-07-27 03:27:15 -05:00
Kevin Flynn
f7e462272a Fix friendList mixed horizontal & vertical scroll, improved scrollbar theme on OS X 2014-07-23 19:05:14 -07:00
Bill Winslow
f9a3192f30 incremental improvements to profiles, more work required 2014-07-23 04:22:09 -05:00
Bill Winslow
8aa451bb5b Merge branch 'master' of https://github.com/tux3/qTox into profiles 2014-07-23 02:50:10 -05:00
Bill Winslow
e14b7d66d4 Merge branch 'master' of https://github.com/dubslow/toxgui 2014-07-22 02:54:18 -05:00
Kevin Flynn
88cc57f4bc Fix #142 2014-07-20 11:17:06 -07:00
dubslow
46848d7712 Profiles, with at least a few bugs:
sanitizing file names isn't done, delete fails because of autosaves, and imports segfault for me
2014-07-16 20:00:23 -05:00
dubslow
e3da9badac Basic infrastructure for profiles is in place, now I gotta hook up the UI 2014-07-16 17:43:30 -05: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
Kevin Flynn
ece497b722 Fix status on F1ynn's theme, notify on non-active window (like uTox) 2014-07-13 19:57:09 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
f173a5dfa9 Fix FT progressbar int overflow 2014-07-12 18:40:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2af720877f Merge pull request #126 from dubslow/master
Add the files transfered Widget
2014-07-12 11:55:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f10e1b5868 Register vpx_image meta type 2014-07-12 10:55:12 +02:00
Bill Winslow
e0b6fd1e13 Remove username and status message from settings, instead use Core 2014-07-11 16:38:39 -04:00
Bill Winslow
34e596641a Fixed bug the first (still needs everything tested though) 2014-07-11 13:14:56 -04:00
Bill Winslow
26f2f143fa Initial commit for activating the file transfer button
It compiles, but is in fact untested (and requires one small new icon)
2014-07-11 12:05:18 -04:00
Arne Böckmann
a164e7a991 FIX: updated username and status message on editingFinished() instead of textEdited(). I.e. if the user presses return or the widget loses focus. 2014-07-07 19:10:24 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6ba8be3503 Fix stack smashing, QTimer threading
QTimer CAN NOT be handled from a different thread, we needed to push them to the Core's thread

Allocating a large video frame buffer on the stack is a Bad Idea(tm), this commit fixes a bad buffer overflow

Also improve our QTimer handling during calls, no need to disconnect/reconnect on call start/end, once is enough, and no need to keep them on the stack
2014-07-07 00:12:07 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
af4706a892 Merge pull request #109 from F1ynn/fix-104
Fix #104
2014-07-06 19:46:05 +02:00
Kevin Flynn
7d15ae48aa Fix #104 2014-07-06 10:40:59 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
1f3c28c173 Merge pull request #106 from dubslow/master
Added GPL header to all source files
2014-07-06 18:45:33 +02:00
Bill Winslow
14a7d298f4 Added GPL header to all source files 2014-07-06 12:19:45 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
4dcccb8a08 Fix status icon not set on startup 2014-07-06 15:52:02 +02:00
Kevin Flynn
c5c0f35f59 Small fixes to status button 2014-07-05 15:03:53 -07:00
Kevin Flynn
46784cc1cc Improved status button 2014-07-05 13:54:27 -07:00
Kevin Flynn
a31304d9e2 Added proper status button
Pixels in status image are shifted slightly, but since this involves
changing the .ui file it's better to merge sooner rather than later.
2014-07-05 12:30:00 -07:00
Kevin Flynn
d1a3a42d88 Removed debug code accidentally included in last commit 2014-07-05 01:04:16 -07:00