Release - 2.7.0.3

2024-06-26 21:13:58 +02:00 · 2024-06-26 21:13:58 +02:00 · 314347b171
commit 314347b171
parent be756c102b
15 changed files with 157 additions and 77 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,15 @@

 Zapisnik razvoja programa TPS1100 Convert.

+---
+
+## v2.7.0.3 (2024/06/20)
+
+### Novo
+
+- Dodane funkcije za uvoz, izvoz in ponastavitev kodiranja podatkov v nastavitvah
+
+
 ---

 ## v2.7.0.0 (2024/06/20)
@ -15,6 +24,7 @@ Zapisnik razvoja programa TPS1100 Convert.
 	- (koda: 2) temperatura in zračni pritisk pritisk
 	- (koda: 3) orientacije

+
 ### Spremembe

 - Dodana vrstica z meniji Datoteka in Program
@ -23,12 +33,13 @@ Zapisnik razvoja programa TPS1100 Convert.
 - Sprememnjen način prikazovanja polj za ročni vnos podatkov za stojišče, temp./pritisk in orientacijo (Urejevalnik GSI datotek)
 - Odstranjena koda za "StakeOut" (ni uporabna)

+
 ### V Delu

 - Delo na dokumentaciji:
 	- Navodila za uporabo programa
 	- Kodiranje podatkov (uporaba in opis kod)
- Delo na funkcijah za uvoz in izvoz kodiranja podatkov v nastavitvah (Uvoz še ni aktiven)
+

 ---

--- a/Form2.Designer.vb
+++ b/Form2.Designer.vb
@ -142,7 +142,6 @@ Partial Class Form2
        '
        'ToolStripTextBox1
        '
-        Me.ToolStripTextBox1.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.ToolStripTextBox1.Name = "ToolStripTextBox1"
        Me.ToolStripTextBox1.Size = New System.Drawing.Size(90, 27)
        Me.ToolStripTextBox1.Text = "NAME"
@ -158,7 +157,6 @@ Partial Class Form2
        '
        'ToolStripTextBox2
        '
-        Me.ToolStripTextBox2.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.ToolStripTextBox2.Name = "ToolStripTextBox2"
        Me.ToolStripTextBox2.Size = New System.Drawing.Size(60, 27)
        Me.ToolStripTextBox2.Text = "0.000"
@ -174,7 +172,6 @@ Partial Class Form2
        '
        'ToolStripTextBox5
        '
-        Me.ToolStripTextBox5.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.ToolStripTextBox5.Name = "ToolStripTextBox5"
        Me.ToolStripTextBox5.Size = New System.Drawing.Size(70, 27)
        Me.ToolStripTextBox5.Text = "0.0000"
@ -190,7 +187,6 @@ Partial Class Form2
        '
        'ToolStripTextBox3
        '
-        Me.ToolStripTextBox3.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.ToolStripTextBox3.Name = "ToolStripTextBox3"
        Me.ToolStripTextBox3.Size = New System.Drawing.Size(50, 27)
        Me.ToolStripTextBox3.Text = "20.0"
@ -206,7 +202,6 @@ Partial Class Form2
        '
        'ToolStripTextBox4
        '
-        Me.ToolStripTextBox4.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.ToolStripTextBox4.Name = "ToolStripTextBox4"
        Me.ToolStripTextBox4.Size = New System.Drawing.Size(60, 27)
        Me.ToolStripTextBox4.Text = "1013"
--- a/FormNastavitve.Designer.vb
+++ b/FormNastavitve.Designer.vb
@ -72,6 +72,7 @@ Partial Class FormNastavitve
        Me.DatotekaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.IzvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.UvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PonastaviKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.ZapriToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ButtonShraniZapri = New System.Windows.Forms.Button()
@ -224,9 +225,8 @@ Partial Class FormNastavitve
        'OpenFileDialogNast
        '
        Me.OpenFileDialogNast.CheckFileExists = False
-        Me.OpenFileDialogNast.DefaultExt = "CFG File|*.cfg"
-        Me.OpenFileDialogNast.FileName = "tps1100_log.txt"
-        Me.OpenFileDialogNast.Filter = "CFG File|*.cfg"
+        Me.OpenFileDialogNast.DefaultExt = "Text File|*.txt"
+        Me.OpenFileDialogNast.Filter = "Text File|*.txt|Any File|*.*"
        '
        'SaveFileDialogLog
        '
@ -652,9 +652,9 @@ Partial Class FormNastavitve
        '
        'SaveFileDialogNast
        '
