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

update start wizard, change gui settings directory into ssl profile directory (RestroShare.conf)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-27 22:31:25 +00:00
parent fb5bbf2e96
commit e142c63180
16 changed files with 1189 additions and 1588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,12 +144,15 @@ p3ConnectMgr::p3ConnectMgr()
ownState.name = AuthGPG::getAuthGPG()->getGPGOwnName(); ownState.name = AuthGPG::getAuthGPG()->getGPGOwnName();
ownState.location = AuthSSL::getAuthSSL()->getOwnLocation(); ownState.location = AuthSSL::getAuthSSL()->getOwnLocation();
ownState.netMode = RS_NET_MODE_UDP; ownState.netMode = RS_NET_MODE_UDP;
ownState.netMode |= RS_NET_MODE_TRY_UPNP;
//use_extr_addr_finder = true ; //use_extr_addr_finder = true ;
use_extr_addr_finder = false; use_extr_addr_finder = false;
allow_tunnel_connection = true; allow_tunnel_connection = true;
mExtAddrFinder = new ExtAddrFinder; mExtAddrFinder = new ExtAddrFinder;
netReset();
return; return;
} }
@ -2707,10 +2710,9 @@ bool p3ConnectMgr::setVisState(std::string id, uint32_t visState)
{ {
if (id == AuthSSL::getAuthSSL()->OwnId()) if (id == AuthSSL::getAuthSSL()->OwnId())
{ {
uint32_t netMode = ownState.netMode; ownState.visState = visState;
setOwnNetConfig(netMode, visState); IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
return true;
return true;
} }
RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/

1
libretroshare/src/rsiface/rsinit.h
View File

@ -80,6 +80,7 @@ class RsInit
/* Post Login Options */ /* Post Login Options */
static std::string RsConfigDirectory(); static std::string RsConfigDirectory();
static std::string RsProfileConfigDirectory();
static bool setStartMinimised() ; static bool setStartMinimised() ;

21
libretroshare/src/rsserver/rsinit.cc
View File

@ -950,16 +950,12 @@ bool RsInit::GenerateSSLCertificate(std::string gpg_id, std::string org, std
/* try to load it, and get Id */ /* try to load it, and get Id */
std::string location; std::string location;
bool ret = LoadCheckX509andGetLocation(cert_name.c_str(), location, sslId) ; if (LoadCheckX509andGetLocation(cert_name.c_str(), location, sslId) == 0) {
std::cerr << "RsInit::GenerateSSLCertificate() Cannot check own signature, maybe the files are corrupted." << std::endl;
std::cout << "LoadCheckX509andGetLocation: returned " << ret << ", sslId=" << sslId << std::endl ; return false;
}
if(!ret) /* Move directory to correct id */
{
std::cerr << "LoadCheckX509andGetLocation failed. Sorry." << std::endl ;
return false ;
}
/* Move directory to correct id */
std::string finalbase = RsInitConfig::basedir + RsInitConfig::dirSeperator + sslId + RsInitConfig::dirSeperator; std::string finalbase = RsInitConfig::basedir + RsInitConfig::dirSeperator + sslId + RsInitConfig::dirSeperator;
/* Rename Directory */ /* Rename Directory */
@ -1621,6 +1617,13 @@ std::string RsInit::RsConfigDirectory()
return RsInitConfig::basedir; return RsInitConfig::basedir;
} }
std::string RsInit::RsProfileConfigDirectory()
{
std::string dir = RsInitConfig::basedir + RsInitConfig::dirSeperator + RsInitConfig::preferedId;
std::cerr << "RsInit::RsProfileConfigDirectory() returning : " << dir << std::endl;
return dir;
}
bool RsInit::setStartMinimised() bool RsInit::setStartMinimised()
{ {
return RsInitConfig::startMinimised; return RsInitConfig::startMinimised;

2
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -216,7 +216,7 @@ void GenCertDialog::genPerson()
//RsInit::LoadGPGPassword(PGPpasswd); //RsInit::LoadGPGPassword(PGPpasswd);
std::string sslId; std::string sslId;
std::cerr << "Generating SSL cert with gpg id : " << PGPId << std::endl; std::cerr << "GenCertDialog::genPerson() Generating SSL cert with gpg id : " << PGPId << std::endl;
std::string err; std::string err;
bool okGen = RsInit::GenerateSSLCertificate(PGPId, "", genLoc, "", sslPasswd, sslId, err); bool okGen = RsInit::GenerateSSLCertificate(PGPId, "", genLoc, "", sslPasswd, sslId, err);

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

@ -113,9 +113,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Create RshareSettings object */ /* Create RshareSettings object */
_settings = new RshareSettings(); _settings = new RshareSettings();
if (!_settings->value(QString::fromUtf8("FirstRun"), false).toBool()) if (_settings->value(QString::fromUtf8("FirstRun"), true).toBool())
{ {
_settings->setValue(QString::fromUtf8("FirstRun"), false); _settings->setValue(QString::fromUtf8("FirstRun"), false);
QuickStartWizard *qstartWizard = new QuickStartWizard(this); QuickStartWizard *qstartWizard = new QuickStartWizard(this);
qstartWizard->exec(); qstartWizard->exec();
} }

190
retroshare-gui/src/gui/QuickStartWizard.cpp
View File

@ -43,19 +43,19 @@ QuickStartWizard::QuickStartWizard(QWidget *parent) :
/* Create RshareSettings object */ /* Create RshareSettings object */
_settings = new RshareSettings(); _settings = new RshareSettings();
loadNetwork(); loadNetwork();
loadShare(); loadShare();
loadGeneral(); loadGeneral();
ui.checkBoxF2FRouting->setChecked(true) ; // ui.checkBoxF2FRouting->setChecked(true) ;
ui.checkBoxF2FRouting->setEnabled(false) ; // ui.checkBoxF2FRouting->setEnabled(false) ;
connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) ); connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) );
connect( ui.checkBoxTunnelConnection, SIGNAL( toggled( bool ) ), this, SLOT( toggleTunnelConnection(bool) ) ); // connect( ui.checkBoxTunnelConnection, SIGNAL( toggled( bool ) ), this, SLOT( toggleTunnelConnection(bool) ) );
bool b = rsPeers->getAllowTunnelConnection() ; // bool b = rsPeers->getAllowTunnelConnection() ;
ui.checkBoxTunnelConnection->setChecked(b) ; // ui.checkBoxTunnelConnection->setChecked(b) ;
ui.shareddirList->horizontalHeader()->setResizeMode( 0,QHeaderView::Stretch); ui.shareddirList->horizontalHeader()->setResizeMode( 0,QHeaderView::Stretch);
ui.shareddirList->horizontalHeader()->setResizeMode( 2,QHeaderView::Interactive); ui.shareddirList->horizontalHeader()->setResizeMode( 2,QHeaderView::Interactive);
@ -88,93 +88,98 @@ void QuickStartWizard::changeEvent(QEvent *e)
void QuickStartWizard::on_pushButtonWelcomeNext_clicked() void QuickStartWizard::on_pushButtonWelcomeNext_clicked()
{ {
ui.pagesWizard->setCurrentIndex(1); ui.pagesWizard->setCurrentIndex(1);
} }
void QuickStartWizard::on_pushButtonWelcomeExit_clicked() void QuickStartWizard::on_pushButtonWelcomeExit_clicked()
{ {
close(); close();
} }
void QuickStartWizard::on_pushButtonConnectionBack_clicked() void QuickStartWizard::on_pushButtonConnectionBack_clicked()
{ {
ui.pagesWizard->setCurrentIndex(0); ui.pagesWizard->setCurrentIndex(0);
} }
void QuickStartWizard::on_pushButtonConnectionNext_clicked() void QuickStartWizard::on_pushButtonConnectionNext_clicked()
{ {
ui.pagesWizard->setCurrentIndex(2); /* Check if netMode has changed */
int netMode = 0;
switch(ui.netModeComboBox->currentIndex())
{
case 2:
netMode = RS_NETMODE_EXT;
break;
case 1:
netMode = RS_NETMODE_UDP;
break;
default:
case 0:
netMode = RS_NETMODE_UPNP;
break;
}
std::cerr << "ui.netModeComboBox->currentIndex()" << ui.netModeComboBox->currentIndex() << std::endl;
rsPeers->setNetworkMode(rsPeers->getOwnId(), netMode);
/* Check if vis has changed */
int visState = 0;
if (0 == ui.discoveryComboBox->currentIndex())
{
visState |= RS_VS_DISC_ON;
}
RsPeerDetails detail;
if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail))
{
return;
}
if (visState != detail.visState)
{
rsPeers->setVisState(rsPeers->getOwnId(), visState);
}
rsicontrol->ConfigSetDataRates( ui.doubleSpinBoxDownloadSpeed->value(), ui.doubleSpinBoxUploadSpeed->value() );
ui.pagesWizard->setCurrentIndex(2);
} }
void QuickStartWizard::on_pushButtonConnectionExit_clicked() void QuickStartWizard::on_pushButtonConnectionExit_clicked()
{ {
close(); on_pushButtonConnectionNext_clicked();
} close();
void QuickStartWizard::on_pushButtonNetworkBack_clicked()
{
ui.pagesWizard->setCurrentIndex(1);
}
void QuickStartWizard::on_pushButtonNetworkNext_clicked()
{
ui.pagesWizard->setCurrentIndex(3);
}
void QuickStartWizard::on_pushButtonNetworkExit_clicked()
{
close();
} }
void QuickStartWizard::on_pushButtonSharesBack_clicked() void QuickStartWizard::on_pushButtonSharesBack_clicked()
{ {
ui.pagesWizard->setCurrentIndex(2); ui.pagesWizard->setCurrentIndex(1);
} }
void QuickStartWizard::on_pushButtonSharesNext_clicked() void QuickStartWizard::on_pushButtonSharesNext_clicked()
{ {
ui.pagesWizard->setCurrentIndex(4); ui.pagesWizard->setCurrentIndex(3);
} }
void QuickStartWizard::on_pushButtonSharesExit_clicked() void QuickStartWizard::on_pushButtonSharesExit_clicked()
{ {
close(); close();
}
void QuickStartWizard::on_pushButtonNetworksBack_clicked()
{
ui.pagesWizard->setCurrentIndex(3);
}
void QuickStartWizard::on_pushButtonNetworksNext_clicked()
{
ui.pagesWizard->setCurrentIndex(5);
}
void QuickStartWizard::on_pushButtonNetworksExit_clicked()
{
close();
} }
void QuickStartWizard::on_pushButtonSystemBack_clicked() void QuickStartWizard::on_pushButtonSystemBack_clicked()
{ {
ui.pagesWizard->setCurrentIndex(4); ui.pagesWizard->setCurrentIndex(3);
} }
void QuickStartWizard::on_pushButtonSystemFinish_clicked() void QuickStartWizard::on_pushButtonSystemFinish_clicked()
{ {
_settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized()); _settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized());
_settings->setValue(QString::fromUtf8("doQuit"), quitbox()); _settings->setValue(QString::fromUtf8("doQuit"), quitbox());
_settings->setRunRetroshareOnBoot(ui.checkBoxRunRetroshareAtSystemStartup->isChecked()); _settings->setRunRetroshareOnBoot(ui.checkBoxRunRetroshareAtSystemStartup->isChecked());
_settings->setValue(QString::fromUtf8("FirstRun"), firstRunWizard());
saveChanges(); saveChanges();
close(); close();
} }
void QuickStartWizard::on_pushButtonSystemExit_clicked() void QuickStartWizard::on_pushButtonSystemExit_clicked()
@ -351,14 +356,13 @@ bool QuickStartWizard::messageBoxOk(QString msg)
void void
QuickStartWizard::loadGeneral() QuickStartWizard::loadGeneral()
{ {
ui.checkBoxRunRetroshareAtSystemStartup->setChecked( ui.checkBoxRunRetroshareAtSystemStartup->setChecked(_settings->runRetroshareOnBoot());
_settings->runRetroshareOnBoot());
ui.checkBoxStartMinimized->setChecked(_settings->value(QString::fromUtf8("StartMinimized"), false).toBool()); ui.checkBoxStartMinimized->setChecked(_settings->value(QString::fromUtf8("StartMinimized"), false).toBool());
ui.checkBoxQuit->setChecked(_settings->value(QString::fromUtf8("doQuit"), false).toBool()); ui.checkBoxQuit->setChecked(_settings->value(QString::fromUtf8("doQuit"), false).toBool());
ui.checkBoxQuickWizard->setChecked(_settings->value(QString::fromUtf8("FirstRun"), false).toBool()); //ui.checkBoxQuickWizard->setChecked(_settings->value(QString::fromUtf8("FirstRun"), false).toBool());
} }
bool QuickStartWizard::quitbox() const { bool QuickStartWizard::quitbox() const {
@ -371,10 +375,10 @@ bool QuickStartWizard::startMinimized() const {
return ui.checkBoxStartMinimized->isChecked(); return ui.checkBoxStartMinimized->isChecked();
} }
bool QuickStartWizard::firstRunWizard() const { //bool QuickStartWizard::firstRunWizard() const {
if(ui.checkBoxQuickWizard->isChecked()) return true; // if(ui.checkBoxQuickWizard->isChecked()) return true;
return ui.checkBoxQuickWizard->isChecked(); // return ui.checkBoxQuickWizard->isChecked();
} //}
/** Loads the settings for this page */ /** Loads the settings for this page */
void QuickStartWizard::loadNetwork() void QuickStartWizard::loadNetwork()
@ -413,14 +417,10 @@ void QuickStartWizard::loadNetwork()
rsiface->lockData(); /* Lock Interface */ rsiface->lockData(); /* Lock Interface */
ui.doubleSpinBoxUploadSpeed->setValue(rsiface->getConfig().maxDownloadDataRate); ui.doubleSpinBoxDownloadSpeed->setValue(rsiface->getConfig().maxDownloadDataRate);
ui.doubleSpinBoxUploadSpeed->setValue(rsiface->getConfig().maxUploadDataRate); ui.doubleSpinBoxUploadSpeed->setValue(rsiface->getConfig().maxUploadDataRate);
rsiface->unlockData(); /* UnLock Interface */ rsiface->unlockData(); /* UnLock Interface */
toggleUPnP();
} }
void QuickStartWizard::saveChanges() void QuickStartWizard::saveChanges()
@ -438,11 +438,12 @@ void QuickStartWizard::saveChanges()
return; return;
} }
int netIndex = ui.netModeComboBox->currentIndex();
/* Check if netMode has changed */ /* Check if netMode has changed */
int netMode = 0; int netMode = 0;
switch(netIndex) int netIndex = ui.netModeComboBox->currentIndex();
std::cerr << "ui.netModeComboBox->currentIndex()" << ui.netModeComboBox->currentIndex() << std::endl;
switch(netIndex)
{ {
case 2: case 2:
netMode = RS_NETMODE_EXT; netMode = RS_NETMODE_EXT;
@ -452,26 +453,22 @@ void QuickStartWizard::saveChanges()
break; break;
default: default:
case 0: case 0:
netMode = RS_NETMODE_UPNP; netMode = RS_NETMODE_UPNP;
break; break;
} }
rsPeers->setNetworkMode(ownId, netMode);
if (detail.tryNetMode != netMode) int visState = 0;
{ /* Check if vis has changed */
rsPeers->setNetworkMode(ownId, netMode); if (0 == ui.discoveryComboBox->currentIndex())
} {
visState |= RS_VS_DISC_ON;
}
int visState = 0; if (visState != detail.visState)
/* Check if vis has changed */ {
if (0 == ui.discoveryComboBox->currentIndex()) rsPeers->setVisState(ownId, visState);
{ }
visState |= RS_VS_DISC_ON;
}
if (visState != detail.visState)
{
rsPeers->setVisState(ownId, visState);
}
/*if (0 != netIndex) /*if (0 != netIndex)
{ {
@ -488,33 +485,8 @@ void QuickStartWizard::saveChanges()
loadNetwork(); loadNetwork();
} }
void QuickStartWizard::toggleUPnP() //void QuickStartWizard::toggleTunnelConnection(bool b)
{ //{
/* switch on the radioButton */ // std::cerr << "QuickStartWizard::toggleTunnelConnection() set tunnel to : " << b << std::endl;
bool settingChangeable = false; // rsPeers->allowTunnelConnection(b) ;
if (0 != ui.netModeComboBox->currentIndex()) //}
{
settingChangeable = true;
}
/*if (settingChangeable)
{
ui.localAddress->setEnabled(false);
ui.localPort -> setEnabled(true);
ui.extAddress -> setEnabled(false);
ui.extPort -> setEnabled(true);
}
else
{
ui.localAddress->setEnabled(false);
ui.localPort -> setEnabled(false);
ui.extAddress -> setEnabled(false);
ui.extPort -> setEnabled(false);
}*/
}
void QuickStartWizard::toggleTunnelConnection(bool b)
{
std::cerr << "QuickStartWizard::toggleTunnelConnection() set tunnel to : " << b << std::endl;
rsPeers->allowTunnelConnection(b) ;
}

