Nova vaerzija 2.5.0.4

App.config

@@ -19,11 +19,11 @@
             <setting name="KodeUporabnik" serializeAs="String">
                 <value>Da</value>
             </setting>
-            <setting name="DatKodeUporabnik" serializeAs="String">
-                <value>GSI_user.ini</value>
+            <setting name="Datoteka" serializeAs="String">
+                <value />
             </setting>
-            <setting name="DatKodeData" serializeAs="String">
-                <value>GSI_data.ini</value>
+            <setting name="Stolpci" serializeAs="String">
+                <value>0</value>
             </setting>
         </TPS1100_Convert.My.MySettings>
     </userSettings>

ApplicationEvents.vb

@@ -0,0 +1,12 @@
+Namespace My
+    ' The following events are available for MyApplication:
+    ' Startup: Raised when the application starts, before the startup form is created.
+    ' Shutdown: Raised after all application forms are closed.  This event is not raised if the application terminates abnormally.
+    ' UnhandledException: Raised if the application encounters an unhandled exception.
+    ' StartupNextInstance: Raised when launching a single-instance application and the application is already active. 
+    ' NetworkAvailabilityChanged: Raised when the network connection is connected or disconnected.
+
+    Partial Friend Class MyApplication
+
+    End Class
+End Namespace

Form1.Designer.vb

@@ -25,27 +25,31 @@ Partial Class Form1
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1))
         Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.ToolStripProgressBar1 = New System.Windows.Forms.ToolStripProgressBar()
         Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
         Me.ToolStripStatusLabel2 = New System.Windows.Forms.ToolStripStatusLabel()
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
-        Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.tsbFileName = New System.Windows.Forms.ToolStripTextBox()
-        Me.tsbConvert = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel()
+        Me.tsbOpenFile = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.LabelDatoteka = New System.Windows.Forms.ToolStripLabel()
+        Me.ButtonUrediDat = New System.Windows.Forms.ToolStripButton()
+        Me.tsbConvert = New System.Windows.Forms.ToolStripButton()
         Me.tsbPointsOnly = New System.Windows.Forms.ToolStripButton()
         Me.tsbHelp = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
+        Me.tsbSaveAs = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolStripComboBox2 = New System.Windows.Forms.ToolStripComboBox()
         Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
         Me.ToolStripComboBox1 = New System.Windows.Forms.ToolStripComboBox()
         Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
+        Me.tsbStolpci = New System.Windows.Forms.ToolStripComboBox()
+        Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel()
+        Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.StatusStrip1.SuspendLayout()
         Me.ToolStrip1.SuspendLayout()
         Me.SuspendLayout()
@@ -58,29 +62,39 @@ Partial Class Form1
         Me.RichTextBox1.BackColor = System.Drawing.SystemColors.ControlLightLight
         Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
-        Me.RichTextBox1.Location = New System.Drawing.Point(9, 29)
+        Me.RichTextBox1.Location = New System.Drawing.Point(9, 39)
         Me.RichTextBox1.Margin = New System.Windows.Forms.Padding(0)
         Me.RichTextBox1.Name = "RichTextBox1"
         Me.RichTextBox1.ReadOnly = True
-        Me.RichTextBox1.Size = New System.Drawing.Size(1233, 690)
+        Me.RichTextBox1.Size = New System.Drawing.Size(1233, 680)
         Me.RichTextBox1.TabIndex = 1
         Me.RichTextBox1.Text = ""
+        Me.RichTextBox1.WordWrap = False
         '
         'StatusStrip1
         '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1, Me.ToolStripStatusLabel2})
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripProgressBar1, Me.ToolStripStatusLabel1, Me.ToolStripStatusLabel2})
         Me.StatusStrip1.Location = New System.Drawing.Point(0, 719)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.Size = New System.Drawing.Size(1251, 22)
         Me.StatusStrip1.TabIndex = 2
         Me.StatusStrip1.Text = "StatusStrip1"
         '
+        'ToolStripProgressBar1
+        '
+        Me.ToolStripProgressBar1.ForeColor = System.Drawing.Color.LimeGreen
+        Me.ToolStripProgressBar1.Margin = New System.Windows.Forms.Padding(10, 3, 10, 3)
+        Me.ToolStripProgressBar1.Name = "ToolStripProgressBar1"
+        Me.ToolStripProgressBar1.Size = New System.Drawing.Size(100, 16)
+        Me.ToolStripProgressBar1.Step = 1
+        Me.ToolStripProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous
+        '
         'ToolStripStatusLabel1
         '
         Me.ToolStripStatusLabel1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
         Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1"
-        Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(99, 17)
-        Me.ToolStripStatusLabel1.Text = "Made by Boris Bilc"
+        Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(236, 17)
+        Me.ToolStripStatusLabel1.Text = "Made by 2B geoinformatika d.o.o. / Boris Bilc"
         '
         'ToolStripStatusLabel2
         '
@@ -97,15 +111,6 @@ Partial Class Form1
         Me.SaveFileDialog1.DefaultExt = "*.txt"
         Me.SaveFileDialog1.Title = "Save As..."
         '
-        'tsbOpenFile
-        '
-        Me.tsbOpenFile.Image = CType(resources.GetObject("tsbOpenFile.Image"), System.Drawing.Image)
-        Me.tsbOpenFile.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbOpenFile.Name = "tsbOpenFile"
-        Me.tsbOpenFile.Size = New System.Drawing.Size(83, 26)
-        Me.tsbOpenFile.Text = "Odpri GSI"
-        Me.tsbOpenFile.ToolTipText = "Open File..."
-        '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
@@ -114,87 +119,105 @@ Partial Class Form1
         'tsbFileName
         '
         Me.tsbFileName.AutoSize = False
-        Me.tsbFileName.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
+        Me.tsbFileName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.tsbFileName.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(238, Byte))
+        Me.tsbFileName.Margin = New System.Windows.Forms.Padding(5, 0, 5, 0)
         Me.tsbFileName.Name = "tsbFileName"
         Me.tsbFileName.ReadOnly = True
-        Me.tsbFileName.Size = New System.Drawing.Size(160, 23)
+        Me.tsbFileName.Size = New System.Drawing.Size(200, 25)
         Me.tsbFileName.Text = "Odpri GSI datoteko..."
         '
-        'tsbConvert
+        'ToolStrip1
         '
-        Me.tsbConvert.Enabled = False
-        Me.tsbConvert.Image = CType(resources.GetObject("tsbConvert.Image"), System.Drawing.Image)
-        Me.tsbConvert.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbConvert.Name = "tsbConvert"
-        Me.tsbConvert.Size = New System.Drawing.Size(77, 26)
-        Me.tsbConvert.Text = "Poročilo"
-        Me.tsbConvert.ToolTipText = "Convert"
+        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(22, 22)
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbOpenFile, Me.ToolStripSeparator2, Me.LabelDatoteka, Me.tsbFileName, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripSeparator3, Me.ToolStripComboBox2, Me.ToolStripLabel2, Me.ToolStripComboBox1, Me.ToolStripLabel1, Me.tsbStolpci, Me.ToolStripLabel3, Me.ToolStripSeparator5})
+        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(10, 5, 10, 5)
+        Me.ToolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System
+        Me.ToolStrip1.Size = New System.Drawing.Size(1251, 39)
+        Me.ToolStrip1.TabIndex = 0
+        Me.ToolStrip1.Text = "ToolStrip1"
+        '
+        'tsbOpenFile
+        '
+        Me.tsbOpenFile.Image = CType(resources.GetObject("tsbOpenFile.Image"), System.Drawing.Image)
+        Me.tsbOpenFile.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbOpenFile.Name = "tsbOpenFile"
+        Me.tsbOpenFile.Size = New System.Drawing.Size(72, 26)
+        Me.tsbOpenFile.Text = "Odpri..."
+        Me.tsbOpenFile.ToolTipText = "Izberi GSI datoteko..."
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
         Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 29)
         '
-        'tsbSaveAs
+        'LabelDatoteka
         '
-        Me.tsbSaveAs.Enabled = False
-        Me.tsbSaveAs.Image = CType(resources.GetObject("tsbSaveAs.Image"), System.Drawing.Image)
-        Me.tsbSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbSaveAs.Name = "tsbSaveAs"
-        Me.tsbSaveAs.Size = New System.Drawing.Size(78, 26)
-        Me.tsbSaveAs.Text = "Shrani ..."
+        Me.LabelDatoteka.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.LabelDatoteka.Image = Global.TPS1100_Convert.My.Resources.Resources.Circled_Right_2_24
+        Me.LabelDatoteka.Name = "LabelDatoteka"
+        Me.LabelDatoteka.Size = New System.Drawing.Size(22, 26)
+        Me.LabelDatoteka.Text = "Datoteka"
         '
-        'ToolStrip1
+        'ButtonUrediDat
         '
-        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(22, 22)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbFileName, Me.tsbOpenFile, Me.ToolStripSeparator2, Me.ToolStripButton1, Me.ToolStripSeparator1, Me.ToolStripLabel3, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripSeparator3, Me.ToolStripComboBox2, Me.ToolStripLabel2, Me.ToolStripComboBox1, Me.ToolStripLabel1})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(10, 0, 10, 0)
-        Me.ToolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System
-        Me.ToolStrip1.Size = New System.Drawing.Size(1251, 29)
-        Me.ToolStrip1.TabIndex = 0
-        Me.ToolStrip1.Text = "ToolStrip1"
+        Me.ButtonUrediDat.Enabled = False
+        Me.ButtonUrediDat.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_edit_50
+        Me.ButtonUrediDat.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ButtonUrediDat.Name = "ButtonUrediDat"
+        Me.ButtonUrediDat.Size = New System.Drawing.Size(61, 26)
+        Me.ButtonUrediDat.Text = "Uredi"
+        Me.ButtonUrediDat.ToolTipText = "Uredi GSI"
         '
-        'ToolStripButton1
+        'tsbConvert
         '
-        Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image)
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(76, 26)
-        Me.ToolStripButton1.Text = "Urejanje"
-        '
-        'ToolStripLabel3
-        '
-        Me.ToolStripLabel3.Name = "ToolStripLabel3"
-        Me.ToolStripLabel3.Size = New System.Drawing.Size(97, 26)
-        Me.ToolStripLabel3.Text = "Izvoz podatkov >"
+        Me.tsbConvert.Enabled = False
+        Me.tsbConvert.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tsbConvert.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_land_surveying_48
+        Me.tsbConvert.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbConvert.Name = "tsbConvert"
+        Me.tsbConvert.Size = New System.Drawing.Size(73, 26)
+        Me.tsbConvert.Text = "Meritve"
+        Me.tsbConvert.ToolTipText = "Izvozi zapisnik meritev."
         '
         'tsbPointsOnly
         '
         Me.tsbPointsOnly.Enabled = False
-        Me.tsbPointsOnly.Image = CType(resources.GetObject("tsbPointsOnly.Image"), System.Drawing.Image)
+        Me.tsbPointsOnly.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.tsbPointsOnly.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_connection_status_on_48
         Me.tsbPointsOnly.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbPointsOnly.Name = "tsbPointsOnly"
-        Me.tsbPointsOnly.Size = New System.Drawing.Size(63, 26)
+        Me.tsbPointsOnly.Size = New System.Drawing.Size(64, 26)
         Me.tsbPointsOnly.Text = "Točke"
-        Me.tsbPointsOnly.ToolTipText = "Points Only"
+        Me.tsbPointsOnly.ToolTipText = "Izvozi koordinate točk."
         '
         'tsbHelp
         '
         Me.tsbHelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.tsbHelp.Image = CType(resources.GetObject("tsbHelp.Image"), System.Drawing.Image)
+        Me.tsbHelp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbHelp.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_info_squared_50
         Me.tsbHelp.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbHelp.Name = "tsbHelp"
-        Me.tsbHelp.Size = New System.Drawing.Size(71, 26)
-        Me.tsbHelp.Text = "Pomoč"
+        Me.tsbHelp.Size = New System.Drawing.Size(26, 26)
+        Me.tsbHelp.Text = "Info"
         '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
         Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 29)
         '
+        'tsbSaveAs
+        '
+        Me.tsbSaveAs.Enabled = False
+        Me.tsbSaveAs.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
+        Me.tsbSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbSaveAs.Name = "tsbSaveAs"
+        Me.tsbSaveAs.Size = New System.Drawing.Size(78, 26)
+        Me.tsbSaveAs.Text = "Shrani ..."
+        '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
@@ -205,7 +228,6 @@ Partial Class Form1
         '
         Me.ToolStripComboBox2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.ToolStripComboBox2.DropDownWidth = 50
-        Me.ToolStripComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.System
         Me.ToolStripComboBox2.Items.AddRange(New Object() {"Pika", "Vejica"})
         Me.ToolStripComboBox2.Name = "ToolStripComboBox2"
         Me.ToolStripComboBox2.Size = New System.Drawing.Size(75, 29)
@@ -214,13 +236,12 @@ Partial Class Form1
         '
         Me.ToolStripLabel2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.ToolStripLabel2.Name = "ToolStripLabel2"
-        Me.ToolStripLabel2.Size = New System.Drawing.Size(56, 26)
-        Me.ToolStripLabel2.Text = "Decimale"
+        Me.ToolStripLabel2.Size = New System.Drawing.Size(63, 26)
+        Me.ToolStripLabel2.Text = "Decimalna"
         '
         'ToolStripComboBox1
         '
         Me.ToolStripComboBox1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.ToolStripComboBox1.FlatStyle = System.Windows.Forms.FlatStyle.System
         Me.ToolStripComboBox1.Items.AddRange(New Object() {"Da", "Ne"})
         Me.ToolStripComboBox1.Name = "ToolStripComboBox1"
         Me.ToolStripComboBox1.Size = New System.Drawing.Size(75, 29)
