mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-17 21:40:36 -04:00
* Rolled back Modifications to SearchDialog and PopupChatDialog.
- unable to get windows to compile with PopupChat on windows. - not happy with new SearchDialog. Not an improvement on old dialog + uses Qt4.4 * updated version numbers... * added a couple of windows scripts. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
705a51ac1f
commit
65e02ba4de
13 changed files with 779 additions and 676 deletions
|
@ -30,7 +30,6 @@
|
|||
#include <gui/Preferences/rsharesettings.h>
|
||||
|
||||
#include "rsiface/rsiface.h"
|
||||
#include "gui/feeds/SubFileItem.h"
|
||||
|
||||
|
||||
|
||||
|
@ -75,19 +74,15 @@ 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();
|
||||
|
@ -100,6 +95,7 @@ private slots:
|
|||
void getAvatar();
|
||||
|
||||
|
||||
|
||||
private:
|
||||
|
||||
void colorChanged(const QColor &c);
|
||||
|
@ -124,9 +120,10 @@ private:
|
|||
QStringList history;
|
||||
QString wholeChat;
|
||||
|
||||
|
||||
|
||||
/** Qt Designer generated object */
|
||||
Ui::PopupChatDialog ui;
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue