mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-04 15:15:15 -04:00
Various improvements to the GUI.
* Switched ServerPage to use netMode, rather than tryNetMode. This fixes the Network Status. * Added "Advanced Mode" to Settings GeneralPage. * Store / Set Advanced Mode via rsConfig::get/setConfigurationOptions. * removed %0D%0A from Linux / OSX emails - made it Windows Only. * updated GetStartedDialog text. * updated Dht and Nat Indicators to accurately reflect Network status. Roughly: - DHT. Off: gray, ERROR: red, NO RS PEERS: yellow, GOOD: green. - NAT. Offline: gray, BAD NET: red, NO DHT, or FIREWALLED: yellow, GOOD: green * disable GetStartedDialog is AdvancedMode is set. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4502 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
31ec7a074b
commit
1cb0a9dc21
8 changed files with 230 additions and 57 deletions
|
@ -33,6 +33,8 @@
|
|||
#endif
|
||||
|
||||
#include <retroshare/rsplugin.h>
|
||||
#include <retroshare/rsconfig.h>
|
||||
|
||||
#include "rshare.h"
|
||||
#include "MainWindow.h"
|
||||
#include "MessengerWindow.h"
|
||||
|
@ -192,6 +194,17 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
|
|||
|
||||
setWindowTitle(tr("RetroShare %1 a secure decentralised communication platform").arg(retroshareVersion()) + " - " + nameAndLocation);
|
||||
|
||||
|
||||
/* WORK OUT IF WE"RE IN ADVANCED MODE OR NOT */
|
||||
bool advancedMode = false;
|
||||
std::string advsetting;
|
||||
if (rsConfig->getConfigurationOption(RS_CONFIG_ADVANCED, advsetting) && (advsetting == "YES"))
|
||||
{
|
||||
advancedMode = true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* add url handler for RetroShare links */
|
||||
QDesktopServices::setUrlHandler(RSLINK_SCHEME, this, "linkActivated");
|
||||
|
||||
|
@ -294,8 +307,12 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
|
|||
|
||||
#ifdef GETSTARTED_GUI
|
||||
MainPage *getStartedPage = NULL;
|
||||
ui.stackPages->add(getStartedPage = new GetStartedDialog(ui.stackPages),
|
||||
|
||||
if (!advancedMode)
|
||||
{
|
||||
ui.stackPages->add(getStartedPage = new GetStartedDialog(ui.stackPages),
|
||||
createPageAction(QIcon(IMG_HELP), tr("Getting Started"), grp));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue