Fixed Issue 368. Fixed Issue 369. Fixed Issue 370.

This commit is contained in:
Michael Möller
2012-10-28 15:19:45 +00:00
parent 69b0050008
commit 9a1d0d5c08
3 changed files with 96 additions and 45 deletions
+5 -5
View File
@@ -84,7 +84,7 @@ namespace OpenHardwareMonitor.GUI {
this.plotWindowMenuItem = new System.Windows.Forms.MenuItem();
this.plotBottomMenuItem = new System.Windows.Forms.MenuItem();
this.plotRightMenuItem = new System.Windows.Forms.MenuItem();
this.MenuItem4 = new System.Windows.Forms.MenuItem();
this.webMenuItemSeparator = new System.Windows.Forms.MenuItem();
this.webMenuItem = new System.Windows.Forms.MenuItem();
this.runWebServerMenuItem = new System.Windows.Forms.MenuItem();
this.serverPortMenuItem = new System.Windows.Forms.MenuItem();
@@ -354,7 +354,7 @@ namespace OpenHardwareMonitor.GUI {
this.separatorMenuItem,
this.temperatureUnitsMenuItem,
this.plotLocationMenuItem,
this.MenuItem4,
this.webMenuItemSeparator,
this.webMenuItem});
this.optionsMenuItem.Text = "Options";
//
@@ -434,8 +434,8 @@ namespace OpenHardwareMonitor.GUI {
//
// MenuItem4
//
this.MenuItem4.Index = 7;
this.MenuItem4.Text = "-";
this.webMenuItemSeparator.Index = 7;
this.webMenuItemSeparator.Text = "-";
//
// webMenuItem
//
@@ -596,7 +596,7 @@ namespace OpenHardwareMonitor.GUI {
private System.Windows.Forms.MenuItem minMenuItem;
private System.Windows.Forms.MenuItem maxMenuItem;
private System.Windows.Forms.MenuItem temperatureUnitsMenuItem;
private System.Windows.Forms.MenuItem MenuItem4;
private System.Windows.Forms.MenuItem webMenuItemSeparator;
private System.Windows.Forms.MenuItem celsiusMenuItem;
private System.Windows.Forms.MenuItem fahrenheitMenuItem;
private System.Windows.Forms.MenuItem sumbitReportMenuItem;
+7 -3
View File
@@ -263,11 +263,16 @@ namespace OpenHardwareMonitor.GUI {
fahrenheitMenuItem.Checked = !celsiusMenuItem.Checked;
server = new HttpServer(root, this.settings.GetValue("listenerPort", 8085));
if (server.PlatformNotSupported) {
webMenuItemSeparator.Visible = false;
webMenuItem.Visible = false;
}
runWebServer = new UserOption("runWebServerMenuItem", false,
runWebServerMenuItem, settings);
runWebServer.Changed += delegate(object sender, EventArgs e) {
if (runWebServer.Value)
runWebServer.Value = server.StartHTTPListener();
server.StartHTTPListener();
else
server.StopHTTPListener();
};
@@ -293,8 +298,7 @@ namespace OpenHardwareMonitor.GUI {
computer.Close();
SaveConfiguration();
if (runWebServer.Value)
server.Quit();
server.Quit();
};
}