@@ -232,8 +253,28 @@ Partial Class Form1
         Me.ToolStripLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
         Me.ToolStripLabel1.Image = CType(resources.GetObject("ToolStripLabel1.Image"), System.Drawing.Image)
         Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(101, 26)
-        Me.ToolStripLabel1.Text = "Uporabi kodiranje"
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(34, 26)
+        Me.ToolStripLabel1.Text = "Kode"
+        '
+        'tsbStolpci
+        '
+        Me.tsbStolpci.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.tsbStolpci.Items.AddRange(New Object() {"Presledek", "Tabulator"})
+        Me.tsbStolpci.Name = "tsbStolpci"
+        Me.tsbStolpci.Size = New System.Drawing.Size(100, 29)
+        '
+        'ToolStripLabel3
+        '
+        Me.ToolStripLabel3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ToolStripLabel3.Name = "ToolStripLabel3"
+        Me.ToolStripLabel3.Size = New System.Drawing.Size(43, 26)
+        Me.ToolStripLabel3.Text = "Stolpci"
+        '
+        'ToolStripSeparator5
+        '
+        Me.ToolStripSeparator5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 29)
         '
         'Form1
         '
@@ -247,6 +288,7 @@ Partial Class Form1
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.MinimumSize = New System.Drawing.Size(1000, 480)
         Me.Name = "Form1"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "TPS1100 Convert"
         Me.StatusStrip1.ResumeLayout(False)
         Me.StatusStrip1.PerformLayout()
@@ -264,7 +306,6 @@ Partial Class Form1
     Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
     Friend WithEvents tsbFileName As ToolStripTextBox
     Friend WithEvents tsbConvert As ToolStripButton
-    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
     Friend WithEvents tsbSaveAs As ToolStripButton
     Friend WithEvents ToolStrip1 As ToolStrip
     Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
@@ -277,6 +318,11 @@ Partial Class Form1
     Friend WithEvents tsbPointsOnly As ToolStripButton
     Friend WithEvents tsbHelp As ToolStripButton
     Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
-    Friend WithEvents ToolStripButton1 As ToolStripButton
+    Friend WithEvents ButtonUrediDat As ToolStripButton
+    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
+    Friend WithEvents LabelDatoteka As ToolStripLabel
+    Friend WithEvents ToolStripSeparator5 As ToolStripSeparator
+    Friend WithEvents tsbStolpci As ToolStripComboBox
     Friend WithEvents ToolStripLabel3 As ToolStripLabel
+    Friend WithEvents ToolStripProgressBar1 As ToolStripProgressBar
 End Class

Form1.resx

@@ -126,187 +126,26 @@
   <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>383, 17</value>
   </metadata>
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="tsbOpenFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALTSURBVGhD7ZZdSFNhGMefoo+bCJLqsmUXgVsKalhpCHkh
-        YmBUkJKBhETQTV1434VUsyLEijCbH6l3UpkZQtDN9Gy6rc3NuUzrpDa/mlFEI2TnfXpHjxzyrJs6m3vh
-        /OAH45xn7/n/D+dwXjAwMDAwWHcinbB9qQtuLHXCAPfVv7jQBS8Wu6E+3A07adnUs/AY2hc6AfUw3Apz
-        8+1goaVTS7gDpuY6APVy5hEsrkuZ2RaQZ9sA9TReZqYVsukSqWGaF5m2AerthA1+fLRBG/9t1UO+1jm8
-        ChsptpZJXuRDC6AIvn8IDRRby2QzyFPNgCI4eR9CFFvLxF2QJx7wR0EEeVaKrSXAT4buAYpgPCvF1hJo
-        AjnYBCiC8awUW4u/EWQuCuLfi/hugey7AyiEPCvF1uLiJz23AZPteHMGhlp2/ZdvbbvDOHZpG0X/E9dN
-        kLmYTOf7DiOGLuriz9D5Lyx44RDFV3FaQeZispx7XoA4XqurSrC2h+Kr2OtBlq4BJsPws3zEYI3uKoGa
-        lxQfgL0r24r+szscDZumndYt/O7p66enuYhj1UlRCVS3UQ2AmL/Sj/5KFNMzVqrBi4yeGsbR0yiibPTk
-        FaoBoHgretB3AkWU+SqqqEa8SHkjeo+jiDJv+TGqwV92d2kd85SikL4pM1MNXmSkpIq5S1BIpdIMqsGL
-        uI4WMVcximbUXryCCBuoBi/iOWJiI4UomisjhbNU4Tfozt8cdebEmLMARTLmPOimCiorjrwwc+ShSCpS
-        bj/FV4nZDwwzKYe/POKoSNk2iq+iDGX1sCELiqQyZLlO8VWUQXNjouE09zLFV+EH69YMiaC6PVklfnDN
-        UPo7aFG3J6swyVKUcDiddViyKL4K2s17Eg6ns5JZ3Z6sEv/UR1/v/5rwD2lodMD0maJr+d6fmR3p3etd
-        6s+MfOvdt5yOxrMt95k8kScm7WNlYGBgYJBaAH4B4+7AZp0Q6fEAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="tsbConvert.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        AABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="tsbSaveAs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="tsbPointsOnly.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        RK5CYII=
-</value>
-  </data>
-  <data name="tsbHelp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
+        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
 </value>
   </data>
   <data name="ToolStripLabel1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

Form1.vb

@@ -1,24 +1,40 @@
-Imports System.Configuration
-Imports System.IO
-Imports TPS1100_Convert.My
+Imports System.IO
 
 Public Class Form1
-    Public DatFileName As String
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        My.Forms.Form1.Text = My.Application.Info.Title + " " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString + "." + My.Application.Info.Version.Revision.ToString
         ToolStripComboBox2.Text = My.Settings.DecimalnoLocilo
-
+        tsbStolpci.SelectedIndex = My.Settings.Stolpci
     End Sub
+
+    Public streamLines As Integer = 0
     Private Sub tsbOpenFile_Click(sender As Object, e As EventArgs) Handles tsbOpenFile.Click
+        OpenFileDialog1.ReadOnlyChecked = False
         If OpenFileDialog1.ShowDialog = DialogResult.OK Then
-            tsbFileName.Text = OpenFileDialog1.SafeFileName
-            DatFileName = OpenFileDialog1.SafeFileName.ToString
             RichTextBox1.Clear()
+            ToolStripProgressBar1.Value = 0
+            Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName)
+            Do Until streamReader.EndOfStream
+                RichTextBox1.AppendText(streamReader.ReadLine + vbCrLf)
+                streamLines = streamLines + 1
+            Loop
+            ToolStripProgressBar1.Maximum = streamLines
+            streamReader.Close()
+            streamReader.Dispose()
+
+            My.Settings.Datoteka = OpenFileDialog1.SafeFileName
+            My.Settings.ZadnjaMapa = OpenFileDialog1.FileName
+            My.Settings.Stolpci = tsbStolpci.SelectedIndex
+            tsbFileName.Text = My.Settings.Datoteka
+            ToolStripStatusLabel1.Text = My.Settings.ZadnjaMapa
             tsbSaveAs.Text = "Shrani ..."
             tsbSaveAs.Enabled = False
             tsbConvert.Enabled = True
             tsbPointsOnly.Enabled = True
-            OpenFileDialog1.Dispose()
-
+            ButtonUrediDat.Enabled = True
+            RichTextBox1.BackColor = SystemColors.Info
+            LabelDatoteka.Image = My.Resources.icons8_ok_50
+            My.Settings.Save()
         Else
             tsbFileName.Text = "Odpri GSI datoteko..."
             RichTextBox1.Clear()
@@ -27,35 +43,43 @@ Public Class Form1
             tsbConvert.Enabled = False
             tsbPointsOnly.Enabled = False
         End If
+        OpenFileDialog1.Dispose()
     End Sub
 
     Private Sub tsbConvert_Click(sender As Object, e As EventArgs) Handles tsbConvert.Click
+        ToolStripStatusLabel1.Text = "Procesiranje..."
         RichTextBox1.Clear()
-        RichTextBox1.AppendText("TPS 1100 GSI Conversion" + vbCrLf + "++++++++++++++++++++++++++++++++" + vbCrLf)
-
+        RichTextBox1.BackColor = SystemColors.Info
+        RichTextBox1.AppendText("TPS 1100 Zapisnik" + vbCrLf + "++++++++++++++++++++++++++++++++" + vbCrLf)
+        ToolStripProgressBar1.Maximum = streamLines
         ' prepare StreamReader
         Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName)
         Dim i As Integer = 0
-
+        Dim PodatkiStojisce As Boolean = False
+        Dim dataStolpci As String = ""
+        If tsbStolpci.SelectedIndex = 0 Then
+            dataStolpci = " "
+        ElseIf tsbStolpci.SelectedIndex = 1 Then
+            dataStolpci = vbTab
+        End If
+        My.Settings.Stolpci = tsbStolpci.SelectedIndex
+        My.Settings.Save()
         ' loop untill end of stream
         Do Until streamReader.EndOfStream
             ' Read and Split each line to separate it into fields
             Dim line() As String = streamReader.ReadLine().Split(" ")
             ' Remove * sign from index line
             line(0) = Replace(line(0), "*", "")
-
-            If i = 0 Then
-
-            End If
+            ToolStripProgressBar1.Value = i
             ' Check if it's a new station setup
             If Microsoft.VisualBasic.Left(line(1), 2) = "25" Then
-                RichTextBox1.AppendText(vbCrLf + "Station:" + vbCrLf + "*************" + vbCrLf)
-                'RichTextBox1.AppendText("PtName:" + vbTab + "Hz.Corr.:" + vbTab + "StnE:" + vbTab + "StnN:" + vbTab + "StnH:" + vbTab + "Refl.h.: " + vbTab + "Inst.h.: " + vbCrLf)
+                RichTextBox1.AppendText(vbCrLf + "Station:" + vbCrLf + "****************" + vbCrLf)
+                RichTextBox1.AppendText("PtID" + dataStolpci + "HzCor" + dataStolpci + "StnE" + dataStolpci + "StnN" + dataStolpci + "StnH" + dataStolpci + "ReflHt" + dataStolpci + "InstHt" + vbCrLf)
             End If
 
             If Microsoft.VisualBasic.Left(line(1), 2) = "84" Then
-                RichTextBox1.AppendText(vbCrLf + "Station:" + vbCrLf + "*************" + vbCrLf)
-                'RichTextBox1.AppendText("PtName:" + vbTab + "StnE:" + vbTab + "StnN:" + vbTab + "StnH:" + vbTab + "Refl.h.: " + vbTab + "Inst.h.: " + vbCrLf)
+                RichTextBox1.AppendText(vbCrLf + "Station:" + vbCrLf + "****************" + vbCrLf)
+                RichTextBox1.AppendText("PtID" + dataStolpci + "StnE" + dataStolpci + "StnN" + dataStolpci + "StnH" + dataStolpci + "ReflHt" + dataStolpci + "InstHt" + vbCrLf)
             End If
             ' Seaparate word index and data
             For Each readLine As String In line
@@ -68,111 +92,125 @@ Public Class Form1
 
                     ' data is always 17 characters long and is read from right to left and has a +/- sign in first place
                     Dim data As String
+                    Dim dataTmp As String
                     Dim numData As Double
                     data = Microsoft.VisualBasic.Right(readLine, 17)
 
                     If wordIndex = "11" Then
                         data = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                     ElseIf wordIndex = "19" Then    ' Date/Time
-                        data = "DateTime= " + Microsoft.VisualBasic.Right(data, 8)
+                        data = dataStolpci + "DateTime= " + Microsoft.VisualBasic.Right(data, 8)
                     ElseIf wordIndex = "21" Then    ' Horizontal angle
                         numData = data / 100000
-                        data = Format(numData, "0.0000")
+                        data = dataStolpci + Format(numData, "0.0000")
                     ElseIf wordIndex = "22" Then    ' Vertical angle
                         numData = data / 100000
-                        data = Format(numData, "0.0000")
+                        data = dataStolpci + Format(numData, "0.0000")
                     ElseIf wordIndex = "25" Then    ' Hz. Orientation correction
                         numData = data / 100000
-                        data = "HzCor= " + Format(numData, "0.0000")
+                        data = dataStolpci + Format(numData, "0.0000")
                     ElseIf wordIndex = "31" Then    ' Slope distance
                         numData = data / 1000
-                        data = Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "32" Then    ' Horizontal distance
                         numData = data / 1000
-                        data = Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "33" Then    ' Height difference
                         numData = data / 1000
-                        data = Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "34" Then    ' Stationing
                         numData = data / 1000
-                        data = "Station= " + Format(numData, "0.000")
+                        data = dataStolpci + "Station= " + Format(numData, "0.000")
                     ElseIf wordIndex = "35" Then    ' Info za offset???
                         numData = data / 1000
-                        data = "Offset= " + Format(numData, "0.000")
+                        data = dataStolpci + "Offset= " + Format(numData, "0.000")
                     ElseIf wordIndex = "41" Then    ' Code
                         'numData = data
                         'data = "Code= " + numData.ToString
                         If ToolStripComboBox1.Text = "Da" Then
                             If data = "+0000000000000010" Then
                                 data = vbCrLf + "Setup: Quick Set" + vbCrLf + "============================="
+                                PodatkiStojisce = True
                             End If
                             If data = "+0000000000000020" Then
-                                data = vbCrLf + "Setup: Set Hz" + vbCrLf + "=============================" + vbCrLf + "PtID    HZ    V    SD    HD    RefHt    PrCon    HtDif    E        N        H        PtCode"
+                                data = vbCrLf + "Setup: Set Hz" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode"
+                                PodatkiStojisce = True
                             End If
                             If data = "+0000000000000030" Then
-                                data = vbCrLf + "Setup: Resection" + vbCrLf + "=============================" + vbCrLf + "PtID    HZ    V    SD    HD    RefHt    PrCon    HtDif    E        N        H        PtCode"
+                                data = vbCrLf + "Setup: Resection" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode"
+                                PodatkiStojisce = True
                             End If
                             If data = "+0000000000000040" Then
