flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-05-03 16:25:54 +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 <QJsonObject>
#include <QStringList> #include <QStringList>
#include <QStringBuilder>
using namespace BlackConfig; using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
@@ -182,67 +183,65 @@ namespace BlackCore
QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const
{ {
QString s("timestamp: "); return "timestamp: "
s.append(this->getFormattedUtcTimestampYmdhms()); % this->getFormattedUtcTimestampYmdhms()
s.append(separator); % separator
% "Global setup loaded: "
% boolToYesNo(this->wasLoaded())
% separator
s.append("Global setup loaded: "); % "For development: "
s.append(boolToYesNo(this->wasLoaded())); % boolToYesNo(isDevelopment())
s.append(separator); % separator
s.append("For development: "); % "Distribution URLs: "
s.append(boolToYesNo(isDevelopment())); % getDistributionUrls().toQString(i18n)
s.append(separator); % separator
% "Bootstrap URLs: "
% getBootstrapFileUrls().toQString(i18n)
% separator
% "News URLs: "
% getSwiftLatestNewsUrls().toQString(i18n)
% separator
s.append("Distribution URLs: "); % "DB root directory: "
s.append(getDistributionUrls().toQString(i18n)); % getDbRootDirectoryUrl().toQString(i18n)
s.append(separator); % separator
s.append("Bootstrap URLs: "); % "ICAO DB reader: "
s.append(getBootstrapFileUrls().toQString(i18n)); % getDbIcaoReaderUrl().toQString(i18n)
s.append(separator); % separator
s.append("News URLs: "); % "Model DB reader: "
s.append(getSwiftLatestNewsUrls().toQString(i18n)); % getDbModelReaderUrl().toQString(i18n)
s.append(separator); % 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: "); % "VATSIM bookings: "
s.append(getDbRootDirectoryUrl().toQString(i18n)); % getVatsimBookingsUrl().toQString(i18n)
s.append(separator); % separator
s.append("ICAO DB reader: "); % "VATSIM METARs: "
s.append(getDbIcaoReaderUrl().toQString(i18n)); % getVatsimMetarsUrls().toQString(i18n)
s.append(separator); % separator
s.append("Model DB reader: "); % "VATSIM data file: "
s.append(getDbModelReaderUrl().toQString(i18n)); % getVatsimDataFileUrls().toQString(i18n)
s.append(separator); % 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);
s.append("VATSIM bookings: "); % "FSD test servers: "
s.append(getVatsimBookingsUrl().toQString(i18n)); % getFsdTestServers().toQString(i18n)
s.append(separator); % 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);
s.append("FSD test servers: "); % "Crash report server: "
s.append(getFsdTestServers().toQString(i18n)); % getCrashReportServerUrl().toQString(i18n);
s.append(separator);
s.append("Crash report server: ");
s.append(getCrashReportServerUrl().toQString(i18n));
return s;
} }
CVariant CGlobalSetup::propertyByIndex(const BlackMisc::CPropertyIndex &index) const 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() void CSimulatorXPlaneConfigWindow::ps_installXBus()
{ {
QString xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplaneRootDir(); const QString xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplaneRootDir();
QString path = QFileDialog::getExistingDirectory(parentWidget(), QString path = QFileDialog::getExistingDirectory(parentWidget(),
tr("Choose your X-Plane install directory"), tr("Choose your X-Plane install directory"),
xPlaneLocation, xPlaneLocation,
@@ -103,7 +102,7 @@ namespace BlackSimPlugin
path.append("/xbus"); path.append("/xbus");
// TODO Use QtConcurrent here, maybe? // TODO Use QtConcurrent here, maybe?
bool result = BlackMisc::CFileUtils::copyRecursively(xBusOriginDir(), path); const bool result = BlackMisc::CFileUtils::copyRecursively(xBusOriginDir(), path);
if (result) if (result)
{ {
QMessageBox::information(this, tr("XBus installed"), tr("You may now launch your X-Plane and start using XBus!")); QMessageBox::information(this, tr("XBus installed"), tr("You may now launch your X-Plane and start using XBus!"));