1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
qTox/ui
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
..
acceptFileButton Embed all ressources in the .qrc 2014-07-01 02:06:15 +02:00
callButton Call buttons: Use tox red 2014-11-17 21:06:04 +01:00
chatArea Merge branch 'master' into chatlog_v3_1 2015-01-03 10:17:53 +01:00
chatroomWidgets Prepare for theme colors support 2014-11-15 18:29:41 +01:00
emoteButton Fixed up Emote button and created new images for the Volume and Mic buttons 2014-12-04 10:57:52 -07:00
emoticonWidget more styling 2014-10-01 16:45:10 +02:00
fileButton code cleanup 2014-09-05 23:03:26 +07:00
fileTransferInstance filetransferwidget: added open (browse?) button, fixed layout 2014-12-10 10:35:56 +01:00
fileTransferWidget Small fixes to status button 2014-07-05 15:03:53 -07:00
friendList Fix friendlist having a bad gray background 2014-11-15 23:04:51 +01:00
micButton Fixed up Emote button and created new images for the Volume and Mic buttons 2014-12-04 10:57:52 -07:00
msgEdit fix #457, styles in mainContent for qtextedit, qspinbox and more 2014-10-18 19:56:09 +01:00
pauseFileButton Embed all ressources in the .qrc 2014-07-01 02:06:15 +02:00
sendButton Embed all ressources in the .qrc 2014-07-01 02:06:15 +02:00
settings Checkboxes in settings grayed out when disabled 2014-11-27 19:46:40 +02:00
statusButton Add GUI to change theme color 2014-11-15 21:30:20 +01:00
stopFileButton Embed all ressources in the .qrc 2014-07-01 02:06:15 +02:00
videoButton Call buttons: Use tox red 2014-11-17 21:06:04 +01:00
volButton removing fixed size from mic/volume buttons so they align nicely 2014-12-17 12:36:34 +01:00
window Add GUI to change theme color 2014-11-15 21:30:20 +01:00