-                                data = vbCrLf + "Setup: Free Station" + vbCrLf + "=============================" + vbCrLf + "PtID    HZ    V    SD    HD    RefHt    PrCon    HtDif    E        N        H        PtCode"
+                                data = vbCrLf + "Setup: Free Station" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode"
+                                PodatkiStojisce = True
                             End If
                             If data = "+0000000000000050" Then
-                                data = vbCrLf + "Setup: Orientation & Ht. transfer" + vbCrLf + "=============================" + vbCrLf + "PtID    HZ    V    SD    HD    RefHt    PrCon    HtDif    E        N        H        PtCode"
+                                data = vbCrLf + "Setup: Orientation & Ht. transfer" + vbCrLf + "=============================" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "PtCode"
+                                PodatkiStojisce = True
                             End If
                             If data = "+0000000000000090" Then
-                                data = vbCrLf + "Measured:" + vbCrLf + "-------------------" + vbCrLf + "PtID    HZ    V    SD    HD    RefHt    PrCon    HtDif    E        N        H        PtCode"
+                                data = vbCrLf + "Measured:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "HZ" + dataStolpci + "V" + dataStolpci + "SD" + dataStolpci + "HD" + dataStolpci + "ReflHt" + dataStolpci + "PrCon" + dataStolpci + "HtDif" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H" + dataStolpci + "PtCode"
+                                PodatkiStojisce = False
                             End If
                             If data = "+0000000000000099" Then
-                                data = "Imported:" + vbCrLf + "-------------------"
+                                data = vbCrLf + "Imported/User-Entered:" + vbCrLf + "----------------------" + vbCrLf + "PtID" + dataStolpci + "E" + dataStolpci + "N" + dataStolpci + "H"
+                                PodatkiStojisce = False
                             End If
                             If data = "+00000000STA_OFFS" Then
                                 data = "Offsets: " + vbCrLf
+                                PodatkiStojisce = False
                             End If
                         End If
                     ElseIf wordIndex = "42" Then    ' Code: Info 1
-                        data = "Info1= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+                        data = dataStolpci + "Info1= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                     ElseIf wordIndex = "43" Then    ' Code: Info 2
-                        data = "Info2= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+                        data = dataStolpci + "Info2= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                     ElseIf wordIndex = "44" Then    ' Code: Info 3
-                        data = "Info3= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+                        data = dataStolpci + "Info3= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                     ElseIf wordIndex = "45" Then    ' Code: Info 4
-                        data = "Info4= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+                        data = dataStolpci + "Info4= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                     ElseIf wordIndex = "47" Then    ' Code: Info 6
-                        data = "Info6= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+                        data = dataStolpci + "Info6= " + Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
                     ElseIf wordIndex = "58" Then    ' Prism constant
                         numData = data / 10000
-                        data = numData.ToString
+                        data = dataStolpci + numData.ToString
                     ElseIf wordIndex = "71" Then    ' Point Code
-                        numData = data
-                        data = numData.ToString
-                    ElseIf wordIndex = "81" Then    ' Target Easting
+                        dataTmp = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
+                        If dataTmp = "" Then
+                            data = ""
+                        Else
+                            data = dataStolpci + dataTmp
+                        End If
+                    ElseIf wordIndex = "81" And PodatkiStojisce = False Then    ' Target Easting
                         numData = data / 1000
-                        data = Format(numData, "0.000")
-                    ElseIf wordIndex = "82" Then    ' Target Northing
+                        data = dataStolpci + Format(numData, "0.000")
+                    ElseIf wordIndex = "82" And PodatkiStojisce = False Then    ' Target Northing
                         numData = data / 1000
-                        data = Format(numData, "0.000")
-                    ElseIf wordIndex = "83" Then    ' Target Height
+                        data = dataStolpci + Format(numData, "0.000")
+                    ElseIf wordIndex = "83" And PodatkiStojisce = False Then    ' Target Height
                         numData = data / 1000
-                        data = Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "84" Then    ' Station Easting
                         numData = data / 1000
-                        data = "StE= " + Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "85" Then    ' Station Northing
                         numData = data / 1000
-                        data = "StN= " + Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "86" Then    ' Station Height
                         numData = data / 1000
-                        data = "StH= " + Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "87" Then    ' Reflector height
                         numData = data / 1000
-                        data = Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "88" Then    ' Instriment height
                         numData = data / 1000
-                        data = "InstHt= " + Format(numData, "0.000")
+                        data = dataStolpci + Format(numData, "0.000")
                     ElseIf wordIndex = "18" Then    ' DATE YY.ss
                         numData = data / 1000000
-                        data = "Year.Sec= " + Format(numData, "0.00")
+                        data = dataStolpci + "Year.Sec= " + Format(numData, "0.00")
                     Else
                         numData = 0
+                        data = ""
                     End If
                     If ToolStripComboBox2.Text = "Pika" Then
                         If wordIndex IsNot "11" Then
@@ -180,37 +218,41 @@ Public Class Form1
                         End If
 
                     End If
-                    RichTextBox1.AppendText(data + " ")
+                    RichTextBox1.AppendText(data)
                 End If
             Next
             RichTextBox1.AppendText(vbCrLf)
+            i = i + 1
         Loop
-        ToolStripStatusLabel1.Text = "Konverzija končana. Shrani datoteko!"
+        ToolStripStatusLabel1.Text = "Prebrano: " + i.ToString + "/" + ToolStripProgressBar1.Maximum.ToString + " vrstic"
         SaveFileDialog1.Filter = "Zapisnik meritve|*.mer|Text file|*.txt|All files|*.*"
         streamReader.Close()
         tsbSaveAs.Enabled = True
         tsbSaveAs.Text = "Shrani Zapisnik"
     End Sub
 
-    Private Sub tsbSaveAs_Click(sender As Object, e As EventArgs) Handles tsbSaveAs.Click
-        SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(OpenFileDialog1.FileName)
-        If SaveFileDialog1.ShowDialog = DialogResult.OK Then
-            RichTextBox1.SaveFile(SaveFileDialog1.FileName, RichTextBoxStreamType.PlainText)
-            ToolStripStatusLabel1.Text = "Shranjeno: " + SaveFileDialog1.FileName.ToString
-        End If
-    End Sub
-
     Private Sub tsbPointsOnly_Click(sender As Object, e As EventArgs) Handles tsbPointsOnly.Click
+        Dim dataStolpci As String = ""
+        If tsbStolpci.SelectedIndex = 0 Then
+            dataStolpci = " "
+        ElseIf tsbStolpci.SelectedIndex = 1 Then
+            dataStolpci = vbTab
+        End If
+        My.Settings.Stolpci = tsbStolpci.SelectedIndex
+        My.Settings.Save()
         RichTextBox1.Clear()
+        RichTextBox1.BackColor = SystemColors.Info
         Dim measuredPoints As Integer = 1
         Dim newStation As Integer = 0
         Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName)
+        Dim i As Integer = 0
+        Dim lin As Integer = 0
         Do Until streamReader.EndOfStream
             ' Read and Split each line to separate it into fields
             Dim line() As String = streamReader.ReadLine().Split(" ")
             ' Remove * sign from index line
             line(0) = Replace(line(0), "*", "")
-
+            ToolStripProgressBar1.Value = i
             If Microsoft.VisualBasic.Left(line(1), 2) = "25" Then
                 measuredPoints = 1
             End If
@@ -233,164 +275,97 @@ Public Class Form1
                             data = "90"
                         End If
                         numData = data
-                        If numData >= 90 Then
+                        If numData = 90 Then
                             measuredPoints = 1
-                        ElseIf numData >= 10 < 90 Then
+                        ElseIf numData < 90 Then
                             measuredPoints = 0
+                        Else
+                            measuredPoints = 2
                         End If
                     End If
 
-                    If wordIndex = "11" And measuredPoints = 1 Then
+                    If wordIndex = "11" And measuredPoints >= 1 Then
                         data = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "81" And measuredPoints = 1 Then    ' Target Easting
+                        RichTextBox1.AppendText(data + dataStolpci)
+                        i = i + 1
+                    ElseIf wordIndex = "81" And measuredPoints >= 1 Then    ' Target Easting
                         numData = data / 1000
                         data = Format(numData, "0.000")
                         If ToolStripComboBox2.Text = "Pika" Then
                             data = data.ToString.Replace(",", ".")
                         End If
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "82" And measuredPoints = 1 Then    ' Target Northing
+                        RichTextBox1.AppendText(data + dataStolpci)
+                    ElseIf wordIndex = "82" And measuredPoints >= 1 Then    ' Target Northing
                         numData = data / 1000
                         data = Format(numData, "0.000")
                         If ToolStripComboBox2.Text = "Pika" Then
                             data = data.ToString.Replace(",", ".")
                         End If
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "83" And measuredPoints = 1 Then    ' Target Height
+                        RichTextBox1.AppendText(data + dataStolpci)
+                    ElseIf wordIndex = "83" And measuredPoints >= 1 Then    ' Target Height
                         numData = data / 1000
                         data = Format(numData, "0.000")
                         If ToolStripComboBox2.Text = "Pika" Then
                             data = data.ToString.Replace(",", ".")
                         End If
-                        RichTextBox1.AppendText(data + vbCrLf)
+                        If measuredPoints = 2 Then
+                            RichTextBox1.AppendText(data + dataStolpci + "REF" + vbCrLf)
+                        Else
+                            RichTextBox1.AppendText(data + dataStolpci + "MEAS" + vbCrLf)
+                        End If
                     ElseIf wordIndex = "84" And measuredPoints = 1 Then    ' Station Easting
                         numData = data / 1000
                         data = Format(numData, "0.000")
                         If ToolStripComboBox2.Text = "Pika" Then
                             data = data.ToString.Replace(",", ".")
                         End If
-                        RichTextBox1.AppendText(data + " ")
+                        RichTextBox1.AppendText(data + dataStolpci)
                     ElseIf wordIndex = "85" And measuredPoints = 1 Then    ' Station Northing
                         numData = data / 1000
                         data = Format(numData, "0.000")
                         If ToolStripComboBox2.Text = "Pika" Then
                             data = data.ToString.Replace(",", ".")
                         End If
-                        RichTextBox1.AppendText(data + " ")
+                        RichTextBox1.AppendText(data + dataStolpci)
                     ElseIf wordIndex = "86" And measuredPoints = 1 Then    ' Station Height
                         numData = data / 1000
                         data = Format(numData, "0.000")
                         If ToolStripComboBox2.Text = "Pika" Then
                             data = data.ToString.Replace(",", ".")
                         End If
-                        RichTextBox1.AppendText(data + vbCrLf)
+                        RichTextBox1.AppendText(data + dataStolpci + "STA" + vbCrLf)
                     Else
                         numData = 0
                         data = ""
                     End If
                 End If
             Next
+            lin = lin + 1
+            ToolStripProgressBar1.Value = lin
         Loop
-        ToolStripStatusLabel1.Text = "Konverzija končana. Shrani datoteko!"
-        SaveFileDialog1.Filter = "KOO datoteka|*.koo|Text file|*.txt|All files|*.*"
+        ToolStripStatusLabel1.Text = "Prebrano točk: " + i.ToString
+        SaveFileDialog1.Filter = "KOO datoteka|*.koo|Text file (Tab)|*.txt|All files|*.*"
         streamReader.Close()
         tsbSaveAs.Enabled = True
         tsbSaveAs.Text = "Shrani Točke"
     End Sub
 
