From e142c63180d5310a9c0579369264042110d7bf9d Mon Sep 17 00:00:00 2001 From: joss17 Date: Wed, 27 Jan 2010 22:31:25 +0000 Subject: [PATCH] update start wizard, change gui settings directory into ssl profile directory (RestroShare.conf) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2141 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/p3connmgr.cc | 10 +- libretroshare/src/rsiface/rsinit.h | 1 + libretroshare/src/rsserver/rsinit.cc | 21 +- retroshare-gui/src/gui/GenCertDialog.cpp | 2 +- retroshare-gui/src/gui/MainWindow.cpp | 4 +- retroshare-gui/src/gui/QuickStartWizard.cpp | 190 +- retroshare-gui/src/gui/QuickStartWizard.h | 39 +- retroshare-gui/src/gui/QuickStartWizard.ui | 2334 +++++++---------- .../src/gui/settings/GeneralPage.cpp | 12 +- retroshare-gui/src/gui/settings/GeneralPage.h | 2 +- .../src/gui/settings/GeneralPage.ui | 15 +- retroshare-gui/src/gui/settings/ServerPage.ui | 95 +- retroshare-gui/src/gui/settings/rsettings.cpp | 20 +- retroshare-gui/src/gui/settings/rsettings.h | 11 +- .../src/gui/settings/rsharesettings.cpp | 16 +- .../src/gui/settings/rsharesettings.h | 5 + 16 files changed, 1189 insertions(+), 1588 deletions(-) diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc index b45f91d63..5fafaac15 100644 --- a/libretroshare/src/pqi/p3connmgr.cc +++ b/libretroshare/src/pqi/p3connmgr.cc @@ -144,12 +144,15 @@ p3ConnectMgr::p3ConnectMgr() ownState.name = AuthGPG::getAuthGPG()->getGPGOwnName(); ownState.location = AuthSSL::getAuthSSL()->getOwnLocation(); ownState.netMode = RS_NET_MODE_UDP; + ownState.netMode |= RS_NET_MODE_TRY_UPNP; //use_extr_addr_finder = true ; use_extr_addr_finder = false; allow_tunnel_connection = true; mExtAddrFinder = new ExtAddrFinder; + netReset(); + return; } @@ -2707,10 +2710,9 @@ bool p3ConnectMgr::setVisState(std::string id, uint32_t visState) { if (id == AuthSSL::getAuthSSL()->OwnId()) { - uint32_t netMode = ownState.netMode; - setOwnNetConfig(netMode, visState); - - return true; + ownState.visState = visState; + IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ + return true; } RsStackMutex stack(connMtx); /****** STACK LOCK MUTEX *******/ diff --git a/libretroshare/src/rsiface/rsinit.h b/libretroshare/src/rsiface/rsinit.h index 20d96a08c..99344f2f3 100644 --- a/libretroshare/src/rsiface/rsinit.h +++ b/libretroshare/src/rsiface/rsinit.h @@ -80,6 +80,7 @@ class RsInit /* Post Login Options */ static std::string RsConfigDirectory(); + static std::string RsProfileConfigDirectory(); static bool setStartMinimised() ; diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index 710386a6f..23f11d361 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -950,16 +950,12 @@ bool RsInit::GenerateSSLCertificate(std::string gpg_id, std::string org, std /* try to load it, and get Id */ std::string location; - bool ret = LoadCheckX509andGetLocation(cert_name.c_str(), location, sslId) ; - - std::cout << "LoadCheckX509andGetLocation: returned " << ret << ", sslId=" << sslId << std::endl ; + if (LoadCheckX509andGetLocation(cert_name.c_str(), location, sslId) == 0) { + std::cerr << "RsInit::GenerateSSLCertificate() Cannot check own signature, maybe the files are corrupted." << std::endl; + return false; + } - if(!ret) - { - std::cerr << "LoadCheckX509andGetLocation failed. Sorry." << std::endl ; - return false ; - } - /* Move directory to correct id */ + /* Move directory to correct id */ std::string finalbase = RsInitConfig::basedir + RsInitConfig::dirSeperator + sslId + RsInitConfig::dirSeperator; /* Rename Directory */ @@ -1621,6 +1617,13 @@ std::string RsInit::RsConfigDirectory() 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() { return RsInitConfig::startMinimised; diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index 408b93831..ce1bb82f7 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -216,7 +216,7 @@ void GenCertDialog::genPerson() //RsInit::LoadGPGPassword(PGPpasswd); 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; bool okGen = RsInit::GenerateSSLCertificate(PGPId, "", genLoc, "", sslPasswd, sslId, err); diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index cda686d9f..06a76c4ff 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -113,9 +113,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) /* Create RshareSettings object */ _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); qstartWizard->exec(); } diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp index 4234cd727..ad3a62440 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.cpp +++ b/retroshare-gui/src/gui/QuickStartWizard.cpp @@ -43,19 +43,19 @@ QuickStartWizard::QuickStartWizard(QWidget *parent) : /* Create RshareSettings object */ _settings = new RshareSettings(); - loadNetwork(); + loadNetwork(); loadShare(); loadGeneral(); - ui.checkBoxF2FRouting->setChecked(true) ; - ui.checkBoxF2FRouting->setEnabled(false) ; +// ui.checkBoxF2FRouting->setChecked(true) ; +// ui.checkBoxF2FRouting->setEnabled(false) ; 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() ; - ui.checkBoxTunnelConnection->setChecked(b) ; +// bool b = rsPeers->getAllowTunnelConnection() ; +// ui.checkBoxTunnelConnection->setChecked(b) ; ui.shareddirList->horizontalHeader()->setResizeMode( 0,QHeaderView::Stretch); ui.shareddirList->horizontalHeader()->setResizeMode( 2,QHeaderView::Interactive); @@ -88,93 +88,98 @@ void QuickStartWizard::changeEvent(QEvent *e) void QuickStartWizard::on_pushButtonWelcomeNext_clicked() { - ui.pagesWizard->setCurrentIndex(1); + ui.pagesWizard->setCurrentIndex(1); } void QuickStartWizard::on_pushButtonWelcomeExit_clicked() { - close(); + close(); } void QuickStartWizard::on_pushButtonConnectionBack_clicked() { - ui.pagesWizard->setCurrentIndex(0); + ui.pagesWizard->setCurrentIndex(0); } 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() { - 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(); + on_pushButtonConnectionNext_clicked(); + close(); } void QuickStartWizard::on_pushButtonSharesBack_clicked() { - ui.pagesWizard->setCurrentIndex(2); + ui.pagesWizard->setCurrentIndex(1); } void QuickStartWizard::on_pushButtonSharesNext_clicked() { - ui.pagesWizard->setCurrentIndex(4); + ui.pagesWizard->setCurrentIndex(3); } void QuickStartWizard::on_pushButtonSharesExit_clicked() { - 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(); + close(); } void QuickStartWizard::on_pushButtonSystemBack_clicked() { - ui.pagesWizard->setCurrentIndex(4); + ui.pagesWizard->setCurrentIndex(3); } void QuickStartWizard::on_pushButtonSystemFinish_clicked() { - _settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized()); + _settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized()); _settings->setValue(QString::fromUtf8("doQuit"), quitbox()); _settings->setRunRetroshareOnBoot(ui.checkBoxRunRetroshareAtSystemStartup->isChecked()); - _settings->setValue(QString::fromUtf8("FirstRun"), firstRunWizard()); - saveChanges(); - close(); + close(); } void QuickStartWizard::on_pushButtonSystemExit_clicked() @@ -351,14 +356,13 @@ bool QuickStartWizard::messageBoxOk(QString msg) void QuickStartWizard::loadGeneral() { - ui.checkBoxRunRetroshareAtSystemStartup->setChecked( - _settings->runRetroshareOnBoot()); + ui.checkBoxRunRetroshareAtSystemStartup->setChecked(_settings->runRetroshareOnBoot()); ui.checkBoxStartMinimized->setChecked(_settings->value(QString::fromUtf8("StartMinimized"), 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 { @@ -371,10 +375,10 @@ bool QuickStartWizard::startMinimized() const { return ui.checkBoxStartMinimized->isChecked(); } -bool QuickStartWizard::firstRunWizard() const { - if(ui.checkBoxQuickWizard->isChecked()) return true; - return ui.checkBoxQuickWizard->isChecked(); -} +//bool QuickStartWizard::firstRunWizard() const { +// if(ui.checkBoxQuickWizard->isChecked()) return true; +// return ui.checkBoxQuickWizard->isChecked(); +//} /** Loads the settings for this page */ void QuickStartWizard::loadNetwork() @@ -413,14 +417,10 @@ void QuickStartWizard::loadNetwork() rsiface->lockData(); /* Lock Interface */ - ui.doubleSpinBoxUploadSpeed->setValue(rsiface->getConfig().maxDownloadDataRate); + ui.doubleSpinBoxDownloadSpeed->setValue(rsiface->getConfig().maxDownloadDataRate); ui.doubleSpinBoxUploadSpeed->setValue(rsiface->getConfig().maxUploadDataRate); rsiface->unlockData(); /* UnLock Interface */ - - - toggleUPnP(); - } void QuickStartWizard::saveChanges() @@ -438,11 +438,12 @@ void QuickStartWizard::saveChanges() return; } - int netIndex = ui.netModeComboBox->currentIndex(); /* Check if netMode has changed */ int netMode = 0; - switch(netIndex) + int netIndex = ui.netModeComboBox->currentIndex(); + std::cerr << "ui.netModeComboBox->currentIndex()" << ui.netModeComboBox->currentIndex() << std::endl; + switch(netIndex) { case 2: netMode = RS_NETMODE_EXT; @@ -452,26 +453,22 @@ void QuickStartWizard::saveChanges() break; default: case 0: - netMode = RS_NETMODE_UPNP; + netMode = RS_NETMODE_UPNP; break; } + rsPeers->setNetworkMode(ownId, netMode); - if (detail.tryNetMode != netMode) - { - rsPeers->setNetworkMode(ownId, netMode); - } + int visState = 0; + /* Check if vis has changed */ + if (0 == ui.discoveryComboBox->currentIndex()) + { + visState |= RS_VS_DISC_ON; + } - int visState = 0; - /* Check if vis has changed */ - if (0 == ui.discoveryComboBox->currentIndex()) - { - visState |= RS_VS_DISC_ON; - } - - if (visState != detail.visState) - { - rsPeers->setVisState(ownId, visState); - } + if (visState != detail.visState) + { + rsPeers->setVisState(ownId, visState); + } /*if (0 != netIndex) { @@ -488,33 +485,8 @@ void QuickStartWizard::saveChanges() loadNetwork(); } -void QuickStartWizard::toggleUPnP() -{ - /* switch on the radioButton */ - bool settingChangeable = false; - 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) ; -} +//void QuickStartWizard::toggleTunnelConnection(bool b) +//{ +// std::cerr << "QuickStartWizard::toggleTunnelConnection() set tunnel to : " << b << std::endl; +// rsPeers->allowTunnelConnection(b) ; +//} diff --git a/retroshare-gui/src/gui/QuickStartWizard.h b/retroshare-gui/src/gui/QuickStartWizard.h index 88996d7f7..d31b31a8f 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.h +++ b/retroshare-gui/src/gui/QuickStartWizard.h @@ -23,6 +23,7 @@ #define _QUICKSTARTWIZARD_H #include +#include #include "settings/rsharesettings.h" #include "ui_QuickStartWizard.h" @@ -43,8 +44,6 @@ public: bool startMinimized() const; bool quitbox() const; - bool firstRunWizard() const; - protected: @@ -60,30 +59,24 @@ private: RshareSettings *_settings; private Q_SLOTS: - void on_pushButtonSharesRemove_clicked(); - void on_pushButtonSharesAdd_clicked(); - void on_pushButtonSystemExit_clicked(); - void on_pushButtonSystemFinish_clicked(); - void on_pushButtonSystemBack_clicked(); - void on_pushButtonNetworksExit_clicked(); - void on_pushButtonNetworksNext_clicked(); - void on_pushButtonNetworksBack_clicked(); - void on_pushButtonNetworkExit_clicked(); - void on_pushButtonNetworkNext_clicked(); - void on_pushButtonNetworkBack_clicked(); - void on_pushButtonSharesExit_clicked(); - void on_pushButtonSharesNext_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 on_pushButtonSharesRemove_clicked(); + void on_pushButtonSharesAdd_clicked(); + void on_pushButtonSystemExit_clicked(); + void on_pushButtonSystemFinish_clicked(); + void on_pushButtonSystemBack_clicked(); + void on_pushButtonSharesExit_clicked(); + void on_pushButtonSharesNext_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 saveChanges(); - void toggleUPnP(); - void toggleTunnelConnection(bool) ; + //void toggleUPnP(); + //void toggleTunnelConnection(bool) ; diff --git a/retroshare-gui/src/gui/QuickStartWizard.ui b/retroshare-gui/src/gui/QuickStartWizard.ui index a334319bd..5f180eff3 100644 --- a/retroshare-gui/src/gui/QuickStartWizard.ui +++ b/retroshare-gui/src/gui/QuickStartWizard.ui @@ -1,1375 +1,959 @@ - - - QuickStartWizard - - - Qt::ApplicationModal - - - - 0 - 0 - 445 - 357 - - - - - 445 - 357 - - - - - 445 - 357 - - - - Quick Start Wizard - - - - :/images/rstray3.png:/images/rstray3.png - - - QComboBox QAbstractItemView { -background-color:white; -} - -QComboBox::down-arrow { -image: url(:/images/combobox_arrow.png); -} - -QComboBox:drop-down -{ -subcontrol-origin: padding; -subcontrol-position: top right; -border-left-style: none; -border-top-right-radius: 1px; -border-bottom-right-radius: 1px; -} - -QToolButton, QPushButton, QComboBox { -border-image: url(:/images/btn_26.png) 4; -border-width: 4; -padding: 0px 6px; -font-size: 12px; -} - -QToolButton:hover, QPushButton:hover, QComboBox:hover { -border-image: url(:/images/btn_26_hover.png) 4; -} - -QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { -color:gray; -} - -QToolButton:pressed, QPushButton:pressed{ -border-image: url(:/images/btn_26_pressed.png) 4; -} - - - true - - - - 0 - - - 0 - - - - - - 0 - 50 - - - - - 16777215 - 50 - - - - background-image: url(:/images/connect/connectFriendBanner.png); - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 1 - - - 0 - - - - - - 48 - 48 - - - - background-color: transparent; - - - - - - :/images/rs_wizard.png - - - true - - - - - - - - 0 - 0 - - - - color: rgb(255, 255, 255); - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt;">RetroShare!</span></p></body></html> - - - - - - - - - - - - - 0 - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Sunken - - - - 4 - - - 4 - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Welcome to RetroShare!</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This QuickStart wizard can help you configure your RetorShare in a few simple steps.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">If you're a more advanced user, you can access the full range of RetroShare's options via the ToolBar. Click Exit to close the wizard at any time.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This wizard will assist you to:</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> </span><img src=":/images/list_bullet_arrow.png" /><span style=" font-size:8pt;"> </span><span style=" font-size:8pt;"> Tell RetroShare about your internet connection.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> </span><img src=":/images/list_bullet_arrow.png" /><span style=" font-size:8pt;"> Choose which Network Mode you want use.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> </span><img src=":/images/list_bullet_arrow.png" /><span style=" font-size:8pt;"> Choos which files you share.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> </span><img src=":/images/list_bullet_arrow.png" /><span style=" font-size:8pt;"> Get started using RetroShare.</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - 4 - - - 4 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Next > - - - true - - - - - - - Exit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Horizontal - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Sunken - - - - - - - 0 - 0 - - - - For best performance, RetroShare needs to know a little about your connection to the internet. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - - 16777215 - 40 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.dslreports.com"><span style=" text-decoration: underline; color:#0000ff;">Click here to test your internet connection speed.</span></a></p></body></html> - - - - - - - Choose your upload speed: - - - KB/s - - - 0 - - - 29.000000000000000 - - - 155000.000000000000000 - - - 256.000000000000000 - - - - - - - Automatically set up ports using Universal Plug and Play - - - - - - - - 16777215 - 15 - - - - 0 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Choose your download speed: - - - KB/s - - - 0 - - - 29.000000000000000 - - - 155000.000000000000000 - - - 2048.000000000000000 - - - - - - - - - - Qt::Horizontal - - - - - - - 4 - - - 4 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - < Back - - - - - - - Next > - - - true - - - - - - - Exit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Sunken - - - - - - - 0 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">RetroShare Network Mode and Network Configuration</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - Network Mode - - - - - - Set your Network Mode: - - - - - - - - Darknet Mode - - - - - Web of Trust Mode - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - - - Network Configuration - - - - - - Set your Mode: - - - - - - - - Automatic (UPnP) - - - - - Firewalled - - - - - Manual Forwarded Port - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - - - Network - - - - - - Set your Mode - - - - - - - Should be disabled if you don't want to share connection information between peers. - - - - Discovery Enabled - - - - - Discovery Disabled - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Qt::Horizontal - - - - - - - 4 - - - 4 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - < Back - - - - - - - Next > - - - true - - - - - - - Exit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - QFrame::NoFrame - - - QFrame::Sunken - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This is a list of shared folders . You can add and remove folders using the button on the left. When you add a new folder, intially all file in that folder are shared.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory:</span><span style=" font-size:8pt;"> </span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">Browsable by friends</span><span style=" font-family:'Sans'; font-size:8pt;">: files are browsable from your direct friends.</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">Anonymously shared</span><span style=" font-family:'Sans'; font-size:8pt;">: files can be downloaded by anybody through anonymous tunnels.</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - QLayout::SetMaximumSize - - - 0 - - - - - - 16777215 - 120 - - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - true - - - false - - - 22 - - - - Directory - - - - - Network Wide - - - - - Browseable - - - - - - - - - - Add - - - - - - - Remove - - - - - - - Qt::Horizontal - - - - 258 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Qt::Horizontal - - - - - - - 4 - - - 4 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - < Back - - - - - - - Next > - - - true - - - - - - - Exit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Sunken - - - - 4 - - - 4 - - - - - - 0 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Network Options</span></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - - - Allow Tunnel Connection - - - - - - - Anonymous F2F Routing - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Qt::Horizontal - - - - - - - 4 - - - 4 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - < Back - - - - - - - Next > - - - true - - - - - - - Exit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Sunken - - - - 4 - - - 4 - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">After closing this wizard by clicking Finish.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Enjoy using RetroShare!</span></p></body></html> - - - true - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Just one more step! You're almost done configuring RetroShare to work with your computer.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">These settings configure how and when RetroShare starts .</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p></body></html> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - - - Do not show Quit RetroShare Message Box - - - - - - - Start Minimized - - - - - - - Start RetroShare when my System Starts. - - - - - - - Do not Start Quick Start Wizard on Start - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Qt::Horizontal - - - - - - - 4 - - - 4 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - < Back - - - - - - - Finish - - - true - - - - - - - Exit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - + + + QuickStartWizard + + + Qt::ApplicationModal + + + + 0 + 0 + 445 + 357 + + + + + 445 + 357 + + + + + 445 + 357 + + + + Quick Start Wizard + + + + :/images/rstray3.png:/images/rstray3.png + + + QComboBox QAbstractItemView { +background-color:white; +} + +QComboBox::down-arrow { +image: url(:/images/combobox_arrow.png); +} + +QComboBox:drop-down +{ +subcontrol-origin: padding; +subcontrol-position: top right; +border-left-style: none; +border-top-right-radius: 1px; +border-bottom-right-radius: 1px; +} + +QToolButton, QPushButton, QComboBox { +border-image: url(:/images/btn_26.png) 4; +border-width: 4; +padding: 0px 6px; +font-size: 12px; +} + +QToolButton:hover, QPushButton:hover, QComboBox:hover { +border-image: url(:/images/btn_26_hover.png) 4; +} + +QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { +color:gray; +} + +QToolButton:pressed, QPushButton:pressed{ +border-image: url(:/images/btn_26_pressed.png) 4; +} + + + true + + + + 0 + + + 0 + + + + + + 0 + 50 + + + + + 16777215 + 50 + + + + background-image: url(:/images/connect/connectFriendBanner.png); + + + + QFrame::NoFrame + + + QFrame::Raised + + + + 1 + + + 0 + + + + + + 48 + 48 + + + + background-color: transparent; + + + + + + :/images/rs_wizard.png + + + true + + + + + + + + 0 + 0 + + + + color: rgb(255, 255, 255); + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:26pt;">RetroShare!</span></p></body></html> + + + + + + + + + + + + + 3 + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Sunken + + + + 4 + + + 4 + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Welcome to RetroShare!</span></p> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This QuickStart wizard can help you configure your RetorShare in a few simple steps.</span></p> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">If you're a more advanced user, you can access the full range of RetroShare's options via the ToolBar. Click Exit to close the wizard at any time.</span></p> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">This wizard will assist you to:</span></p> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> </span><img src=":/images/list_bullet_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Tell RetroShare about your internet connection.</span></p> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> </span><img src=":/images/list_bullet_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Choos which files you share.</span></p> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> </span><img src=":/images/list_bullet_arrow.png" /><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;"> Get started using RetroShare.</span></p></body></html> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 4 + + + 4 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Next > + + + true + + + + + + + Exit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Sunken + + + + + + + 0 + 0 + + + + For best performance, RetroShare needs to know a little about your connection to the internet. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + 16777215 + 40 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.dslreports.com"><span style=" text-decoration: underline; color:#0000ff;">Click here to test your internet connection speed.</span></a></p></body></html> + + + + + + + Choose your upload speed limit: + + + KB/s + + + 0 + + + 29.000000000000000 + + + 155000.000000000000000 + + + 256.000000000000000 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Choose your download speed limit: + + + KB/s + + + 0 + + + 29.000000000000000 + + + 155000.000000000000000 + + + 2048.000000000000000 + + + + + + + + + Connection : + + + + + + + + Automatic (UPnP) + + + + + Firewalled + + + + + Manually forwarded port + + + + + + + + Dicovery : + + + + + + + + Share Ip and information with your friend (Disc On) + + + + + Don't share any information (Disc Off) + + + + + + + + + + + + + Qt::Horizontal + + + + + + + 4 + + + 4 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + < Back + + + + + + + Next > + + + true + + + + + + + Exit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QFrame::NoFrame + + + QFrame::Sunken + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This is a list of shared folders . You can add and remove folders using the button on the left. When you add a new folder, intially all file in that folder are shared.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory:</span><span style=" font-size:8pt;"> </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">Browsable by friends</span><span style=" font-family:'Sans'; font-size:8pt;">: files are browsable from your direct friends.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">Anonymously shared</span><span style=" font-family:'Sans'; font-size:8pt;">: files can be downloaded by anybody through anonymous tunnels.</span></p></body></html> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + QLayout::SetMaximumSize + + + 0 + + + + + + 16777215 + 120 + + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + true + + + false + + + 22 + + + + Directory + + + + + Network Wide + + + + + Browseable + + + + + + + + + + Add + + + + + + + Remove + + + + + + + Qt::Horizontal + + + + 258 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Qt::Horizontal + + + + + + + 4 + + + 4 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + < Back + + + + + + + Next > + + + true + + + + + + + Exit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Sunken + + + + 4 + + + 4 + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style="-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:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Enjoy using RetroShare!</span></p></body></html> + + + true + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Just one more step! You're almost done configuring RetroShare to work with your computer.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">These settings configure how and when RetroShare starts .</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p></body></html> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + + + Do not show a message when Closing RetroShare + + + + + + + Start Minimized + + + + + + + Start RetroShare when my System Starts. + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + Qt::Horizontal + + + + + + + 4 + + + 4 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + < Back + + + + + + + Finish + + + true + + + + + + + Exit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index dbc8a9d48..9a83d464f 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -60,7 +60,7 @@ GeneralPage::save(QString &errmsg) _settings->setValue(QString::fromUtf8("ClosetoTray"), closetoTray()); - _settings->setValue(QString::fromUtf8("FirstRun"), firstRun()); + //_settings->setValue(QString::fromUtf8("FirstRun"), firstRun()); _settings->setRunRetroshareOnBoot( ui.chkRunRetroshareAtSystemStartup->isChecked()); @@ -81,7 +81,7 @@ GeneralPage::load() 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(); } -bool GeneralPage::firstRun() const { - if(ui.checkBoxWizard->isChecked()) return true; - return ui.checkBoxWizard->isChecked(); -} +//bool GeneralPage::firstRun() const { +// if(ui.checkBoxWizard->isChecked()) return true; +// return ui.checkBoxWizard->isChecked(); +//} /** Called when the "show on startup" checkbox is toggled. */ void diff --git a/retroshare-gui/src/gui/settings/GeneralPage.h b/retroshare-gui/src/gui/settings/GeneralPage.h index 7aebd9b65..de68d9c19 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.h +++ b/retroshare-gui/src/gui/settings/GeneralPage.h @@ -50,7 +50,7 @@ public: bool startMinimized() const; bool closetoTray() const; bool quit() const; - bool firstRun() const; + //bool firstRun() const; private slots: diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui index 1f812a152..c056c6838 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.ui +++ b/retroshare-gui/src/gui/settings/GeneralPage.ui @@ -538,14 +538,14 @@ Misc - + Do not show the Quit RetroShare MessageBox - + Do not Minimize to Tray Icon @@ -555,13 +555,6 @@ - - - - Do not run Quick Start Wizard on RetroShare start - - - @@ -580,8 +573,6 @@ - - - + diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index a3b8ca4d2..d11b28b8b 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -6,7 +6,7 @@ 0 0 - 483 + 573 394 @@ -504,41 +504,11 @@ - Network Configuration (restart not needed) + Network Configuration - - - - - Darknet - - - - - Web of Trust - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 40 - 20 - - - - @@ -823,6 +793,67 @@ behind a firewall or a VPN. + + + F2F routing + + + + + + + + enable anonymous F2F routing + + + true + + + + + + + Show router statistics + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + true + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-family:'Sans'; font-size:8pt;"> 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.</span></p> +<p style="-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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">If want to you use </span><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-family:'Sans'; font-size:8pt;"> to anonymously share and download files, leaving this checked drastically increases your download scope, and participate into the overall network bandwidth. </span></p> +<p style="-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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory:</span></p> +<ul style="-qt-list-indent: 1;"><li style=" font-family:'Sans'; font-size:8pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Browsable by friends</span>: files are browsable from your direct friends.</li> +<li style=" font-family:'Sans'; font-size:8pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Anonymously shared</span>: files can be downloaded by anybody through anonymous tunnels.</li></ul></body></html> + + + + + diff --git a/retroshare-gui/src/gui/settings/rsettings.cpp b/retroshare-gui/src/gui/settings/rsettings.cpp index ce17420c7..ea2be7661 100644 --- a/retroshare-gui/src/gui/settings/rsettings.cpp +++ b/retroshare-gui/src/gui/settings/rsettings.cpp @@ -1,7 +1,7 @@ /**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2008, crypton + * This file is distributed under the following license: + * + * Copyright (c) 2008, crypton * Copyright (c) 2008, Matt Edman, Justin Hipple * * This program is free software; you can redistribute it and/or @@ -23,13 +23,21 @@ #include #include "rsettings.h" +#include "rsiface/rsinit.h" /** 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 */ 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()) beginGroup(settingsGroup); @@ -78,7 +86,7 @@ void RSettings::reset() { /* 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(); } diff --git a/retroshare-gui/src/gui/settings/rsettings.h b/retroshare-gui/src/gui/settings/rsettings.h index c598cb513..dcdf9c2e5 100644 --- a/retroshare-gui/src/gui/settings/rsettings.h +++ b/retroshare-gui/src/gui/settings/rsettings.h @@ -1,7 +1,7 @@ /**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2008, crypton + * This file is distributed under the following license: + * + * Copyright (c) 2008, crypton * Copyright (c) 2008, Matt Edman, Justin Hipple * * This program is free software; you can redistribute it and/or @@ -37,6 +37,11 @@ public: * value() and setValue(). */ RSettings(const QString group = QString()); + /** Default constructor. The optional parameter group 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. */ static void reset(); diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index 2419ae513..6b93cd0ab 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -1,7 +1,7 @@ /**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton + * This file is distributed under the following license: + * + * Copyright (c) 2006-2007, crypton * Copyright (c) 2006, Matt Edman, Justin Hipple * * 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_ALWAYS_ON_TOP false - +RshareSettings::RshareSettings(std::string filename) : RSettings(filename) { + initSettings(); +} /** Default Constructor */ -RshareSettings::RshareSettings() +RshareSettings::RshareSettings() { + initSettings(); +} + +void RshareSettings::initSettings() { #if defined(Q_WS_MAC) setDefault(SETTING_STYLE, "macintosh (aqua)"); diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h index 0d50a6a48..e6a2caf9c 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.h +++ b/retroshare-gui/src/gui/settings/rsharesettings.h @@ -52,6 +52,11 @@ public: /** Default constructor. */ RshareSettings(); + /** Default constructor. */ + RshareSettings(std::string filename); + + void initSettings(); + /** Gets the currently preferred language code for RShare. */ QString getLanguageCode(); /** Saves the preferred language code. */