Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-16 18:10:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added the peers custom state string to NotifyBase::notifyCustomState and to the signal NotifyQt::notifyCustomState.

Browse source 
Changed the display of the peers custom state string in PopupChatDialog from QTimer to signal.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-02 10:15:13 +00:00
parent 80764a1ff7
commit 48acd856af
9 changed files with 34 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

31
retroshare-gui/src/gui/chat/PopupChatDialog.h
View file

@ -44,7 +44,7 @@ public:
void updateChat();
void updatePeerAvatar(const std::string&);
public slots:
/** Overloaded QWidget.show */
void show();
@ -53,10 +53,10 @@ public slots:
void flash();
void pasteLink() ;
void contextMenu(QPoint) ;
void smileyWidget();
void addSmiley();
void changeStyle();
void fileHashingFinished(AttachFileItem* file);
@ -86,7 +86,6 @@ protected:
void loadEmoticons2();
void updateAvatar();
void updateStatusMessage();
QString loadEmptyStyle();
@ -98,17 +97,18 @@ private slots:
void showAvatarFrame(bool show);
void on_closeInfoFrameButton_clicked();
void setColor();
void setColor();
void getFont();
void setFont();
void checkChat();
void sendChat();
void updatePeersCustomStateString(const QString& peer_id, const QString& status_string) ;
void getAvatar();
void on_actionClear_Chat_triggered();
bool fileSave();
bool fileSaveAs();
void setCurrentFileName(const QString &fileName);
@ -120,24 +120,24 @@ private:
void addAttachment(std::string,int flag);
void processSettings(bool bLoad);
QAction *actionTextBold;
QAction *actionTextUnderline;
QAction *actionTextItalic;
QAction *pasteLinkAct ;
QAction *actionTextBold;
QAction *actionTextUnderline;
QAction *actionTextItalic;
QAction *pasteLinkAct ;
std::string dialogId, dialogName;
unsigned int lastChatTime;
std::string lastChatName;
time_t last_status_send_time ;
QHash<QString, QString> smileys;
QColor mCurrentColor;
QFont mCurrentFont;
QString styleHtm;
QString emptyStyle;
QStringList history;
QString wholeChat;
QString wholeChat;
QString fileName;
bool m_bInsertOnVisible;
@ -145,7 +145,6 @@ private:
/** Qt Designer generated object */
Ui::PopupChatDialog ui;
};
#endif