1.1 --- a/GUI/MainForm.Designer.cs Sun Jul 08 19:26:00 2012 +0000
1.2 +++ b/GUI/MainForm.Designer.cs Wed Jul 11 17:35:30 2012 +0000
1.3 @@ -51,6 +51,12 @@
1.4 this.sumbitReportMenuItem = new System.Windows.Forms.MenuItem();
1.5 this.MenuItem2 = new System.Windows.Forms.MenuItem();
1.6 this.resetMenuItem = new System.Windows.Forms.MenuItem();
1.7 + this.menuItem5 = new System.Windows.Forms.MenuItem();
1.8 + this.mainboardMenuItem = new System.Windows.Forms.MenuItem();
1.9 + this.cpuMenuItem = new System.Windows.Forms.MenuItem();
1.10 + this.gpuMenuItem = new System.Windows.Forms.MenuItem();
1.11 + this.fanControllerMenuItem = new System.Windows.Forms.MenuItem();
1.12 + this.hddMenuItem = new System.Windows.Forms.MenuItem();
1.13 this.menuItem6 = new System.Windows.Forms.MenuItem();
1.14 this.exitMenuItem = new System.Windows.Forms.MenuItem();
1.15 this.viewMenuItem = new System.Windows.Forms.MenuItem();
1.16 @@ -73,9 +79,12 @@
1.17 this.temperatureUnitsMenuItem = new System.Windows.Forms.MenuItem();
1.18 this.celsiusMenuItem = new System.Windows.Forms.MenuItem();
1.19 this.fahrenheitMenuItem = new System.Windows.Forms.MenuItem();
1.20 + this.plotLocationMenuItem = new System.Windows.Forms.MenuItem();
1.21 + this.plotWindowMenuItem = new System.Windows.Forms.MenuItem();
1.22 + this.plotBottomMenuItem = new System.Windows.Forms.MenuItem();
1.23 + this.plotRightMenuItem = new System.Windows.Forms.MenuItem();
1.24 this.MenuItem4 = new System.Windows.Forms.MenuItem();
1.25 - this.hddMenuItem = new System.Windows.Forms.MenuItem();
1.26 - this.webMenuItem = new System.Windows.Forms.MenuItem();
1.27 + this.webMenuItem = new System.Windows.Forms.MenuItem();
1.28 this.runWebServerMenuItem = new System.Windows.Forms.MenuItem();
1.29 this.serverPortMenuItem = new System.Windows.Forms.MenuItem();
1.30 this.helpMenuItem = new System.Windows.Forms.MenuItem();
1.31 @@ -84,13 +93,8 @@
1.32 this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
1.33 this.timer = new System.Windows.Forms.Timer(this.components);
1.34 this.splitContainer = new OpenHardwareMonitor.GUI.SplitContainerAdv();
1.35 - this.treeView = new Aga.Controls.Tree.TreeViewAdv();
1.36 - this.plotLocationMenuItem = new System.Windows.Forms.MenuItem();
1.37 - this.plotWindowMenuItem = new System.Windows.Forms.MenuItem();
1.38 - this.plotBottomMenuItem = new System.Windows.Forms.MenuItem();
1.39 - this.plotRightMenuItem = new System.Windows.Forms.MenuItem();
1.40 + this.treeView = new Aga.Controls.Tree.TreeViewAdv();
1.41 this.splitContainer.Panel1.SuspendLayout();
1.42 - this.splitContainer.Panel2.SuspendLayout();
1.43 this.splitContainer.SuspendLayout();
1.44 this.SuspendLayout();
1.45 //
1.46 @@ -189,6 +193,7 @@
1.47 this.sumbitReportMenuItem,
1.48 this.MenuItem2,
1.49 this.resetMenuItem,
1.50 + this.menuItem5,
1.51 this.menuItem6,
1.52 this.exitMenuItem});
1.53 this.fileMenuItem.Text = "File";
1.54 @@ -216,14 +221,50 @@
1.55 this.resetMenuItem.Text = "Reset";
1.56 this.resetMenuItem.Click += new System.EventHandler(this.resetClick);
1.57 //
1.58 + // menuItem5
1.59 + //
1.60 + this.menuItem5.Index = 4;
1.61 + this.menuItem5.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
1.62 + this.mainboardMenuItem,
1.63 + this.cpuMenuItem,
1.64 + this.gpuMenuItem,
1.65 + this.fanControllerMenuItem,
1.66 + this.hddMenuItem});
1.67 + this.menuItem5.Text = "Hardware";
1.68 + //
1.69 + // mainboardMenuItem
1.70 + //
1.71 + this.mainboardMenuItem.Index = 0;
1.72 + this.mainboardMenuItem.Text = "Mainboard";
1.73 + //
1.74 + // cpuMenuItem
1.75 + //
1.76 + this.cpuMenuItem.Index = 1;
1.77 + this.cpuMenuItem.Text = "CPU";
1.78 + //
1.79 + // gpuMenuItem
1.80 + //
1.81 + this.gpuMenuItem.Index = 2;
1.82 + this.gpuMenuItem.Text = "GPU";
1.83 + //
1.84 + // fanControllerMenuItem
1.85 + //
1.86 + this.fanControllerMenuItem.Index = 3;
1.87 + this.fanControllerMenuItem.Text = "Fan Controllers";
1.88 + //
1.89 + // hddMenuItem
1.90 + //
1.91 + this.hddMenuItem.Index = 4;
1.92 + this.hddMenuItem.Text = "Hard Disk Drives";
1.93 + //
1.94 // menuItem6
1.95 //
1.96 - this.menuItem6.Index = 4;
1.97 + this.menuItem6.Index = 5;
1.98 this.menuItem6.Text = "-";
1.99 //
1.100 // exitMenuItem
1.101 //
1.102 - this.exitMenuItem.Index = 5;
1.103 + this.exitMenuItem.Index = 6;
1.104 this.exitMenuItem.Text = "Exit";
1.105 this.exitMenuItem.Click += new System.EventHandler(this.exitClick);
1.106 //
1.107 @@ -307,8 +348,7 @@
1.108 this.temperatureUnitsMenuItem,
1.109 this.plotLocationMenuItem,
1.110 this.MenuItem4,
1.111 - this.hddMenuItem,
1.112 - this.webMenuItem});
1.113 + this.webMenuItem});
1.114 this.optionsMenuItem.Text = "Options";
1.115 //
1.116 // startMinMenuItem
1.117 @@ -356,34 +396,53 @@
1.118 this.fahrenheitMenuItem.Text = "Fahrenheit";
1.119 this.fahrenheitMenuItem.Click += new System.EventHandler(this.fahrenheitMenuItem_Click);
1.120 //
1.121 + // plotLocationMenuItem
1.122 + //
1.123 + this.plotLocationMenuItem.Index = 6;
1.124 + this.plotLocationMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
1.125 + this.plotWindowMenuItem,
1.126 + this.plotBottomMenuItem,
1.127 + this.plotRightMenuItem});
1.128 + this.plotLocationMenuItem.Text = "Plot Location";
1.129 + //
1.130 + // plotWindowMenuItem
1.131 + //
1.132 + this.plotWindowMenuItem.Index = 0;
1.133 + this.plotWindowMenuItem.Text = "Window";
1.134 + //
1.135 + // plotBottomMenuItem
1.136 + //
1.137 + this.plotBottomMenuItem.Index = 1;
1.138 + this.plotBottomMenuItem.Text = "Bottom";
1.139 + //
1.140 + // plotRightMenuItem
1.141 + //
1.142 + this.plotRightMenuItem.Index = 2;
1.143 + this.plotRightMenuItem.Text = "Right";
1.144 + //
1.145 // MenuItem4
1.146 //
1.147 this.MenuItem4.Index = 7;
1.148 this.MenuItem4.Text = "-";
1.149 //
1.150 - // hddMenuItem
1.151 + // webMenuItem
1.152 //
1.153 - this.hddMenuItem.Index = 8;
1.154 - this.hddMenuItem.Text = "Read HDD sensors";
1.155 - //
1.156 - // webMenuItem
1.157 - //
1.158 - this.webMenuItem.Index = 9;
1.159 - this.webMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
1.160 - this.runWebServerMenuItem,
1.161 - this.serverPortMenuItem});
1.162 - this.webMenuItem.Text = "Remote Web Server";
1.163 + this.webMenuItem.Index = 8;
1.164 + this.webMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
1.165 + this.runWebServerMenuItem,
1.166 + this.serverPortMenuItem});
1.167 + this.webMenuItem.Text = "Remote Web Server";
1.168 //
1.169 // runWebServerMenuItem
1.170 //
1.171 this.runWebServerMenuItem.Index = 0;
1.172 this.runWebServerMenuItem.Text = "Run";
1.173 - //
1.174 - // serverPortMenuItem
1.175 - //
1.176 - this.serverPortMenuItem.Index = 1;
1.177 - this.serverPortMenuItem.Text = "Port";
1.178 - this.serverPortMenuItem.Click += new System.EventHandler(this.serverPortMenuItem_Click);
1.179 + //
1.180 + // serverPortMenuItem
1.181 + //
1.182 + this.serverPortMenuItem.Index = 1;
1.183 + this.serverPortMenuItem.Text = "Port";
1.184 + this.serverPortMenuItem.Click += new System.EventHandler(this.serverPortMenuItem_Click);
1.185 //
1.186 // helpMenuItem
1.187 //
1.188 @@ -466,30 +525,6 @@
1.189 this.treeView.MouseMove += new System.Windows.Forms.MouseEventHandler(this.treeView_MouseMove);
1.190 this.treeView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeView_MouseUp);
1.191 //
1.192 - // plotLocationMenuItem
1.193 - //
1.194 - this.plotLocationMenuItem.Index = 6;
1.195 - this.plotLocationMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
1.196 - this.plotWindowMenuItem,
1.197 - this.plotBottomMenuItem,
1.198 - this.plotRightMenuItem});
1.199 - this.plotLocationMenuItem.Text = "Plot Location";
1.200 - //
1.201 - // plotWindowMenuItem
1.202 - //
1.203 - this.plotWindowMenuItem.Index = 0;
1.204 - this.plotWindowMenuItem.Text = "Window";
1.205 - //
1.206 - // plotBottomMenuItem
1.207 - //
1.208 - this.plotBottomMenuItem.Index = 1;
1.209 - this.plotBottomMenuItem.Text = "Bottom";
1.210 - //
1.211 - // plotRightMenuItem
1.212 - //
1.213 - this.plotRightMenuItem.Index = 2;
1.214 - this.plotRightMenuItem.Text = "Right";
1.215 - //
1.216 // MainForm
1.217 //
1.218 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
1.219 @@ -506,7 +541,6 @@
1.220 this.ResizeEnd += new System.EventHandler(this.MainForm_MoveOrResize);
1.221 this.Move += new System.EventHandler(this.MainForm_MoveOrResize);
1.222 this.splitContainer.Panel1.ResumeLayout(false);
1.223 - this.splitContainer.Panel2.ResumeLayout(false);
1.224 this.splitContainer.ResumeLayout(false);
1.225 this.ResumeLayout(false);
1.226
1.227 @@ -568,6 +602,11 @@
1.228 private System.Windows.Forms.MenuItem webMenuItem;
1.229 private System.Windows.Forms.MenuItem runWebServerMenuItem;
1.230 private System.Windows.Forms.MenuItem serverPortMenuItem;
1.231 + private System.Windows.Forms.MenuItem menuItem5;
1.232 + private System.Windows.Forms.MenuItem mainboardMenuItem;
1.233 + private System.Windows.Forms.MenuItem cpuMenuItem;
1.234 + private System.Windows.Forms.MenuItem gpuMenuItem;
1.235 + private System.Windows.Forms.MenuItem fanControllerMenuItem;
1.236 }
1.237 }
1.238