StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr608'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-02 23:41:07 +01:00
commit 2ac1a33cb5
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc/settings.cpp
View File

@ -125,7 +125,7 @@ void Settings::load()
s.beginGroup("GUI"); s.beginGroup("GUI");
enableSmoothAnimation = s.value("smoothAnimation", true).toBool(); enableSmoothAnimation = s.value("smoothAnimation", true).toBool();
smileyPack = s.value("smileyPack", QString()).toString(); smileyPack = s.value("smileyPack", ":/smileys/cylgom/emoticons.xml").toString();
customEmojiFont = s.value("customEmojiFont", true).toBool(); customEmojiFont = s.value("customEmojiFont", true).toBool();
emojiFontFamily = s.value("emojiFontFamily", "DejaVu Sans").toString(); emojiFontFamily = s.value("emojiFontFamily", "DejaVu Sans").toString();
emojiFontPointSize = s.value("emojiFontPointSize", QApplication::font().pointSize()).toInt(); emojiFontPointSize = s.value("emojiFontPointSize", QApplication::font().pointSize()).toInt();