1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
qTox/widget
dubslow 1bacd2da7a Merge branch 'master' into profiles... yikes
Conflicts:
	core.cpp
	core.h
	misc/settings.cpp
	misc/settings.h
	widget/form/settings/generalform.h
	widget/form/settingsform.cpp
	widget/widget.cpp
	widget/widget.h
2014-10-08 20:25:26 -05:00
..
form Introduced "Connection Settings" group in GeneralSettings widget 2014-10-07 09:24:52 +07:00
tool Change indicator for action messages 2014-10-04 20:40:14 +01:00
adjustingscrollarea.cpp AdjustingScrollArea: removed event filter 2014-10-01 17:22:51 +02:00
adjustingscrollarea.h AdjustingScrollArea: removed event filter 2014-10-01 17:22:51 +02:00
camera.cpp Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
camera.h Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
chatareawidget.cpp bug in file transfer widget displaying fix 2014-10-07 19:20:53 +09:00
chatareawidget.h reimplemented insert chat line function: every line in own table 2014-10-07 14:49:24 +07:00
croppinglabel.cpp Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
croppinglabel.h Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
emoticonswidget.cpp cleanup, applied some of the "Tox User Interface Guidelines" 2014-10-01 16:41:17 +02:00
emoticonswidget.h a shiny new widget 2014-08-01 14:32:51 +02:00
friendlistwidget.cpp Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
friendlistwidget.h Initial avatars support 2014-09-24 17:28:38 +02:00
friendwidget.cpp fixed regression (#334) 2014-10-05 14:22:28 +02:00
friendwidget.h unmessification 2014-10-01 16:41:17 +02:00
genericchatroomwidget.cpp GenericChatroomWidget: use QFrame instead of QWidget as base class 2014-10-01 18:53:31 +02:00
genericchatroomwidget.h GenericChatroomWidget: use QFrame instead of QWidget as base class 2014-10-01 18:53:31 +02:00
groupwidget.cpp fixed wrong group status image 2014-10-04 11:08:14 +02:00
groupwidget.h unmessification 2014-10-01 16:41:17 +02:00
maskablepixmapwidget.cpp MaskablePixmapWidget::getPixmap: return the masked pixmap 2014-10-05 14:36:07 +02:00
maskablepixmapwidget.h MaskablePixmapWidget::getPixmap: return the masked pixmap 2014-10-05 14:36:07 +02:00
netcamview.cpp fix: Force video output to follow aspect ratio #130 2014-09-16 00:51:25 +07:00
netcamview.h fix: Force video output to follow aspect ratio #130 2014-09-16 00:51:25 +07:00
selfcamview.cpp fix: Force video output to follow aspect ratio #130 2014-09-16 00:51:25 +07:00
selfcamview.h fix: Force video output to follow aspect ratio #130 2014-09-16 00:51:25 +07:00
widget.cpp Merge branch 'master' into profiles... yikes 2014-10-08 20:25:26 -05:00
widget.h Merge branch 'master' into profiles... yikes 2014-10-08 20:25:26 -05:00