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

New class for the work with emoticons - Emoticons

Browse source 
Redesigned emoticons window
- flat buttons
- 9 icons in a row
- moved the window to the direction of the input object

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3487 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-14 17:47:11 +00:00
parent 6e771af2b6
commit 0b63a4be86
15 changed files with 272 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -49,6 +49,7 @@
#include "gui/notifyqt.h"
#include "../RsAutoUpdatePage.h"
#include "gui/common/StatusDefs.h"
#include "gui/common/Emoticons.h"
#include "gui/feeds/AttachFileItem.h"
#include "gui/msgs/MessageComposer.h"
@ -105,7 +106,6 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
last_status_send_time = 0 ;
style.setStyleFromSettings(ChatStyle::TYPE_PRIVATE);
style.loadEmoticons();
/* Hide or show the frames */
showAvatarFrame(true);
@ -716,7 +716,7 @@ void PopupChatDialog::setFont()
void PopupChatDialog::smileyWidget()
{
style.showSmileyWidget(this, ui.emoteiconButton, SLOT(addSmiley()));
Emoticons::showSmileyWidget(this, ui.emoteiconButton, SLOT(addSmiley()), true);
}
//============================================================================