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

Minor, string building

Browse Source
This commit is contained in:
Klaus Basan
2017-03-30 19:58:06 +02:00
committed by Mathew Sutcliffe
parent 9faad01c8b
commit 9ec452f1c4
2 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/blackcore/data/globalsetup.cpp
View File

@@ -16,6 +16,7 @@
#include <QJsonObject>
#include <QStringList>
#include <QStringBuilder>
using namespace BlackConfig;
using namespace BlackMisc;
@@ -182,67 +183,65 @@ namespace BlackCore
QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const
{
QString s("timestamp: ");
s.append(this->getFormattedUtcTimestampYmdhms());
s.append(separator);
return "timestamp: "
% this->getFormattedUtcTimestampYmdhms()
% separator
% "Global setup loaded: "
% boolToYesNo(this->wasLoaded())
% separator
s.append("Global setup loaded: ");
s.append(boolToYesNo(this->wasLoaded()));
s.append(separator);
% "For development: "
% boolToYesNo(isDevelopment())
% separator
s.append("For development: ");
s.append(boolToYesNo(isDevelopment()));
s.append(separator);
% "Distribution URLs: "
% getDistributionUrls().toQString(i18n)
% separator
% "Bootstrap URLs: "
% getBootstrapFileUrls().toQString(i18n)
% separator
% "News URLs: "
% getSwiftLatestNewsUrls().toQString(i18n)
% separator
s.append("Distribution URLs: ");
s.append(getDistributionUrls().toQString(i18n));
s.append(separator);
s.append("Bootstrap URLs: ");
s.append(getBootstrapFileUrls().toQString(i18n));
s.append(separator);
s.append("News URLs: ");
s.append(getSwiftLatestNewsUrls().toQString(i18n));
s.append(separator);
% "DB root directory: "
% getDbRootDirectoryUrl().toQString(i18n)
% separator
% "ICAO DB reader: "
% getDbIcaoReaderUrl().toQString(i18n)
% separator
% "Model DB reader: "
% getDbModelReaderUrl().toQString(i18n)
% separator
% "Airport DB reader: "
% getDbAirportReaderUrl().toQString(i18n)
% separator
% "DB home page: "
% getDbHomePageUrl().toQString(i18n)
% separator
% "DB login service: "
% getDbLoginServiceUrl().toQString(i18n)
% separator
% "swift DB datafile locations: "
% getSwiftDbDataFileLocationUrls().toQString(i18n)
% separator
s.append("DB root directory: ");
s.append(getDbRootDirectoryUrl().toQString(i18n));
s.append(separator);
s.append("ICAO DB reader: ");
s.append(getDbIcaoReaderUrl().toQString(i18n));
s.append(separator);
s.append("Model DB reader: ");
s.append(getDbModelReaderUrl().toQString(i18n));
s.append(separator);
s.append("Airport DB reader: ");
s.append(getDbAirportReaderUrl().toQString(i18n));
s.append(separator);
s.append("DB home page: ");
s.append(getDbHomePageUrl().toQString(i18n));
s.append(separator);
s.append("DB login service: ");
s.append(getDbLoginServiceUrl().toQString(i18n));
s.append(separator);
s.append("swift DB datafile locations: ");
s.append(getSwiftDbDataFileLocationUrls().toQString(i18n));
s.append(separator);
% "VATSIM bookings: "
% getVatsimBookingsUrl().toQString(i18n)
% separator
% "VATSIM METARs: "
% getVatsimMetarsUrls().toQString(i18n)
% separator
% "VATSIM data file: "
% getVatsimDataFileUrls().toQString(i18n)
% separator
s.append("VATSIM bookings: ");
s.append(getVatsimBookingsUrl().toQString(i18n));
s.append(separator);
s.append("VATSIM METARs: ");
s.append(getVatsimMetarsUrls().toQString(i18n));
s.append(separator);
s.append("VATSIM data file: ");
s.append(getVatsimDataFileUrls().toQString(i18n));
s.append(separator);
% "FSD test servers: "
% getFsdTestServers().toQString(i18n)
% separator
s.append("FSD test servers: ");
s.append(getFsdTestServers().toQString(i18n));
s.append(separator);
s.append("Crash report server: ");
s.append(getCrashReportServerUrl().toQString(i18n));
return s;
% "Crash report server: "
% getCrashReportServerUrl().toQString(i18n);
}
CVariant CGlobalSetup::propertyByIndex(const BlackMisc::CPropertyIndex &index) const

5
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
View File

@@ -83,8 +83,7 @@ namespace BlackSimPlugin
void CSimulatorXPlaneConfigWindow::ps_installXBus()
{
QString xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplaneRootDir();
const QString xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplaneRootDir();
QString path = QFileDialog::getExistingDirectory(parentWidget(),
tr("Choose your X-Plane install directory"),
xPlaneLocation,
@@ -103,7 +102,7 @@ namespace BlackSimPlugin
path.append("/xbus");
// TODO Use QtConcurrent here, maybe?
bool result = BlackMisc::CFileUtils::copyRecursively(xBusOriginDir(), path);
const bool result = BlackMisc::CFileUtils::copyRecursively(xBusOriginDir(), path);
if (result)
{
QMessageBox::information(this, tr("XBus installed"), tr("You may now launch your X-Plane and start using XBus!"));