rolled back commit 1200 only for popupchatdialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1215 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-05-11 14:21:11 +00:00
parent 4ef40b5cd1
commit 3698fc5a2c
5 changed files with 667 additions and 530 deletions

View file

@ -30,6 +30,7 @@
#include <gui/Preferences/rsharesettings.h>
#include "rsiface/rsiface.h"
#include "gui/feeds/SubFileItem.h"
@ -74,15 +75,19 @@ public slots:
void addSmiley();
void changeStyle();
void fileHashingFinished(SubFileItem* file);
void resetStatusBar() ;
void updateStatusTyping() ;
void updateStatusString(const QString&) ;
void anchorClicked (const QUrl &);
protected:
void closeEvent (QCloseEvent * event);
private slots:
void addExtraFile();
void showAvatarFrame(bool show);
void setColor();
@ -95,7 +100,6 @@ private slots:
void getAvatar();
private:
void colorChanged(const QColor &c);
@ -120,10 +124,9 @@ private:
QStringList history;
QString wholeChat;
/** Qt Designer generated object */
Ui::PopupChatDialog ui;
};
#endif