rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use auto config if Bonjour already installed #4240

This commit is contained in:
Xinyu Hou 2014-11-28 11:21:45 +00:00
parent 581d4c5469
commit 00d6b23d57
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/src/AppConfig.cpp
View File

@ -54,7 +54,7 @@ AppConfig::AppConfig(QSettings* settings) :
m_WizardLastRun(0), m_WizardLastRun(0),
m_CryptoPass(), m_CryptoPass(),
m_ProcessMode(DEFAULT_PROCESS_MODE), m_ProcessMode(DEFAULT_PROCESS_MODE),
m_AutoConfig(false), m_AutoConfig(true),
m_ElevateMode(false), m_ElevateMode(false),
m_AutoConfigPrompted(false) m_AutoConfigPrompted(false)
{ {
@ -124,7 +124,7 @@ void AppConfig::loadSettings()
m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool(); m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
m_Language = settings().value("language", QLocale::system().name()).toString(); m_Language = settings().value("language", QLocale::system().name()).toString();
m_StartedBefore = settings().value("startedBefore", false).toBool(); 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_ElevateMode = settings().value("elevateMode", false).toBool();
m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool(); m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool();
} }

18
src/gui/src/MainWindow.cpp
View File

@ -1111,23 +1111,7 @@ void MainWindow::installBonjour()
void MainWindow::promptAutoConfig() void MainWindow::promptAutoConfig()
{ {
if (isBonjourRunning()) { 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 {
int r = QMessageBox::question( int r = QMessageBox::question(
this, tr("Synergy"), this, tr("Synergy"),
tr("Do you want to enable auto config and install Bonjour?\n\n" tr("Do you want to enable auto config and install Bonjour?\n\n"