1.1 --- a/GUI/SharpDisplay.cs Tue Feb 03 10:14:18 2015 +0100
1.2 +++ b/GUI/SharpDisplay.cs Sat Jan 23 06:23:15 2016 +0100
1.3 @@ -20,7 +20,7 @@
1.4 using System.Runtime.InteropServices;
1.5 using UacHelpers;
1.6 using System.ServiceModel;
1.7 -using SharpDisplay;
1.8 +using SharpLib.Display;
1.9
1.10
1.11 namespace OpenHardwareMonitor.GUI
1.12 @@ -31,13 +31,13 @@
1.13 private PersistentSettings settings;
1.14 private UnitManager unitManager;
1.15 private List<SensorSharpDisplay> iSensors = new List<SensorSharpDisplay>();
1.16 - private global::SharpDisplay.DisplayClient iClient;
1.17 - DataField iTextFieldTop;
1.18 - DataField iTextFieldBottom;
1.19 - DataField iTextFieldTopRight;
1.20 - DataField iTextFieldBottomRight;
1.21 + private Client iClient;
1.22 + TextField iTextFieldTop;
1.23 + TextField iTextFieldBottom;
1.24 + TextField iTextFieldTopRight;
1.25 + TextField iTextFieldBottomRight;
1.26
1.27 - DataField[] iTextFields;
1.28 + DataField[] iTextFields;
1.29
1.30 private int iNextSensorToDisplay = 0;
1.31 private int iTickCounter = 0;
1.32 @@ -53,12 +53,12 @@
1.33
1.34 //Connect our client
1.35 //Instance context is then managed by our client class
1.36 - iClient = new global::SharpDisplay.DisplayClient();
1.37 + iClient = new Client();
1.38 //
1.39 - iTextFieldTop = new DataField(0);
1.40 - iTextFieldBottom = new DataField(1);
1.41 - iTextFieldTopRight = new DataField(2, "", ContentAlignment.MiddleRight);
1.42 - iTextFieldBottomRight = new DataField(3, "", ContentAlignment.MiddleRight);
1.43 + iTextFieldTop = new TextField("", ContentAlignment.MiddleLeft,0,0);
1.44 + iTextFieldBottom = new TextField("", ContentAlignment.MiddleLeft, 0, 1);
1.45 + iTextFieldTopRight = new TextField("", ContentAlignment.MiddleRight,1,0);
1.46 + iTextFieldBottomRight = new TextField("", ContentAlignment.MiddleRight,1,1);
1.47 //
1.48 iClient.Open();
1.49 iClient.SetName("Open Hardware Monitor");