-        Me.SaveFileDialogNast.DefaultExt = "CFG File|*.cfg"
-        Me.SaveFileDialogNast.FileName = "tps1100_kode.cfg"
-        Me.SaveFileDialogNast.Filter = "CFG File|*.cfg"
+        Me.SaveFileDialogNast.DefaultExt = "Text File|*.txt"
+        Me.SaveFileDialogNast.FileName = "tps1100_kode.txt"
+        Me.SaveFileDialogNast.Filter = "Text File|*.txt|Any File|*.*"
        '
        'MenuStrip1
        '
@ -667,7 +667,7 @@ Partial Class FormNastavitve
        '
        'DatotekaToolStripMenuItem
        '
-        Me.DatotekaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.IzvoziKodeToolStripMenuItem, Me.UvoziKodeToolStripMenuItem, Me.ToolStripSeparator1, Me.ZapriToolStripMenuItem})
+        Me.DatotekaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UvoziKodeToolStripMenuItem, Me.IzvoziKodeToolStripMenuItem, Me.PonastaviKodeToolStripMenuItem, Me.ToolStripSeparator1, Me.ZapriToolStripMenuItem})
        Me.DatotekaToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
        Me.DatotekaToolStripMenuItem.Name = "DatotekaToolStripMenuItem"
        Me.DatotekaToolStripMenuItem.Size = New System.Drawing.Size(82, 20)
@ -687,6 +687,13 @@ Partial Class FormNastavitve
        Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.UvoziKodeToolStripMenuItem.Text = "&Uvozi Kode"
        '
+        'PonastaviKodeToolStripMenuItem
+        '
+        Me.PonastaviKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_rotate_48
+        Me.PonastaviKodeToolStripMenuItem.Name = "PonastaviKodeToolStripMenuItem"
+        Me.PonastaviKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.PonastaviKodeToolStripMenuItem.Text = "Ponastavi Kode"
+        '
        'ToolStripSeparator1
        '
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
@ -705,9 +712,9 @@ Partial Class FormNastavitve
        Me.ButtonShraniZapri.AutoSize = True
        Me.ButtonShraniZapri.Image = Global.TPS1100_Convert.My.Resources.Resources.Save_as_24
        Me.ButtonShraniZapri.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.ButtonShraniZapri.Location = New System.Drawing.Point(473, 396)
+        Me.ButtonShraniZapri.Location = New System.Drawing.Point(471, 387)
        Me.ButtonShraniZapri.Name = "ButtonShraniZapri"
-        Me.ButtonShraniZapri.Size = New System.Drawing.Size(69, 33)
+        Me.ButtonShraniZapri.Size = New System.Drawing.Size(71, 42)
        Me.ButtonShraniZapri.TabIndex = 8
        Me.ButtonShraniZapri.Text = "Shrani"
        Me.ButtonShraniZapri.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@ -804,4 +811,5 @@ Partial Class FormNastavitve
    Friend WithEvents ButtonShraniZapri As Button
    Friend WithEvents Label7 As Label
    Friend WithEvents TextBoxOriHz As TextBox
+    Friend WithEvents PonastaviKodeToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/FormNastavitve.vb
+++ b/FormNastavitve.vb
@ -3,6 +3,7 @@
 Public Class FormNastavitve

    Private Sub FormNastavitve_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        ' Izvedi pri nalaganju okna z nastavitvami
        If My.Settings.Stolpci = 0 Then
            RadioButton1.Checked = True
        ElseIf My.Settings.Stolpci = 1 Then
@ -32,7 +33,7 @@ Public Class FormNastavitve

    End Sub
    Private Sub FormNastavitve_Closing(sender As Object, e As EventArgs) Handles MyBase.Closing
-
+        ' Izvedi preden zapreš okno z nastavitvami
        If RadioButton1.Checked = True Then
            My.Settings.Stolpci = 0
        End If
@ -68,6 +69,7 @@ Public Class FormNastavitve
        Form1.RichTextBox1.Font = New Font(My.Settings.Pisava, My.Settings.PisavaVelikost)
    End Sub
    Private Sub ButtonOdpriLog_Click(sender As Object, e As EventArgs) Handles ButtonOdpriLog.Click
+        ' Pokaži pot do datoteke z zapisnikom procesiranja
        If SaveFileDialogLog.ShowDialog = DialogResult.OK Then
            TextBoxLog.Text = SaveFileDialogLog.FileName.ToString
            My.Settings.DatLogfile = SaveFileDialogLog.FileName.ToString
