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
dubslow
8212a3dad0
Added all current settings except cam test, which segfaults on init...
2014-09-30 04:44:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
da8f83943d
Compat with toxcore
2014-09-30 01:18:23 -05:00
dubslow
767f164a14
fix file mvs
2014-09-29 13:28:59 -05:00
dubslow
84f56b81a7
fixes #331 , remove special chars
2014-09-28 13:09:10 -05:00
dubslow
7735973d94
remove duplicate code
2014-09-28 12:57:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
12380bc397
Allow non-png avatars, convert them on the fly
2014-09-28 10:59:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
21d084e258
Compat with toxcore
2014-09-28 10:56:02 +02:00
dubslow
eb67f9b3dd
revert special self avatar
2014-09-27 17:19:30 -05:00
dubslow
b1b89ac1f4
minor
2014-09-27 16:44:08 -05:00
dubslow
28d2680fec
conform to standard, fix bug related to nospam in ID
2014-09-27 16:37:39 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
1d978f1871
Merge branch 'pr321'
2014-09-27 20:15:01 +02:00
krepa098
9b52d3174d
set clickable to true
2014-09-27 19:13:46 +02:00
krepa098
bb214b53f7
set profile picture to contact_dark.png
2014-09-27 17:58:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d684fca868
Fix #322
2014-09-26 21:26:31 +02:00
krepa098
5662aa933f
Added MaskablePixmapWidget, improved avatar rendering
2014-09-26 19:13:08 +02:00
dubslow
e32ad72368
slight improvements to avatars
2014-09-25 10:16:36 -05:00
dubslow
be7c39d69a
api update
2014-09-25 09:55:36 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
52d18f9f18
Keep avatar aspect ratio (for real)
2014-09-24 18:40:40 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
81e6d8323a
Keep avatar aspect ratio
2014-09-24 18:32:20 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c1f24b27ba
Fix self avatar being cropped
2014-09-24 18:25:09 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
ff2994a0fd
Cache avatars
2014-09-24 17:55:54 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8de71c19ed
Initial avatars support
2014-09-24 17:28:38 +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
dubslow
6c365c2260
Merge branch 'newsettings' of https://github.com/tux3/qTox into newsettings
...
Conflicts:
res.qrc
widget/widget.cpp
2014-09-16 12:10:52 -05:00
dubslow
e4e36dc946
initial new settings widget, subforms not started
...
also "filing" some files under misc
2014-09-15 22:42:41 +02:00
dubslow
55437df210
initial new settings widget, subforms not started
...
also "filing" some files under misc
2014-09-13 03:32:24 -05:00
Marcel
1b2855e05b
use settings dialog in widget
2014-09-12 15:46:34 +02:00
Marcel
c3a8cd01f3
removed settingsform, removed selfcamview from widget
2014-09-12 15:35:48 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6440ef8310
Make group <unknown> name translatable
2014-09-11 18:05:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a7c75e63a5
Clean code, improve compilation speed
2014-09-11 15:44:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e91846e821
Fix #205
2014-09-11 13:40:44 +02:00
krepa098
b6848772fc
converted notification.wav to notification.pcm (raw audio) fixes #256
2014-09-10 23:21:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
0ae0d01a61
Generalize #275 to groupchats
2014-09-10 23:00:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c76f6a7e73
Fix #275
2014-09-10 22:53:02 +02:00
apprb
2826e83cef
addMessage moved to parent class
2014-09-05 23:03:26 +07: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
