mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 14:16:16 -04:00
* 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:
parent
935a52dee3
commit
5dc3e39337
8 changed files with 174 additions and 104 deletions
|
@ -28,6 +28,7 @@
|
|||
|
||||
#include "rshare.h"
|
||||
#include "MessengerWindow.h"
|
||||
//#include "MainWindow.h"
|
||||
|
||||
#include "chat/PopupChatDialog.h"
|
||||
#include "msgs/ChanMsgDialog.h"
|
||||
|
@ -70,18 +71,20 @@
|
|||
|
||||
|
||||
/** Constructor */
|
||||
MessengerWindow::MessengerWindow(QWidget * parent)
|
||||
: QMainWindow(parent)
|
||||
MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
|
||||
: RWindow("MessengerWindow", parent, flags)
|
||||
{
|
||||
/* Invoke the Qt Designer generated object setup routine */
|
||||
ui.setupUi(this);
|
||||
|
||||
RshareSettings config;
|
||||
config.loadWidgetInformation(this);
|
||||
//RshareSettings config;
|
||||
//config.loadWidgetInformation(this);
|
||||
|
||||
connect( ui.messengertreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( messengertreeWidgetCostumPopupMenu( QPoint ) ) );
|
||||
|
||||
connect( ui.avatarButton, SIGNAL(clicked()), SLOT(getPicture()));
|
||||
connect( ui.mailButton, SIGNAL(clicked()), SLOT(showMessages()));
|
||||
|
||||
connect( ui.addIMAccountButton, SIGNAL(clicked( bool ) ), this , SLOT( addFriend2() ) );
|
||||
|
||||
connect( ui.messengertreeWidget, SIGNAL(itemDoubleClicked ( QTreeWidgetItem *, int)), this, SLOT(chatfriend2()));
|
||||
|
@ -91,7 +94,7 @@ MessengerWindow::MessengerWindow(QWidget * parent)
|
|||
/* to hide the header */
|
||||
ui.messengertreeWidget->header()->hide();
|
||||
|
||||
/* Set header resize modes and initial section sizes */
|
||||
/* Set header resize modes and initial section sizes */
|
||||
ui.messengertreeWidget->setColumnCount(1);
|
||||
|
||||
QHeaderView * _header = ui.messengertreeWidget->header () ;
|
||||
|
@ -101,6 +104,9 @@ MessengerWindow::MessengerWindow(QWidget * parent)
|
|||
//_header->setResizeMode (3, QHeaderView::Interactive);
|
||||
|
||||
_header->resizeSection ( 0, 200 );
|
||||
|
||||
/* Create all the dialogs of which we only want one instance */
|
||||
//_mainWindow = new MainWindow();
|
||||
|
||||
//LogoBar
|
||||
_rsLogoBarmessenger = NULL;
|
||||
|
@ -353,13 +359,18 @@ void MessengerWindow::show()
|
|||
|
||||
void MessengerWindow::closeEvent (QCloseEvent * event)
|
||||
{
|
||||
RshareSettings config;
|
||||
config.saveWidgetInformation(this);
|
||||
//RshareSettings config;
|
||||
//config.saveWidgetInformation(this);
|
||||
|
||||
hide();
|
||||
event->ignore();
|
||||
}
|
||||
|
||||
/** Shows Messages */
|
||||
/*void MessengerWindow::showMessages(MainWindow::Page page)
|
||||
{
|
||||
mainWindow->showWindow(page);
|
||||
}*/
|
||||
|
||||
|
||||
void MessengerWindow::setChatDialog(PeersDialog *cd)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue