Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-02-17 16:57:01 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-02-21 14:34:55 (GMT) |
| commit | 3605b6622bc8b4abb810fac6b53f7f71be0fa7de (patch) | |
| tree | 638a8fd6449dd235931fe307e50119adf9c9fe22 /Swift/QtUI/QtSwift.h | |
| parent | b05f8fcb285d2d13d2be50a3eb1062048fbe30f5 (diff) | |
| download | swift-3605b6622bc8b4abb810fac6b53f7f71be0fa7de.zip swift-3605b6622bc8b4abb810fac6b53f7f71be0fa7de.tar.bz2 | |
Introduce system settings policies.
Release-Notes: It is now possible for sysadmins to deploy files with policies for configuration options, such as making it impossible for users to save passwords or to force sound notifications off, or to set defaults.
Also allow changing an option so that Swift disconnects on idle timeout, instead of going away.
Diffstat (limited to 'Swift/QtUI/QtSwift.h')
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index c808fa0..7a49fa7 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Kevin Smith + * Copyright (c) 2010-2012 Kevin Smith * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ @@ -23,7 +23,6 @@ #endif #include "SwifTools/Idle/PlatformIdleQuerier.h" #include "SwifTools/Idle/ActualIdleDetector.h" -#include <Swift/QtUI/QtUIPreferences.h> namespace po = boost::program_options; @@ -48,6 +47,8 @@ namespace Swift { class QtUserSearchWindowFactory; class EventLoop; class URIHandler; + class SettingsProviderHierachy; + class XMLSettingsProvider; class QtSwift : public QObject { Q_OBJECT @@ -56,6 +57,8 @@ namespace Swift { static po::options_description getOptionsDescription(); ~QtSwift(); private: + XMLSettingsProvider* loadSettingsFile(const QString& fileName); + private: QtEventLoop clientMainThreadCaller_; PlatformTLSFactories tlsFactories_; BoostNetworkFactories networkFactories_; @@ -63,7 +66,9 @@ namespace Swift { std::vector<MainController*> mainControllers_; std::vector<QtSystemTray*> systemTrays_; std::vector<QtUIFactory*> uiFactories_; - QtSettingsProvider *settings_; + QtSettingsProvider* qtSettings_; + XMLSettingsProvider* xmlSettings_; + SettingsProviderHierachy* settingsHierachy_; QSplitter* splitter_; QtSoundPlayer* soundPlayer_; Dock* dock_; @@ -76,7 +81,6 @@ namespace Swift { Notifier* notifier_; PlatformIdleQuerier idleQuerier_; ActualIdleDetector idleDetector_; - QtUIPreferences uiPreferences_; #if defined(SWIFTEN_PLATFORM_MACOSX) CocoaApplication cocoaApplication_; #endif |