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

Source code maintenance

Browse source 
Memory leaks:
- PeersDialog::insertPeers -> takeTopLevelItem, takeChild

- activate correct page on creating a new forum or channel from PeersDialog (problems with RS_RELEASE_VERSION)
  new static method to activate a page MainWindow::activatePage

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-03 00:09:55 +00:00
parent ed566d85b9
commit fb58beef4f
11 changed files with 159 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

17
retroshare-gui/src/gui/MessengerWindow.cpp
View file

@ -97,7 +97,7 @@ void MessengerWindow::releaseInstance()
/** Constructor */
MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
: maxTimeBeforeIdle(30), RWindow("MessengerWindow", parent, flags)
: RWindow("MessengerWindow", parent, flags), maxTimeBeforeIdle(30)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
@ -572,12 +572,9 @@ std::string getPeersRsCertId(QTreeWidgetItem *i)
/** Add a Friend ShortCut */
void MessengerWindow::addFriend()
{
ConnectFriendWizard* connwiz = new ConnectFriendWizard(this);
// set widget to be deleted after close
connwiz->setAttribute( Qt::WA_DeleteOnClose, true);
connwiz->show();
ConnectFriendWizard connwiz (this);
connwiz.exec ();
}
/** Open a QFileDialog to browse for export a file. */
@ -808,7 +805,7 @@ void MessengerWindow::show()
QWidget::show();
} else {
QWidget::activateWindow();
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
QWidget::raise();
}
}
@ -858,6 +855,8 @@ void MessengerWindow::sendMessage()
nMsgDialog->newMsg();
nMsgDialog->show();
/* window will destroy itself! */
}
LogoBar & MessengerWindow::getLogoBar() const {
@ -1058,10 +1057,10 @@ void MessengerWindow::savestatus()
void MessengerWindow::checkAndSetIdle(int idleTime){
if((idleTime >= maxTimeBeforeIdle) && !isIdle){
if((idleTime >= (int) maxTimeBeforeIdle) && !isIdle){
setIdle(true);
}else
if((idleTime < maxTimeBeforeIdle) && isIdle){
if((idleTime < (int) maxTimeBeforeIdle) && isIdle){
setIdle(false);
}