39
retroshare-gui/src/gui/QuickStartWizard.h
View File

@ -23,6 +23,7 @@
#define _QUICKSTARTWIZARD_H #define _QUICKSTARTWIZARD_H
#include <QtGui/QDialog> #include <QtGui/QDialog>
#include <QtGui/QWizard>
#include "settings/rsharesettings.h" #include "settings/rsharesettings.h"
#include "ui_QuickStartWizard.h" #include "ui_QuickStartWizard.h"
@ -43,8 +44,6 @@ public:
bool startMinimized() const; bool startMinimized() const;
bool quitbox() const; bool quitbox() const;
bool firstRunWizard() const;
protected: protected:
@ -60,30 +59,24 @@ private:
RshareSettings *_settings; RshareSettings *_settings;
private Q_SLOTS: private Q_SLOTS:
void on_pushButtonSharesRemove_clicked(); void on_pushButtonSharesRemove_clicked();
void on_pushButtonSharesAdd_clicked(); void on_pushButtonSharesAdd_clicked();
void on_pushButtonSystemExit_clicked(); void on_pushButtonSystemExit_clicked();
void on_pushButtonSystemFinish_clicked(); void on_pushButtonSystemFinish_clicked();
void on_pushButtonSystemBack_clicked(); void on_pushButtonSystemBack_clicked();
void on_pushButtonNetworksExit_clicked(); void on_pushButtonSharesExit_clicked();
void on_pushButtonNetworksNext_clicked(); void on_pushButtonSharesNext_clicked();
void on_pushButtonNetworksBack_clicked(); void on_pushButtonSharesBack_clicked();
void on_pushButtonNetworkExit_clicked(); void on_pushButtonWelcomeExit_clicked();
void on_pushButtonNetworkNext_clicked(); void on_pushButtonWelcomeNext_clicked();
void on_pushButtonNetworkBack_clicked(); void on_pushButtonConnectionExit_clicked();
void on_pushButtonSharesExit_clicked(); void on_pushButtonConnectionNext_clicked();
void on_pushButtonSharesNext_clicked(); void on_pushButtonConnectionBack_clicked();
void on_pushButtonSharesBack_clicked();
void on_pushButtonWelcomeExit_clicked();
void on_pushButtonWelcomeNext_clicked();
void on_pushButtonConnectionExit_clicked();
void on_pushButtonConnectionNext_clicked();
void on_pushButtonConnectionBack_clicked();
void updateFlags(bool); void updateFlags(bool);
void saveChanges(); void saveChanges();
void toggleUPnP(); //void toggleUPnP();
void toggleTunnelConnection(bool) ; //void toggleTunnelConnection(bool) ;