-    Private Sub tsbKooConvert_Click(sender As Object, e As EventArgs)
-        RichTextBox1.Clear()
-        Dim measuredPoints As Integer = 0
-        Dim newStation As Integer = 0
-        Dim streamReader As StreamReader = New StreamReader(OpenFileDialog1.FileName)
-        Do Until streamReader.EndOfStream
-            ' Read and Split each line to separate it into fields
-            Dim line() As String = streamReader.ReadLine().Split(" ")
-            ' Remove * sign from index line
-            line(0) = Replace(line(0), "*", "")
-
-            If Microsoft.VisualBasic.Left(line(1), 2) = "25" Then
-                newStation = 1
+    Private Sub tsbSaveAs_Click(sender As Object, e As EventArgs) Handles tsbSaveAs.Click
+        SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(OpenFileDialog1.FileName)
+        If SaveFileDialog1.ShowDialog = DialogResult.OK Then
+            RichTextBox1.SaveFile(SaveFileDialog1.FileName, RichTextBoxStreamType.PlainText)
+            ToolStripStatusLabel1.Text = "Shranjeno: " + SaveFileDialog1.FileName.ToString
+            RichTextBox1.BackColor = SystemColors.ControlLightLight
+            'Dim filePath As String
+            'filePath = System.IO.Path.Combine(My.Computer.FileSystem.SpecialDirectories.MyDocuments, "tps1100_log.txt")
+            My.Computer.FileSystem.WriteAllText("tps1100_log.txt", System.DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") + " | " + OpenFileDialog1.FileName.ToString + " -> " + SaveFileDialog1.FileName.ToString + vbCrLf, True)
         End If
-            ' Seaparate word index and data
-            For Each readLine As String In line
-
-                If readLine = "" Then
-                    ' do nothing
-                Else
-                    ' wordindex is always 6 characters long and is read fron left to right
-                    Dim wordIndex As String
-                    wordIndex = Microsoft.VisualBasic.Left(readLine, 2)
-                    ' data is always 17 characters long and is read from right to left and has a +/- sign in first place
-                    Dim data As String
-                    Dim numData As Double
-
-                    data = Microsoft.VisualBasic.Right(readLine, 17)
-
-                    If wordIndex = "11" Then
-                        data = Microsoft.VisualBasic.Right(data, 16).TrimStart("0"c)
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "81" Then    ' Target Easting
-                        numData = data / 1000
-                        data = Format(numData, "0.000")
-                        If ToolStripComboBox2.Text = "Pika" Then
-                            data = data.ToString.Replace(",", ".")
-                        End If
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "82" Then    ' Target Northing
-                        numData = data / 1000
-                        data = Format(numData, "0.000")
-                        If ToolStripComboBox2.Text = "Pika" Then
-                            data = data.ToString.Replace(",", ".")
-                        End If
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "83" Then    ' Target Height
-                        numData = data / 1000
-                        data = Format(numData, "0.000")
-                        If ToolStripComboBox2.Text = "Pika" Then
-                            data = data.ToString.Replace(",", ".")
-                        End If
-                        RichTextBox1.AppendText(data + vbCrLf)
-                    ElseIf wordIndex = "84" Then    ' Station Easting
-                        numData = data / 1000
-                        data = Format(numData, "0.000")
-                        If ToolStripComboBox2.Text = "Pika" Then
-                            data = data.ToString.Replace(",", ".")
-                        End If
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "85" Then    ' Station Northing
-                        numData = data / 1000
-                        data = Format(numData, "0.000")
-                        If ToolStripComboBox2.Text = "Pika" Then
-                            data = data.ToString.Replace(",", ".")
-                        End If
-                        RichTextBox1.AppendText(data + " ")
-                    ElseIf wordIndex = "86" Then    ' Station Height
-                        numData = data / 1000
-                        data = Format(numData, "0.000")
-                        If ToolStripComboBox2.Text = "Pika" Then
-                            data = data.ToString.Replace(",", ".")
-                        End If
-                        RichTextBox1.AppendText(data + vbCrLf)
-                    Else
-                        numData = 0
-                        data = ""
-                    End If
-                End If
-            Next
-
-        Loop
-        ToolStripStatusLabel1.Text = "Konverzija končana. Shrani datoteko!"
-        SaveFileDialog1.Filter = "KOO datoteka|*.koo|Text file|*.txt|All files|*.*"
-        streamReader.Close()
-        tsbSaveAs.Enabled = True
-        tsbSaveAs.Text = "Shrani Točke"
     End Sub
 
     Private Sub tsbHelp_Click(sender As Object, e As EventArgs) Handles tsbHelp.Click
-        MessageBox.Show("Za konvertiranje GSI datoteke najprej izberi datoteko, ki jo želiš konvertirati z ukazom 'Open File'. Nato izberi metodo konverzije (Poročilo, Merjene točke, Vse točke). Po končani knverziji shrani novo datoteko z ukazom 'Save As...'",
-"Kratka navodila")
+        ' MessageBox.Show("Za konvertiranje GSI datoteke najprej izberi datoteko, ki jo želiš konvertirati z ukazom 'Open File'. Nato izberi metodo konverzije (Poročilo, Merjene točke, Vse točke). Po končani knverziji shrani novo datoteko z ukazom 'Save As...'","Kratka navodila")
+        SplashScreen1.ShowDialog()
+
     End Sub
 
     Private Sub ToolStripComboBox2_Click(sender As Object, e As EventArgs) Handles MyBase.FormClosing
@@ -398,7 +373,7 @@ Public Class Form1
         My.Settings.Save()
     End Sub
 
-    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ButtonUrediDat.Click
 
         Form2.ShowDialog()
 

Form2.Designer.vb

@@ -24,67 +24,104 @@ Partial Class Form2
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form2))
-        Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
+        Me.RichTextBoxEdit = New System.Windows.Forms.RichTextBox()
         Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.BtnShraniF2 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
         Me.ComBoxKoda = New System.Windows.Forms.ToolStripComboBox()
+        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.BtnShraniF2 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.SaveFileDialog2 = New System.Windows.Forms.SaveFileDialog()
         Me.MyApplicationBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.MyApplicationBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
-        Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
+        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStrip1.SuspendLayout()
         Me.StatusStrip1.SuspendLayout()
         CType(Me.MyApplicationBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MyApplicationBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
-        'RichTextBox1
+        'RichTextBoxEdit
         '
-        Me.RichTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.RichTextBox1.DetectUrls = False
-        Me.RichTextBox1.EnableAutoDragDrop = True
-        Me.RichTextBox1.Font = New System.Drawing.Font("Courier New", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.RichTextBox1.Location = New System.Drawing.Point(12, 34)
-        Me.RichTextBox1.Name = "RichTextBox1"
-        Me.RichTextBox1.Size = New System.Drawing.Size(1060, 552)
-        Me.RichTextBox1.TabIndex = 2
-        Me.RichTextBox1.Text = ""
-        Me.RichTextBox1.WordWrap = False
+        Me.RichTextBoxEdit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.RichTextBoxEdit.DetectUrls = False
+        Me.RichTextBoxEdit.EnableAutoDragDrop = True
+        Me.RichTextBoxEdit.Font = New System.Drawing.Font("Courier New", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.RichTextBoxEdit.Location = New System.Drawing.Point(12, 35)
+        Me.RichTextBoxEdit.Name = "RichTextBoxEdit"
+        Me.RichTextBoxEdit.Size = New System.Drawing.Size(1060, 551)
+        Me.RichTextBoxEdit.TabIndex = 2
+        Me.RichTextBoxEdit.Text = ""
+        Me.RichTextBoxEdit.WordWrap = False
         '
         'ToolStrip1
         '
-        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BtnShraniF2, Me.ToolStripSeparator1, Me.ToolStripLabel1, Me.ComBoxKoda, Me.ToolStripButton2, Me.ToolStripSeparator2, Me.ToolStripButton1})
+        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BtnShraniF2, Me.ToolStripSeparator3, Me.ToolStripButton3, Me.ToolStripSeparator1, Me.ToolStripLabel1, Me.ComBoxKoda, Me.ToolStripButton2, Me.ToolStripSeparator2, Me.ToolStripButton1})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1084, 31)
+        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(10, 5, 10, 0)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1084, 32)
         Me.ToolStrip1.TabIndex = 3
         Me.ToolStrip1.Text = "ToolStrip1"
         '
+        'BtnShraniF2
+        '
+        Me.BtnShraniF2.Enabled = False
+        Me.BtnShraniF2.Image = Global.TPS1100_Convert.My.Resources.Resources.Save_as_24
+        Me.BtnShraniF2.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.BtnShraniF2.Name = "BtnShraniF2"
+        Me.BtnShraniF2.Size = New System.Drawing.Size(73, 24)
+        Me.BtnShraniF2.Text = "Shrani..."
+        '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 27)
         '
         'ToolStripLabel1
         '
         Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(69, 28)
-        Me.ToolStripLabel1.Text = "Vstavi Kodo"
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(45, 24)
+        Me.ToolStripLabel1.Text = "Koda >"
         '
         'ComBoxKoda
         '
-        Me.ComBoxKoda.Items.AddRange(New Object() {"10: Quick Set", "20: Set Azimuth", "30: Resection", "40: Free Station", "50: Ori. & Ht. Transfer", "90: Measured"})
+        Me.ComBoxKoda.DropDownWidth = 180
+        Me.ComBoxKoda.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ComBoxKoda.Items.AddRange(New Object() {"10: Quick Set", "20: Set Azimuth", "30: Resection", "40: Free Station", "50: Ori. & Ht. Transfer", "90: Measured", "99: Imported/User-Entered"})
         Me.ComBoxKoda.Name = "ComBoxKoda"
-        Me.ComBoxKoda.Size = New System.Drawing.Size(121, 31)
+        Me.ComBoxKoda.Size = New System.Drawing.Size(180, 27)
         Me.ComBoxKoda.ToolTipText = "Izberi kodo..."
         '
+        'ToolStripButton2
+        '
+        Me.ToolStripButton2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_advance_48
+        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton2.Name = "ToolStripButton2"
+        Me.ToolStripButton2.Size = New System.Drawing.Size(62, 24)
+        Me.ToolStripButton2.Text = "Vstavi"
+        Me.ToolStripButton2.ToolTipText = "Vstavi vrstico..."
+        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 27)
+        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_undo_48
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(65, 24)
+        Me.ToolStripButton1.Text = "Povrni"
+        '
         'StatusStrip1
         '
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1})
@@ -100,36 +137,9 @@ Partial Class Form2
         Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(69, 17)
         Me.ToolStripStatusLabel1.Text = "Nalaganje..."
         '
-        'ToolStripSeparator2
+        'SaveFileDialog2
         '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
-        '
-        'BtnShraniF2
-        '
-        Me.BtnShraniF2.Enabled = False
-        Me.BtnShraniF2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50
-        Me.BtnShraniF2.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.BtnShraniF2.Name = "BtnShraniF2"
-        Me.BtnShraniF2.Size = New System.Drawing.Size(77, 28)
-        Me.BtnShraniF2.Text = "Shrani..."
-        '
-        'ToolStripButton2
-        '
-        Me.ToolStripButton2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_advance_48
-        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton2.Name = "ToolStripButton2"
-        Me.ToolStripButton2.Size = New System.Drawing.Size(66, 28)
-        Me.ToolStripButton2.Text = "Vstavi"
-        Me.ToolStripButton2.ToolTipText = "Vstavi vrstico..."
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_undo_48
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(69, 28)
-        Me.ToolStripButton1.Text = "Povrni"
+        Me.SaveFileDialog2.Filter = "GSI Files|*.GSI"
         '
         'MyApplicationBindingSource
         '
@@ -139,9 +149,18 @@ Partial Class Form2
         '
         Me.MyApplicationBindingSource1.DataSource = GetType(TPS1100_Convert.My.MyApplication)
         '
-        'SaveFileDialog1
+        'ToolStripSeparator3
         '
-        Me.SaveFileDialog1.Filter = "GSI Files|*.GSI"
+        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 27)
+        '
+        'ToolStripButton3
+        '
+        Me.ToolStripButton3.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
+        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton3.Name = "ToolStripButton3"
+        Me.ToolStripButton3.Size = New System.Drawing.Size(58, 24)
+        Me.ToolStripButton3.Text = "Zapri"
         '
         'Form2
         '
@@ -150,9 +169,10 @@ Partial Class Form2
         Me.ClientSize = New System.Drawing.Size(1084, 611)
         Me.Controls.Add(Me.StatusStrip1)
         Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.RichTextBox1)
+        Me.Controls.Add(Me.RichTextBoxEdit)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "Form2"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "TPS1100 Convert: Settings"
         Me.ToolStrip1.ResumeLayout(False)
         Me.ToolStrip1.PerformLayout()
@@ -167,7 +187,7 @@ Partial Class Form2
 
     Friend WithEvents MyApplicationBindingSource As BindingSource
     Friend WithEvents MyApplicationBindingSource1 As BindingSource
-    Friend WithEvents RichTextBox1 As RichTextBox
+    Friend WithEvents RichTextBoxEdit As RichTextBox
     Friend WithEvents ToolStrip1 As ToolStrip
     Friend WithEvents BtnShraniF2 As ToolStripButton
     Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
@@ -178,5 +198,7 @@ Partial Class Form2
     Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel
     Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
     Friend WithEvents ToolStripButton1 As ToolStripButton
-    Friend WithEvents SaveFileDialog1 As SaveFileDialog
+    Friend WithEvents SaveFileDialog2 As SaveFileDialog
+    Friend WithEvents ToolStripButton3 As ToolStripButton
+    Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
 End Class

Form2.resx

@@ -123,15 +123,15 @@
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>662, 17</value>
   </metadata>
+  <metadata name="SaveFileDialog2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>778, 17</value>
+  </metadata>
   <metadata name="MyApplicationBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="MyApplicationBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>341, 17</value>
   </metadata>
-  <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>778, 17</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Form2.vb

@@ -11,78 +11,95 @@ Public Class Form2
         ' Dim attrs As New System.ComponentModel.AttributeCollection(userAttr)
         ' PropertyGrid1.BrowsableAttributes = attrs
         Form1.Hide()
-        BtnShraniF2.Enabled = False
-        RichTextBox1.Clear()
+        RichTextBoxEdit.Clear()
 
         ' prepare StreamReader
-        Dim streamReader As StreamReader = New StreamReader(Form1.OpenFileDialog1.FileName)
+        Dim streamReader As StreamReader = New StreamReader(My.Settings.ZadnjaMapa)
         Dim i As Integer = 0
 
         ' loop untill end of stream
         Do Until streamReader.EndOfStream
             ' Beri vrstico po vrstico
             Dim line As String = streamReader.ReadLine()
-            RichTextBox1.AppendText(line + vbCrLf)
+            RichTextBoxEdit.AppendText(line + vbCrLf)
             i = i + 1
         Loop
-        ToolStripStatusLabel1.Text = "Vrstic: " + i.ToString + "| Datoteka: " + Form1.OpenFileDialog1.FileName
+        ToolStripStatusLabel1.Text = "Prebrano: " + i.ToString + " | Datoteka: " + My.Settings.ZadnjaMapa
         DatotekaSpemembe = False
+        BtnShraniF2.Enabled = False
         streamReader.Close()
+        streamReader.Dispose()
     End Sub
 
     Private Sub Form2_Close(sender As Object, e As EventArgs) Handles MyBase.Closing
