mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-20 15:00:36 -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
|
@ -21,7 +21,9 @@
|
|||
|
||||
#include <iostream>
|
||||
#include <rshare.h>
|
||||
#include <retroshare/rsinit.h>
|
||||
#include "retroshare/rsinit.h"
|
||||
#include "retroshare/rsconfig.h"
|
||||
|
||||
#include "GeneralPage.h"
|
||||
#include <util/stringutil.h>
|
||||
#include <QSystemTrayIcon>
|
||||
|
@ -66,6 +68,17 @@ bool GeneralPage::save(QString &errmsg)
|
|||
|
||||
RsInit::setAutoLogin(ui.autoLogin->isChecked());
|
||||
|
||||
if (ui.checkAdvanced->isChecked())
|
||||
{
|
||||
std::string opt("YES");
|
||||
rsConfig->setConfigurationOption(RS_CONFIG_ADVANCED, opt);
|
||||
}
|
||||
else
|
||||
{
|
||||
std::string opt("NO");
|
||||
rsConfig->setConfigurationOption(RS_CONFIG_ADVANCED, opt);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -88,4 +101,13 @@ void GeneralPage::load()
|
|||
ui.spinBox->setValue(Settings->getMaxTimeBeforeIdle());
|
||||
|
||||
ui.autoLogin->setChecked(RsInit::getAutoLogin());
|
||||
|
||||
bool advancedmode = false;
|
||||
std::string advsetting;
|
||||
if (rsConfig->getConfigurationOption(RS_CONFIG_ADVANCED, advsetting) && (advsetting == "YES"))
|
||||
{
|
||||
advancedmode = true;
|
||||
}
|
||||
ui.checkAdvanced->setChecked(advancedmode);
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue