New versions from Gurux.DLMS.UI and Gurux.DLMS.

polfosol · May 23, 2017 · 2316ace · 2316ace
1 parent a08b6c8
commit 2316ace
Show file tree

Hide file tree

Showing 28 changed files with 83 additions and 66 deletions.
diff --git a/Development/CryptHelper.cs b/Development/CryptHelper.cs
@@ -5,9 +5,9 @@
 //
 //
 //
-// Version: $Revision: 6803 $,
-// $Date: 2013-12-16 09:52:30 +0200 (ma, 16 joulu 2013) $
-// $Author: kurumi $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
+// $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
 //

diff --git a/Development/DevicePropertiesForm.Designer.cs b/Development/DevicePropertiesForm.Designer.cs
diff --git a/Development/DevicePropertiesForm.cs b/Development/DevicePropertiesForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 9397 $,
-// $Date: 2017-05-15 10:43:42 +0300 (ma, 15 touko 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
@@ -788,7 +788,7 @@ void UpdateStartProtocol()
  {
  //If IEC47 is used DLMS is only protocol.
  GXManufacturer man = this.ManufacturerCB.SelectedItem as GXManufacturer;
- this.UseLNCB.Checked = man.UseLogicalNameReferencing;
+ this.UseLNCB.Checked = Device.UseLogicalNameReferencing = man.UseLogicalNameReferencing;
  if (SelectedMedia is GXNet && man != null)
  {
  StartProtocolCB.Enabled = !man.UseIEC47;

diff --git a/Development/DeviceState.cs b/Development/DeviceState.cs
@@ -5,9 +5,9 @@
 //
 //
 //
-// Version: $Revision: 3125 $,
-// $Date: 2010-12-14 10:08:50 +0200 (ti, 14 joulu 2010) $
-// $Author: kurumi $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
+// $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
 //

diff --git a/Development/GXDLMSCommunicator.cs b/Development/GXDLMSCommunicator.cs
@@ -4,8 +4,8 @@
 //
 //
 //
-// Version: $Revision: 9397 $,
-// $Date: 2017-05-15 10:43:42 +0300 (ma, 15 touko 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/GXDLMSDevice.cs b/Development/GXDLMSDevice.cs
@@ -4,8 +4,8 @@
 //
 //
 //
-// Version: $Revision: 9397 $,
-// $Date: 2017-05-15 10:43:42 +0300 (ma, 15 touko 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/GXDLMSDeviceCollection.cs b/Development/GXDLMSDeviceCollection.cs
@@ -5,9 +5,9 @@
 //
 //
 //
-// Version: $Revision: 6743 $,
-// $Date: 2013-11-28 15:38:22 +0200 (to, 28 marras 2013) $
-// $Author: kurumi $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
+// $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
 //

diff --git a/Development/GXDLMSDirector.csproj b/Development/GXDLMSDirector.csproj
@@ -98,12 +98,12 @@
  <HintPath>packages\Gurux.Common.8.1.1702.0602\lib\portable-win+net35\Gurux.Common.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Gurux.DLMS, Version=8.5.1705.1201, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>packages\Gurux.DLMS.8.5.1705.1201\lib\portable-win+net35\Gurux.DLMS.dll</HintPath>
+ <Reference Include="Gurux.DLMS, Version=8.5.1705.2202, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>packages\Gurux.DLMS.8.5.1705.2202\lib\portable-win+net35\Gurux.DLMS.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="Gurux.DLMS.UI, Version=8.5.1705.1502, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>packages\Gurux.DLMS.UI.8.5.1705.1502\lib\portable-win+net35\Gurux.DLMS.UI.dll</HintPath>
+ <Reference Include="Gurux.DLMS.UI, Version=8.5.1705.2201, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>packages\Gurux.DLMS.UI.8.5.1705.2201\lib\portable-win+net35\Gurux.DLMS.UI.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="Gurux.Net, Version=8.1.1703.3101, Culture=neutral, processorArchitecture=MSIL">

diff --git a/Development/GXDLMSObjectSerializer.cs b/Development/GXDLMSObjectSerializer.cs
@@ -5,9 +5,9 @@
 //
 //
 //
-// Version: $Revision: 5618 $,
-// $Date: 2012-08-24 09:15:04 +0300 (pe, 24 elo 2012) $
-// $Author: kurumi $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
+// $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
 //

diff --git a/Development/GXObisValueItemForm.Designer.cs b/Development/GXObisValueItemForm.Designer.cs
diff --git a/Development/GXObisValueItemForm.cs b/Development/GXObisValueItemForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 8937 $,
-// $Date: 2016-11-23 14:03:11 +0200 (ke, 23 marras 2016) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/GXValueSerializer.cs b/Development/GXValueSerializer.cs
@@ -5,9 +5,9 @@
 //
 //
 //
-// Version: $Revision: 3125 $,
-// $Date: 2010-12-14 10:08:50 +0200 (ti, 14 joulu 2010) $
-// $Author: kurumi $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
+// $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
 //

diff --git a/Development/GuruxWin32.cs b/Development/GuruxWin32.cs
@@ -5,9 +5,9 @@
 //
 //
 //
-// Version: $Revision: 4004 $,
-// $Date: 2011-09-14 13:46:00 +0300 (ke, 14 syys 2011) $
-// $Author: kurumi $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
+// $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
 //

diff --git a/Development/MainForm.Designer.cs b/Development/MainForm.Designer.cs
diff --git a/Development/MainForm.cs b/Development/MainForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 9403 $,
-// $Date: 2017-05-15 17:10:26 +0300 (ma, 15 touko 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
@@ -661,6 +661,23 @@ private void UpdateProperties(object obj, IGXDLMSView view, List<object> Updated
 
  void Initialize()
  {
+ //Save changes?
+ if (this.Dirty)
+ {
+ DialogResult ret = MessageBox.Show(this, Properties.Resources.SaveChangesTxt, Properties.Resources.GXDLMSDirectorTxt, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+ if (ret == DialogResult.Cancel)
+ {
+ return;
+ }
+ if (ret == DialogResult.Yes)
+ {
+ if (!Save())
+ {
+ return;
+ }
+ }
+ }
+
  path = "";
  ObjectTreeItems.Clear();
  SelectedListItems.Clear();

diff --git a/Development/ManufacturerForm.Designer.cs b/Development/ManufacturerForm.Designer.cs
diff --git a/Development/ManufacturerForm.cs b/Development/ManufacturerForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 9367 $,
-// $Date: 2017-04-19 13:14:37 +0300 (ke, 19 huhti 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/ManufacturerSettings/GXError.cs b/Development/ManufacturerSettings/GXError.cs
@@ -5,9 +5,9 @@
 //
 //
 //
-// Version: $Revision: 5901 $,
-// $Date: 2013-01-08 14:52:06 +0200 (ti, 08 tammi 2013) $
-// $Author: kurumi $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
+// $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd
 //

diff --git a/Development/ManufacturerSettings/GXLogWriter.cs b/Development/ManufacturerSettings/GXLogWriter.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 9233 $,
-// $Date: 2017-02-20 09:17:34 +0200 (ma, 20 helmi 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/ManufacturersForm.Designer.cs b/Development/ManufacturersForm.Designer.cs
diff --git a/Development/ManufacturersForm.cs b/Development/ManufacturersForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 9048 $,
-// $Date: 2016-12-20 16:35:34 +0200 (ti, 20 joulu 2016) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/OBISCodeForm.Designer.cs b/Development/OBISCodeForm.Designer.cs
diff --git a/Development/OBISCodeForm.cs b/Development/OBISCodeForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 8991 $,
-// $Date: 2016-12-02 13:54:21 +0200 (pe, 02 joulu 2016) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/OBISCodesForm.Designer.cs b/Development/OBISCodesForm.Designer.cs
diff --git a/Development/OBISCodesForm.cs b/Development/OBISCodesForm.cs
@@ -5,8 +5,8 @@
 //
 //
 //
-// Version: $Revision: 8937 $,
-// $Date: 2016-11-23 14:03:11 +0200 (ke, 23 marras 2016) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/Program.cs b/Development/Program.cs
@@ -4,8 +4,8 @@
 //
 //
 //
-// Version: $Revision: 9270 $,
-// $Date: 2017-03-21 21:24:32 +0200 (ti, 21 maalis 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/Properties/AssemblyInfo.cs b/Development/Properties/AssemblyInfo.cs
@@ -4,8 +4,8 @@
 //
 //
 //
-// Version: $Revision: 9152 $,
-// $Date: 2017-01-23 10:12:50 +0200 (ma, 23 tammi 2017) $
+// Version: $Revision: 9442 $,
+// $Date: 2017-05-23 15:21:03 +0300 (ti, 23 touko 2017) $
 // $Author: gurux01 $
 //
 // Copyright (c) Gurux Ltd

diff --git a/Development/packages.config b/Development/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Gurux.Common" version="8.1.1702.0602" targetFramework="net35" />
- <package id="Gurux.DLMS" version="8.5.1705.1201" targetFramework="net35" />
- <package id="Gurux.DLMS.UI" version="8.5.1705.1502" targetFramework="net35" />
+ <package id="Gurux.DLMS" version="8.5.1705.2202" targetFramework="net35" />
+ <package id="Gurux.DLMS.UI" version="8.5.1705.2201" targetFramework="net35" />
  <package id="Gurux.Net" version="8.1.1703.3101" targetFramework="net35" />
  <package id="Gurux.Serial" version="8.1.1702.1001" targetFramework="net35" />
  <package id="Gurux.Terminal" version="8.1.1702.1001" targetFramework="net35" />