-        If DatotekaSpemembe = True Then
-            MessageBox.Show("Podatki spremenjeni... Shranim spremembe?", "Podatki spremenjeni", MessageBoxButtons.YesNo)
-            If DatotekaSpemembe = True Then
-                RichTextBox1.SaveFile(Form1.OpenFileDialog1.FileName, RichTextBoxStreamType.PlainText)
-                BtnShraniF2.Enabled = False
-            End If
-        End If
+        ' If DatotekaSpemembe = True Then
+        '     MessageBox.Show("Shranim spremembe?", "Podatki spremenjeni", MessageBoxButtons.YesNo)
+        '     If MessageBoxButtons.YesNo = vbYes Then
+        '         RichTextBoxEdit.SaveFile(My.Settings.ZadnjaMapa, RichTextBoxStreamType.PlainText)
+        '         BtnShraniF2.Enabled = False
+        '         DatotekaSpemembe = False
+        '     End If
+        ' End If
+        Form1.RichTextBox1.Clear()
+        Form1.streamLines = 0
+        Dim streamReader As StreamReader = New StreamReader(Form1.OpenFileDialog1.FileName)
+        Do Until streamReader.EndOfStream
+            Form1.RichTextBox1.AppendText(streamReader.ReadLine + vbCrLf)
+            Form1.streamLines = Form1.streamLines + 1
+        Loop
+        Form1.ToolStripProgressBar1.Maximum = Form1.streamLines
+        streamReader.Close()
+        streamReader.Dispose()
+
         Form1.Show()
     End Sub
 
-    Private Sub RichTextBox1_TextChanged(sender As Object, e As EventArgs) Handles RichTextBox1.TextChanged
+    Private Sub RichTextBox1_TextChanged(sender As Object, e As EventArgs) Handles RichTextBoxEdit.TextChanged
         ToolStripStatusLabel1.Text = "Spremenjeni podatki... datoteka je bila urejana."
         BtnShraniF2.Enabled = True
         DatotekaSpemembe = True
     End Sub
 
     Private Sub BtnShraniF2_Click(sender As Object, e As EventArgs) Handles BtnShraniF2.Click
-        SaveFileDialog1.FileName = Path.GetFileNameWithoutExtension(Form1.OpenFileDialog1.FileName)
-        If SaveFileDialog1.ShowDialog = DialogResult.OK Then
-            RichTextBox1.SaveFile(SaveFileDialog1.FileName, RichTextBoxStreamType.PlainText)
-            ToolStripStatusLabel1.Text = "Shranjeno: " + SaveFileDialog1.FileName.ToString
+        ' SaveFileDialog2.FileName = My.Settings.ZadnjaMapa
+        ' If SaveFileDialog2.ShowDialog = DialogResult.OK Then
+        RichTextBoxEdit.SaveFile(My.Settings.ZadnjaMapa, RichTextBoxStreamType.PlainText)
+        ToolStripStatusLabel1.Text = "Shranjeno: " + SaveFileDialog2.FileName.ToString
         BtnShraniF2.Enabled = False
         DatotekaSpemembe = False
-        End If
+        ' End If
     End Sub
 
     Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
-        RichTextBox1.Focus()
-        RichTextBox1.SelectionStart = RichTextBox1.GetFirstCharIndexOfCurrentLine
+        RichTextBoxEdit.Focus()
+        RichTextBoxEdit.SelectionStart = RichTextBoxEdit.GetFirstCharIndexOfCurrentLine
         SendKeys.Send("+{HOME}")
         If ComBoxKoda.SelectedIndex = 0 Then
-            RichTextBox1.SelectedText = "*410000+0000000000000010 " + vbCrLf
+            RichTextBoxEdit.SelectedText = "*410000+0000000000000010 " + vbCrLf
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
         ElseIf ComBoxKoda.SelectedIndex = 1 Then
-            RichTextBox1.SelectedText = "*410000+0000000000000020 " + vbCrLf
+            RichTextBoxEdit.SelectedText = "*410000+0000000000000020 " + vbCrLf
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
         ElseIf ComBoxKoda.SelectedIndex = 2 Then
-            RichTextBox1.SelectedText = "*410000+0000000000000030 " + vbCrLf
+            RichTextBoxEdit.SelectedText = "*410000+0000000000000030 " + vbCrLf
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
         ElseIf ComBoxKoda.SelectedIndex = 3 Then
-            RichTextBox1.SelectedText = "*410000+0000000000000040 " + vbCrLf
+            RichTextBoxEdit.SelectedText = "*410000+0000000000000040 " + vbCrLf
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
         ElseIf ComBoxKoda.SelectedIndex = 4 Then
-            RichTextBox1.SelectedText = "*410000+0000000000000050 " + vbCrLf
+            RichTextBoxEdit.SelectedText = "*410000+0000000000000050 " + vbCrLf
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
         ElseIf ComBoxKoda.SelectedIndex = 5 Then
-            RichTextBox1.SelectedText = "*410000+0000000000000090 " + vbCrLf
+            RichTextBoxEdit.SelectedText = "*410000+0000000000000090 " + vbCrLf
+            BtnShraniF2.Enabled = True
+            DatotekaSpemembe = True
+        ElseIf ComBoxKoda.SelectedIndex = 6 Then
+            RichTextBoxEdit.SelectedText = "*410000+0000000000000099 " + vbCrLf
             BtnShraniF2.Enabled = True
             DatotekaSpemembe = True
         End If
@@ -90,6 +107,10 @@ Public Class Form2
     End Sub
 
     Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
-        RichTextBox1.Undo()
+        RichTextBoxEdit.Undo()
+    End Sub
+
+    Private Sub ToolStripButton3_Click(sender As Object, e As EventArgs) Handles ToolStripButton3.Click
+        Me.Close()
     End Sub
 End Class

My Project/Application.Designer.vb

@@ -27,7 +27,7 @@ Namespace My
             Me.IsSingleInstance = false
             Me.EnableVisualStyles = false
             Me.SaveMySettingsOnExit = true
-            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
+            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterAllFormsClose
         End Sub
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _

My Project/Application.myapp

@@ -3,7 +3,7 @@
   <MySubMain>true</MySubMain>
   <MainForm>Form1</MainForm>
   <SingleInstance>false</SingleInstance>
-  <ShutdownMode>0</ShutdownMode>
+  <ShutdownMode>1</ShutdownMode>
   <EnableVisualStyles>false</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>
   <MinimumSplashScreenDisplayTime>0</MinimumSplashScreenDisplayTime>

My Project/AssemblyInfo.vb

@@ -1,4 +1,5 @@
-Imports System
+Imports System.Resources
+Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 
@@ -9,10 +10,10 @@ Imports System.Runtime.InteropServices
 ' Review the values of the assembly attributes
 
 <Assembly: AssemblyTitle("TPS1100 Convert")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyDescription("Program za konvertiranje GSI datotek")>
+<Assembly: AssemblyCompany("2B geoinformatika, d.o.o.")>
 <Assembly: AssemblyProduct("TPS1100 Convert")>
-<Assembly: AssemblyCopyright("Copyright ©  2016")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -31,5 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("2.5.0.4")>
+<Assembly: AssemblyFileVersion("2.5.0.4")>
+<Assembly: NeutralResourcesLanguage("sl-SI")>

My Project/Resources.Designer.vb

