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

Improvements for ProgressDialog.

Browse source 
- Launch progress dialog after connectWizard.
 - fix display of location on connectWizard.
 - add cleanup code to ProgressDialog.
 - Qt4.7 bugfix.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-08-26 07:24:37 +00:00
parent 5dffde209a
commit fd66a963d2
5 changed files with 56 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -51,10 +51,7 @@
#include "util/misc.h"
#include "vmessagebox.h"
#define PROGRESS_DIALOG 1
#ifdef PROGRESS_DIALOG
#include "gui/connect/ConnectProgressDialog.h"
#endif
#include "FriendList.h"
#include "ui_FriendList.h"
@ -1490,15 +1487,20 @@ void FriendList::connectfriend()
if (item->type() == TYPE_SSL) {
rsPeers->connectAttempt(getRsId(item));
item->setIcon(COLUMN_NAME,(QIcon(IMAGE_CONNECT2)));
// Launch ProgressDialog, only if single SSL child.
if (childCount == 1)
{
ConnectProgressDialog::showProgress(getRsId(item));
}
}
}
} else {
//this is a SSL key
rsPeers->connectAttempt(getRsId(c));
c->setIcon(COLUMN_NAME,(QIcon(IMAGE_CONNECT2)));
#ifdef PROGRESS_DIALOG
// Launch ProgressDialog.
ConnectProgressDialog::showProgress(getRsId(c));
#endif
}
}
}