1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
qTox/widget
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
..
form Merge branch 'master' into profiles 2014-09-05 03:53:00 -05:00
tool removed ClickableLabel, EditableLabelWidget, ElideLabel, EscLineEdit, 2014-09-01 11:08:02 +02:00
adjustingscrollarea.cpp consider scrollbar's width 2014-08-11 17:06:57 +02:00
adjustingscrollarea.h put back the not so native window decoration, status panel respects 2014-08-11 13:56:52 +02:00
camera.cpp Clean & remove old code and dependencies 2014-08-30 15:15:23 +02:00
camera.h Remove all Qt video code 2014-08-29 14:42:38 +02:00
croppinglabel.cpp compatibility with old widgets 2014-09-01 11:16:41 +02:00
croppinglabel.h cleanup 2014-09-01 12:27:41 +02:00
emoticonswidget.cpp use Style::get 2014-08-11 17:23:41 +02:00
emoticonswidget.h a shiny new widget 2014-08-01 14:32:51 +02:00
filetransfertwidget.cpp Reduce precision of human readable, now more readable! 2014-08-31 23:07:07 +02:00
filetransfertwidget.h Fix #174, was only partially fixed 2014-08-31 12:49:58 +02:00
friendlistwidget.cpp Clean & remove old code and dependencies 2014-08-30 15:15:23 +02:00
friendlistwidget.h sort the friendlist by contact Status 2014-08-23 02:12:37 +07:00
friendwidget.cpp further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
friendwidget.h further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
genericchatroomwidget.cpp further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
genericchatroomwidget.h further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
groupwidget.cpp further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
groupwidget.h further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
netcamview.cpp Color compatibility with uTox 2014-08-29 14:33:19 +02:00
netcamview.h Drop video frames when lagging 2014-07-12 14:10:24 +02:00
selfcamview.cpp Clean & remove old code and dependencies 2014-08-30 15:15:23 +02:00
selfcamview.h Added GPL header to all source files 2014-07-06 12:19:45 -04:00
widget.cpp Merge branch 'master' into profiles 2014-09-05 03:53:00 -05:00
widget.h Merge branch 'master' into profiles 2014-09-05 03:53:00 -05:00