Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-22 06:05:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

change the design of the connect friends wizard

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 21:30:44 +00:00
parent c6edff7df8
commit 018b84a1e1
4 changed files with 78 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/pqi/p3connmgr.cc
View File

@ -2958,6 +2958,7 @@ bool p3ConnectMgr::loadList(std::list<RsItem *> load)
/* add ownConfig */ /* add ownConfig */
setOwnNetConfig(pitem->netMode, pitem->visState); setOwnNetConfig(pitem->netMode, pitem->visState);
ownState.gpg_id = AuthGPG::getAuthGPG()->getGPGOwnId(); ownState.gpg_id = AuthGPG::getAuthGPG()->getGPGOwnId();
ownState.location = AuthSSL::getAuthSSL()->getOwnLocation();
} }
else else
{ {
@ -2968,8 +2969,8 @@ bool p3ConnectMgr::loadList(std::list<RsItem *> load)
#endif #endif
/* ************* */ /* ************* */
addFriend(pitem->pid, pitem->gpg_id, pitem->netMode, pitem->visState, pitem->lastContact); addFriend(pitem->pid, pitem->gpg_id, pitem->netMode, pitem->visState, pitem->lastContact);
}
setLocation(pitem->pid, pitem->location); setLocation(pitem->pid, pitem->location);
}
setLocalAddress(pitem->pid, pitem->currentlocaladdr); setLocalAddress(pitem->pid, pitem->currentlocaladdr);
setExtAddress(pitem->pid, pitem->currentremoteaddr); setExtAddress(pitem->pid, pitem->currentremoteaddr);
setAddressList(pitem->pid, pitem->ipAddressList); setAddressList(pitem->pid, pitem->ipAddressList);

63
libretroshare/src/rsserver/p3peers.cc
View File

@ -40,10 +40,10 @@
#include <gpgme.h> #include <gpgme.h>
#endif #endif
const std::string CERT_SSL_ID = "---SSLID---"; const std::string CERT_SSL_ID = "--SSLID--";
const std::string CERT_LOCATION = "---LOCATION---"; const std::string CERT_LOCATION = "--LOCATION--";
const std::string CERT_LOCAL_IP = "---LOCAL---"; const std::string CERT_LOCAL_IP = "--LOCAL--";
const std::string CERT_EXT_IP = "---EXT---"; const std::string CERT_EXT_IP = "--EXT--";
@ -790,16 +790,16 @@ p3Peers::GetRetroshareInvite()
//add the sslid, location, ip local and external address after the signature //add the sslid, location, ip local and external address after the signature
RsPeerDetails ownDetail; RsPeerDetails ownDetail;
if (getPeerDetails(rsPeers->getOwnId(), ownDetail)) { if (getPeerDetails(rsPeers->getOwnId(), ownDetail)) {
invite += CERT_SSL_ID + ownDetail.id + ";\n"; invite += CERT_SSL_ID + ownDetail.id + ";";
invite += CERT_LOCATION + ownDetail.location + ";\n"; invite += CERT_LOCATION + ownDetail.location + ";\n";
invite += CERT_LOCAL_IP + ownDetail.localAddr + ":"; invite += CERT_LOCAL_IP + ownDetail.localAddr + ":";
std::ostringstream out; std::ostringstream out;
out << ownDetail.localPort; out << ownDetail.localPort;
invite += out.str() + ";\n"; invite += out.str() + ";";
invite += CERT_EXT_IP + ownDetail.extAddr + ":"; invite += CERT_EXT_IP + ownDetail.extAddr + ":";
std::ostringstream out2; std::ostringstream out2;
out2 << ownDetail.extPort; out2 << ownDetail.extPort;
invite += out2.str() + ";\n"; invite += out2.str() + ";";
} }
std::cerr << "p3Peers::GetRetroshareInvite() returns : \n"; std::cerr << "p3Peers::GetRetroshareInvite() returns : \n";
@ -895,41 +895,39 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
//let's parse the ssl id //let's parse the ssl id
parsePosition = certstr.find(CERT_SSL_ID); parsePosition = certstr.find(CERT_SSL_ID);
std::cerr << "sslid position : " << parsePosition << std::endl; std::cerr << "sslid position : " << parsePosition << std::endl;
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
parsePosition += CERT_SSL_ID.length(); parsePosition += CERT_SSL_ID.length();
std::string subCert = certstr.substr(parsePosition); std::string subCert = certstr.substr(parsePosition);
parsePosition = subCert.find(";"); parsePosition = subCert.find(";");
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
std::string ssl_id = subCert.substr(0, parsePosition); std::string ssl_id = subCert.substr(0, parsePosition);
std::cerr << "SSL id : " << ssl_id << std::endl; std::cerr << "SSL id : " << ssl_id << std::endl;
pd.id = ssl_id; pd.id = ssl_id;
}
}
//let's parse the location //let's parse the location
parsePosition = certstr.find(CERT_LOCATION); parsePosition = certstr.find(CERT_LOCATION);
std::cerr << "location position : " << parsePosition << std::endl; std::cerr << "location position : " << parsePosition << std::endl;
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
parsePosition += CERT_LOCATION.length(); parsePosition += CERT_LOCATION.length();
subCert = certstr.substr(parsePosition); std::string subCert = certstr.substr(parsePosition);
parsePosition = subCert.find(";"); parsePosition = subCert.find(";");
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
std::string location = subCert.substr(0, parsePosition); std::string location = subCert.substr(0, parsePosition);
std::cerr << "location : " << location << std::endl; std::cerr << "location : " << location << std::endl;
pd.location = location; pd.location = location;
}
}
//let's parse ip local address //let's parse ip local address
parsePosition = certstr.find(CERT_LOCAL_IP); parsePosition = certstr.find(CERT_LOCAL_IP);
std::cerr << "local ip position : " << parsePosition << std::endl; std::cerr << "local ip position : " << parsePosition << std::endl;
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
parsePosition += CERT_LOCAL_IP.length(); parsePosition += CERT_LOCAL_IP.length();
subCert = certstr.substr(parsePosition); std::string subCert = certstr.substr(parsePosition);
parsePosition = subCert.find(":"); parsePosition = subCert.find(":");
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
std::string local_ip = subCert.substr(0, parsePosition); std::string local_ip = subCert.substr(0, parsePosition);
std::cerr << "Local Ip : " << local_ip << std::endl; std::cerr << "Local Ip : " << local_ip << std::endl;
pd.localAddr = local_ip; pd.localAddr = local_ip;
@ -937,22 +935,22 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
//let's parse local port //let's parse local port
subCert = subCert.substr(parsePosition + 1); subCert = subCert.substr(parsePosition + 1);
parsePosition = subCert.find(";"); parsePosition = subCert.find(";");
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
std::string local_port = subCert.substr(0, parsePosition); std::string local_port = subCert.substr(0, parsePosition);
std::cerr << "Local port : " << local_port << std::endl; std::cerr << "Local port : " << local_port << std::endl;
pd.localPort = (boost::lexical_cast<uint16_t>(local_port)); pd.localPort = (boost::lexical_cast<uint16_t>(local_port));
}
}
}
//let's parse ip ext address //let's parse ip ext address
parsePosition = certstr.find(CERT_EXT_IP); parsePosition = certstr.find(CERT_EXT_IP);
std::cerr << "Ext ip position : " << parsePosition << std::endl; std::cerr << "Ext ip position : " << parsePosition << std::endl;
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
parsePosition = parsePosition + CERT_EXT_IP.length(); parsePosition = parsePosition + CERT_EXT_IP.length();
subCert = certstr.substr(parsePosition); std::string subCert = certstr.substr(parsePosition);
parsePosition = subCert.find(":"); parsePosition = subCert.find(":");
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
std::string ext_ip = subCert.substr(0, parsePosition); std::string ext_ip = subCert.substr(0, parsePosition);
std::cerr << "Ext Ip : " << ext_ip << std::endl; std::cerr << "Ext Ip : " << ext_ip << std::endl;
pd.extAddr = ext_ip; pd.extAddr = ext_ip;
@ -960,17 +958,20 @@ bool p3Peers::loadDetailsFromStringCert(std::string certstr, RsPeerDetails &pd)
//let's parse ext port //let's parse ext port
subCert = subCert.substr(parsePosition + 1); subCert = subCert.substr(parsePosition + 1);
parsePosition = subCert.find(";"); parsePosition = subCert.find(";");
if (parsePosition == std::string::npos) if (parsePosition != std::string::npos) {
return true;
std::string ext_port = subCert.substr(0, parsePosition); std::string ext_port = subCert.substr(0, parsePosition);
std::cerr << "Ext port : " << ext_port << std::endl; std::cerr << "Ext port : " << ext_port << std::endl;
pd.extPort = (boost::lexical_cast<uint16_t>(ext_port)); pd.extPort = (boost::lexical_cast<uint16_t>(ext_port));
}
}
}
} catch (...) { } catch (...) {
std::cerr << "ConnectFriendWizard : Parse ip address error." << std::endl; std::cerr << "ConnectFriendWizard : Parse ip address error." << std::endl;
} }
return true;; return true;
} }