@ -75,6 +77,7 @@ Public Class FormNastavitve
    End Sub

    Private Sub ButtonFont_Click(sender As Object, e As EventArgs) Handles ButtonFont.Click
+        ' Izbira pisave za prikaz v glavnem oknu
        Dim fontdia1 = FontDialog1.Font.Name = My.Settings.Pisava
        Dim fontdia2 = FontDialog1.Font.Size = My.Settings.PisavaVelikost

@ -86,6 +89,7 @@ Public Class FormNastavitve
    End Sub

    Private Sub IzvoziKodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IzvoziKodeToolStripMenuItem.Click
+        ' Izvoz kodiranja v TXT datoteko
        Dim dataNast As String = ""

        dataNast = dataNast + "KodaStojisce = " + My.Settings.KodaStojisce + vbCrLf
@ -105,13 +109,8 @@ Public Class FormNastavitve
        End If
    End Sub

-    Private Sub ZapriToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZapriToolStripMenuItem.Click
-        Me.Close()
-
-    End Sub
-
    Private Sub UvoziKodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UvoziKodeToolStripMenuItem.Click
-        ' TODO: Uvoz nastavitev iz datototeke
+        ' Uvoz nastavitev iz datototeke
        If OpenFileDialogNast.ShowDialog = DialogResult.OK Then
            Dim streamReader As StreamReader = New StreamReader(OpenFileDialogNast.FileName)
            Do Until streamReader.EndOfStream
@ -176,6 +175,39 @@ Public Class FormNastavitve

    Private Sub ButtonShraniZapri_Click(sender As Object, e As EventArgs) Handles ButtonShraniZapri.Click
        Me.Close()
+
+    End Sub
+    Private Sub ZapriToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZapriToolStripMenuItem.Click
+        Me.Close()
+
    End Sub

+    Private Sub PonastaviKodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PonastaviKodeToolStripMenuItem.Click
+        ' Ponastavi Kode na privzete vrednosti
+        My.Settings.KodaStojisce = "1"
+        My.Settings.KodaStojisceInfo = "2"
+        My.Settings.KodaStojisceOri = "3"
+        My.Settings.KodaQuickSet = "10"
+        My.Settings.KodaSetAzi = "20"
+        My.Settings.KodaResection = "30"
+        My.Settings.KodaFreeStation = "40"
+        My.Settings.KodaOriHtTrans = "50"
+        My.Settings.KodaMeasOri = "80"
+        My.Settings.KodaMeas = "90"
+        My.Settings.KodaUserImport = "99"
+
+        My.Settings.Save()
+
+        TextBoxStoj.Text = My.Settings.KodaStojisce.ToString
+        TextBoxStojInfo.Text = My.Settings.KodaStojisceInfo.ToString
+        TextBoxOriHz.Text = My.Settings.KodaStojisceOri.ToString
+        TextBoxQuickSet.Text = My.Settings.KodaQuickSet.ToString
+        TextBoxSetAzi.Text = My.Settings.KodaSetAzi.ToString
+        TextBoxRes.Text = My.Settings.KodaResection.ToString
+        TextBoxFree.Text = My.Settings.KodaFreeStation.ToString
+        TextBoxOriHt.Text = My.Settings.KodaOriHtTrans.ToString
+        TextBoxMeasOri.Text = My.Settings.KodaMeasOri.ToString
+        TextBoxMeas.Text = My.Settings.KodaMeas.ToString
+        TextBoxImport.Text = My.Settings.KodaUserImport.ToString
+    End Sub
 End Class
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.7.0.2")>
-<Assembly: AssemblyFileVersion("2.7.0.2")>
+<Assembly: AssemblyVersion("2.7.0.3")>
+<Assembly: AssemblyFileVersion("2.7.0.3")>
 <Assembly: NeutralResourcesLanguage("sl-SI")>
--- a/Project/Icons/icons8-rotate-48.png
+++ b/Project/Icons/icons8-rotate-48.png
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -431,6 +431,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_add_folder_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-add-folder-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
@ -701,6 +711,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_rotate_48() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-rotate-48", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@ -130,6 +130,9 @@
  <data name="icons8-send-file-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-send-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="48" xml:space="preserve">
+    <value>Information 7</value>
+  </data>
  <data name="58" xml:space="preserve">
    <value>Prism constant</value>
  </data>
@ -151,9 +154,6 @@
  <data name="ModernXP_41_Settings_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\ModernXP-41-Settings-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="icons8_add_folder_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="icons8_done_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-done-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -169,9 +169,6 @@
  <data name="76" xml:space="preserve">
    <value>Remark 6</value>
  </data>
