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

49 Commits

Author SHA1 Message Date
krepa098
3c349e29ad cleanup 2015-02-06 14:04:15 +01:00
krepa098
52f220c9e4 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/widget/form/chatform.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
	src/widget/tool/chatactions/chataction.h
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/widget.cpp
	ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
krepa098
5be6caca68 [HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent
This does not enable HiDPI support!

issue #975
2015-01-26 14:01:42 +01:00
krepa098
bb29536df1 NotificationIcon 2015-01-19 19:04:19 +01:00
krepa098
5429e50bd0 updated error/info.png 2015-01-18 12:30:31 +01:00
krepa098
2914a9883c ChatMessage::createTypingNotification, resized images to 18x18, new
(spinning) notification icon
2015-01-18 12:20:13 +01:00
Ildar Akhmetgaleev
575247218d Defining link color in chat area css
Fixes #852. Links now visible with white on black system theme.
Defining with a {...}
2015-01-11 22:56:41 +07:00
Ildar Akhmetgaleev
416f1565cc Defining link color in chat area css
Fixes #852. Links now visible with white on black system theme.
2015-01-11 10:52:57 +07:00
krepa098
904627e50a moved typing notifications to ChatLog 2015-01-10 11:57:46 +01:00
krepa098
6c6d0254fc plain svg 2015-01-06 15:12:39 +01:00
krepa098
b82c5835ce error symbol 2015-01-06 14:30:24 +01:00
krepa098
2828a97d54 styled chatlog, cleanup 2015-01-03 10:21:15 +01:00
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
krepa098
f1f42fc237 innerStyle, groupchats 2014-12-31 13:42:06 +01:00
Dubslow
0fff9dab3d
Merge branch 'pr943' 2014-12-17 14:44:26 -06:00
Zetok Zalbavar
e5b9e8c59c
Make quote colour more readable 2014-12-17 15:37:07 +00:00
agilob
8f173af3d7
removing border from contact name linedit 2014-12-15 17:14:17 +01:00
novist
d5c593d088 No border for message area (as in mockup) 2014-11-25 19:10:00 +02:00
krepa098
3facab1db4 artwork 2014-11-16 13:01:26 +01:00
krepa098
74bd802863 progress 2014-11-16 12:40:44 +01:00
krepa098
3a34678900 progress 2014-11-12 16:45:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2ba994c73a
Force font size in groupchat header for all DPIs
Fixes #75
2014-10-24 00:18:48 +02:00
agilob
28d1287b18
implemented krepas suggestions about style 2014-10-22 16:27:15 +01:00
agilob
9bc1568c0d Merge remote-tracking branch 'upsteam/master' into style 2014-10-22 16:21:01 +01:00
dubslow
aa55dcae1e fix bug, fix actions to be like irc, and a disabled feature for future 2014-10-20 06:34:17 -05:00
dubslow
30e2afcc92 add alerts on user mention (could use some tweaking, but is plenty fine for now) 2014-10-20 06:05:45 -05:00
agilob
41327910a4
fix #457, styles in mainContent for qtextedit, qspinbox and more 2014-10-18 19:56:09 +01:00
krepa098
2913326fb2 fix #416, cleanup 2014-10-17 09:09:59 +02:00
apprb
339afafa05
magic number removed in FileTransferInstance 2014-10-13 16:43:20 +09:00
krepa098
b93343bb99 tweak 2014-10-04 11:03:50 +02:00
krepa098
2ebc583f29 fixed #372 2014-10-04 11:03:50 +02:00
dubslow
cfa39460bf added sending actions, and tested both ways 2014-10-02 02:00:06 -05:00
dubslow
5f106ab618 add receive actions (no one to test with currently) 2014-10-02 01:01:23 -05:00
dubslow
30f3866772 restore bold names in chat 2014-10-01 23:21:43 -05:00
krepa098
5e328d2404 more styling 2014-10-01 16:45:10 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
b6ccbfc62f Fix greentext
Thanks to dewbasaur for reporting the bug
2014-09-12 22:51:13 +02:00
krepa098
39ba354651 use "white-space: nowrap" for div.date 2014-09-09 18:09:51 +02:00
apprb
aa2f67c983 code cleanup 2014-09-07 19:17:47 +07:00
apprb
0a1eaac9a4 filetransferinstance should use own pictures 2014-09-07 15:04:42 +07:00
apprb
92b2848916 rewrite 2014-09-07 00:21:47 +07:00
apprb
0fe14953c8 somehow working example 2014-09-07 00:21:47 +07:00
apprb
25ee6a24d9 new chat beginning 2014-09-07 00:21:39 +07:00
Kevin Flynn
290e985c1c Disabled custom window borders, fixed bug where message alert wouldn't play when window was minimized 2014-06-30 19:12:17 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
5eb3179f1e Embed all ressources in the .qrc
Should help with #15 and make urras happy
2014-07-01 02:06:15 +02:00
Kevin Flynn
c6870d2137 Added horizontal scrollbars to chatArea 2014-06-29 00:04:20 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
821fa4822d Revert "Revert "Skinned scrollbars and other small improvements"" 2014-06-28 23:59:11 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
60e0d7b325 Revert "Skinned scrollbars and other small improvements" 2014-06-28 23:12:13 +02:00
Kevin Flynn
36b2c496cb Make chatArea and msgEdit more like the mockup 2014-06-28 13:56:47 -07:00
Kevin Flynn
33e487d0dd Added skinned scrollbar in chat 2014-06-28 13:02:19 -07:00