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

Partial fix for ticket #146:

Browse Source 
- set default of the signature checkbox in ConnectFriendWizard to disabled
- set the initial option for the download directory to network wide only
- set the default of a new shared directory to network wide


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-08-28 22:54:01 +00:00
parent 44806b7581
commit 35a059c44c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/ft/ftserver.cc
View File

@ -717,7 +717,7 @@ bool ftServer::shareDownloadDirectory(bool share)
/* Share */ /* Share */
SharedDirInfo inf ; SharedDirInfo inf ;
inf.filename = mFtController->getDownloadDirectory(); inf.filename = mFtController->getDownloadDirectory();
inf.shareflags = RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_BROWSABLE ; inf.shareflags = RS_FILE_HINTS_NETWORK_WIDE ;
return addSharedDirectory(inf); return addSharedDirectory(inf);
} }

4
retroshare-gui/src/gui/ShareDialog.cpp
View File

@ -40,7 +40,9 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent, Qt::WFlags flags
ui.okButton->setEnabled(false); ui.okButton->setEnabled(false);
if (filename.empty() == false) { if (filename.empty()) {
ui.networkwideCheckBox->setChecked(true);
} else {
/* edit exisiting share */ /* edit exisiting share */
std::list<SharedDirInfo> dirs; std::list<SharedDirInfo> dirs;
rsFiles->getSharedDirectories(dirs); rsFiles->getSharedDirectories(dirs);

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

@ -1051,7 +1051,7 @@ void ConclusionPage::initializePage() {
//set the radio button to sign the GPG key //set the radio button to sign the GPG key
if (detail.accept_connection && !detail.ownsign) { if (detail.accept_connection && !detail.ownsign) {
//gpg key connection is already accepted, don't propose to accept it again //gpg key connection is already accepted, don't propose to accept it again
signGPGCheckBox->setChecked(true); signGPGCheckBox->setChecked(false);
acceptNoSignGPGCheckBox->hide(); acceptNoSignGPGCheckBox->hide();
acceptNoSignGPGCheckBox->setChecked(false); acceptNoSignGPGCheckBox->setChecked(false);
} }
@ -1064,7 +1064,7 @@ void ConclusionPage::initializePage() {
if (!detail.accept_connection && !detail.ownsign) { if (!detail.accept_connection && !detail.ownsign) {
acceptNoSignGPGCheckBox->setChecked(true); acceptNoSignGPGCheckBox->setChecked(true);
signGPGCheckBox->show(); signGPGCheckBox->show();
signGPGCheckBox->setChecked(true); signGPGCheckBox->setChecked(false);
acceptNoSignGPGCheckBox->show(); acceptNoSignGPGCheckBox->show();
} }
if (detail.accept_connection && detail.ownsign) { if (detail.accept_connection && detail.ownsign) {