Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

add RS version on peer details panel

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
alexandrut 2009-07-17 21:41:20 +00:00
parent 48df36f6d0
commit d9e99a8774
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/util/rsversion.h
View File

@ -5,8 +5,8 @@
* Author: alexandrut * Author: alexandrut
*/ */
#ifndef RSVERSIONXX_H_ #ifndef RSVERSION_H_
#define RSVERSIONXX_H_ #define RSVERSION_H_
#include <string> #include <string>

32
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -15,13 +15,14 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "ConfCertDialog.h" #include "ConfCertDialog.h"
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsdisc.h"
#include <QTime> #include <QTime>
@ -47,7 +48,7 @@ ConfCertDialog::ConfCertDialog(QWidget *parent, Qt::WFlags flags)
connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg())); connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closeinfodlg()));
connect(ui._makeFriendPB, SIGNAL(clicked()), this, SLOT(makeFriend())); connect(ui._makeFriendPB, SIGNAL(clicked()), this, SLOT(makeFriend()));
ui.applyButton->setToolTip(tr("Apply and Close")); ui.applyButton->setToolTip(tr("Apply and Close"));
} }
@ -60,7 +61,7 @@ void ConfCertDialog::show(const std::string& peer_id)
} }
/** /**
Overloads the default show() slot so we can set opacity*/ Overloads the default show() slot so we can set opacity*/
void void
@ -99,7 +100,7 @@ void ConfCertDialog::loadDialog()
/* fail */ /* fail */
return; return;
} }
ui.name->setText(QString::fromStdString(detail.name)); ui.name->setText(QString::fromStdString(detail.name));
ui.orgloc->setText(QString::fromStdString(detail.org)); ui.orgloc->setText(QString::fromStdString(detail.org));
ui.country->setText(QString::fromStdString(detail.location)); ui.country->setText(QString::fromStdString(detail.location));
@ -108,7 +109,16 @@ void ConfCertDialog::loadDialog()
QDateTime date = QDateTime::fromTime_t(detail.lastConnect); QDateTime date = QDateTime::fromTime_t(detail.lastConnect);
QString stime = date.toString(Qt::LocalDate); QString stime = date.toString(Qt::LocalDate);
ui.lastcontact-> setText(stime); ui.lastcontact-> setText(stime);
/* set retroshare version */
std::map<std::string, std::string>::iterator vit;
std::map<std::string, std::string> versions;
bool retv = rsDisc->getDiscVersions(versions);
if (retv && versions.end() != (vit = versions.find(detail.id)))
{
ui.version->setText(QString("v") + QString::fromStdString(vit->second));
}
/* set local address */ /* set local address */
ui.localAddress->setText(QString::fromStdString(detail.localAddr)); ui.localAddress->setText(QString::fromStdString(detail.localAddr));
ui.localPort -> setValue(detail.localPort); ui.localPort -> setValue(detail.localPort);
@ -124,7 +134,7 @@ void ConfCertDialog::loadDialog()
//ui.chkForwarded ->setChecked(ni->forwardPort); //ui.chkForwarded ->setChecked(ni->forwardPort);
//ui.chkFirewall ->setChecked(0); //ui.chkFirewall ->setChecked(0);
//ui.chkForwarded ->setChecked(0); //ui.chkForwarded ->setChecked(0);
//ui.indivRate->setValue(0); //ui.indivRate->setValue(0);
//ui.trustLvl->setText(QString::fromStdString(RsPeerTrustString(detail.trustLvl))); //ui.trustLvl->setText(QString::fromStdString(RsPeerTrustString(detail.trustLvl)));
@ -153,7 +163,7 @@ void ConfCertDialog::applyDialog()
/* fail */ /* fail */
return; return;
} }
/* check if the data is the same */ /* check if the data is the same */
bool localChanged = false; bool localChanged = false;
bool extChanged = false; bool extChanged = false;
@ -170,7 +180,7 @@ void ConfCertDialog::applyDialog()
if (detail.ownsign) if (detail.ownsign)
{ {
if (ui._peerAcceptedCB->isChecked() != ((detail.state & RS_PEER_STATE_FRIEND) > 0)) if (ui._peerAcceptedCB->isChecked() != ((detail.state & RS_PEER_STATE_FRIEND) > 0))
trustChanged = true; trustChanged = true;
} }
else if (ui.signBox->isChecked()) else if (ui.signBox->isChecked())
@ -206,7 +216,7 @@ void ConfCertDialog::applyDialog()
/* reload now */ /* reload now */
loadDialog(); loadDialog();
/* close the Dialog after the Changes applied */ /* close the Dialog after the Changes applied */
closeinfodlg(); closeinfodlg();
@ -224,7 +234,7 @@ void ConfCertDialog::makeFriend()
} }
#if 0 #if 0
void ConfCertDialog::setInfo(std::string name, void ConfCertDialog::setInfo(std::string name,
std::string trust, std::string trust,
std::string org, std::string org,
std::string loc, std::string loc,
@ -240,4 +250,4 @@ void ConfCertDialog::setInfo(std::string name,
} }
#endif #endif

14
retroshare-gui/src/gui/connect/ConfCertDialog.ui
View File

@ -597,6 +597,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1">
<widget class="QLineEdit" name="version">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Version</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>