Use auto config if Bonjour already installed #4240
This commit is contained in:
parent
581d4c5469
commit
00d6b23d57
|
@ -54,7 +54,7 @@ AppConfig::AppConfig(QSettings* settings) :
|
|||
m_WizardLastRun(0),
|
||||
m_CryptoPass(),
|
||||
m_ProcessMode(DEFAULT_PROCESS_MODE),
|
||||
m_AutoConfig(false),
|
||||
m_AutoConfig(true),
|
||||
m_ElevateMode(false),
|
||||
m_AutoConfigPrompted(false)
|
||||
{
|
||||
|
@ -124,7 +124,7 @@ void AppConfig::loadSettings()
|
|||
m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
|
||||
m_Language = settings().value("language", QLocale::system().name()).toString();
|
||||
m_StartedBefore = settings().value("startedBefore", false).toBool();
|
||||
m_AutoConfig = settings().value("autoConfig", false).toBool();
|
||||
m_AutoConfig = settings().value("autoConfig", true).toBool();
|
||||
m_ElevateMode = settings().value("elevateMode", false).toBool();
|
||||
m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool();
|
||||
}
|
||||
|
|
|
@ -1111,23 +1111,7 @@ void MainWindow::installBonjour()
|
|||
|
||||
void MainWindow::promptAutoConfig()
|
||||
{
|
||||
if (isBonjourRunning()) {
|
||||
int r = QMessageBox::question(
|
||||
this, tr("Synergy"),
|
||||
tr("Do you want to enable auto config?\n\n"
|
||||
"This feature helps you establish the connection."),
|
||||
QMessageBox::Yes | QMessageBox::No);
|
||||
|
||||
if (r == QMessageBox::Yes) {
|
||||
m_AppConfig.setAutoConfig(true);
|
||||
m_pCheckBoxAutoConfig->setChecked(true);
|
||||
}
|
||||
else {
|
||||
m_AppConfig.setAutoConfig(false);
|
||||
m_pCheckBoxAutoConfig->setChecked(false);
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!isBonjourRunning()) {
|
||||
int r = QMessageBox::question(
|
||||
this, tr("Synergy"),
|
||||
tr("Do you want to enable auto config and install Bonjour?\n\n"
|
||||
|
|
Loading…
Reference in New Issue