2334
retroshare-gui/src/gui/QuickStartWizard.ui
View File

File diff suppressed because it is too large Load Diff

12
retroshare-gui/src/gui/settings/GeneralPage.cpp
View File

@ -60,7 +60,7 @@ GeneralPage::save(QString &errmsg)
_settings->setValue(QString::fromUtf8("ClosetoTray"), closetoTray()); _settings->setValue(QString::fromUtf8("ClosetoTray"), closetoTray());
_settings->setValue(QString::fromUtf8("FirstRun"), firstRun()); //_settings->setValue(QString::fromUtf8("FirstRun"), firstRun());
_settings->setRunRetroshareOnBoot( _settings->setRunRetroshareOnBoot(
ui.chkRunRetroshareAtSystemStartup->isChecked()); ui.chkRunRetroshareAtSystemStartup->isChecked());
@ -81,7 +81,7 @@ GeneralPage::load()
ui.checkClosetoTray->setChecked(_settings->value(QString::fromUtf8("ClosetoTray"), false).toBool()); ui.checkClosetoTray->setChecked(_settings->value(QString::fromUtf8("ClosetoTray"), false).toBool());
ui.checkBoxWizard->setChecked(_settings->value(QString::fromUtf8("FirstRun"), false).toBool()); //ui.checkBoxWizard->setChecked(_settings->value(QString::fromUtf8("FirstRun"), false).toBool());
} }
@ -101,10 +101,10 @@ bool GeneralPage::closetoTray() const {
return ui.checkClosetoTray->isChecked(); return ui.checkClosetoTray->isChecked();
} }
bool GeneralPage::firstRun() const { //bool GeneralPage::firstRun() const {
if(ui.checkBoxWizard->isChecked()) return true; // if(ui.checkBoxWizard->isChecked()) return true;
return ui.checkBoxWizard->isChecked(); // return ui.checkBoxWizard->isChecked();
} //}
/** Called when the "show on startup" checkbox is toggled. */ /** Called when the "show on startup" checkbox is toggled. */
void void

