Version 2.0

Mit änderbarem Einstellungen Download Pfad

PSU_Calculator/DataWorker/CalculatorSettingsFile.cs

@@ -35,11 +35,23 @@ private CalculatorSettingsFile()
     private Updater updater;
     private bool hasChanged = false;
 
+    public bool HasChanged
+    {
+      get
+      {
+        return hasChanged;
+      }
+      set
+      {
+        hasChanged = value;
+      }
+    }
+
     public void Load()
     {
       if (!FileExists(PSUCalculatorSettings.Einstellungen))
       {
-        return;
+        new Updater().RunUpdateSyncroniced();
       }
       settings = StorageMapper.GetXML(PSUCalculatorSettings.GetFilePath(PSUCalculatorSettings.Einstellungen));
 
@@ -55,13 +67,20 @@ public void Load()
           versionFileDict.Add(name, ver);
         }
       }
+      if (settings.getElementByName(PSUCalculatorSettings.Einstellungen)!=null)
+      {
+        if (!string.IsNullOrWhiteSpace(settings.getElementByName(PSUCalculatorSettings.Einstellungen).Text))
+        {
+          AddDownloadableFile(PSUCalculatorSettings.Einstellungen, settings.getElementByName(PSUCalculatorSettings.Einstellungen).Text.Trim());
+        }
+      }
       updater.FileVersions = versionFileDict;
       updater.FilesToUpdate = updateFileDict;
 
     }
 
     /// <summary>
-    /// gibt einen Boolschen wert asu dem Settings Element zurück.
+    /// gibt einen Boolschen wert aus dem Settings Element zurück.
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>
@@ -107,7 +126,10 @@ public void SaveSettings()
     public double GetVersionForFile(string filename) 
     {
       double outvalue;
-      if (versionFileDict.TryGetValue(filename, out outvalue))
+      string value= settings.getElementByPfadOnCreate(PSUCalculatorSettings.Version).
+        getElementByPfadOnCreate(filename).
+        getAttribut(PSUCalculatorSettings.Version);
+      if (Double.TryParse(value, out outvalue))
       {
         return outvalue;
       }
@@ -147,6 +169,7 @@ public void AddDownloadableFile(string filename, string url)
         updateFileDict.Remove(filename);
       }
       updateFileDict.Add(filename, url);
+      hasChanged = true;
     }
 
     public bool IsValid()

PSU_Calculator/DataWorker/PSUCalculatorSettings.cs

@@ -140,13 +140,12 @@ private void Load()
       version = Settings.getElementByName("Version");
       //ElementDict abfüllen.
       ElementDict.Add(GPU, version.getElementByName(GPU));
+      ElementDict.Add("AskSaveLocal", Settings.getElementByPfadOnCreate("AskSaveLocal"));
       ElementDict.Add(CPU, version.getElementByName(CPU));
       ElementDict.Add(PowerSupply, version.getElementByName(PowerSupply));
       ElementDict.Add(SearchEngineString, Settings.getElementByName(SearchEngineString));
-      //if (Settings.getElementByName(BoolValues) != null)
-      //{
-      //  ElementDict.Add(BoolValues, Settings.getElementByName(BoolValues));
-      //}
+
+
       SetSearchEngine(Settings.getElementByName(SearchEngineString).Text);
     }
 
@@ -234,6 +233,10 @@ public void SetSearchEngine(string engine)
       if (oldEngine != null && !oldEngine.Equals(SearchEngine))
       {
         hasChanged = true;
+      } 
+      if (string.IsNullOrEmpty(oldEngine) || oldEngine.Equals(SearchEngine))
+      {
+        CalculatorSettingsFile.Get().HasChanged = false;
       }
     }
 
@@ -265,17 +268,18 @@ public bool ShowPriceComparer
       get;
       set;
     }
-    //public bool ShowPriceComparer
-    //{
-    //  get
-    //  {
-    //    return GetBoolValue("ShowPriceComparer");
-    //  }
-    //  set
-    //  {
-    //    SetBoolValue("ShowPriceComparer", value);
-    //  }
-    //}
+
+    public bool AskSaveLocal
+    {
+      get
+      {
+        return CalculatorSettingsFile.Get().GetBoolValue("AskSaveLocal");
+      }
+      set
+      {
+        CalculatorSettingsFile.Get().SetBoolValue("AskSaveLocal", value);
+      }
+    }
 
     public bool ConnectorsHaveToFit
     {

PSU_Calculator/Dateizugriffe/StorageMapper.cs

@@ -15,7 +15,7 @@ public class StorageMapper
     public static bool SetLocalData(string _version, List<PcComponent> _gpu, List<PcComponent> _cpu, List<PcComponent> _nt)
     {
       //erstesmal?
-      if (!Properties.Einstellungen.Default.AskSaveLocal)
+      if (!PSUCalculatorSettings.Get().AskSaveLocal)
       {
         if (!StorageMapper.Existiert(PSUCalculatorSettings.Get().DirectoryPath))
         {
@@ -32,7 +32,7 @@ public static bool SetLocalData(string _version, List<PcComponent> _gpu, List<Pc
           {
             return false;
           }
-          Properties.Einstellungen.Default.AskSaveLocal = true;
+          PSUCalculatorSettings.Get().AskSaveLocal = true;
         }
 
       }

PSU_Calculator/Forms/InputFeld.cs

@@ -0,0 +1,64 @@
+using PSU_Calculator.Komponenten;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+
+namespace PSU_Calculator
+{
+  /// <summary>
+  /// Einfaches Input Feld, mit übernehmen Button und Regex Prüfung.
+  /// </summary>
+  public partial class InputFeld : Form
+  {
+    PowerSupply PSU;
+    private Regex myRegex;
+    public InputFeld(string inTitle, Regex inRegex)
+    {
+      InitializeComponent();
+      Name = inTitle;
+      myRegex = inRegex;
+      FormClosing += InputFeld_FormClosing;
+    }
+
+    void InputFeld_FormClosing(object sender, FormClosingEventArgs e)
+    {
+      if (string.IsNullOrWhiteSpace(tbxInput.Text))
+      {
+        this.DialogResult = DialogResult.Cancel;
+      }
+      if (myRegex !=null)
+      {
+        if (!myRegex.IsMatch(tbxInput.Text))
+        {
+          this.DialogResult = DialogResult.Cancel;
+        }
+      }
+    }
+
+    public string GetText
+    {
+      get
+      {
+        return tbxInput.Text;
+      }
+      set
+      {
+        tbxInput.Text = value;
+      }
+    }
+
+    private void Finished(object sender, EventArgs e)
+    {
+      DialogResult = DialogResult.OK;
+      this.Close();
+    }
+
+
+  }
+}