Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-08 06:56:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added if defined for Windows use emoticons from extern

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@948 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-25 18:25:36 +00:00
parent 2682400bbe
commit 30b6e6c423
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -992,7 +992,11 @@ void PeersDialog::displayInfoChatMenu(const QPoint& pos)
void PeersDialog::loadEmoticonsgroupchat() void PeersDialog::loadEmoticonsgroupchat()
{ {
QString sm_codes; QString sm_codes;
QFile sm_file(QString(":/emoticons/emotes.acs")); #if defined(Q_OS_WIN32)
QFile sm_file(QApplication::applicationDirPath() + "/emoticons/emotes.acs");
#else
QFile sm_file(QString(":/emoticons/emotes.acs"));
#endif
if(!sm_file.open(QIODevice::ReadOnly)) if(!sm_file.open(QIODevice::ReadOnly))
{ {
std::cerr << "Could not open resouce file :/emoticons/emotes.acs" << endl ; std::cerr << "Could not open resouce file :/emoticons/emotes.acs" << endl ;
@ -1039,7 +1043,11 @@ void PeersDialog::loadEmoticonsgroupchat()
} }
i++; i++;
if(!smcode.isEmpty() && !smfile.isEmpty()) if(!smcode.isEmpty() && !smfile.isEmpty())
smileys.insert(smcode, ":/"+smfile); #if defined(Q_OS_WIN32)
smileys.insert(smcode, smfile);
#else
smileys.insert(smcode, ":/"+smfile);
#endif
} }
} }

9
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View File

@ -389,7 +389,11 @@ void PopupChatDialog::loadEmoticons2()
void PopupChatDialog::loadEmoticons() void PopupChatDialog::loadEmoticons()
{ {
QString sm_codes; QString sm_codes;
#if defined(Q_OS_WIN32)
QFile sm_file(QApplication::applicationDirPath() + "/emoticons/emotes.acs");
#else
QFile sm_file(QString(":/emoticons/emotes.acs")); QFile sm_file(QString(":/emoticons/emotes.acs"));
#endif
if(!sm_file.open(QIODevice::ReadOnly)) if(!sm_file.open(QIODevice::ReadOnly))
{ {
std::cout << "error opening ressource file" << std::endl ; std::cout << "error opening ressource file" << std::endl ;
@ -436,7 +440,12 @@ void PopupChatDialog::loadEmoticons()
} }
i++; i++;
if(!smcode.isEmpty() && !smfile.isEmpty()) if(!smcode.isEmpty() && !smfile.isEmpty())
#if defined(Q_OS_WIN32)
smileys.insert(smcode, smfile);
#else
smileys.insert(smcode, ":/"+smfile); smileys.insert(smcode, ":/"+smfile);
#endif
} }
} }