flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #911, settings UI for simConnect.cfg improved

Browse Source 
* only work with local file, a remote file can be adjusted in the core`s settings
* set UI port/address from file
* formatting/renaming
This commit is contained in:
Klaus Basan
2017-03-16 02:23:02 +01:00
committed by Mathew Sutcliffe
parent f82f04275b
commit 566b6aabf3
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
View File

@@ -39,7 +39,7 @@ namespace BlackSimPlugin
connect(ui->pb_SettingsFsxDeleteSimconnectCfg, &QPushButton::clicked, this, &CSimConnectSettingsComponent::deleteSimConnectCfgFile); connect(ui->pb_SettingsFsxDeleteSimconnectCfg, &QPushButton::clicked, this, &CSimConnectSettingsComponent::deleteSimConnectCfgFile);
connect(ui->pb_SettingsFsxExistsSimconncetCfg, &QPushButton::clicked, this, &CSimConnectSettingsComponent::checkSimConnectCfgFile); connect(ui->pb_SettingsFsxExistsSimconncetCfg, &QPushButton::clicked, this, &CSimConnectSettingsComponent::checkSimConnectCfgFile);
connect(ui->pb_SettingsFsxSaveSimconnectCfg, &QPushButton::clicked, this, &CSimConnectSettingsComponent::saveSimConnectCfgFile); connect(ui->pb_SettingsFsxSaveSimconnectCfg, &QPushButton::clicked, this, &CSimConnectSettingsComponent::saveSimConnectCfgFile);
connect(ui->pb_SettingsFsxTestConnection, &QPushButton::clicked, this, &CSimConnectSettingsComponent::testSimConnectConnection); connect(ui->pb_SettingsFsxTestConnection, &QPushButton::clicked, this, &CSimConnectSettingsComponent::testConnection);
this->setSimConnectInfo(); this->setSimConnectInfo();
} }
@@ -58,49 +58,56 @@ namespace BlackSimPlugin
void CSimConnectSettingsComponent::deleteSimConnectCfgFile() void CSimConnectSettingsComponent::deleteSimConnectCfgFile()
{ {
const QString fileName = CSimConnectUtilities::getLocalSimConnectCfgFilename(); const QString fileName = CSimConnectUtilities::getLocalSimConnectCfgFilename();
const bool result = sGui->getIContextApplication()->removeFile(fileName); QFile file(fileName);
const bool result = file.exists() && file.remove();
if (result) if (result)
{ {
QMessageBox::information(qApp->activeWindow(), tr("File deleted"), QMessageBox::information(qApp->activeWindow(), tr("File deleted"), tr("File %1 deleted successfully.").arg(fileName));
tr("File %1 deleted successfully.").arg(fileName));
} }
checkSimConnectCfgFile(); checkSimConnectCfgFile();
} }
void CSimConnectSettingsComponent::checkSimConnectCfgFile() void CSimConnectSettingsComponent::checkSimConnectCfgFile()
{ {
// this works for local files only
const QString fileName = CSimConnectUtilities::getLocalSimConnectCfgFilename(); const QString fileName = CSimConnectUtilities::getLocalSimConnectCfgFilename();
if (sGui->getIContextApplication()->existsFile(fileName)) const QFile file(fileName);
ui->le_SettingsFsxExistsSimconncetCfg->setText(file.exists() ? fileName : "no file");
// only works for local file (which the simconnect file normally is)
if (!CSimConnectUtilities::hasLocalSimConnectCfgFilename()) { return; }
const QSharedPointer<QSettings> settings = CSimConnectUtilities::simConnectFileAsSettings();
if (!settings) { return; }
const QString address = CSimConnectUtilities::ipAddress(settings.data());
const int port = CSimConnectUtilities::ipPort(settings.data());
if (!address.isEmpty())
{ {
ui->le_SettingsFsxExistsSimconncetCfg->setText(fileName); ui->le_SettingsFsxAddress->setText(address);
} }
else if (port > 0)
{ {
ui->le_SettingsFsxExistsSimconncetCfg->setText("no file"); ui->le_SettingsFsxPort->setText(QString::number(port));
} }
} }
void CSimConnectSettingsComponent::testSimConnectConnection() void CSimConnectSettingsComponent::testConnection()
{ {
const QString address = ui->le_SettingsFsxAddress->text().trimmed(); const QString address = ui->le_SettingsFsxAddress->text().trimmed();
const QString port = ui->le_SettingsFsxPort->text().trimmed(); const QString port = ui->le_SettingsFsxPort->text().trimmed();
if (address.isEmpty() || port.isEmpty()) if (address.isEmpty() || port.isEmpty())
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), tr("Address and/or port not specified!"));
tr("Address and/or port not specified!"));
return; return;
} }
if (!CNetworkUtils::isValidIPv4Address(address)) if (!CNetworkUtils::isValidIPv4Address(address))
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), tr("Wrong IPv4 address!"));
tr("Wrong IPv4 address!"));
return; return;
} }
if (!CNetworkUtils::isValidPort(port)) if (!CNetworkUtils::isValidPort(port))
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), tr("Invalid port!"));
tr("Invalid port!"));
return; return;
} }
int p = port.toInt(); int p = port.toInt();
@@ -111,8 +118,7 @@ namespace BlackSimPlugin
return; return;
} }
QMessageBox::information(qApp->activeWindow(), tr("Connection successful"), QMessageBox::information(qApp->activeWindow(), tr("Connection successful"), tr("Connected to %1:%2.").arg(address, port));
tr("Connected to %1:%2.").arg(address, port));
} }
void CSimConnectSettingsComponent::saveSimConnectCfgFile() void CSimConnectSettingsComponent::saveSimConnectCfgFile()
@@ -122,20 +128,17 @@ namespace BlackSimPlugin
if (address.isEmpty() || port.isEmpty()) if (address.isEmpty() || port.isEmpty())
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), tr("Address and/or port not specified!"));
tr("Address and/or port not specified!"));
return; return;
} }
if (!CNetworkUtils::isValidIPv4Address(address)) if (!CNetworkUtils::isValidIPv4Address(address))
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), tr("Wrong IPv4 address!"));
tr("Wrong IPv4 address!"));
return; return;
} }
if (!CNetworkUtils::isValidPort(port)) if (!CNetworkUtils::isValidPort(port))
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), tr("Invalid port!"));
tr("Invalid port!"));
return; return;
} }
@@ -155,21 +158,18 @@ namespace BlackSimPlugin
if (fileName.isEmpty()) if (fileName.isEmpty())
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Failed writing simConnect.cfg"), QMessageBox::warning(qApp->activeWindow(), tr("Failed writing simConnect.cfg"), tr("No file name specified!"));
tr("No file name specified!"));
return; return;
} }
if (sGui->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p))) if (sGui->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p)))
{ {
QMessageBox::information(qApp->activeWindow(), tr("File saved"), QMessageBox::information(qApp->activeWindow(), tr("File saved"), tr("File '%1' saved.").arg(fileName));
tr("File '%1' saved.").arg(fileName));
checkSimConnectCfgFile(); checkSimConnectCfgFile();
} }
else else
{ {
QMessageBox::warning(qApp->activeWindow(), tr("Failed writing simConnect.cfg"), QMessageBox::warning(qApp->activeWindow(), tr("Failed writing simConnect.cfg"), tr("Failed writing '%1'!").arg(fileName));
tr("Failed writing '%1'!").arg(fileName));
} }
} }
@@ -177,6 +177,7 @@ namespace BlackSimPlugin
{ {
const CWinDllUtils::DLLInfo simConnectInfo = CSimConnectUtilities::simConnectDllInfo(); const CWinDllUtils::DLLInfo simConnectInfo = CSimConnectUtilities::simConnectDllInfo();
ui->lbl_SimConnectInfo->setText(simConnectInfo.summary()); ui->lbl_SimConnectInfo->setText(simConnectInfo.summary());
this->checkSimConnectCfgFile();
} }
} // ns } // ns
} // ns } // ns

2
src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h
View File

@@ -45,7 +45,7 @@ namespace BlackSimPlugin
void checkSimConnectCfgFile(); void checkSimConnectCfgFile();
//! Test the SimConnect connectivity //! Test the SimConnect connectivity
void testSimConnectConnection(); void testConnection();
//! Save a simconnect.cfg file for FSX //! Save a simconnect.cfg file for FSX
void saveSimConnectCfgFile(); void saveSimConnectCfgFile();