2
retroshare-gui/src/gui/settings/GeneralPage.h
View File

@ -50,7 +50,7 @@ public:
bool startMinimized() const; bool startMinimized() const;
bool closetoTray() const; bool closetoTray() const;
bool quit() const; bool quit() const;
bool firstRun() const; //bool firstRun() const;
private slots: private slots:

15
retroshare-gui/src/gui/settings/GeneralPage.ui
View File

@ -538,14 +538,14 @@
<string>Misc</string> <string>Misc</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="1" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="checkQuit"> <widget class="QCheckBox" name="checkQuit">
<property name="text"> <property name="text">
<string>Do not show the Quit RetroShare MessageBox</string> <string>Do not show the Quit RetroShare MessageBox</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="checkClosetoTray"> <widget class="QCheckBox" name="checkClosetoTray">
<property name="text"> <property name="text">
<string>Do not Minimize to Tray Icon</string> <string>Do not Minimize to Tray Icon</string>
@ -555,13 +555,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxWizard">
<property name="text">
<string>Do not run Quick Start Wizard on RetroShare start</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -580,8 +573,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

95
retroshare-gui/src/gui/settings/ServerPage.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>483</width> <width>573</width>
<height>394</height> <height>394</height>
</rect> </rect>
</property> </property>
@ -504,41 +504,11 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title"> <property name="title">
<string>Network Configuration (restart not needed)</string> <string>Network Configuration</string>
</property> </property>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QComboBox" name="comboBoxdarknetwot">
<item>
<property name="text">
<string>Darknet</string>
</property>
</item>
<item>
<property name="text">
<string>Web of Trust</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QComboBox" name="netModeComboBox"> <widget class="QComboBox" name="netModeComboBox">
<item> <item>
@ -823,6 +793,67 @@ behind a firewall or a VPN.</string>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>F2F routing</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="_enableTurtleCB">
<property name="text">
<string>enable anonymous F2F routing</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="_showTurtleDialogPB">
<property name="text">
<string>Show router statistics</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QTextEdit" name="textEdit">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt; is capable of transfering data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:8pt;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt;If want to you use &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt; font-weight:600;&quot;&gt;RetroShare&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt; to anonymously share and download files, leaving this checked drastically increases your download scope, and participate into the overall network bandwidth. &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:8pt;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:8pt;&quot;&gt;You can separately setup share flags for each shared directory:&lt;/span&gt;&lt;/p&gt;
&lt;ul style=&quot;-qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Sans'; font-size:8pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Browsable by friends&lt;/span&gt;: files are browsable from your direct friends.&lt;/li&gt;
&lt;li style=&quot; font-family:'Sans'; font-size:8pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Anonymously shared&lt;/span&gt;: files can be downloaded by anybody through anonymous tunnels.&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>