@@ -60,6 +60,26 @@ Namespace My.Resources
             End Set
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Circled_Right_2_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Circled-Right-2-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_add_new_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-add-new-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -70,6 +90,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_cancel_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-cancel-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -80,6 +110,156 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_clear_symbol_501() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-clear-symbol-501", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_close_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-close-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_close_window_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-close-window-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_connection_status_on_48() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-connection-status-on-48", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_design_48() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-design-48", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_done_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-done-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_drawing_compass_48() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-drawing-compass-48", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_edit_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-edit-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_info_squared_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-info-squared-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_information_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-information-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_land_surveying_48() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-land-surveying-48", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_no_entry_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-no-entry-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_ok_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-ok-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_ok_501() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-ok-501", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_open_end_wrench_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-open-end-wrench-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -90,6 +270,36 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_save_as_501() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-save-as-501", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_tools_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-tools-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_unavailable_50() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-unavailable-50", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized resource of type System.Drawing.Bitmap.
         '''</summary>
@@ -109,5 +319,15 @@ Namespace My.Resources
                 Return CType(obj,System.Drawing.Bitmap)
             End Get
         End Property
+        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property TPS1100CNVRT_logo() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("TPS1100CNVRT_logo", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
     End Module
 End Namespace

My Project/Resources.resx

@@ -118,19 +118,85 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="icons8-clear-symbol-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Save-as-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Save-as-24.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>..\icons8-advance-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icons8-ok-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-ok-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Circled-Right-2-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Circled-Right-2-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8-clear-symbol-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icons8-save-as-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icons8-undo-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\icons8-undo-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Save-as-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Save-as-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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>
+  <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>
+  </data>
+  <data name="icons8-clear-symbol-501" 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-close-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-close-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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>
+  <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="icons8-design-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-design-48.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>
+  <data name="icons8-drawing-compass-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-drawing-compass-48.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-information-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-information-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</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>
+  <data name="icons8-land-surveying-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-land-surveying-48.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>
+  </data>
+  <data name="icons8-ok-501" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-ok-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <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="icons8-save-as-501" 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-tools-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-tools-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icons8-unavailable-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\icons8-unavailable-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TPS1100CNVRT_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Icons\TPS1100CNVRT_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

My Project/Settings.Designer.vb

@@ -96,25 +96,25 @@ Namespace My
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("GSI_user.ini")>  _
-        Public Property DatKodeUporabnik() As String
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property Datoteka() As String
             Get
-                Return CType(Me("DatKodeUporabnik"),String)
+                Return CType(Me("Datoteka"),String)
             End Get
             Set
-                Me("DatKodeUporabnik") = value
+                Me("Datoteka") = value
             End Set
         End Property
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("GSI_data.ini")>  _
-        Public Property DatKodeData() As String
+         Global.System.Configuration.DefaultSettingValueAttribute("0")>  _
+        Public Property Stolpci() As Integer
             Get
-                Return CType(Me("DatKodeData"),String)
+                Return CType(Me("Stolpci"),Integer)
             End Get
             Set
-                Me("DatKodeData") = value
+                Me("Stolpci") = value
             End Set
         End Property
     End Class

My Project/Settings.settings

@@ -11,11 +11,11 @@
     <Setting Name="KodeUporabnik" Type="System.String" Scope="User">
       <Value Profile="(Default)">Da</Value>
     </Setting>
-    <Setting Name="DatKodeUporabnik" Type="System.String" Scope="User">
-      <Value Profile="(Default)">GSI_user.ini</Value>
+    <Setting Name="Datoteka" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="DatKodeData" Type="System.String" Scope="User">
-      <Value Profile="(Default)">GSI_data.ini</Value>
+    <Setting Name="Stolpci" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
     </Setting>
   </Settings>
 </SettingsFile>

SplashScreen1.Designer.vb

@@ -0,0 +1,204 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class SplashScreen1
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+    Friend WithEvents ApplicationTitle As System.Windows.Forms.Label
+    Friend WithEvents Version As System.Windows.Forms.Label
+    Friend WithEvents Copyright As System.Windows.Forms.Label
+    Friend WithEvents MainLayoutPanel As System.Windows.Forms.TableLayoutPanel
+    Friend WithEvents DetailsLayoutPanel As System.Windows.Forms.TableLayoutPanel
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.MainLayoutPanel = New System.Windows.Forms.TableLayoutPanel()
+        Me.ApplicationTitle = New System.Windows.Forms.Label()
+        Me.DetailsLayoutPanel = New System.Windows.Forms.TableLayoutPanel()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Version = New System.Windows.Forms.Label()
+        Me.Copyright = New System.Windows.Forms.Label()
+        Me.LabelCompany = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.MainLayoutPanel.SuspendLayout()
+        Me.DetailsLayoutPanel.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'MainLayoutPanel
+        '
+        Me.MainLayoutPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
+        Me.MainLayoutPanel.ColumnCount = 2
+        Me.MainLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 107.0!))
+        Me.MainLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 236.0!))
+        Me.MainLayoutPanel.Controls.Add(Me.DetailsLayoutPanel, 1, 1)
+        Me.MainLayoutPanel.Controls.Add(Me.PictureBox1, 0, 0)
+        Me.MainLayoutPanel.Controls.Add(Me.ApplicationTitle, 1, 0)
+        Me.MainLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MainLayoutPanel.Location = New System.Drawing.Point(0, 0)
+        Me.MainLayoutPanel.Name = "MainLayoutPanel"
+        Me.MainLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 108.0!))
+        Me.MainLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 148.0!))
+        Me.MainLayoutPanel.Size = New System.Drawing.Size(398, 298)
+        Me.MainLayoutPanel.TabIndex = 0
+        '
+        'ApplicationTitle
+        '
+        Me.ApplicationTitle.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.ApplicationTitle.BackColor = System.Drawing.Color.Transparent
+        Me.ApplicationTitle.Font = New System.Drawing.Font("Gill Sans MT Condensed", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ApplicationTitle.Location = New System.Drawing.Point(117, 24)
+        Me.ApplicationTitle.Name = "ApplicationTitle"
+        Me.ApplicationTitle.Size = New System.Drawing.Size(270, 59)
+        Me.ApplicationTitle.TabIndex = 0
+        Me.ApplicationTitle.Text = "TPS1100 Convert"
+        Me.ApplicationTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        '
+        'DetailsLayoutPanel
+        '
+        Me.DetailsLayoutPanel.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.DetailsLayoutPanel.BackColor = System.Drawing.Color.Transparent
+        Me.DetailsLayoutPanel.ColumnCount = 1
+        Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 247.0!))
+        Me.DetailsLayoutPanel.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 142.0!))
+        Me.DetailsLayoutPanel.Controls.Add(Me.Version, 0, 0)
+        Me.DetailsLayoutPanel.Controls.Add(Me.Label1, 0, 1)
+        Me.DetailsLayoutPanel.Controls.Add(Me.Copyright, 0, 4)
+        Me.DetailsLayoutPanel.Controls.Add(Me.Button1, 0, 5)
+        Me.DetailsLayoutPanel.Controls.Add(Me.LinkLabel1, 0, 3)
+        Me.DetailsLayoutPanel.Controls.Add(Me.LabelCompany, 0, 2)
+        Me.DetailsLayoutPanel.Location = New System.Drawing.Point(113, 115)
+        Me.DetailsLayoutPanel.Name = "DetailsLayoutPanel"
+        Me.DetailsLayoutPanel.RowCount = 6
+        Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70.27027!))
+        Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 29.72973!))
+        Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26.0!))
+        Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25.0!))
+        Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21.0!))
+        Me.DetailsLayoutPanel.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31.0!))
+        Me.DetailsLayoutPanel.Size = New System.Drawing.Size(279, 175)
+        Me.DetailsLayoutPanel.TabIndex = 1
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.Label1.AutoSize = True
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(3, 54)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(91, 13)
+        Me.Label1.TabIndex = 4
+        Me.Label1.Text = "Napisal: Boris Bilc"
+        '
+        'Version
+        '
+        Me.Version.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.Version.AutoSize = True
+        Me.Version.BackColor = System.Drawing.Color.Transparent
+        Me.Version.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Version.Location = New System.Drawing.Point(3, 15)
+        Me.Version.Name = "Version"
+        Me.Version.Size = New System.Drawing.Size(131, 20)
+        Me.Version.TabIndex = 1
+        Me.Version.Text = "Version {0}.{1:00}"
+        '
+        'Copyright
+        '
+        Me.Copyright.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.Copyright.AutoSize = True
+        Me.Copyright.BackColor = System.Drawing.Color.Transparent
+        Me.Copyright.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Copyright.Location = New System.Drawing.Point(3, 125)
+        Me.Copyright.Name = "Copyright"
+        Me.Copyright.Size = New System.Drawing.Size(58, 15)
+        Me.Copyright.TabIndex = 2
+        Me.Copyright.Text = "Copyright"
+        '
+        'LabelCompany
+        '
+        Me.LabelCompany.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LabelCompany.AutoSize = True
+        Me.LabelCompany.BackColor = System.Drawing.Color.Transparent
+        Me.LabelCompany.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LabelCompany.Location = New System.Drawing.Point(3, 76)
+        Me.LabelCompany.Name = "LabelCompany"
+        Me.LabelCompany.Size = New System.Drawing.Size(59, 15)
+        Me.LabelCompany.TabIndex = 3
+        Me.LabelCompany.Text = "Company"
+        '
+        'Button1
+        '
+        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button1.Location = New System.Drawing.Point(201, 147)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 25)
+        Me.Button1.TabIndex = 2
+        Me.Button1.Text = "OK"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'LinkLabel1
+        '
+        Me.LinkLabel1.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LinkLabel1.AutoSize = True
+        Me.LinkLabel1.Location = New System.Drawing.Point(3, 103)
+        Me.LinkLabel1.Name = "LinkLabel1"
+        Me.LinkLabel1.Size = New System.Drawing.Size(71, 13)
+        Me.LinkLabel1.TabIndex = 5
+        Me.LinkLabel1.TabStop = True
+        Me.LinkLabel1.Text = "Spletna Stran"
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.Image = Global.TPS1100_Convert.My.Resources.Resources.TPS1100CNVRT_logo
+        Me.PictureBox1.Location = New System.Drawing.Point(3, 3)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(101, 101)
+        Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox1.TabIndex = 3
+        Me.PictureBox1.TabStop = False
+        '
+        'SplashScreen1
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(398, 298)
+        Me.ControlBox = False
+        Me.Controls.Add(Me.MainLayoutPanel)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "SplashScreen1"
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.MainLayoutPanel.ResumeLayout(False)
+        Me.DetailsLayoutPanel.ResumeLayout(False)
+        Me.DetailsLayoutPanel.PerformLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents Button1 As Button
+    Friend WithEvents LabelCompany As Label
+    Friend WithEvents Label1 As Label
+    Friend WithEvents LinkLabel1 As LinkLabel
+    Friend WithEvents PictureBox1 As PictureBox
+End Class

SplashScreen1.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

SplashScreen1.vb

@@ -0,0 +1,46 @@
+
+Public NotInheritable Class SplashScreen1
+
+    'TODO: This form can easily be set as the splash screen for the application by going to the "Application" tab
+    '  of the Project Designer ("Properties" under the "Project" menu).
+
+
+    Private Sub SplashScreen1_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+        'Set up the dialog text at runtime according to the application's assembly information.  
+
+        'TODO: Customize the application's assembly information in the "Application" pane of the project 
+        '  properties dialog (under the "Project" menu).
+
+        'Application title
+        If My.Application.Info.Title <> "" Then
+            ApplicationTitle.Text = My.Application.Info.Title
+        Else
+            'If the application title is missing, use the application name, without the extension
+            ApplicationTitle.Text = System.IO.Path.GetFileNameWithoutExtension(My.Application.Info.AssemblyName)
+        End If
+
+        'Format the version information using the text set into the Version control at design time as the
+        '  formatting string.  This allows for effective localization if desired.
+        '  Build and revision information could be included by using the following code and changing the 
+        '  Version control's designtime text to "Version {0}.{1:00}.{2}.{3}" or something similar.  See
+        '  String.Format() in Help for more information.
+        '
+        '    Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build, My.Application.Info.Version.Revision)
+
+        Version.Text = "Verzija: " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString + "." + My.Application.Info.Version.Revision.ToString
+
+        'Copyright info
+        Copyright.Text = My.Application.Info.Copyright
+        LabelCompany.Text = My.Application.Info.CompanyName
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Me.Close()
+
+    End Sub
+
+    Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
+        Dim webAddress As String = "https://2bgeo.si/"
+        Process.Start(webAddress)
+    End Sub
+End Class

TEST.GSI

@@ -1,3 +1,4 @@
+*410000+0000000000000099 
 *110001+00000000000GS001 81..00+0000000465423089 82..00+0000000110526243 83..00+0000000000301586 
 *110002+00000000000GS002 81..00+0000000465437688 82..00+0000000110547569 83..00+0000000000302107 
 *110003+00000000000GS003 81..00+0000000465472908 82..00+0000000110527226 83..00+0000000000302945 

TEST.koo

@@ -0,0 +1,44 @@
+GS001	465423.089	110526.243	301.586	REF
+GS002	465437.688	110547.569	302.107	REF
+GS003	465472.908	110527.226	302.945	REF
+11111	465444.529	110546.554	302.353	STA
+GS003	465472.895	110527.228	302.954	MEAS
+GS001	465423.100	110526.246	301.598	MEAS
+GS002	465437.693	110547.564	302.084	MEAS
+1	465474.729	110533.795	303.558	MEAS
+2	465463.403	110539.024	302.973	MEAS
+3	465455.561	110542.757	302.689	MEAS
+4	465446.424	110547.098	302.354	MEAS
+5	465447.834	110549.258	302.521	MEAS
+6	465447.013	110549.645	302.470	MEAS
+7	465447.133	110549.911	302.484	MEAS
+8	465442.260	110552.180	302.590	MEAS
+9	465439.917	110549.069	302.276	MEAS
+10	465434.013	110548.886	302.034	MEAS
+11	465447.924	110549.193	303.527	MEAS
+12	465448.112	110549.481	303.244	MEAS
+13	465452.362	110554.843	304.664	MEAS
+14	465454.504	110557.544	305.149	MEAS
+15	465453.962	110560.654	305.190	MEAS
+16	465451.792	110572.598	306.363	MEAS
+17	465452.236	110573.476	307.192	MEAS
+18	465451.552	110573.751	306.829	MEAS
+19	465460.165	110569.493	306.147	MEAS
+20	465460.732	110564.366	308.875	MEAS
+21	465456.144	110555.142	308.718	MEAS
+22	465466.357	110550.055	310.853	MEAS
+23	465457.019	110582.726	312.411	MEAS
+24	465471.010	110580.229	312.548	MEAS
+31	465443.141	110551.729	303.779	MEAS
+32	465440.407	110548.265	302.097	MEAS
+33	465438.211	110547.118	302.072	MEAS
+34	465434.570	110547.693	301.894	MEAS
+35	465436.599	110547.165	301.948	MEAS
+36	465439.124	110546.897	302.006	MEAS
+37	465441.653	110546.549	302.094	MEAS
+38	465446.526	110544.850	302.298	MEAS
+39	465454.849	110541.033	302.554	MEAS
+40	465460.359	110538.438	302.711	MEAS
+41	465472.352	110532.887	302.986	MEAS
+42	465473.669	110532.696	303.036	MEAS
+43	465474.578	110533.313	303.177	MEAS

TEST.mer

@@ -0,0 +1,65 @@
+TPS 1100 Zapisnik
+++++++++++++++++++++++++++++++++
+
+Imported/User-Entered:
+----------------------
+PtID	E	N	H
+GS001	465423.089	110526.243	301.586
+GS002	465437.688	110547.569	302.107
+GS003	465472.908	110527.226	302.945
+
+Setup: Free Station
+=============================
+PtID	HZ	V	SD	HD	ReflHt	PrCon	HtDif	PtCode
+GS001	138.3101	89.3234	29.523	29.522	2.500	0.0175	-0.754
+GS002	190.2304	103.3841	7.115	6.914	0.100	0.0175	-0.268
+GS003	36.1441	91.2102	34.333	34.324	0.100	0.0175	0.601
+
+Station:
+****************
+PtID	HzCor	StnE	StnN	StnH	ReflHt	InstHt
+11111	88.0119	465444.529	110546.554	302.353	0.100	1.510
+
+Measured:
+----------------------
+PtID	HZ	V	SD	HD	ReflHt	PrCon	HtDif	E	N	H	PtCode
+GS003	124.1559	91.2102	34.332	34.323	0.100	0.0175	0.601	465472.895	110527.228	302.954
+GS001	226.3226	89.3239	29.524	29.523	2.500	0.0175	-0.755	465423.100	110526.246	301.598
+GS002	278.2430	103.3939	7.112	6.911	0.100	0.0175	-0.270	465437.693	110547.564	302.084
+1	112.5409	88.1545	32.800	32.785	1.300	0.0175	1.205	465474.729	110533.795	303.558
+2	111.4452	88.5039	20.325	20.321	1.300	0.0175	0.620	465463.403	110539.024	302.973
+3	108.5920	89.2251	11.668	11.667	1.300	0.0175	0.336	465455.561	110542.757	302.689
+4	73.5833	96.0303	1.983	1.972	1.300	0.0175	0.001	465446.424	110547.098	302.354
+5	50.4246	107.2703	4.476	4.270	0.000	0.0344	0.168	465447.834	110549.258	302.521
+6	38.4642	109.2145	4.204	3.966	0.000	0.0344	0.116	465447.013	110549.645	302.470
+7	37.4746	107.5859	4.468	4.249	0.000	0.0344	0.131	465447.133	110549.911	302.484
+8	338.0216	101.5057	6.199	6.067	0.000	0.0344	0.237	465442.260	110552.180	302.590
+9	298.3616	106.4853	5.488	5.254	0.000	0.0344	-0.078	465439.917	110549.069	302.276
+10	282.3022	92.4844	10.785	10.772	1.300	0.0175	-0.319	465434.013	110548.886	302.034
+11	52.0802	94.2821	4.313	4.300	0.000	0.0344	1.174	465447.924	110549.193	303.527
+12	50.4445	81.3752	4.677	4.627	1.300	0.0175	0.891	465448.112	110549.481	303.244
+13	43.2242	79.3342	11.597	11.405	1.300	0.0175	2.311	465452.362	110554.843	304.664
+14	42.1339	80.0701	15.065	14.842	1.300	0.0175	2.796	465454.504	110557.544	305.149
+15	33.4646	81.1159	17.167	16.965	1.300	0.0175	2.836	465453.962	110560.654	305.190
+16	15.3456	82.0003	27.304	27.038	1.300	0.0175	4.010	465451.792	110572.598	306.363
+17	15.5830	80.3654	28.384	28.004	1.300	0.0175	4.838	465452.236	110573.476	307.192
+18	14.2841	81.2154	28.412	28.090	1.300	0.0175	4.476	465451.552	110573.751	306.829
+19	34.1646	82.3838	27.992	27.761	1.300	0.0175	3.794	465460.165	110569.493	306.147
+20	42.1727	78.1433	24.595	24.079	0.000	0.0344	6.522	465460.732	110564.366	308.875
+21	53.3104	71.2531	15.239	14.445	0.000	0.0344	6.364	465456.144	110555.142	308.718
+22	80.5316	72.2717	23.186	22.107	0.000	0.0344	8.500	465466.357	110550.055	310.853
+23	19.0258	77.2433	39.212	38.269	0.000	0.0344	10.058	465457.019	110582.726	312.411
+24	38.1048	78.3224	43.712	42.840	0.000	0.0344	10.195	465471.010	110580.229	312.548
+31	344.5857	90.5405	5.359	5.358	0.000	0.0344	1.426	465443.141	110551.729	303.779
+32	292.3305	95.5811	4.488	4.464	1.300	0.0175	-0.257	465440.407	110548.265	302.097
+33	275.0604	94.2552	6.362	6.343	1.300	0.0175	-0.282	465438.211	110547.118	302.072
+34	276.3140	93.4917	10.047	10.024	1.300	0.0175	-0.460	465434.570	110547.693	301.894
+35	274.2437	94.2524	7.978	7.954	1.300	0.0175	-0.405	465436.599	110547.165	301.948
+36	273.3758	95.5230	5.445	5.416	1.300	0.0175	-0.347	465439.124	110546.897	302.006
+37	269.5406	99.1634	2.914	2.876	1.300	0.0175	-0.260	465441.653	110546.549	302.094
+38	130.2741	95.4557	2.638	2.625	1.300	0.0175	-0.055	465446.526	110544.850	302.298
+39	118.0836	90.0246	11.703	11.703	1.300	0.0175	0.201	465454.849	110541.033	302.554
+40	117.0839	89.3129	17.790	17.789	1.300	0.0175	0.358	465460.359	110538.438	302.711
+41	116.0938	89.1307	31.001	30.998	1.300	0.0175	0.633	465472.352	110532.887	302.986
+42	115.2603	89.0942	32.271	32.268	1.300	0.0175	0.682	465473.669	110532.696	303.036
+43	113.4649	88.5545	32.842	32.836	1.300	0.0175	0.824	465474.578	110533.313	303.177

TEST.txt

@@ -0,0 +1,44 @@
+GS001 465423.089 110526.243 301.586
+GS002 465437.688 110547.569 302.107
+GS003 465472.908 110527.226 302.945
+11111 465444.529 110546.554 302.353
+GS003 465472.895 110527.228 302.954
+GS001 465423.100 110526.246 301.598
+GS002 465437.693 110547.564 302.084
+1 465474.729 110533.795 303.558
+2 465463.403 110539.024 302.973
+3 465455.561 110542.757 302.689
+4 465446.424 110547.098 302.354
+5 465447.834 110549.258 302.521
+6 465447.013 110549.645 302.470
+7 465447.133 110549.911 302.484
+8 465442.260 110552.180 302.590
+9 465439.917 110549.069 302.276
+10 465434.013 110548.886 302.034
+11 465447.924 110549.193 303.527
+12 465448.112 110549.481 303.244
+13 465452.362 110554.843 304.664
+14 465454.504 110557.544 305.149
+15 465453.962 110560.654 305.190
+16 465451.792 110572.598 306.363
+17 465452.236 110573.476 307.192
+18 465451.552 110573.751 306.829
+19 465460.165 110569.493 306.147
+20 465460.732 110564.366 308.875
+21 465456.144 110555.142 308.718
+22 465466.357 110550.055 310.853
+23 465457.019 110582.726 312.411
+24 465471.010 110580.229 312.548
+31 465443.141 110551.729 303.779
+32 465440.407 110548.265 302.097
+33 465438.211 110547.118 302.072
+34 465434.570 110547.693 301.894
+35 465436.599 110547.165 301.948
+36 465439.124 110546.897 302.006
+37 465441.653 110546.549 302.094
+38 465446.526 110544.850 302.298
+39 465454.849 110541.033 302.554
+40 465460.359 110538.438 302.711
+41 465472.352 110532.887 302.986
+42 465473.669 110532.696 303.036
+43 465474.578 110533.313 303.177

TPS1100 Convert.vbproj

@@ -19,17 +19,23 @@
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
+    <UpdateMode>Background</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <WebPage>publish.htm</WebPage>
+    <TargetCulture>sl-SI</TargetCulture>
+    <ProductName>TPS1100 Convert</ProductName>
+    <PublisherName>2B geoinformatika d.o.o.</PublisherName>
+    <MinimumRequiredVersion>2.1.0.4</MinimumRequiredVersion>
+    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
+    <WebPage>publish.html</WebPage>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>4</ApplicationRevision>
-    <ApplicationVersion>1.1.0.%2a</ApplicationVersion>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>2.5.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -75,7 +81,7 @@
     <ManifestKeyFile>TPS1100 Convert_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
+    <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>false</SignManifests>
@@ -112,6 +118,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
     <Compile Include="Form1.vb">
       <SubType>Form</SubType>
     </Compile>
@@ -141,6 +148,12 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="SplashScreen1.Designer.vb">
+      <DependentUpon>SplashScreen1.vb</DependentUpon>
+    </Compile>
+    <Compile Include="SplashScreen1.vb">
+      <SubType>Form</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Form1.resx">
@@ -155,14 +168,11 @@
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="SplashScreen1.resx">
+      <DependentUpon>SplashScreen1.vb</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Include="GSI_user.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="GSI_data.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="My Project\app.manifest" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
@@ -184,6 +194,27 @@
     <None Include="icons8-save-as-50.png" />
     <None Include="icons8-advance-48.png" />
     <None Include="icons8-undo-48.png" />
+    <None Include="Circled-Right-2-24.png" />
+    <None Include="Icons\icons8-ok-50.png" />
+    <None Include="Icons\icons8-add-new-50.png" />
+    <None Include="Icons\icons8-cancel-50.png" />
+    <None Include="Icons\icons8-clear-symbol-50.png" />
+    <None Include="Icons\icons8-close-50.png" />
+    <None Include="Icons\icons8-close-window-50.png" />
+    <None Include="Icons\icons8-connection-status-on-48.png" />
+    <None Include="Icons\icons8-design-48.png" />
+    <None Include="Icons\icons8-done-50.png" />
+    <None Include="Icons\icons8-drawing-compass-48.png" />
+    <None Include="Icons\icons8-edit-50.png" />
+    <None Include="Icons\icons8-information-50.png" />
+    <None Include="Icons\icons8-info-squared-50.png" />
+    <None Include="Icons\icons8-land-surveying-48.png" />
+    <None Include="Icons\icons8-no-entry-50.png" />
+    <None Include="Icons\icons8-open-end-wrench-50.png" />
+    <None Include="Icons\icons8-save-as-50.png" />
+    <None Include="Icons\icons8-tools-50.png" />
+    <None Include="Icons\icons8-unavailable-50.png" />
+    <None Include="Icons\TPS1100CNVRT_logo.png" />
     <Content Include="TPS1100CNVRT.ico" />
   </ItemGroup>
   <ItemGroup>
@@ -192,6 +223,11 @@
       <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
       <Visible>False</Visible>
       <ProductName>.NET Framework 3.5 SP1</ProductName>

bin/Release/GSI_data.ini

@@ -1,139 +0,0 @@
-[WORD_INDEX]
-11 = Pointnumber # 11 / block: 11....+00000H66
-# PtNo=“H66“
-12 = Serial number # 12 / block: 12....+00640054
-# S.No. “640054”
-13 = Instrument type # 13; 13....+00TCR305
-# Instr. “TCR305”
-19 = Time # 19 / block: 19....+02081029
-# [MM.DD.hh.mm]
-21 = Horizontal Angle # 21 / block: 21.102+17920860
-# Hz „179.086“ gon
-22 = Vertical Angle # 22 / block: 22.102+07567500
-# V: „75.675“ gon
-25 = Horizontal Angle Delta Azimuth # 22 / block: 22.102+07567500
-# V: „75.675“ gon
-31 = Slope distance # 31; e-g. 31..00+00003387
-# Sdist: „3.387“ m
-32 = Horizontal distance # 32 / block: 32..00+00003198
-# Hdist: „3.198“ m
-33 = Height difference # 33 / block: 33..00+00001119
-# Hdiff: „1.119“ m
-41 = Code-Block ID # 41 / block: 41....+00000013
-# Code: „13“ m
-42 = Information 1 # 42 / block: 42....+000TREES
-# Info1: „TREES“
-43 = Information 2 # 43 / block: 43....+000004.5
-# Info2: „4.5“
-44 = Information 3 # 44 / block: 44....+00CAT.02
-# Info3: „CAT.02“
-45 = Information 4 # 45 / block: 45....+000000NN
-# Info4: „NN“
-46 = Information 5 # 46 / block: 46....+000000NN
-# Info5: „NN“
-47 = Information 6 # 47 / block: 47....+000000NN
-# Info6: „NN“
-48 = Information 7 # 48 / block: 48....+000000NN
-# Info7: „NN“
-49 = Information 8 # 49 / block: 49....+000000NN
-# Info8: „NN“
-51 = PPM/mm # 51 / block: 51..1.+0000+034
-# “0”ppm; “34”mm
-58 = Prism constant # 58 / block: 58..16+00000020
-# Prism „2“ mm
-59 = PPM # 59 / block: 59..16+02200000
-# PPM „220“
-71 = Remark 1
-# (or Attribute 1)
-# 71 / block: 71....+0000REM1
-# “REM1”
-72 = Remark 2
-# (or Attribute 2)
-# 72 / block: 72....+0000REM2
-# “REM2”
-73 = Remark 3
-# (or Attribute 3)
-# 73 / block: 73....+0000REM3
-# “REM3”
-74 = Remark 4
-# (or Attribute 4)
-# 74 / block: 74....+0000REM4
-# “REM4”
-75 = Remark 5
-# (or Attribute 5)
-# 75 / block: 75....+0000REM5
-# “REM5”
-76 = Remark 6
-# (or Attribute 6)
-# 76 / block: 76....+0000REM6
-# “REM6”
-77 = Remark 7
-# (or Attribute 7)
-# 77 / block: 77....+0000REM7
-# “REM7”
-78 = Remark 8 # (or Attribute 8)
-# 78 / block: 78....+0000REM8
-# “REM8”
-79 = Remark 9
-# (or Attribute 9)
-# 79 / block: 79....+0000REM9
-# “REM9”
-81 = Easting
-# (E)
-# 81 / block: 81..00+01999507
-# E: “1999.507”m
-82 = Northing
-# (N)
-# 82 / block: 82..00+00213159
-# N: “2139.159”m
-83 = Elevation
-# (H)
-# 83 / block: 83..00-00032881
-# H: “32.881”m
-84 = St. Easting
-# (E0)
-# 84 / block: 84..11+00393700
-# E: “393.700”m
-85 = St. Northing
-# (N0)
-# 85 / block: 85..11+06561220
-# N: “6561.220”m
-86 = St. Height
-# (H0)
-# 86 / block: 86..11+00065618
-# H: “65.618”m
-87 = Reflector height
-# (hr)
-# 87 / block: 87..11+00001700
-# hr: “1.700” m
-88 = Instrument height
-# (hi)
-# 88 / block: 88..11+00001550
-# hi: “1.550” m
-
-[AUTOMATIC_INDEX_INFORMATION]
-# POS : 4
-0 = Automatic index OFF
-1 = Automatic index OPERATING
-3 = Automatic index OPERATING
-
-[INPUT_MODE]
-# POS : 5
-0 = Original measured values transferred from the instrument
-1 = Manual input from keyboard
-2 = Measured value, Hz-Correction ON
-3 = Measured value, Hz-Correction OFF
-4 = Result of special function
-
-[UNITS]
-# POS : 6
-0 = Meter # (last digit: 1mm / 0.000m)
-1 = Feet # (last digit: 1/1000ft / 0.000ft)
-2 = 400 gon
-3 = 360° decimal # (DDD.DDDDD)
-4 = 360° sexagesimal # (DDD.MMSSS)
-5 = 6400 mil
-6 = Meter # (last digit: 1/10mm)
-7 = Feet # (last digit: 1/10‘000ft)
-8 = Meter # (last digit: 1/100mm)
-

bin/Release/GSI_user.ini

@@ -1,8 +0,0 @@
-[CODE]
-10 = Quick Set
-20 = Set Azimuth
-30 = Resection
-40 = Free Station
-90 = Measured Data
-99 = Imported Data
-

bin/Release/TPS1100 Convert.application

@@ -0,0 +1,21 @@
+<?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.5.0.4" 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" />
+  <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="5098">
+      <assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.4" 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>mi1NgancRnCpJERnEGTkp67M9PQDKvaw98XhgbHMRqw=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+</asmv1:assembly>

bin/Release/TPS1100 Convert.exe.config

@@ -19,11 +19,11 @@
             <setting name="KodeUporabnik" serializeAs="String">
                 <value>Da</value>
             </setting>
-            <setting name="DatKodeUporabnik" serializeAs="String">
-                <value>GSI_user.ini</value>
+            <setting name="Datoteka" serializeAs="String">
+                <value />
             </setting>
-            <setting name="DatKodeData" serializeAs="String">
-                <value>GSI_data.ini</value>
+            <setting name="Stolpci" serializeAs="String">
+                <value>0</value>
             </setting>
         </TPS1100_Convert.My.MySettings>
     </userSettings>

bin/Release/TPS1100 Convert.exe.manifest

@@ -0,0 +1,92 @@
+<?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.5.0.4" 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.5.0.4" language="neutral" processorArchitecture="msil" />
+    <commandLine file="TPS1100 Convert.exe" parameters="" />
+  </entryPoint>
+  <trustInfo>
+    <security>
+      <applicationRequestMinimum>
+        <PermissionSet version="1" class="System.Security.NamedPermissionSet" Name="LocalIntranet" Description="Default rights given to applications on the local intranet" Unrestricted="true" ID="Custom" SameSite="site" />
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+      </applicationRequestMinimum>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentOS>
+      <osVersionInfo>
+        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
+      </osVersionInfo>
+    </dependentOS>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
+      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="636928">
+      <assemblyIdentity name="TPS1100 Convert" version="2.5.0.4" 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>AQwcFLu1utwPCQjlPgYpdQxwTM1xmK3U6nfVkNcyf5E=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <file name="TPS1100 Convert.exe.config" size="1398">
+    <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>1VaEGgf8SiN+OrIDf5Tg9i7UOvOgWe/2TCc6gjoYbCQ=</dsig:DigestValue>
+    </hash>
+  </file>
+  <file name="TPS1100CNVRT.ico" size="176342">
+    <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>74qm9dMNKX/YirNPCGO0q9XYo6Tzd8K6cBxxg17LnsU=</dsig:DigestValue>
+    </hash>
+  </file>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+</asmv1:assembly>

bin/Release/TPS1100 Convert.xml

@@ -22,21 +22,126 @@ TPS1100 Convert
   resource lookups using this strongly typed resource class.
 </summary>
 </member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.Circled_Right_2_24">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_add_new_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
 <member name="P:TPS1100_Convert.My.Resources.Resources.icons8_advance_48">
 <summary>
   Looks up a localized resource of type System.Drawing.Bitmap.
 </summary>
 </member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_cancel_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
 <member name="P:TPS1100_Convert.My.Resources.Resources.icons8_clear_symbol_50">
 <summary>
   Looks up a localized resource of type System.Drawing.Bitmap.
 </summary>
 </member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_clear_symbol_501">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_close_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_close_window_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_connection_status_on_48">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_design_48">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_done_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_drawing_compass_48">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_edit_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_info_squared_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_information_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_land_surveying_48">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_no_entry_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_ok_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_ok_501">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_open_end_wrench_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
 <member name="P:TPS1100_Convert.My.Resources.Resources.icons8_save_as_50">
 <summary>
   Looks up a localized resource of type System.Drawing.Bitmap.
 </summary>
 </member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_save_as_501">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_tools_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.icons8_unavailable_50">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
 <member name="P:TPS1100_Convert.My.Resources.Resources.icons8_undo_48">
 <summary>
   Looks up a localized resource of type System.Drawing.Bitmap.
@@ -47,6 +152,11 @@ TPS1100 Convert
   Looks up a localized resource of type System.Drawing.Bitmap.
 </summary>
 </member>
+<member name="P:TPS1100_Convert.My.Resources.Resources.TPS1100CNVRT_logo">
+<summary>
+  Looks up a localized resource of type System.Drawing.Bitmap.
+</summary>
+</member>
 <member name="P:TPS1100_Convert.My.MySettings.DecimalnoLocilo">
 <summary>
 Znak za decimalno ločilo

bin/Release/app.publish/Application Files/TPS1100 Convert_2_5_0_4/TPS1100 Convert.exe.config.deploy

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="TPS1100_Convert.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    </startup>
+    <userSettings>
+        <TPS1100_Convert.My.MySettings>
+            <setting name="ZadnjaMapa" serializeAs="String">
+                <value>C:\</value>
+            </setting>
+            <setting name="DecimalnoLocilo" serializeAs="String">
+                <value>Pika</value>
+            </setting>
+            <setting name="KodeUporabnik" serializeAs="String">
+                <value>Da</value>
+            </setting>
+            <setting name="Datoteka" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="Stolpci" serializeAs="String">
+                <value>0</value>
+            </setting>
+        </TPS1100_Convert.My.MySettings>
+    </userSettings>
+</configuration>

bin/Release/app.publish/Application Files/TPS1100 Convert_2_5_0_4/TPS1100 Convert.exe.manifest

@@ -0,0 +1,92 @@
+<?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.5.0.4" 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.5.0.4" language="neutral" processorArchitecture="msil" />
+    <commandLine file="TPS1100 Convert.exe" parameters="" />
+  </entryPoint>
+  <trustInfo>
+    <security>
+      <applicationRequestMinimum>
+        <PermissionSet version="1" class="System.Security.NamedPermissionSet" Name="LocalIntranet" Description="Default rights given to applications on the local intranet" Unrestricted="true" ID="Custom" SameSite="site" />
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+      </applicationRequestMinimum>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentOS>
+      <osVersionInfo>
+        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
+      </osVersionInfo>
+    </dependentOS>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
+      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TPS1100 Convert.exe" size="636928">
+      <assemblyIdentity name="TPS1100 Convert" version="2.5.0.4" 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>AQwcFLu1utwPCQjlPgYpdQxwTM1xmK3U6nfVkNcyf5E=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+  <file name="TPS1100 Convert.exe.config" size="1398">
+    <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>1VaEGgf8SiN+OrIDf5Tg9i7UOvOgWe/2TCc6gjoYbCQ=</dsig:DigestValue>
+    </hash>
+  </file>
+  <file name="TPS1100CNVRT.ico" size="176342">
+    <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>74qm9dMNKX/YirNPCGO0q9XYo6Tzd8K6cBxxg17LnsU=</dsig:DigestValue>
+    </hash>
+  </file>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+</asmv1:assembly>

bin/Release/app.publish/TPS1100 Convert.application

@@ -0,0 +1,21 @@
+<?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.5.0.4" 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" />
+  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
+    <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
+  </compatibleFrameworks>
+  <dependency>
+    <dependentAssembly dependencyType="install" codebase="Application Files\TPS1100 Convert_2_5_0_4\TPS1100 Convert.exe.manifest" size="5098">
+      <assemblyIdentity name="TPS1100 Convert.exe" version="2.5.0.4" 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>mi1NgancRnCpJERnEGTkp67M9PQDKvaw98XhgbHMRqw=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+</asmv1:assembly>

bin/Release/app.publish/autorun.inf

@@ -0,0 +1,3 @@
+[autorun]
+open=setup.exe
+icon=setup.exe,0

bin/Release/app.publish/publish.html

@@ -0,0 +1,97 @@
+<HTML>
+  <HEAD>
+    <TITLE>TPS1100 Convert</TITLE>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8" />
+    <STYLE TYPE="text/css">
+<!--
+BODY{margin-top:20px; margin-left:20px; margin-right:20px; color:#000000; font-family:Tahoma; background-color:white}
+A:link {font-weight:normal; color:#000066; text-decoration:none}
+A:visited {font-weight:normal; color:#000066; text-decoration:none}
+A:active {font-weight:normal; text-decoration:none}
+A:hover {font-weight:normal; color:#FF6600; text-decoration:none}
+P {margin-top:0px; margin-bottom:12px; color:#000000; font-family:Tahoma}
+PRE {border-right:#f0f0e0 1px solid; padding-right:5px; border-top:#f0f0e0 1px solid; margin-top:-5px; padding-left:5px; font-size:x-small; padding-bottom:5px; border-left:#f0f0e0 1px solid; padding-top:5px; border-bottom:#f0f0e0 1px solid; font-family:Courier New; background-color:#e5e5cc}
+TD {font-size:12px; color:#000000; font-family:Tahoma}
+H2 {border-top: #003366 1px solid; margin-top:25px; font-weight:bold; font-size:1.5em; margin-bottom:10px; margin-left:-15px; color:#003366}
+H3 {margin-top:10px; font-size: 1.1em; margin-bottom: 10px; margin-left: -15px; color: #000000}
+UL {margin-top:10px; margin-left:20px}
+OL {margin-top:10px; margin-left:20px}
+LI {margin-top:10px; color: #000000}
+FONT.value {font-weight:bold; color:darkblue}
+FONT.key {font-weight: bold; color: darkgreen}
+.divTag {border:1px; border-style:solid; background-color:#FFFFFF; text-decoration:none; height:auto; width:auto; background-color:#cecece}
+.BannerColumn {background-color:#000000}
+.Banner {border:0; padding:0; height:8px; margin-top:0px; color:#ffffff; filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=1,StartColorStr='#1c5280',EndColorStr='#FFFFFF');}
+.BannerTextCompany {font:bold; font-size:18pt; color:#cecece; font-family:Tahoma; height:0px; margin-top:0; margin-left:8px; margin-bottom:0; padding:0px; white-space:nowrap; filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=2,OffY=2,Color='black',Positive='true');}
+.BannerTextApplication {font:bold; font-size:18pt; font-family:Tahoma; height:0px; margin-top:0; margin-left:8px; margin-bottom:0; padding:0px; white-space:nowrap; filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=2,OffY=2,Color='black',Positive='true');}
+.BannerText {font:bold; font-size:18pt; font-family:Tahoma; height:0px; margin-top:0; margin-left:8px; margin-bottom:0; padding:0px; filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=2,OffY=2,Color='black',Positive='true');}
+.BannerSubhead {border:0; padding:0; height:16px; margin-top:0px; margin-left:10px; color:#ffffff; filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=1,StartColorStr='#4B3E1A',EndColorStr='#FFFFFF');}
+.BannerSubheadText {font:bold; height:11px; font-size:11px; font-family:Tahoma; margin-top:1; margin-left:10; filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=2,OffY=2,Color='black',Positive='true');}
+.FooterRule {border:0; padding:0; height:1px; margin:0px; color:#ffffff; filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=1,StartColorStr='#4B3E1A',EndColorStr='#FFFFFF');}
+.FooterText {font-size:11px; font-weight:normal; text-decoration:none; font-family:Tahoma; margin-top:10; margin-left:0px; margin-bottom:2; padding:0px; color:#999999; white-space:nowrap}
+.FooterText A:link {font-weight:normal; color:#999999; text-decoration:underline}
+.FooterText A:visited {font-weight:normal; color:#999999; text-decoration:underline}
+.FooterText A:active {font-weight:normal; color:#999999; text-decoration:underline}
+.FooterText A:hover {font-weight:normal; color:#FF6600; text-decoration:underline}
+.ClickOnceInfoText {font-size:11px; font-weight:normal; text-decoration:none; font-family:Tahoma; margin-top:0; margin-right:2px; margin-bottom:0; padding:0px; color:#000000}
+.InstallTextStyle {font:bold; font-size:14pt; font-family:Tahoma; a:#FF0000; text-decoration:None}
+.DetailsStyle {margin-left:30px}
+.ItemStyle {margin-left:-15px; font-weight:bold}
+.StartColorStr {background-color:#4B3E1A}
+.JustThisApp A:link {font-weight:normal; color:#000066; text-decoration:underline}
+.JustThisApp A:visited {font-weight:normal; color:#000066; text-decoration:underline}
+.JustThisApp A:active {font-weight:normal; text-decoration:underline}
+.JustThisApp A:hover {font-weight:normal; color:#FF6600; text-decoration:underline}
+-->
+
+</STYLE>
+
+</HEAD>
+  <BODY>
+    <TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="2" BORDER="0">
+
+<!-- Begin Banner -->
+<TR><TD><TABLE CELLPADDING="2" CELLSPACING="0" BORDER="0" BGCOLOR="#cecece" WIDTH="100%"><TR><TD><TABLE BGCOLOR="#1c5280" WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR><TD CLASS="Banner" /></TR><TR><TD CLASS="Banner"><SPAN CLASS="BannerTextCompany">2B geoinformatika d.o.o.</SPAN></TD></TR><TR><TD CLASS="Banner"><SPAN CLASS="BannerTextApplication">TPS1100 Convert</SPAN></TD></TR><TR><TD CLASS="Banner" ALIGN="RIGHT" /></TR></TABLE></TD></TR></TABLE></TD></TR>
+<!-- End Banner -->
+
+
+<!-- Begin Dialog -->
+<TR><TD ALIGN="LEFT"><TABLE CELLPADDING="2" CELLSPACING="0" BORDER="0" WIDTH="540"><TR><TD WIDTH="496">
+
+<!-- Begin AppInfo -->
+<TABLE><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>Name:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>TPS1100 Convert</TD></TR><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>Version:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>2.5.0.4</TD></TR><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>Publisher:</B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>2B geoinformatika d.o.o.</TD></TR><tr><td colspan="3">&nbsp;</td></tr></TABLE>
+<!-- End AppInfo -->
+
+
+<!-- Begin Prerequisites -->
+<TABLE ID="BootstrapperSection" BORDER="0"><TR><TD COLSPAN="2">The following prerequisites are required:</TD></TR><TR><TD WIDTH="10">&nbsp;</TD><TD><UL>
+<LI>Microsoft .NET Framework 4.5.2 (x86 and x64)</LI>
+<LI>Microsoft .NET Framework 4.8 (x86 and x64)</LI>
+</UL></TD></TR><TR><TD COLSPAN="2">
+If these components are already installed, you can <SPAN CLASS="JustThisApp"><A HREF="TPS1100 Convert.application">launch</A></SPAN> the application now. Otherwise, click the button below to install the prerequisites and run the application.
+</TD></TR><TR><TD COLSPAN="2">&nbsp;</TD></TR></TABLE>
+<!-- End Prerequisites -->
+
+
+</TD></TR></TABLE>
+<!-- Begin Buttons -->
+<TR><TD ALIGN="LEFT"><TABLE CELLPADDING="2" CELLSPACING="0" BORDER="0" WIDTH="540" STYLE="cursor:hand" ONCLICK="window.navigate(InstallButton.href)"><TR><TD ALIGN="LEFT"><TABLE CELLPADDING="1" BGCOLOR="#333333" CELLSPACING="0" BORDER="0"><TR><TD><TABLE CELLPADDING="1" BGCOLOR="#cecece" CELLSPACING="0" BORDER="0"><TR><TD><TABLE CELLPADDING="1" BGCOLOR="#efefef" CELLSPACING="0" BORDER="0"><TR><TD WIDTH="20"><SPACER TYPE="block" WIDTH="20" HEIGHT="1" /></TD><TD><A ID="InstallButton" HREF="setup.exe">Install</A></TD><TD width="20"><SPACER TYPE="block" WIDTH="20" HEIGHT="1" /></TD></TR></TABLE></TD></TR></TABLE></TD></TR></TABLE></TD><TD WIDTH="15%" ALIGN="right" /></TR></TABLE></TD></TR>
+<!-- End Buttons -->
+</TD></TR>
+<!-- End Dialog -->
+
+
+
+<!-- Spacer Row -->
+<TR><TD>&nbsp;</TD></TR>
+
+<TR><TD>
+<!-- Begin Footer -->
+<TABLE WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0" BGCOLOR="#ffffff"><TR><TD HEIGHT="5"><SPACER TYPE="block" HEIGHT="5" /></TD></TR><TR><TD CLASS="FooterText" ALIGN="center"><A HREF="https://go.microsoft.com/fwlink/?LinkId=154571">ClickOnce and .NET Framework Resources</A>
+</TD></TR><TR><TD HEIGHT="5"><SPACER TYPE="block" HEIGHT="5" /></TD></TR><TR><TD HEIGHT="1" bgcolor="#cecece"><SPACER TYPE="block" HEIGHT="1" /></TD></TR></TABLE>
+<!-- End Footer -->
+</TD></TR>
+
+</TABLE>
+  </BODY>
+</HTML>

bin/Release/tps1100_log.txt

@@ -0,0 +1,3 @@
+2024. 06. 09 05:08:08 | C:\TPS1100\GSI\GAB2024.GSI -> C:\TPS1100\GSI\GAB2024.koo
+2024. 06. 09 05:09:33 | C:\TPS1100\GSI\GAB2024.GSI -> C:\TPS1100\GSI\GAB2024.koo
+2024. 06. 09 05:10:02 | C:\TPS1100\GSI\KUZMA_M.gsi -> C:\TPS1100\GSI\KUZMA_M.koo