-  <data name="19" xml:space="preserve">
-    <value>Time</value>
-  </data>
  <data name="icons8_do_not_disturb_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-do-not-disturb-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -196,17 +193,14 @@
  <data name="icons8_open_end_wrench_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-open-end-wrench-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="82" xml:space="preserve">
-    <value>Northing</value>
-  </data>
  <data name="12" xml:space="preserve">
    <value>Serial number</value>
  </data>
  <data name="73" xml:space="preserve">
    <value>Remark 3</value>
  </data>
-  <data name="icons8_close_window_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8_add_new_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-add-new-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="icons8_cancel_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-cancel-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -235,18 +229,21 @@
  <data name="icons8_clear_symbol_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="icons8_edit_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="icons8-support-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-support-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="25" xml:space="preserve">
-    <value>Horizontal Angle Correction</value>
-  </data>
  <data name="79" xml:space="preserve">
    <value>Remark 9</value>
  </data>
  <data name="Save_as_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\Save-as-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="41" xml:space="preserve">
+    <value>Code-Block ID</value>
+  </data>
  <data name="74" xml:space="preserve">
    <value>Remark 4</value>
  </data>
@ -271,9 +268,6 @@
  <data name="11" xml:space="preserve">
    <value>Point number</value>
  </data>
-  <data name="31" xml:space="preserve">
-    <value>Slope distance</value>
-  </data>
  <data name="icons8_info_squared_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-info-squared-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -292,11 +286,17 @@
  <data name="88" xml:space="preserve">
    <value>Instrument height</value>
  </data>
+  <data name="42" xml:space="preserve">
+    <value>Information 1</value>
+  </data>
  <data name="icons8-question-mark-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-question-mark-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="icons8_opened_folder_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-opened-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="19" xml:space="preserve">
+    <value>Time</value>
+  </data>
+  <data name="icons8-program-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-program-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="icons8_no_entry_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-no-entry-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -304,9 +304,6 @@
  <data name="icons8_save_as_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="icons8-move-to-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="README" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\README.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
  </data>
@ -316,8 +313,8 @@
  <data name="icons8_connection_status_on_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-connection-status-on-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="48" xml:space="preserve">
-    <value>Information 7</value>
+  <data name="82" xml:space="preserve">
+    <value>Northing</value>
  </data>
  <data name="71" xml:space="preserve">
    <value>Remark 1</value>
@ -325,6 +322,9 @@
  <data name="45" xml:space="preserve">
    <value>Information 4</value>
  </data>
+  <data name="icons8_opened_folder_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-opened-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="icons8_advance_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-advance-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -334,8 +334,8 @@
  <data name="87" xml:space="preserve">
    <value>Reflector height</value>
  </data>
-  <data name="icons8_add_new_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-add-new-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-move-to-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="icons8-add-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-add-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -343,11 +343,11 @@
  <data name="32" xml:space="preserve">
    <value>Horizontal distance</value>
  </data>
-  <data name="icons8_edit_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-edit-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="31" xml:space="preserve">
+    <value>Slope distance</value>
  </data>
-  <data name="41" xml:space="preserve">
-    <value>Code-Block ID</value>
+  <data name="25" xml:space="preserve">
+    <value>Horizontal Angle Correction</value>
  </data>
  <data name="21" xml:space="preserve">
    <value>Horizontal Angle</value>
@ -355,10 +355,10 @@
  <data name="84" xml:space="preserve">
    <value>St. Easting</value>
  </data>
-  <data name="42" xml:space="preserve">
-    <value>Information 1</value>
+  <data name="icons8_close_window_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-close-window-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="icons8-program-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-program-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-rotate-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-rotate-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Convert.vbproj
+++ b/Convert.vbproj
@ -18,7 +18,7 @@
    <PublishUrl>E:\_Boris\Git_YunoHost\TPS1100-Convert\publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateEnabled>false</UpdateEnabled>
    <UpdateMode>Background</UpdateMode>
    <UpdateInterval>7</UpdateInterval>
    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
@ -202,9 +202,9 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
-    <None Include="CHANGELOG.md">
+    <Content Include="CHANGELOG.md">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
    <None Include="My Project\app.manifest" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
@ -218,12 +218,13 @@
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
    <None Include="App.config" />
+    <None Include="My Project\Icons\icons8-rotate-48.png" />
    <Content Include="Navodila.pdf">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
-    <None Include="README.md">
+    <Content Include="README.md">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
    <Content Include="Podatki\TEST.GSI">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
