* replaced toText in MessagesDialog QTextEdit with QTextBrowser to get use a scrollbar

* update little bit ProfileView(added function for load a image to picture label, added a Button for Edit Profile) 
* set context menu icon for Connect To Friend
* Fixed OnlineToaster's Picture Label Layout
* set for Make Friend a Header Image and Text

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-23 01:58:56 +00:00
parent 80a8b41d66
commit 643379aec7
13 changed files with 412 additions and 352 deletions

View file

@ -17,37 +17,37 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
****************************************************************/
#ifndef _PEERSDIALOG_H
#define _PEERSDIALOG_H
#define _PEERSDIALOG_H
#include <QFileDialog>
#include "chat/PopupChatDialog.h"
#include "mainpage.h"
#include "ui_PeersDialog.h"
#include "mainpage.h"
#include "ui_PeersDialog.h"
class QFont;
class QAction;
class QTextEdit;
class QTextCharFormat;
class ChatDialog;
class PeersDialog : public MainPage
{
Q_OBJECT
public:
/** Default Constructor */
PeersDialog(QWidget *parent = 0);
class PeersDialog : public MainPage
{
Q_OBJECT
public:
/** Default Constructor */
PeersDialog(QWidget *parent = 0);
/** Default Destructor */
PopupChatDialog *getPrivateChat(std::string id, std::string name, uint chatflags);
void clearOldChats();
void loadEmoticonsgroupchat();
void loadEmoticonsgroupchat();
void insertPeers();
@ -63,13 +63,13 @@ public slots:
void smileyWidgetgroupchat();
void addSmileys();
void on_actionClearChat_triggered();
void displayInfoChatMenu(const QPoint& pos);
private slots:
/** Create the context popup menu and it's submenus */
void on_actionClearChat_triggered();
void displayInfoChatMenu(const QPoint& pos);
private slots:
/** Create the context popup menu and it's submenus */
void peertreeWidgetCostumPopupMenu( QPoint point );
/** Export friend in Friends Dialog */
@ -80,7 +80,8 @@ private slots:
void chatfriend();
void msgfriend();
void configurefriend();
void configurefriend();
void viewprofile();
/** RsServer Friend Calls */
void allowfriend();
@ -99,8 +100,8 @@ private slots:
void getFont();
void underline();
private:
private:
/* Worker Functions */
/* (1) Update Display */
@ -111,12 +112,13 @@ private:
ChatDialog *chatDialog;
/** Define the popup menus for the Context menu */
/** Define the popup menus for the Context menu */
QMenu* contextMnu;
/** Defines the actions for the context menu */
/** Defines the actions for the context menu */
QAction* chatAct;
QAction* msgAct;
QAction* connectfriendAct;
QAction* profileviewAct;
QAction* configurefriendAct;
QAction* exportfriendAct;
QAction* removefriendAct;
@ -124,17 +126,17 @@ private:
QTreeWidget *peertreeWidget;
QColor _currentColor;
bool _underline;
bool _underline;
QHash<QString, QString> smileys;
std::map<std::string, PopupChatDialog *> chatDialogs;
QFont mCurrentFont; /* how the text will come out */
/** Qt Designer generated object */
Ui::PeersDialog ui;
};
#endif
/** Qt Designer generated object */
Ui::PeersDialog ui;
};
#endif