diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc index e3b138072..771cb7b0a 100644 --- a/libretroshare/src/pqi/p3connmgr.cc +++ b/libretroshare/src/pqi/p3connmgr.cc @@ -148,7 +148,7 @@ p3ConnectMgr::p3ConnectMgr() //use_extr_addr_finder = true ; use_extr_addr_finder = false; - allow_tunnel_connection = true; + allow_tunnel_connection = false; mExtAddrFinder = new ExtAddrFinder; mNetInitTS = 0; diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 58a96d662..ed02fc9cb 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -140,6 +140,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) connect(ui.actionAdd_Share, SIGNAL(triggered() ), this , SLOT( openShareManager() ) ); connect(ui.actionOptions, SIGNAL(triggered()), this, SLOT( showSettings()) ); connect(ui.actionMessenger, SIGNAL(triggered()), this, SLOT( showMessengerWindow()) ); + #ifdef RS_RELEASE_VERSION + ui.actionMessenger->setVisible(false); + #endif connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT( showabout()) ); //connect(ui.actionColor, SIGNAL(triggered()), this, SLOT( setStyle()) ); @@ -179,27 +182,34 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) ui.stackPages->add(messagesDialog = new MessagesDialog(ui.stackPages), createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp)); + #ifndef RS_RELEASE_VERSION ChannelFeed *channelFeed = NULL; ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); + #endif ForumsDialog *forumsDialog = NULL; ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), createPageAction(QIcon(IMAGE_FORUMS), tr("Forums"), grp)); - + + #ifndef RS_RELEASE_VERSION LinksDialog *linksDialog = NULL; ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages), createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), grp)); + #endif + #ifndef RS_RELEASE_VERSION NewsFeed *newsFeed = NULL; ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), createPageAction(QIcon(IMAGE_NEWSFEED), tr("News Feed"), grp)); + #endif -#ifdef PLUGINMGR + #ifndef RS_RELEASE_VERSION + #ifdef PLUGINMGR ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); -#endif - + #endif + #endif /* Create the toolbar */ ui.toolBar->addActions(grp->actions()); diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui index f28d82ef0..7cee1b241 100644 --- a/retroshare-gui/src/gui/MainWindow.ui +++ b/retroshare-gui/src/gui/MainWindow.ui @@ -1,147 +1,150 @@ - - - MainWindow - - - - 0 - 0 - 571 - 450 - - - - MainWindow - - - - - 0 - - - - - - - - - - toolBar - - - Qt::ToolButtonTextUnderIcon - - - TopToolBarArea - - - false - - - - - toolBar_2 - - - LeftToolBarArea - - - false - - - - - - - - - - - - - - - :/images/add-friend24.png:/images/add-friend24.png - - - Add Friend - - - Add a Friend Wizard - - - - - - :/images/add-share24.png:/images/add-share24.png - - - Add Share - - - - - - :/images/kcmsystem24.png:/images/kcmsystem24.png - - - Options - - - - - - :/images/messenger.png:/images/messenger.png - - - Messenger - - - - - - :/images/informations_24x24.png:/images/informations_24x24.png - - - About - - - - - SMPlayer - - - - - - :/images/exit_24x24.png:/images/exit_24x24.png - - - Quit - - - - - - :/images/tools_wizard.png:/images/tools_wizard.png - - - Quick Start Wizard - - - Quick Start Wizard - - - - - - MainPageStack - QWidget -
gui/mainpagestack.h
- - - - - - - + + + MainWindow + + + + 0 + 0 + 571 + 450 + + + + MainWindow + + + + + 0 + + + + + + + + + + toolBar + + + Qt::ToolButtonTextUnderIcon + + + TopToolBarArea + + + false + + + + + toolBar_2 + + + LeftToolBarArea + + + false + + + + + + + + + + + + + + + :/images/add-friend24.png:/images/add-friend24.png + + + Add Friend + + + Add a Friend Wizard + + + + + + :/images/add-share24.png:/images/add-share24.png + + + Add Share + + + + + + :/images/kcmsystem24.png:/images/kcmsystem24.png + + + Options + + + + + + :/images/messenger.png:/images/messenger.png + + + Messenger + + + true + + + + + + :/images/informations_24x24.png:/images/informations_24x24.png + + + About + + + + + SMPlayer + + + + + + :/images/exit_24x24.png:/images/exit_24x24.png + + + Quit + + + + + + :/images/tools_wizard.png:/images/tools_wizard.png + + + Quick Start Wizard + + + Quick Start Wizard + + + + + + MainPageStack + QWidget +
gui/mainpagestack.h
+ + + + + + + diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index 9e870399a..1335af2e7 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -754,16 +754,7 @@ void NetworkDialog::updateNetworkStatus() { ui.iconlabel_upnp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); } - - if(config.netStunOk) - { - ui.iconlabel_udp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); - } - else - { - ui.iconlabel_udp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); - } - + if (config.netLocalOk) { ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index f7ac4b35c..4893a7ec5 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -6,7 +6,7 @@ 0 0 - 549 + 555 444 @@ -329,33 +329,6 @@ subcontrol-position: bottom right; - - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - UDP stun external ip address - - - - - diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp index e74e76d8b..46613b9bf 100644 --- a/retroshare-gui/src/gui/PeersDialog.cpp +++ b/retroshare-gui/src/gui/PeersDialog.cpp @@ -185,7 +185,9 @@ PeersDialog::PeersDialog(QWidget *parent) menu->addAction(ui.actionAdd_Friend); menu->addSeparator(); menu->addAction(ui.actionCreate_New_Forum); + #ifndef RS_RELEASE_VERSION menu->addAction(ui.actionCreate_New_Channel); + #endif menu->addAction(ui.actionSet_your_Avatar); menu->addAction(ui.actionSet_your_Personal_Message); diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index f4896d01b..834ed19cb 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -53,6 +53,10 @@ ServerPage::ServerPage(QWidget * parent, Qt::WFlags flags) ui.allowIpDeterminationCB->setChecked(b) ; ui.IPServersLV->setEnabled(b) ; + #ifdef RS_RELEASE_VERSION + ui.allowTunnelConnectionCB->hide(); + this->toggleTunnelConnection(false); + #endif b = rsPeers->getAllowTunnelConnection() ; ui.allowTunnelConnectionCB->setChecked(b) ; diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index d11b28b8b..c346622a3 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -793,67 +793,6 @@ 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/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp index d37a88b4d..3b30482f8 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.cpp +++ b/retroshare-gui/src/gui/settings/TransferPage.cpp @@ -40,9 +40,6 @@ TransferPage::TransferPage(QWidget * parent, Qt::WFlags flags) connect( ui._showTurtleDialogPB,SIGNAL(clicked()),this,SLOT( showTurtleRouterDialog() )) ; - ui._enableTurtleCB->setChecked(true) ; - ui._enableTurtleCB->setEnabled(false) ; - QTimer *timer = new QTimer(this); timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus())); timer->start(1000); diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui index 536562fc6..d0ead3196 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.ui +++ b/retroshare-gui/src/gui/settings/TransferPage.ui @@ -1,183 +1,160 @@ - - - TransferPage - - - - 0 - 0 - 433 - 340 - - - - Form - - - - - - 0 - - - - Transfer - - - - - - Transfer options - - - - - - Queue Size: - - - - - - - 1 - - - 7 - - - - - - - Maximum Download speed per file: - - - - - - - kB/s - - - 100000 - - - 1024 - - - - - - - Default chunk strategy: - - - - - - - - Streaming - - - - - Random - - - - - - - - - - - Show Cache Transfers - - - - - - - Qt::Vertical - - - - 248 - 138 - - - - - - - - - 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:'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-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> - - - - - - - - - - - - + + + TransferPage + + + + 0 + 0 + 435 + 340 + + + + Form + + + + + + 0 + + + + Transfer + + + + + + Transfer options + + + + + + Queue Size: + + + + + + + 1 + + + 7 + + + + + + + Maximum Download speed per file: + + + + + + + kB/s + + + 100000 + + + 1024 + + + + + + + Default chunk strategy: + + + + + + + + Streaming + + + + + Random + + + + + + + + + + + Show Cache Transfers + + + + + + + Qt::Vertical + + + + 248 + 138 + + + + + + + + + F2F Routing + + + + + + + + Show router statistics + + + + + + + + + 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> + + + + + + + + + + + +