--- a/Convert.application
+++ b/Convert.application
@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="TPS1100 Convert.application" version="2.7.0.2" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="TPS1100 Convert.application" version="2.7.0.3" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <description asmv2:publisher="2B geoinformatika d.o.o." asmv2:product="TPS1100 Convert" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <deployment install="true" mapFileExtensions="true" co.v1:createDesktopShortcut="true">
-    <subscription>
-      <update>
-        <expiration maximumAge="0" unit="days" />
-      </update>
-    </subscription>
    <deploymentProvider codebase="https://multibox.nohost.me/gitea/boris/TPS1100-Convert/publish/TPS1100%20Convert.application" />
  </deployment>
  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
    <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
  </compatibleFrameworks>
  <dependency>
-    <dependentAssembly dependencyType="install" codebase="TPS1100 Convert.exe.manifest" size="6681">
-      <assemblyIdentity name="TPS1100 Convert.exe" version="2.7.0.2" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
+    <dependentAssembly dependencyType="install" codebase="TPS1100 Convert.exe.manifest" size="7458">
+      <assemblyIdentity name="TPS1100 Convert.exe" version="2.7.0.3" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>cZW5uN7uAZiW5RzW3zv3YHcWdJNcCPgTKKJBn5vKYF0=</dsig:DigestValue>
+        <dsig:DigestValue>N5C+oRH7VYnSMhb6eQcXKR1wHXezvTSWJEz5QkJL448=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
--- a/bin/Release/TPS1100
+++ b/bin/Release/TPS1100
--- a/Convert.exe.manifest
+++ b/Convert.exe.manifest
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="TPS1100 Convert.exe" version="2.7.0.2" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="TPS1100 Convert.exe" version="2.7.0.3" publicKeyToken="0000000000000000" language="sl-SI" processorArchitecture="msil" type="win32" />
  <description asmv2:iconFile="TPS1100CNVRT.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
  <application />
  <entryPoint>
-    <assemblyIdentity name="TPS1100 Convert" version="2.7.0.2" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="TPS1100 Convert" version="2.7.0.3" language="neutral" processorArchitecture="msil" />
    <commandLine file="TPS1100 Convert.exe" parameters="" />
  </entryPoint>
  <trustInfo>
@ -43,17 +43,26 @@
    </dependentAssembly>
  </dependency>
  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="1237504">
-      <assemblyIdentity name="TPS1100 Convert" version="2.7.0.2" language="neutral" processorArchitecture="msil" />
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="1239040">
+      <assemblyIdentity name="TPS1100 Convert" version="2.7.0.3" language="neutral" processorArchitecture="msil" />
      <hash>
        <dsig:Transforms>
          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
        </dsig:Transforms>
        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>xH9o70f656ukaus5yKiGjkXBXLLWEcxLLtCs4zZhfcE=</dsig:DigestValue>
+        <dsig:DigestValue>9MbQdsngL/DHeK3cDx94oj68MzP5KjB+q9WSEUtgKKA=</dsig:DigestValue>
      </hash>
    </dependentAssembly>
  </dependency>
+  <file name="CHANGELOG.md" size="1803">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>TnL6bdrblDtfQ1Ivt3Cvr9XTXjAr+ofmFHcsg3XXil0=</dsig:DigestValue>
+    </hash>
+  </file>
  <file name="Navodila.pdf" size="206224">
    <hash>
      <dsig:Transforms>
@ -90,6 +99,15 @@
      <dsig:DigestValue>cEKQ3UJZqlT+pcEDo3keS5sCumc6xExVvgGt/ax4Sdc=</dsig:DigestValue>
    </hash>
  </file>
+  <file name="README.md" size="1999">
+    <hash>
+      <dsig:Transforms>
+        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+      </dsig:Transforms>
+      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+      <dsig:DigestValue>61Ai0lnWulgtSMKKVLZy853nrwGZ2wQhSI1up4sW9fA=</dsig:DigestValue>
+    </hash>
+  </file>
  <file name="TPS1100 Convert.exe.config" size="3202">
    <hash>
      <dsig:Transforms>
--- a/bin/Release/app.publish/TPS1100
+++ b/bin/Release/app.publish/TPS1100
--- a/bin/TPS1100-Convert_2.7.0.0_Portable.zip
+++ b/bin/TPS1100-Convert_2.7.0.0_Portable.zip
--- a/bin/TPS1100-Convert_2.7.0.3_Portable.zip
+++ b/bin/TPS1100-Convert_2.7.0.3_Portable.zip