Zetok Zalbavar
|
f95291af3e
|
Some style fixes
"if(" → "if ("
"for(" → "for ("
"while(" → "while ("
|
2015-03-20 18:38:10 +00: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
|
f509e07c45
|
make use of EmojiFontPointSize (fix #1026)
|
2015-01-26 23:19:18 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
801554bbd8
|
Fix #1037
|
2015-01-24 21:46:53 +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 |
|
Zetok Zalbavar
|
e0993a72f6
|
Style corrections
'if()' → 'if ()'
'for()' → 'for ()'
|
2014-12-11 18:05:52 +00:00 |
|
krepa098
|
4ea21c2d19
|
(c)
|
2014-11-16 12:58:43 +01:00 |
|
krepa098
|
fd1063eb2c
|
bye bye base64 emoticons
|
2014-11-16 12:52:53 +01:00 |
|
krepa098
|
74bd802863
|
progress
|
2014-11-16 12:40:44 +01:00 |
|
krepa098
|
808f8b1cc5
|
progress
|
2014-11-13 18:27:32 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
e17672acd8
|
Add tooltip for emoticons, fix #597
|
2014-11-02 12:58:18 +01:00 |
|
agilob
|
c079641fc1
|
prevent duplicating emoticons on the list
|
2014-10-29 20:24:56 +00:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
edca806af1
|
Rescale smileys smoothly, fix #501
|
2014-10-26 21:12:39 +01:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
80e648a5a2
|
Force smiley size to match text size
Fixes #501
|
2014-10-23 22:39:03 +02:00 |
|
agilob
|
45c60a17c0
|
Merge remote-tracking branch 'upsteam/master' into emoticon-preview
|
2014-10-12 11:12:10 +01:00 |
|
dubslow
|
3ba95d82ae
|
Move code into src/
|
2014-10-07 23:26:25 -05:00 |
|