Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-11-11 11:28:53 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-11-11 13:50:52 (GMT) |
| commit | 97c87cf3e9b5e150152898e7907577c3ca3fdd86 (patch) | |
| tree | 17c23b1a10537261e0d1e662493cc4ddf137026c /Swift/QtUI/QtUISettingConstants.h | |
| parent | 94ec9c25311f8d54519f045205d58526d885412a (diff) | |
| download | swift-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.h | 9 |
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 @@ -1,46 +1,53 @@ /* * Copyright (c) 2012-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <string> + #include <Swift/Controllers/Settings/SettingsProvider.h> namespace Swift { class QtUISettingConstants { public: static const SettingsProvider::Setting<bool> COMPACT_ROSTER; static const SettingsProvider::Setting<std::string> CLICKTHROUGH_BANNER; static const SettingsProvider::Setting<int> CURRENT_ROSTER_TAB; static const SettingsProvider::Setting<bool> SHOW_NICK_IN_ROSTER_HEADER; static const SettingsProvider::Setting<int> CHATWINDOW_FONT_SIZE; static const SettingsProvider::Setting<int> HISTORYWINDOW_FONT_SIZE; static const SettingsProvider::Setting<bool> SHOW_EMOTICONS; static const SettingsProvider::Setting<bool> USE_PLAIN_CHATS; static const SettingsProvider::Setting<bool> USE_SCREENREADER; static const SettingsProvider::Setting<bool> SPELL_CHECKER; static const SettingsProvider::Setting<std::string> SPELL_CHECKER_LANGUAGE; /** * The #TRELLIS_GRID_SIZE setting specifies the dimensions of the grid used for the trellis * layout. * * Its value is a Qt serialized representation. */ static const SettingsProvider::Setting<std::string> TRELLIS_GRID_SIZE; /** * The #TRELLIS_GRID_POSITIONS setting specifies where conversations to contacts or rooms go * in the trellis grid. * * Its value is a Qt serialized representation. */ 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; }; } |