A few remaining changes of OHM to LHM (#144)

LibreHardwareMonitor.sln

@@ -61,24 +61,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6A8EF661-2BD7-498F-8FB9-28182B3B0BE5}
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = OpenHardwareMonitor.csproj
-		Policies = $0
-		$0.DotNetNamingPolicy = $1
-		$1.DirectoryNamespaceAssociation = None
-		$1.ResourceNamePolicy = FileFormatDefault
-		$0.TextStylePolicy = $3
-		$2.FileWidth = 120
-		$2.TabWidth = 2
-		$2.NoTabsAfterNonTabs = True
-		$2.inheritsSet = VisualStudio
-		$2.inheritsScope = text/plain
-		$2.scope = text/plain
-		$3.inheritsSet = null
-		$3.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $4
-		$4.inheritsSet = Mono
-		$4.inheritsScope = text/x-csharp
-		$4.scope = text/x-csharp
-	EndGlobalSection
 EndGlobal

LibreHardwareMonitor/TestScripts/basicwmi.py

@@ -4,13 +4,13 @@
 # * python.exe -m pip install wmi
 #
 # Usage:
-# * !! Make sure openhardwaremonitor is running !!
+# * !! Make sure librehardwaremonitor is running !!
 # * python basicwmi.py
 ################################################################
 
 import wmi
 
-hwmon = wmi.WMI(namespace="root\OpenHardwareMonitor")
+hwmon = wmi.WMI(namespace="root\LibreHardwareMonitor")
 sensors = hwmon.Sensor(SensorType="Control")
 
 for s in sensors:

LibreHardwareMonitorLib/Hardware/Network/Network.cs

@@ -1,7 +1,7 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
+// Mozilla Public License 2.0
-// License, v. 2.0. If a copy of the MPL was not distributed with this
+// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// Copyright (C) LibreHardwareMonitor and Contributors
-// Copyright (C) 2012 Michael Möller <mmoeller@openhardwaremonitor.org>
+// All Rights Reserved
 
 using System;
 using System.Diagnostics;

LibreHardwareMonitorLib/Hardware/Network/NetworkGroup.cs

@@ -1,7 +1,7 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
+// Mozilla Public License 2.0
-// License, v. 2.0. If a copy of the MPL was not distributed with this
+// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// Copyright (C) LibreHardwareMonitor and Contributors
-// Copyright (C) 2012 Michael Möller <mmoeller@openhardwaremonitor.org>
+// All Rights Reserved
 
 using System.Collections.Generic;
 using System.Linq;

Licenses/License.html

@@ -7,14 +7,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<title>Open Hardware Monitor - License</title>
+<title>Libre Hardware Monitor - License</title>
 <style type="text/css" media="screen">
 
 body {
 	font: message-box;
 	color: #333333;
-	background: #f2f2f2 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAJYCAQAAAAJAkQUAAAAAXNSR0IArs4c6QAAAAJiS0dEAP+Hj8y/AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2wMeFQUPtG6UfwAAAE1JREFUOMtjWPOfiYFhaCBGhiHj1CHnbMZR99DLGYw01sJItCwjWWYyEifFSMgoRhINIUkjE/VMptwKGhlLdpiQEfiUpwfqcokUIVoQAL0FBqEjZ7+VAAAAAElFTkSuQmCC) repeat-x top;
+	background: #f2f2f2;
-	*background: #f2f2f2;
 	padding: 5px;
 }
      
@@ -24,12 +23,9 @@ dt {
 
 #page  {
 	clear: both;
-	max-width: 800px;	
+	max-width: 950px;	
 	margin:10px auto;
 	background: #ffffff;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
 	box-shadow: 0px 0px 5px #777;
 	-moz-box-shadow: 0px 0px 5px #777;
 	-webkit-box-shadow: 0px 0px 5px #777;
@@ -53,14 +49,14 @@ dt {
 <div id="page">
 <div id="content">
 
-<h1>Open Hardware Monitor License</h1>
+<h1>Libre Hardware Monitor License</h1>
 
 <p> 
-The <b>binaries</b> of the Open Hardware Monitor have been made available by the <a href="http://openhardwaremonitor.org">Open Hardware Monitor Project</a> under the Mozilla Public License 2.0 (MPL).
+The <b>binaries</b> of the Libre Hardware Monitor have been made available by the <a href="http://openhardwaremonitor.org">Libre Hardware Monitor Project</a> under the Mozilla Public License 2.0 (MPL).
 </p>
 
 <p>
-The <b>source code</b> of the Open Hardware Monitor is <a href="http://code.google.com/p/open-hardware-monitor/source/">available</a> under licenses which are both <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and <a href="http://www.opensource.org/docs/definition.php">open source</a>. Most of it is available under the Mozilla Public License 2.0 (MPL).
+The <b>source code</b> of the Libre Hardware Monitor is <a href="http://code.google.com/p/open-hardware-monitor/source/">available</a> under licenses which are both <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and <a href="http://www.opensource.org/docs/definition.php">open source</a>. Most of it is available under the Mozilla Public License 2.0 (MPL).
 </p>
 
 <ul>
@@ -74,10 +70,7 @@ The remainder of the software which is not under the Mozilla Public License 2.0
 <ul>
 <li><a href="#Aga.Controls">Aga.Controls License</a></li>
 <li><a href="#WinRing0">WinRing0 License</a></li>
-<li><a href="#jQuery">jQuery License</a></li>
-<li><a href="#Knockout">Knockout License</a></li>
 <li><a href="#OxyPlot">OxyPlot License</a></li>
-<li><a href="#LINQBridge">LINQBridge License</a></li>
 </ul>
 
 <br/>
@@ -276,62 +269,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <hr/>
 
-<h1 id="jQuery">jQuery License</h1>
-<p>
-This license applies to the jQuery JavaScript library.
-</p>
-<pre>
-Copyright (c) 2012 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
-</pre>
-
-<hr/>
-
-<h1 id="Knockout">Knockout License</h1>
-<p>
-This license applies to the Knockout JavaScript library.
-</p>
-<pre>
-Copyright (c) 2012 Steven Sanderson, Roy Jacobs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
-</pre>
-
-<hr/>
-
 <h1 id="OxyPlot">OxyPlot License</h1>
 <p>
 This license applies to the OxyPlot library.
@@ -358,42 +295,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 </pre>
 
-<hr/>
-
-<h1 id="LINQBridge">LINQBridge License</h1>
-<p>
-This license applies to the LINQBridge library.
-</p>
-<pre>
-Copyright (c) 2007-2009 Atif Aziz, Joseph Albahari. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-- Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-- Redistributions in binary form must reproduce the above copyright notice, this 
-list of conditions and the following disclaimer in the documentation and/or other 
-materials provided with the distribution. 
-- Neither the name of the original authors nor the names of its contributors may 
-be used to endorse or promote products derived from this software without specific 
-prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-</pre>
-
 </div>
 </div>