* added for systray contextmenu Open Messages (working)

* set for MessengerWindow to use RWindow now
* added Messages button for MessengerWindow not working at the moment


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@919 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-01-07 21:12:31 +00:00
parent 935a52dee3
commit 5dc3e39337
8 changed files with 174 additions and 104 deletions

View file

@ -27,17 +27,19 @@
#include "ui_MessengerWindow.h"
#include "NetworkDialog.h"
#include <gui/Preferences/rsharesettings.h>
#include <gui/common/rwindow.h>
class LogoBar;
class PeersDialog;
//class MainWindow;
class MessengerWindow : public QMainWindow
class MessengerWindow : public RWindow
{
Q_OBJECT
public:
/** Default Constructor */
MessengerWindow(QWidget *parent = 0);
MessengerWindow(QWidget *parent = 0, Qt::WFlags flags = 0);
/** Default Destructor */
void insertPeers();
@ -76,7 +78,10 @@ private slots:
void addFriend2();
void getPicture();
void getPicture();
//void showMessages(MainWindow::Page page = MainWindow::Messages);
/** RsServer Friend Calls */
@ -99,6 +104,9 @@ private:
PeersDialog *chatDialog;
//MainWindow* mainWindow;
/** Define the popup menus for the Context menu */
QMenu* contextMnu;
/** Defines the actions for the context menu */