Client|Log: Resetting Log filter and alert settings to defaults

skyjake · Jan 8, 2014 · cb7ef36 · cb7ef36
1 parent 263ff46
commit cb7ef36
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/doomsday/client/include/clientapp.h b/doomsday/client/include/clientapp.h
@@ -64,6 +64,7 @@ class ClientApp : public de::GuiApp
 public:
     static ClientApp &app();
     static Updater &updater();
+    static SettingsRegister &logSettings();
     static SettingsRegister &audioSettings();    ///< @todo Belongs in AudioSystem.
     static ServerLink &serverLink();
     static InputSystem &inputSystem();

diff --git a/doomsday/client/include/settingsregister.h b/doomsday/client/include/settingsregister.h
@@ -74,6 +74,9 @@ class SettingsRegister
     /**
      * Defines a new setting in the profile.
      *
+     * The default values of Config variables are taken from Config (so it must already
+     * be initialized).
+     *
      * @param type          Type of setting.
      * @param settingName   Name of the setting.
      * @param defaultValue  Default value of the setting (for cvars).

diff --git a/doomsday/client/src/clientapp.cpp b/doomsday/client/src/clientapp.cpp
@@ -127,6 +127,7 @@ DENG2_PIMPL(ClientApp)
 {    
     QScopedPointer<Updater> updater;
     SettingsRegister audioSettings;
+    SettingsRegister logSettings;
     QMenuBar *menuBar;
     InputSystem *inputSys;
     QScopedPointer<WidgetActions> widgetActions;
@@ -240,7 +241,17 @@ DENG2_PIMPL(ClientApp)
 
     void initSettings()
     {
-        typedef SettingsRegister SReg;
+        typedef SettingsRegister SReg; // convenience
+
+        // Log filter and alert settings.
+        for(int i = LogEntry::FirstDomainBit; i <= LogEntry::LastDomainBit; ++i)
+        {
+            String const name = LogFilter::domainRecordName(LogEntry::Context(1 << i));
+            logSettings
+                    .define(SReg::ConfigVariable, String("log.filter.%1.minLevel").arg(name))
+                    .define(SReg::ConfigVariable, String("log.filter.%1.allowDev").arg(name))
+                    .define(SReg::ConfigVariable, String("alert.%1").arg(name));
+        }
 
         /// @todo These belong in their respective subsystems.
 
@@ -332,7 +343,7 @@ void ClientApp::initialize()
 
     initSubsystems(); // loads Config
 
-    // Set up the log alerts.
+    // Set up the log alerts (observes Config variables).
     d->logAlarm.alertMask.init();
 
     // Create the user's configurations and settings folder, if it doesn't exist.
@@ -439,6 +450,11 @@ Updater &ClientApp::updater()
     return *app().d->updater;
 }
 
+SettingsRegister &ClientApp::logSettings()
+{
+    return app().d->logSettings;
+}
+
 SettingsRegister &ClientApp::audioSettings()
 {
     return app().d->audioSettings;

diff --git a/doomsday/client/src/ui/dialogs/logsettingsdialog.cpp b/doomsday/client/src/ui/dialogs/logsettingsdialog.cpp
@@ -21,8 +21,7 @@
 #include "ui/widgets/variabletogglewidget.h"
 #include "ui/widgets/foldpanelwidget.h"
 #include "SignalAction"
-
-#include <de/App>
+#include "clientapp.h"
 
 using namespace de;
 
@@ -245,6 +244,7 @@ LogSettingsDialog::LogSettingsDialog(String const &name)
 
 void LogSettingsDialog::resetToDefaults()
 {
+    ClientApp::logSettings().resetToDefaults();
 }
 
 void LogSettingsDialog::updateLogFilter()