20
retroshare-gui/src/gui/settings/rsettings.cpp
View File

@ -1,7 +1,7 @@
/**************************************************************** /****************************************************************
* This file is distributed under the following license: * This file is distributed under the following license:
* *
* Copyright (c) 2008, crypton * Copyright (c) 2008, crypton
* Copyright (c) 2008, Matt Edman, Justin Hipple * Copyright (c) 2008, Matt Edman, Justin Hipple
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -23,13 +23,21 @@
#include <rshare.h> #include <rshare.h>
#include "rsettings.h" #include "rsettings.h"
#include "rsiface/rsinit.h"
/** The file in which all settings will read and written. */ /** The file in which all settings will read and written. */
#define SETTINGS_FILE (Rshare::dataDirectory() + "/RetroShare.conf") #define SETTINGS_FILE (RsInit::RsProfileConfigDirectory() + "/RetroShare.conf")
/** Constructor */ /** Constructor */
RSettings::RSettings(const QString settingsGroup) RSettings::RSettings(const QString settingsGroup)
: QSettings(SETTINGS_FILE, QSettings::IniFormat) : QSettings(QString::fromStdString(SETTINGS_FILE), QSettings::IniFormat)
{
if (!settingsGroup.isEmpty())
beginGroup(settingsGroup);
}
RSettings::RSettings(std::string fileName, const QString settingsGroup)
: QSettings(QString::fromStdString(fileName), QSettings::IniFormat)
{ {
if (!settingsGroup.isEmpty()) if (!settingsGroup.isEmpty())
beginGroup(settingsGroup); beginGroup(settingsGroup);
@ -78,7 +86,7 @@ void
RSettings::reset() RSettings::reset()
{ {
/* Static method, so we have to create a QSettings object. */ /* Static method, so we have to create a QSettings object. */
QSettings settings(SETTINGS_FILE, QSettings::IniFormat); QSettings settings(QString::fromStdString(SETTINGS_FILE), QSettings::IniFormat);
settings.clear(); settings.clear();
} }

11
retroshare-gui/src/gui/settings/rsettings.h
View File

@ -1,7 +1,7 @@
/**************************************************************** /****************************************************************
* This file is distributed under the following license: * This file is distributed under the following license:
* *
* Copyright (c) 2008, crypton * Copyright (c) 2008, crypton
* Copyright (c) 2008, Matt Edman, Justin Hipple * Copyright (c) 2008, Matt Edman, Justin Hipple
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -37,6 +37,11 @@ public:
* value() and setValue(). */ * value() and setValue(). */
RSettings(const QString group = QString()); RSettings(const QString group = QString());
/** Default constructor. The optional parameter <b>group</b> can be used to
* set a prefix that will be prepended to keys specified to VSettings in
* value() and setValue(). */
RSettings(std::string fileName, const QString group = QString());
/** Resets all of Vidalia's settings. */ /** Resets all of Vidalia's settings. */
static void reset(); static void reset();

16
retroshare-gui/src/gui/settings/rsharesettings.cpp
View File

@ -1,7 +1,7 @@
/**************************************************************** /****************************************************************
* This file is distributed under the following license: * This file is distributed under the following license:
* *
* Copyright (c) 2006-2007, crypton * Copyright (c) 2006-2007, crypton
* Copyright (c) 2006, Matt Edman, Justin Hipple * Copyright (c) 2006, Matt Edman, Justin Hipple
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -69,10 +69,16 @@
#define DEFAULT_BWGRAPH_FILTER (BWGRAPH_SEND|BWGRAPH_REC) #define DEFAULT_BWGRAPH_FILTER (BWGRAPH_SEND|BWGRAPH_REC)
#define DEFAULT_BWGRAPH_ALWAYS_ON_TOP false #define DEFAULT_BWGRAPH_ALWAYS_ON_TOP false
RshareSettings::RshareSettings(std::string filename) : RSettings(filename) {
initSettings();
}
/** Default Constructor */ /** Default Constructor */
RshareSettings::RshareSettings() RshareSettings::RshareSettings() {
initSettings();
}
void RshareSettings::initSettings()
{ {
#if defined(Q_WS_MAC) #if defined(Q_WS_MAC)
setDefault(SETTING_STYLE, "macintosh (aqua)"); setDefault(SETTING_STYLE, "macintosh (aqua)");

5
retroshare-gui/src/gui/settings/rsharesettings.h
View File

@ -52,6 +52,11 @@ public:
/** Default constructor. */ /** Default constructor. */
RshareSettings(); RshareSettings();
/** Default constructor. */
RshareSettings(std::string filename);
void initSettings();
/** Gets the currently preferred language code for RShare. */ /** Gets the currently preferred language code for RShare. */
QString getLanguageCode(); QString getLanguageCode();
/** Saves the preferred language code. */ /** Saves the preferred language code. */