Changeset 562

Timestamp:

11/14/2008 8:43:37 AM (3 years ago)

Author:

lowjoel

Message:

-The EraserSettings? class should belong in Program.cs
-Defined a few defaults:

-File erasure method: Gutmann (35)
-Unused space: Pseudorandom (1)
-PRNG: RNGCryptoServiceProvider
-UI language: whatever the current UI culture is

Location:

branches/eraser6

Files:

• Eraser/Program.cs (modified) (2 diffs)
• Eraser/SettingsPanel.cs (modified) (1 diff)
• Manager/Method.cs (modified) (1 diff)
• Manager/Settings.cs (modified) (3 diffs)

branches/eraser6/Eraser/Program.cs

@@ -163 +163 @@
             //Open the registry key containing the settings
             RegistryKey pluginsKey = Application.UserAppDataRegistry.OpenSubKey(
-                "Plugins\\" + guid.ToString(), true);
+                guid.ToString(), true);
             if (pluginsKey == null)
                 pluginsKey = Application.UserAppDataRegistry.CreateSubKey(
-                    "Plugins\\" + guid.ToString());
+                    guid.ToString());
 
             //Return the Settings object.
@@ -172 +172 @@
         }
     }
+
+    internal class EraserSettings
+    {
+        public EraserSettings()
+        {
+            settings = Manager.ManagerLibrary.Instance.SettingsManager.ModuleSettings;
+        }
+
+        /// <summary>
+        /// Gets or sets the LCID of the language which the UI should be displayed in.
+        /// </summary>
+        public string Language
+        {
+            get
+            {
+                return settings["Language"] == null ? 
+                    GetCurrentCulture().Name :
+                    (string)settings["Language"];
+            }
+            set
+            {
+                settings["Language"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value on whether the main frame should be minimised to the
+        /// system notification area.
+        /// </summary>
+        public bool HideWhenMinimised
+        {
+            get
+            {
+                return settings["HideWhenMinimised"] == null ?
+                    true : (bool)settings["HideWhenMinimised"];
+            }
+            set
+            {
+                settings["HideWhenMinimised"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current UI culture, correct to the top-level culture (i.e., English
+        /// instead of English (United Kingdom))
+        /// </summary>
+        /// <returns>The CultureInfo of the current UI culture, correct to the top level.</returns>
+        private static CultureInfo GetCurrentCulture()
+        {
+            CultureInfo culture = CultureInfo.CurrentUICulture;
+            while (culture.Parent != CultureInfo.InvariantCulture)
+                culture = culture.Parent;
+
+            return culture;
+        }
+
+        private Manager.Settings settings;
+    }
 }

branches/eraser6/Eraser/SettingsPanel.cs

@@ -375 +375 @@
         }
     }
-
-    internal class EraserSettings
-    {
-        public EraserSettings()
-        {
-            settings = Manager.ManagerLibrary.Instance.SettingsManager.ModuleSettings;
-        }
-
-        /// <summary>
-        /// Gets or sets a value containing the language the UI should be displayed in.
-        /// </summary>
-        public string Language
-        {
-            get
-            {
-                return (string)settings["Language"];
-            }
-            set
-            {
-                settings["Language"] = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value on whether the main frame should be minimised to the
-        /// system notification area.
-        /// </summary>
-        public bool HideWhenMinimised
-        {
-            get
-            {
-                return (bool)settings["HideWhenMinimised"];
-            }
-            set
-            {
-                settings["HideWhenMinimised"] = value;
-            }
-        }
-
-        private Manager.Settings settings;
-    }
 }
 

branches/eraser6/Manager/Method.cs

@@ -451 +451 @@
         }
 
-
         /// <summary>
         /// Allows plug-ins to register methods with the main program. Thread-safe.

branches/eraser6/Manager/Settings.cs

@@ -116 +116 @@
             get
             {
-                return settings["DefaultFileErasureMethod"] == null ? Guid.Empty :
+                return settings["DefaultFileErasureMethod"] == null ? 
+                    new Guid("1407FC4E-FEFF-4375-B4FB-D7EFBB7E9922") :
                     (Guid)settings["DefaultFileErasureMethod"];
             }
@@ -134 +135 @@
             get
             {
-                return settings["DefaultUnusedSpaceErasureMethod"] == null ? Guid.Empty :
+                return settings["DefaultUnusedSpaceErasureMethod"] == null ? 
+                    new Guid("{BF8BA267-231A-4085-9BF9-204DE65A6641}") :
                     (Guid)settings["DefaultUnusedSpaceErasureMethod"];
             }
@@ -151 +153 @@
             get
             {
-                return settings["ActivePRNG"] == null ? Guid.Empty :
+                return settings["ActivePRNG"] == null ? 
+                    new Guid("{6BF35B8E-F37F-476e-B6B2-9994A92C3B0C}") :
                     (Guid)settings["ActivePRNG"];
             }