Removed the WMI Provider menu entry and restricted WMI to the Windows platform.
authormoel.mich
Sun, 17 Oct 2010 19:13:26 +0000
changeset 232475b7160e3bc
parent 231 30f5a06f5d8a
child 233 c5139c236200
Removed the WMI Provider menu entry and restricted WMI to the Windows platform.
GUI/MainForm.Designer.cs
GUI/MainForm.cs
Properties/AssemblyVersion.cs
     1.1 --- a/GUI/MainForm.Designer.cs	Sun Oct 17 17:12:38 2010 +0000
     1.2 +++ b/GUI/MainForm.Designer.cs	Sun Oct 17 19:13:26 2010 +0000
     1.3 @@ -100,8 +100,6 @@
     1.4        this.fahrenheitMenuItem = new System.Windows.Forms.MenuItem();
     1.5        this.MenuItem4 = new System.Windows.Forms.MenuItem();
     1.6        this.hddMenuItem = new System.Windows.Forms.MenuItem();
     1.7 -      this.menuItem5 = new System.Windows.Forms.MenuItem();
     1.8 -      this.wmiMenuItem = new System.Windows.Forms.MenuItem();
     1.9        this.helpMenuItem = new System.Windows.Forms.MenuItem();
    1.10        this.aboutMenuItem = new System.Windows.Forms.MenuItem();
    1.11        this.sensorContextMenu = new System.Windows.Forms.ContextMenu();
    1.12 @@ -310,9 +308,7 @@
    1.13              this.separatorMenuItem,
    1.14              this.temperatureUnitsMenuItem,
    1.15              this.MenuItem4,
    1.16 -            this.hddMenuItem,
    1.17 -            this.menuItem5,
    1.18 -            this.wmiMenuItem});
    1.19 +            this.hddMenuItem});
    1.20        this.optionsMenuItem.Text = "Options";
    1.21        // 
    1.22        // startMinMenuItem
    1.23 @@ -370,16 +366,6 @@
    1.24        this.hddMenuItem.Index = 7;
    1.25        this.hddMenuItem.Text = "Read HDD sensors";
    1.26        // 
    1.27 -      // menuItem5
    1.28 -      // 
    1.29 -      this.menuItem5.Index = 8;
    1.30 -      this.menuItem5.Text = "-";
    1.31 -      // 
    1.32 -      // wmiMenuItem
    1.33 -      // 
    1.34 -      this.wmiMenuItem.Index = 9;
    1.35 -      this.wmiMenuItem.Text = "Enable WMI Provider";
    1.36 -      // 
    1.37        // helpMenuItem
    1.38        // 
    1.39        this.helpMenuItem.Index = 3;
    1.40 @@ -536,8 +522,6 @@
    1.41      private System.Windows.Forms.MenuItem MenuItem3;
    1.42      private System.Windows.Forms.MenuItem gadgetMenuItem;
    1.43      private System.Windows.Forms.MenuItem minCloseMenuItem;
    1.44 -    private System.Windows.Forms.MenuItem menuItem5;
    1.45 -    private System.Windows.Forms.MenuItem wmiMenuItem;
    1.46    }
    1.47  }
    1.48  
     2.1 --- a/GUI/MainForm.cs	Sun Oct 17 17:12:38 2010 +0000
     2.2 +++ b/GUI/MainForm.cs	Sun Oct 17 19:13:26 2010 +0000
     2.3 @@ -73,7 +73,6 @@
     2.4      private UserOption autoStart;
     2.5      private UserOption readHddSensors;
     2.6      private UserOption showGadget;
     2.7 -    private UserOption enableWmiProvider;
     2.8  
     2.9      private WmiProvider wmiProvider;
    2.10  
    2.11 @@ -130,13 +129,11 @@
    2.12          minCloseMenuItem.Visible = false;
    2.13        } else { // Windows
    2.14          gadget = new SensorGadget(computer, settings, unitManager);
    2.15 +        wmiProvider = new WmiProvider(computer);
    2.16        }          
    2.17  
    2.18        computer.HardwareAdded += new HardwareEventHandler(HardwareAdded);
    2.19 -      computer.HardwareRemoved += new HardwareEventHandler(HardwareRemoved);
    2.20 -
    2.21 -      if (settings.GetValue("enableWmiProvider", false))
    2.22 -        wmiProvider = new WmiProvider(computer);
    2.23 +      computer.HardwareRemoved += new HardwareEventHandler(HardwareRemoved);        
    2.24  
    2.25        computer.Open();
    2.26  
    2.27 @@ -223,17 +220,6 @@
    2.28            gadget.Visible = showGadget.Value;
    2.29        };
    2.30  
    2.31 -      enableWmiProvider = new UserOption("enableWmiProvider", false,
    2.32 -        wmiMenuItem, settings);
    2.33 -      enableWmiProvider.Changed += delegate {
    2.34 -        if (enableWmiProvider.Value && wmiProvider == null)
    2.35 -          wmiProvider = new WmiProvider(computer);
    2.36 -        else if (!enableWmiProvider.Value && wmiProvider != null) {
    2.37 -          wmiProvider.Dispose();
    2.38 -          wmiProvider = null;
    2.39 -        }
    2.40 -      };
    2.41 -
    2.42        celciusMenuItem.Checked = 
    2.43          unitManager.TemperatureUnit == TemperatureUnit.Celcius;
    2.44        fahrenheitMenuItem.Checked = !celciusMenuItem.Checked;
     3.1 --- a/Properties/AssemblyVersion.cs	Sun Oct 17 17:12:38 2010 +0000
     3.2 +++ b/Properties/AssemblyVersion.cs	Sun Oct 17 19:13:26 2010 +0000
     3.3 @@ -37,5 +37,5 @@
     3.4  
     3.5  using System.Reflection;
     3.6  
     3.7 -[assembly: AssemblyVersion("0.2.1.1")]
     3.8 -[assembly: AssemblyInformationalVersion("0.2.1.1 Alpha")]
     3.9 \ No newline at end of file
    3.10 +[assembly: AssemblyVersion("0.2.1.6")]
    3.11 +[assembly: AssemblyInformationalVersion("0.2.1.6 Alpha")]
    3.12 \ No newline at end of file