Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-15 16:49:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added new Emojione Emoticons

Browse source
This commit is contained in:
defnax 2015-12-21 22:27:10 +01:00
parent f12b4a1474
commit 4ccab411c0
1726 changed files with 2514 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -48,7 +48,7 @@ void Emoticons::load()
internalEmoticons = false;
} else {
// then embedded emotions
sm_file.setFileName(":/smileys/emotes.acs");
sm_file.setFileName(":/emojione/emotes.acs");
if(!sm_file.open(QIODevice::ReadOnly))
{
std::cout << "error opening ressource file" << std::endl ;
@ -56,7 +56,7 @@ void Emoticons::load()
}
}
#else
QFile sm_file(QString(":/smileys/emotes.acs"));
QFile sm_file(QString(":/emojione/emotes.acs"));
if(!sm_file.open(QIODevice::ReadOnly))
{
std::cout << "error opening ressource file" << std::endl ;
@ -128,7 +128,7 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
const int buttonWidth = 26;
const int buttonHeight = 26;
const int countPerLine = 9;
const int countPerLine = 14;
int rowCount = (Smileys.size()/countPerLine) + ((Smileys.size() % countPerLine) ? 1 : 0);