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

set proper default options in make friend dialog, and hide the frame showing own cert since it is not needed anymore

Browse source
This commit is contained in:
csoler 2017-02-28 22:20:52 +01:00
parent 4abf2c6bf1
commit 53186ee3ce
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -79,6 +79,9 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
mTitleFontSize = 0; // Standard mTitleFontSize = 0; // Standard
mTitleFontWeight = 0; // Standard mTitleFontWeight = 0; // Standard
// (csoler) I'm hiding this, since it is not needed anymore with the new Home page.
ui->userFrame->hide();
// this define comes from Qt example. I don't have mac, so it wasn't tested // this define comes from Qt example. I don't have mac, so it wasn't tested
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
setWizardStyle(ModernStyle); setWizardStyle(ModernStyle);
@ -415,7 +418,7 @@ void ConnectFriendWizard::initializePage(int id)
{ {
std::cerr << "Conclusion page id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl; std::cerr << "Conclusion page id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
ui->_direct_transfer_CB_2 ->setChecked(peerDetails.service_perm_flags & RS_NODE_PERM_DIRECT_DL) ; ui->_direct_transfer_CB_2 ->setChecked(false) ; //peerDetails.service_perm_flags & RS_NODE_PERM_DIRECT_DL) ;
ui->_allow_push_CB_2 ->setChecked(peerDetails.service_perm_flags & RS_NODE_PERM_ALLOW_PUSH) ; ui->_allow_push_CB_2 ->setChecked(peerDetails.service_perm_flags & RS_NODE_PERM_ALLOW_PUSH) ;
ui->_require_WL_CB_2 ->setChecked(peerDetails.service_perm_flags & RS_NODE_PERM_REQUIRE_WL) ; ui->_require_WL_CB_2 ->setChecked(peerDetails.service_perm_flags & RS_NODE_PERM_REQUIRE_WL) ;
@ -426,7 +429,7 @@ void ConnectFriendWizard::initializePage(int id)
{ {
QString ipstring0 = QString::fromStdString(sockaddr_storage_iptostring(addr)); QString ipstring0 = QString::fromStdString(sockaddr_storage_iptostring(addr));
ui->_addIPToWhiteList_CB_2->setChecked(true) ; ui->_addIPToWhiteList_CB_2->setChecked(ui->_require_WL_CB_2->isChecked());
ui->_addIPToWhiteList_ComboBox_2->addItem(ipstring0) ; ui->_addIPToWhiteList_ComboBox_2->addItem(ipstring0) ;
ui->_addIPToWhiteList_ComboBox_2->addItem(ipstring0+"/24") ; ui->_addIPToWhiteList_ComboBox_2->addItem(ipstring0+"/24") ;
ui->_addIPToWhiteList_ComboBox_2->addItem(ipstring0+"/16") ; ui->_addIPToWhiteList_ComboBox_2->addItem(ipstring0+"/16") ;

6
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>620</width> <width>1161</width>
<height>530</height> <height>804</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -1613,8 +1613,8 @@ resources.</string>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/>
<include location="../icons.qrc"/> <include location="../icons.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>