summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-11-11 11:28:53 (GMT)
committerTobias Markmann <tm@ayena.de>2016-11-11 13:50:52 (GMT)
commit97c87cf3e9b5e150152898e7907577c3ca3fdd86 (patch)
tree17c23b1a10537261e0d1e662493cc4ddf137026c /Swift/QtUI/QtUISettingConstants.h
parent94ec9c25311f8d54519f045205d58526d885412a (diff)
downloadswift-97c87cf3e9b5e150152898e7907577c3ca3fdd86.zip
swift-97c87cf3e9b5e150152898e7907577c3ca3fdd86.tar.bz2
Add update channel configuration dialog to the about window
If software updates are enabled the about dialog will show the currently configured update channel and provides a link to a dialog to change the update channel. Test-Information: Builds on macOS 10.12.1, unit tests pass, and dialogs behave as expected. Did not test Sparkle updating. Change-Id: I05d5014f0d719ba9b2146c1e599db4f7fde80558
Diffstat (limited to 'Swift/QtUI/QtUISettingConstants.h')
-rw-r--r--Swift/QtUI/QtUISettingConstants.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/Swift/QtUI/QtUISettingConstants.h b/Swift/QtUI/QtUISettingConstants.h
index 4616656..a569587 100644
--- a/Swift/QtUI/QtUISettingConstants.h
+++ b/Swift/QtUI/QtUISettingConstants.h
@@ -6,6 +6,8 @@
#pragma once
+#include <string>
+
#include <Swift/Controllers/Settings/SettingsProvider.h>
namespace Swift {
@@ -37,10 +39,15 @@ namespace Swift {
*/
static const SettingsProvider::Setting<std::string> TRELLIS_GRID_POSITIONS;
/**
- * The #ENABLE_SOFTWARE_UPDATES settings specifies, whether Swift
+ * The #ENABLE_SOFTWARE_UPDATES setting specifies, whether Swift
* should automatically check for software updates in regular
* intervals and install them automatically.
*/
static const SettingsProvider::Setting<bool> ENABLE_SOFTWARE_UPDATES;
+ /**
+ * The #SOFTWARE_UPDATE_CHANNEL setting defines what update channel
+ * Swift uses to check for, and receive, updates.
+ */
+ static const SettingsProvider::Setting<std::string> SOFTWARE_UPDATE_CHANNEL;
};
}