Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-04 23:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Create the instance of MessengerWindow only when needed and delete it on close.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-07-18 11:43:39 +00:00
parent 8f5fe8bae2
commit d53a6c9d29
7 changed files with 87 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

13
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -154,8 +154,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Create all the dialogs of which we only want one instance */
_bandwidthGraph = new BandwidthGraph();
/*messengerWindow instance is created statically so that RsAutoUpdatePage can access it*/
messengerWindow = MessengerWindow::getInstance();
#ifdef UNFINISHED
applicationWindow = new ApplicationWindow();
applicationWindow->hide();
@ -304,10 +302,9 @@ MainWindow::~MainWindow()
delete natstatus;
delete ratesstatus;
MessengerWindow::releaseInstance();
messengerWindow = NULL;
#ifdef UNFINISHED
delete applicationWindow;
#endif
#endif
}
void MainWindow::displayDiskSpaceWarning(int loc,int size_limit_mb)
@ -624,7 +621,7 @@ void MainWindow::showSettings()
/** Shows Messenger window */
void MainWindow::showMessengerWindow()
{
messengerWindow->show();
MessengerWindow::showYourself();
}
@ -640,13 +637,11 @@ void MainWindow::showApplWindow()
* tray menu configuration. */
void MainWindow::createActions()
{
_settingsAct = new QAction(QIcon(IMAGE_PREFERENCES), tr("Options"), this);
connect(_settingsAct, SIGNAL(triggered()), this, SLOT(showSettings()));
_bandwidthAct = new QAction(QIcon(IMAGE_BWGRAPH), tr("Bandwidth Graph"), this);
connect(_bandwidthAct, SIGNAL(triggered()),
_bandwidthGraph, SLOT(showWindow()));
connect(_bandwidthAct, SIGNAL(triggered()), _bandwidthGraph, SLOT(showWindow()));
_messengerwindowAct = new QAction(QIcon(IMAGE_RSM16), tr("Open Messenger"), this);
connect(_messengerwindowAct, SIGNAL(triggered()),this, SLOT(showMessengerWindow()));
@ -659,8 +654,6 @@ void MainWindow::createActions()
#endif
_helpAct = new QAction(QIcon(IMG_HELP), tr("Help"), this);
connect(_helpAct, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
}
/** If the user attempts to quit the app, a check-warning is issued. This warning can be