12
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -84,6 +84,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent)
setWizardStyle(ModernStyle); setWizardStyle(ModernStyle);
#endif #endif
// at this moment I don't know, what information should be in help // at this moment I don't know, what information should be in help
// setOption(HaveHelpButton, true); // setOption(HaveHelpButton, true);
// connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp())); // connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp()));
@ -204,6 +205,13 @@ TextPage::TextPage(QWidget *parent)
userCertEdit->setText(QString::fromStdString(invite)); userCertEdit->setText(QString::fromStdString(invite));
userCertEdit->setReadOnly(true); userCertEdit->setReadOnly(true);
userCertEdit->setMinimumHeight(200); userCertEdit->setMinimumHeight(200);
userCertEdit->setMinimumWidth(450);
QFont font;
font.setPointSize(10);
font.setBold(false);
font.setStyleHint(QFont::TypeWriter, QFont::PreferDefault);
//font.setWeight(75);
userCertEdit->setFont(font);
std::cerr << "TextPage() getting Invite: " << invite << std::endl; std::cerr << "TextPage() getting Invite: " << invite << std::endl;
@ -752,11 +760,11 @@ ConclusionPage::ConclusionPage(QWidget *parent) : QWizardPage(parent) {
peerGPGIdEdit = new QLineEdit(this); peerGPGIdEdit = new QLineEdit(this);
peerGPGIdEdit->setVisible(false); peerGPGIdEdit->setVisible(false);
registerField(SSL_ID_FIELD_CONNECT_FRIEND_WIZARD,peerGPGIdEdit); registerField(GPG_ID_FIELD_CONNECT_FRIEND_WIZARD,peerGPGIdEdit);
peerLocation = new QLineEdit(this); peerLocation = new QLineEdit(this);
peerLocation->setVisible(false); peerLocation->setVisible(false);
registerField(GPG_ID_FIELD_CONNECT_FRIEND_WIZARD,peerLocation); registerField(LOCATION_FIELD_CONNECT_FRIEND_WIZARD,peerLocation);
peerCertStringEdit = new QLineEdit(this); peerCertStringEdit = new QLineEdit(this);
peerCertStringEdit->setVisible(false); peerCertStringEdit->setVisible(false);

BIN
retroshare-gui/src/gui/images/connect/connectFriendBanner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 588 B