Browse Source

Add Custom Actions directory to App Settings

This is required to create a storage location for Android.
QGC4.4
Nick Exton 2 years ago
parent
commit
67af6f9d8f
  1. 12
      src/Settings/AppSettings.cc
  2. 31
      src/Settings/AppSettings.h

12
src/Settings/AppSettings.cc

@ -34,6 +34,7 @@ const char* AppSettings::logDirectory = QT_TRANSLATE_NOOP("AppSettin @@ -34,6 +34,7 @@ const char* AppSettings::logDirectory = QT_TRANSLATE_NOOP("AppSettin
const char* AppSettings::videoDirectory = QT_TRANSLATE_NOOP("AppSettings", "Video");
const char* AppSettings::photoDirectory = QT_TRANSLATE_NOOP("AppSettings", "Photo");
const char* AppSettings::crashDirectory = QT_TRANSLATE_NOOP("AppSettings", "CrashLogs");
const char* AppSettings::customActionsDirectory = QT_TRANSLATE_NOOP("AppSettings", "CustomActions");
// Release languages are 90%+ complete
QList<int> AppSettings::_rgReleaseLanguages = {
@ -217,6 +218,7 @@ void AppSettings::_checkSavePathDirectories(void) @@ -217,6 +218,7 @@ void AppSettings::_checkSavePathDirectories(void)
savePathDir.mkdir(videoDirectory);
savePathDir.mkdir(photoDirectory);
savePathDir.mkdir(crashDirectory);
savePathDir.mkdir(customActionsDirectory);
}
}
@ -295,6 +297,16 @@ QString AppSettings::crashSavePath(void) @@ -295,6 +297,16 @@ QString AppSettings::crashSavePath(void)
return QString();
}
QString AppSettings::customActionsSavePath(void)
{
QString path = savePath()->rawValue().toString();
if (!path.isEmpty() && QDir(path).exists()) {
QDir dir(path);
return dir.filePath(customActionsDirectory);
}
return QString();
}
QList<int> AppSettings::firstRunPromptsIdsVariantToList(const QVariant& firstRunPromptIds)
{
QList<int> rgIds;

31
src/Settings/AppSettings.h

@ -70,13 +70,14 @@ public: @@ -70,13 +70,14 @@ public:
// Although this is a global setting it only affects ArduPilot vehicle since PX4 automatically starts the stream from the vehicle side
DEFINE_SETTINGFACT(apmStartMavlinkStreams)
Q_PROPERTY(QString missionSavePath READ missionSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString parameterSavePath READ parameterSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString telemetrySavePath READ telemetrySavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString logSavePath READ logSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString videoSavePath READ videoSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString photoSavePath READ photoSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString crashSavePath READ crashSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString missionSavePath READ missionSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString parameterSavePath READ parameterSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString telemetrySavePath READ telemetrySavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString logSavePath READ logSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString videoSavePath READ videoSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString photoSavePath READ photoSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString crashSavePath READ crashSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString customActionsSavePath READ customActionsSavePath NOTIFY savePathsChanged)
Q_PROPERTY(QString planFileExtension MEMBER planFileExtension CONSTANT)
Q_PROPERTY(QString missionFileExtension MEMBER missionFileExtension CONSTANT)
@ -87,13 +88,14 @@ public: @@ -87,13 +88,14 @@ public:
Q_PROPERTY(QString shpFileExtension MEMBER shpFileExtension CONSTANT)
Q_PROPERTY(QString logFileExtension MEMBER logFileExtension CONSTANT)
QString missionSavePath ();
QString parameterSavePath ();
QString telemetrySavePath ();
QString logSavePath ();
QString videoSavePath ();
QString photoSavePath ();
QString crashSavePath ();
QString missionSavePath ();
QString parameterSavePath ();
QString telemetrySavePath ();
QString logSavePath ();
QString videoSavePath ();
QString photoSavePath ();
QString crashSavePath ();
QString customActionsSavePath ();
// Helper methods for working with firstRunPromptIds QVariant settings string list
static QList<int> firstRunPromptsIdsVariantToList (const QVariant& firstRunPromptIds);
@ -120,6 +122,7 @@ public: @@ -120,6 +122,7 @@ public:
static const char* videoDirectory;
static const char* photoDirectory;
static const char* crashDirectory;
static const char* customActionsDirectory;
// Returns the current qLocaleLanguage setting bypassing the standard SettingsGroup path. This should only be used
// by QGCApplication::setLanguage to query the language setting as early in the boot process as possible.

Loading…
Cancel
Save