mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-09 07:02:41 -04:00
ported v0.5.0 commits 2561,2562 and 2574 to trunk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
12a0f45625
commit
f8d6590952
10 changed files with 134 additions and 90 deletions
|
@ -72,6 +72,8 @@ public slots:
|
|||
|
||||
void getfocus();
|
||||
void flash();
|
||||
void pasteLink() ;
|
||||
void contextMenu(QPoint) ;
|
||||
|
||||
void smileyWidget();
|
||||
void addSmiley();
|
||||
|
@ -115,6 +117,7 @@ private:
|
|||
QAction *actionTextBold;
|
||||
QAction *actionTextUnderline;
|
||||
QAction *actionTextItalic;
|
||||
QAction *pasteLinkAct ;
|
||||
|
||||
std::string dialogId, dialogName;
|
||||
unsigned int lastChatTime;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue