Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added new smiley to the emotes.acs, changed the Smiley Button size for a better mouse over effect.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-09-30 15:45:43 +00:00
parent a16530c04f
commit 12fd5b29f7
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/common/Emoticons.cpp
View File

@ -126,8 +126,8 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
{ {
QWidget *smWidget = new QWidget(parent, Qt::Popup); QWidget *smWidget = new QWidget(parent, Qt::Popup);
const int buttonWidth = 24; const int buttonWidth = 26;
const int buttonHeight = 24; const int buttonHeight = 26;
const int countPerLine = 9; const int countPerLine = 9;
int rowCount = (Smileys.size()/countPerLine) + ((Smileys.size() % countPerLine) ? 1 : 0); int rowCount = (Smileys.size()/countPerLine) + ((Smileys.size() % countPerLine) ? 1 : 0);

1
retroshare-gui/src/gui/images.qrc
View File

@ -477,6 +477,7 @@
<file>qss/chat/history/variants/Standard.css</file> <file>qss/chat/history/variants/Standard.css</file>
<file>smileys/amorous.png</file> <file>smileys/amorous.png</file>
<file>smileys/angry.png</file> <file>smileys/angry.png</file>
<file>smileys/bad.png</file>
<file>smileys/beer.png</file> <file>smileys/beer.png</file>
<file>smileys/cake.png</file> <file>smileys/cake.png</file>
<file>smileys/camera.png</file> <file>smileys/camera.png</file>

1
retroshare-gui/src/gui/smileys/emotes.acs
View File

@ -39,6 +39,7 @@
"(S)":"smileys/moon.png" "(S)":"smileys/moon.png"
"*-:)":"smileys/lamp.png" "*-:)":"smileys/lamp.png"
"(Y)|(y)":"smileys/good.png" "(Y)|(y)":"smileys/good.png"
"(N)|(n)":"smileys/bad.png"
"(D)|(d)":"smileys/drink.png" "(D)|(d)":"smileys/drink.png"
"(ap)":"smileys/airplane.png" "(ap)":"smileys/airplane.png"
"(tu)":"smileys/turtle.png" "(tu)":"smileys/turtle.png"