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

removed duplicated emoticons

Browse Source
This commit is contained in:
agilob 2014-10-13 19:50:54 +01:00
parent 45c60a17c0
commit db5c115a91
No known key found for this signature in database
GPG Key ID: 2CACF3EEF598C663
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widget/form/settings/generalform.cpp
View File

@ -126,14 +126,11 @@ void GeneralForm::reloadSmiles()
{ {
QList<QStringList> emoticons = SmileyPack::getInstance().getEmoticons(); QList<QStringList> emoticons = SmileyPack::getInstance().getEmoticons();
QStringList smiles; QStringList smiles;
smiles << ":)" << ";)" << ":p" << ":O" << ":'("; //just in case... smiles << ":)" << ";)" << ":p" << ":O" << ":["; //just in case...
for(int i = 0; i < emoticons.size(); i++) for(int i = 0; i < emoticons.size(); i++)
{ smiles.push_front(emoticons.at(i).first());
foreach (QString icon, emoticons.at(i))
smiles.push_front(icon);
}
int pixSize = 30; int pixSize = 30;
bodyUI->smile1->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[0]).pixmap(pixSize, pixSize)); bodyUI->smile1->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[0]).pixmap(pixSize, pixSize));
bodyUI->smile2->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[1]).pixmap(pixSize, pixSize)); bodyUI->smile2->setPixmap(SmileyPack::getInstance().getAsIcon(smiles[1]).pixmap(pixSize, pixSize));