Verzija 2.8.0.1 - update 2

2024-07-19 23:44:24 +02:00 · 2024-07-19 23:44:24 +02:00 · ee60d54f7c
commit ee60d54f7c
parent e49fea6dc0
26 changed files with 24714 additions and 222 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,16 +7,18 @@ Zapisnik razvoja programa TPS1100 Convert.

 ## v2.8.0.1 - Release

- Datum: 2024/07/15
+ Datum: 2024/07/19

 - Popravljen izris grafike
- Dodane funkcije za uvoz in nalaganje GSI joba iz menuja "Projekti..."
 - Popravki izvoza seznama točk
 - Spremembe in popravki UI
    - Glavnega meni aplikacije
 	- Indikatorji za trenutni projekt in odprto GSI datoteko presstavljena v novo vrstico
+	- Dodani razni meniji za nove funkcije
 - Dopoljnjen UI za Projekte
- Dodana funkcija za pripravo PC-kartice (kopira pred-pripravljene podatke iz Virtualna Kartica)
+- Dodan UI za nalaganje Job-a (Gumb: Odpri Job)
+- Dodane funkcije za uvoz in nalaganje GSI joba iz menuja "Projekti..."
+- Dodana funkcija za pripravo/formatiranje PC-kartice (kopira pred-pripravljene podatke iz Virtualna Kartica)
 - Dodana funkcija za zavarovanje kartice v mapo "\Zavarovanja\..."
 - Dodana funkcija za izračun orientacijskega kota (Azi = Hz + HzCor)
 - Pripravljen UI za izračun meritve iz koordinat stojišča in merjene točke
--- a/DialogJobOdpri.Designer.vb
+++ b/DialogJobOdpri.Designer.vb
@ -0,0 +1,220 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class DialogJobOdpri
+    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
+
+    '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()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DialogJobOdpri))
+        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.OK_Button = New System.Windows.Forms.Button()
+        Me.Cancel_Button = New System.Windows.Forms.Button()
+        Me.ButtonUvozi = New System.Windows.Forms.Button()
+        Me.ListView1 = New System.Windows.Forms.ListView()
+        Me.ColumnHeaderJob = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+        Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
+        Me.LabelMapa = New System.Windows.Forms.Label()
+        Me.LabelDatum = New System.Windows.Forms.Label()
+        Me.LabelDatoteka = New System.Windows.Forms.Label()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.TableLayoutPanel1.SuspendLayout()
+        Me.TableLayoutPanel2.SuspendLayout()
+        Me.GroupBox1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'TableLayoutPanel1
+        '
+        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.TableLayoutPanel1.ColumnCount = 3
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.0!))
+        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 2, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.ButtonUvozi, 1, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(12, 298)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 1
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(380, 42)
+        Me.TableLayoutPanel1.TabIndex = 0
+        '
+        'OK_Button
+        '
+        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.OK_Button.Enabled = False
+        Me.OK_Button.FlatAppearance.BorderSize = 0
+        Me.OK_Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.OK_Button.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_product_documents_24
+        Me.OK_Button.Location = New System.Drawing.Point(21, 3)
+        Me.OK_Button.Name = "OK_Button"
+        Me.OK_Button.Size = New System.Drawing.Size(90, 35)
+        Me.OK_Button.TabIndex = 1
+        Me.OK_Button.Text = "Naloži Job"
+        Me.OK_Button.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
+        '
+        'Cancel_Button
+        '
+        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Cancel_Button.FlatAppearance.BorderSize = 0
+        Me.Cancel_Button.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Cancel_Button.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_24
+        Me.Cancel_Button.Location = New System.Drawing.Point(278, 3)
+        Me.Cancel_Button.Name = "Cancel_Button"
+        Me.Cancel_Button.Size = New System.Drawing.Size(90, 35)
+        Me.Cancel_Button.TabIndex = 3
+        Me.Cancel_Button.Text = "Prekliči"
+        Me.Cancel_Button.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
+        '
+        'ButtonUvozi
+        '
+        Me.ButtonUvozi.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom), System.Windows.Forms.AnchorStyles)
+        Me.ButtonUvozi.FlatAppearance.BorderSize = 0
+        Me.ButtonUvozi.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.ButtonUvozi.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_move_to_folder_24
+        Me.ButtonUvozi.Location = New System.Drawing.Point(154, 3)
+        Me.ButtonUvozi.Name = "ButtonUvozi"
+        Me.ButtonUvozi.Size = New System.Drawing.Size(90, 36)
+        Me.ButtonUvozi.TabIndex = 2
+        Me.ButtonUvozi.Text = "Uvozi Job"
+        Me.ButtonUvozi.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
+        Me.ButtonUvozi.UseVisualStyleBackColor = True
+        '
+        'ListView1
+        '
+        Me.ListView1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.ListView1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeaderJob})
+        Me.ListView1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ListView1.FullRowSelect = True
+        Me.ListView1.GridLines = True
+        Me.ListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
+        Me.ListView1.HideSelection = False
+        Me.ListView1.LabelWrap = False
+        Me.ListView1.Location = New System.Drawing.Point(14, 14)
+        Me.ListView1.Margin = New System.Windows.Forms.Padding(5)
+        Me.ListView1.MultiSelect = False
+        Me.ListView1.Name = "ListView1"
+        Me.ListView1.ShowItemToolTips = True
+        Me.ListView1.Size = New System.Drawing.Size(177, 278)
+        Me.ListView1.TabIndex = 0
+        Me.ListView1.UseCompatibleStateImageBehavior = False
+        Me.ListView1.View = System.Windows.Forms.View.List
+        '
+        'ColumnHeaderJob
+        '
+        Me.ColumnHeaderJob.Width = 155
+        '
+        'TableLayoutPanel2
+        '
+        Me.TableLayoutPanel2.ColumnCount = 1
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelMapa, 0, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelDatum, 0, 2)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelDatoteka, 0, 1)
+        Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 19)
+        Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
+        Me.TableLayoutPanel2.RowCount = 3
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!))
+        Me.TableLayoutPanel2.Size = New System.Drawing.Size(181, 90)
+        Me.TableLayoutPanel2.TabIndex = 3
+        '
+        'LabelMapa
+        '
+        Me.LabelMapa.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelMapa.AutoSize = True
+        Me.LabelMapa.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.LabelMapa.Location = New System.Drawing.Point(3, 8)
+        Me.LabelMapa.Name = "LabelMapa"
+        Me.LabelMapa.Size = New System.Drawing.Size(175, 13)
+        Me.LabelMapa.TabIndex = 2
+        Me.LabelMapa.Text = "..."
+        '
+        'LabelDatum
+        '
+        Me.LabelDatum.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelDatum.AutoSize = True
+        Me.LabelDatum.Location = New System.Drawing.Point(3, 68)
+        Me.LabelDatum.Name = "LabelDatum"
+        Me.LabelDatum.Size = New System.Drawing.Size(175, 13)
+        Me.LabelDatum.TabIndex = 3
+        Me.LabelDatum.Text = "..."
+        '
+        'LabelDatoteka
+        '
+        Me.LabelDatoteka.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.LabelDatoteka.AutoSize = True
+        Me.LabelDatoteka.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LabelDatoteka.Location = New System.Drawing.Point(3, 37)
+        Me.LabelDatoteka.Name = "LabelDatoteka"
+        Me.LabelDatoteka.Size = New System.Drawing.Size(175, 16)
+        Me.LabelDatoteka.TabIndex = 1
+        Me.LabelDatoteka.Text = "..."
+        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.TableLayoutPanel2)
+        Me.GroupBox1.Location = New System.Drawing.Point(199, 12)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(193, 124)
+        Me.GroupBox1.TabIndex = 4
+        Me.GroupBox1.TabStop = False
+        Me.GroupBox1.Text = "Job"
+        '
+        'DialogJobOdpri
+        '
+        Me.AcceptButton = Me.OK_Button
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.CancelButton = Me.Cancel_Button
+        Me.ClientSize = New System.Drawing.Size(404, 352)
+        Me.Controls.Add(Me.GroupBox1)
+        Me.Controls.Add(Me.ListView1)
+        Me.Controls.Add(Me.TableLayoutPanel1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "DialogJobOdpri"
+        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Odpri Job"
+        Me.TopMost = True
+        Me.TableLayoutPanel1.ResumeLayout(False)
+        Me.TableLayoutPanel2.ResumeLayout(False)
+        Me.TableLayoutPanel2.PerformLayout()
+        Me.GroupBox1.ResumeLayout(False)
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
+    Friend WithEvents OK_Button As System.Windows.Forms.Button
+    Friend WithEvents Cancel_Button As System.Windows.Forms.Button
+    Friend WithEvents ListView1 As ListView
+    Friend WithEvents ColumnHeaderJob As ColumnHeader
+    Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
+    Friend WithEvents LabelMapa As Label
+    Friend WithEvents LabelDatoteka As Label
+    Friend WithEvents LabelDatum As Label
+    Friend WithEvents GroupBox1 As GroupBox
+    Friend WithEvents ButtonUvozi As Button
+End Class
--- a/DialogJobOdpri.resx
+++ b/DialogJobOdpri.resx
--- a/DialogJobOdpri.vb
+++ b/DialogJobOdpri.vb
@ -0,0 +1,70 @@
+Imports System.IO
+Imports System.Windows.Forms
+
+
+Public Class DialogJobOdpri
+
+    Dim mapa As String
+    Dim datime As String
+    Dim datmapa As String
+    Dim datdatum As String
+
+    Private Sub DialogJobOdpri_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        mapa = My.Settings.ProjektMapa.ToString
+        Dim delovnaMapa = My.Application.Info.DirectoryPath.ToString + "\" + mapa.ToString
+        Dim datotekeJobi = My.Computer.FileSystem.GetFiles(delovnaMapa, FileIO.SearchOption.SearchTopLevelOnly, "*.GSI")
+        ListView1.Clear()
+        For Each datJob In datotekeJobi
+            ListView1.Items.Add(Path.GetFileName(datJob).ToString).SubItems.Add(Path.GetFullPath(datJob))
+        Next
+        LabelMapa.Text = mapa.ToString
+    End Sub
+
+    Private Sub NaloziJob()
+        Form1.datJob = datmapa
+        Form1.NaloziGsiJob()
+    End Sub
+
+    Private Sub ListView1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListView1.SelectedIndexChanged
+        Dim izbran As ListView.SelectedListViewItemCollection = Me.ListView1.SelectedItems
+        Dim item As ListViewItem
+
+        For Each item In izbran
+            datime = item.SubItems(0).Text
+            datmapa = item.SubItems(1).Text
+        Next
+
+        datdatum = My.Computer.FileSystem.GetFileInfo(datmapa).LastWriteTime
+
+        If LabelDatoteka.Text = "" Then
+            OK_Button.Enabled = False
+        Else
+            OK_Button.Enabled = True
+        End If
+
+        LabelDatoteka.Text = datime.ToString
+        LabelDatum.Text = datdatum.ToString
+
+    End Sub
+
+    Private Sub ListView1_Selected_DoubleClick(sender As Object, e As EventArgs) Handles ListView1.DoubleClick
+        NaloziJob()
+        Me.Close()
+    End Sub
+
+    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
+        NaloziJob()
+        Me.Close()
+    End Sub
+
+    Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
+        Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Close()
+    End Sub
+
+    Private Sub ButtonUvozi_Click(sender As Object, e As EventArgs) Handles ButtonUvozi.Click
+        Form1.UvoziGsiJob()
+        Me.Close()
+
+    End Sub
+End Class
--- a/DialogPripravaKartice.Designer.vb
+++ b/DialogPripravaKartice.Designer.vb
@ -22,14 +22,19 @@ Partial Class DialogPripravaKartice
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DialogPripravaKartice))
        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-        Me.Cancel_Button = New System.Windows.Forms.Button()
-        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button_Pripravi = New System.Windows.Forms.Button()
+        Me.Button_Zapri = New System.Windows.Forms.Button()
+        Me.Button_Format = New System.Windows.Forms.Button()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
+        Me.LabelPogonIme = New System.Windows.Forms.Label()
+        Me.LabelSize = New System.Windows.Forms.Label()
+        Me.LabelTip = New System.Windows.Forms.Label()
        Me.TableLayoutPanel1.SuspendLayout()
        Me.TableLayoutPanel2.SuspendLayout()
        Me.SuspendLayout()
@ -37,74 +42,107 @@ Partial Class DialogPripravaKartice
        'TableLayoutPanel1
        '
        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TableLayoutPanel1.ColumnCount = 2
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
-        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 0, 0)
-        Me.TableLayoutPanel1.Controls.Add(Me.Button1, 1, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(12, 122)
+        Me.TableLayoutPanel1.ColumnCount = 4
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.0!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.0!))
+        Me.TableLayoutPanel1.Controls.Add(Me.Button_Pripravi, 1, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.Button_Zapri, 3, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.Button_Format, 0, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(12, 139)
        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
        Me.TableLayoutPanel1.RowCount = 1
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 29.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(296, 29)
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40.0!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(310, 40)
        Me.TableLayoutPanel1.TabIndex = 0
        '
-        'Cancel_Button
+        'Button_Pripravi
        '
-        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.Cancel_Button.AutoSize = True
-        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Cancel_Button.Location = New System.Drawing.Point(33, 3)
-        Me.Cancel_Button.Name = "Cancel_Button"
-        Me.Cancel_Button.Size = New System.Drawing.Size(82, 23)
-        Me.Cancel_Button.TabIndex = 1
-        Me.Cancel_Button.Text = "Pripravi"
+        Me.Button_Pripravi.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button_Pripravi.AutoSize = True
+        Me.Button_Pripravi.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Button_Pripravi.Enabled = False
+        Me.Button_Pripravi.FlatAppearance.BorderSize = 0
+        Me.Button_Pripravi.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Pripravi.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_caps_lock_on_24
+        Me.Button_Pripravi.Location = New System.Drawing.Point(96, 3)
+        Me.Button_Pripravi.Name = "Button_Pripravi"
+        Me.Button_Pripravi.Size = New System.Drawing.Size(87, 34)
+        Me.Button_Pripravi.TabIndex = 1
+        Me.Button_Pripravi.Text = "Pripravi"
+        Me.Button_Pripravi.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
        '
-        'Button1
+        'Button_Zapri
        '
-        Me.Button1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.Button1.AutoSize = True
-        Me.Button1.Location = New System.Drawing.Point(190, 3)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(64, 23)
-        Me.Button1.TabIndex = 2
-        Me.Button1.Text = "Zapri"
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.Button_Zapri.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button_Zapri.AutoSize = True
+        Me.Button_Zapri.FlatAppearance.BorderSize = 0
+        Me.Button_Zapri.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Zapri.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_24
+        Me.Button_Zapri.Location = New System.Drawing.Point(220, 3)
+        Me.Button_Zapri.Name = "Button_Zapri"
+        Me.Button_Zapri.Size = New System.Drawing.Size(87, 34)
+        Me.Button_Zapri.TabIndex = 2
+        Me.Button_Zapri.Text = "Izhod"
+        Me.Button_Zapri.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage
+        Me.Button_Zapri.UseVisualStyleBackColor = True
+        '
+        'Button_Format
+        '
+        Me.Button_Format.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button_Format.Enabled = False
+        Me.Button_Format.FlatAppearance.BorderSize = 0
+        Me.Button_Format.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button_Format.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_error_24
+        Me.Button_Format.Location = New System.Drawing.Point(3, 3)
+        Me.Button_Format.Name = "Button_Format"
+        Me.Button_Format.Size = New System.Drawing.Size(87, 34)
+        Me.Button_Format.TabIndex = 3
+        Me.Button_Format.Text = "Formatiraj"
+        Me.Button_Format.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
+        Me.Button_Format.UseVisualStyleBackColor = True
        '
        'Label1
        '
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label1.Location = New System.Drawing.Point(67, 13)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(241, 48)
+        Me.Label1.Size = New System.Drawing.Size(241, 65)
        Me.Label1.TabIndex = 1
-        Me.Label1.Text = "Na kartico bodo naloženi podatki za uporabo na TPS1100 in GPS500"
+        Me.Label1.Text = "Formatiranje in Priprava kartice.." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Na kartico bodo naloženi podatki za TPS1100 i" &
+    "n GPS500."
        Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
        '
        'Label2
        '
-        Me.Label2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_error_48
+        Me.Label2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_micro_sd_50
        Me.Label2.Location = New System.Drawing.Point(13, 13)
        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(48, 48)
+        Me.Label2.Size = New System.Drawing.Size(48, 65)
        Me.Label2.TabIndex = 2
        '
        'ComboBox1
        '
-        Me.ComboBox1.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.ComboBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Location = New System.Drawing.Point(121, 15)
+        Me.ComboBox1.Location = New System.Drawing.Point(49, 14)
        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(70, 24)
+        Me.ComboBox1.Size = New System.Drawing.Size(71, 24)
        Me.ComboBox1.TabIndex = 0
        '
        'Label3
        '
        Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(77, 21)
+        Me.Label3.Location = New System.Drawing.Point(5, 19)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(38, 13)
        Me.Label3.TabIndex = 3
@ -113,29 +151,66 @@ Partial Class DialogPripravaKartice
        '
        'TableLayoutPanel2
        '
-        Me.TableLayoutPanel2.ColumnCount = 2
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40.0!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60.0!))
+        Me.TableLayoutPanel2.ColumnCount = 5
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.0!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 15.0!))
        Me.TableLayoutPanel2.Controls.Add(Me.ComboBox1, 1, 0)
        Me.TableLayoutPanel2.Controls.Add(Me.Label3, 0, 0)
-        Me.TableLayoutPanel2.Location = New System.Drawing.Point(12, 64)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelPogonIme, 2, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelSize, 3, 0)
+        Me.TableLayoutPanel2.Controls.Add(Me.LabelTip, 4, 0)
+        Me.TableLayoutPanel2.Location = New System.Drawing.Point(12, 81)
        Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
        Me.TableLayoutPanel2.RowCount = 1
        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!))
-        Me.TableLayoutPanel2.Size = New System.Drawing.Size(296, 55)
+        Me.TableLayoutPanel2.Size = New System.Drawing.Size(310, 52)
        Me.TableLayoutPanel2.TabIndex = 4
        '
+        'LabelPogonIme
+        '
+        Me.LabelPogonIme.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LabelPogonIme.AutoSize = True
+        Me.LabelPogonIme.Location = New System.Drawing.Point(126, 19)
+        Me.LabelPogonIme.Name = "LabelPogonIme"
+        Me.LabelPogonIme.Size = New System.Drawing.Size(32, 13)
+        Me.LabelPogonIme.TabIndex = 4
+        Me.LabelPogonIme.Text = "(IME)"
+        '
+        'LabelSize
+        '
+        Me.LabelSize.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LabelSize.AutoSize = True
+        Me.LabelSize.Location = New System.Drawing.Point(219, 19)
+        Me.LabelSize.Name = "LabelSize"
+        Me.LabelSize.Size = New System.Drawing.Size(29, 13)
+        Me.LabelSize.TabIndex = 5
+        Me.LabelSize.Text = "(MB)"
+        '
+        'LabelTip
+        '
+        Me.LabelTip.Anchor = System.Windows.Forms.AnchorStyles.Left
+        Me.LabelTip.AutoSize = True
+        Me.LabelTip.Location = New System.Drawing.Point(265, 19)
+        Me.LabelTip.Name = "LabelTip"
+        Me.LabelTip.Size = New System.Drawing.Size(30, 13)
+        Me.LabelTip.TabIndex = 6
+        Me.LabelTip.Text = "(TIP)"
+        '
        'DialogPripravaKartice
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.Cancel_Button
-        Me.ClientSize = New System.Drawing.Size(320, 163)
+        Me.CancelButton = Me.Button_Pripravi
+        Me.ClientSize = New System.Drawing.Size(334, 191)
        Me.Controls.Add(Me.TableLayoutPanel2)
        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.TableLayoutPanel1)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.MaximizeBox = False
        Me.MinimizeBox = False
        Me.Name = "DialogPripravaKartice"
@ -150,11 +225,15 @@ Partial Class DialogPripravaKartice

    End Sub
    Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
-    Friend WithEvents Cancel_Button As System.Windows.Forms.Button
-    Friend WithEvents Button1 As Button
+    Friend WithEvents Button_Pripravi As System.Windows.Forms.Button
+    Friend WithEvents Button_Zapri As Button
    Friend WithEvents Label1 As Label
    Friend WithEvents Label2 As Label
    Friend WithEvents ComboBox1 As ComboBox
    Friend WithEvents Label3 As Label
    Friend WithEvents TableLayoutPanel2 As TableLayoutPanel
+    Friend WithEvents Button_Format As Button
+    Friend WithEvents LabelPogonIme As Label
+    Friend WithEvents LabelSize As Label
+    Friend WithEvents LabelTip As Label
 End Class
--- a/DialogPripravaKartice.resx
+++ b/DialogPripravaKartice.resx
--- a/DialogPripravaKartice.vb
+++ b/DialogPripravaKartice.vb
@ -1,20 +1,12 @@
-Imports System.Windows.Forms
+Imports System.IO
+Imports System.Windows.Forms

 Public Class DialogPripravaKartice
-    Enum FormatType
-        Quick = 0
-        Normal = 1
-    End Enum
-    Enum Capacity
-        DefaultCapcity = 0
-    End Enum
-
-    Declare Function SHFormatDrive Lib "shell32" (ByVal hwnd As Int32, ByVal sDriveToFormat As String, ByVal s As Capacity, ByVal formattype As FormatType) As Int32

    Private Sub DialogPripravaKartice_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        For Each drive In IO.DriveInfo.GetDrives
            'get all removable and fixed drives
-            If drive.DriveType = IO.DriveType.Removable Then
+            If drive.DriveType = IO.DriveType.Removable And drive.IsReady = True Then
                'add all found drives into the combobox
                ComboBox1.Items.Add(drive)
            End If
@ -24,7 +16,7 @@ Public Class DialogPripravaKartice

    ' Funkcija za pripravo PC-kartice/delovne mape
    Private Sub PripravaKartice()
-
+        ' Pripravi datoteke in poti za kopiranje
        Dim delovnaMapa = My.Application.Info.DirectoryPath.ToString
        Dim karticaMapa = ComboBox1.Text
        Dim fileUvozCode = delovnaMapa + "\Virtualna Kartica\CODE\TPS1100.crf"
@ -64,6 +56,20 @@ Public Class DialogPripravaKartice
            My.Computer.FileSystem.CopyFile(fileUvozGpsPor, fileIzvozGpsPor, True)
        End If

+        If My.Computer.FileSystem.DirectoryExists(karticaMapa + "GSI") = False Then
+            My.Computer.FileSystem.CreateDirectory(karticaMapa + "GSI")
+        End If
+
+        If My.Computer.FileSystem.DirectoryExists(karticaMapa + "LOG") = False Then
+            My.Computer.FileSystem.CreateDirectory(karticaMapa + "LOG")
+        End If
+
+        Process.Start(karticaMapa)
+    End Sub
+
+    Private Sub Button_Pripravi_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button_Pripravi.Click
+        PripravaKartice()
+
        MessageBox.Show("Kartica pripravljena...
 Naloženo:
 - knjižnica z kodami TPS1100
@ -73,20 +79,38 @@ Naloženo:

    End Sub

-    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
-        'Show the Format dialog
-        SHFormatDrive(Me.Handle.ToInt32, ComboBox1.Text, CType(2, Capacity), FormatType.Normal)
-
-    End Sub
-
-    Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
-        PripravaKartice()
-
-    End Sub
-
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+    Private Sub Button_Zapri_Click(sender As Object, e As EventArgs) Handles Button_Zapri.Click
        Me.Close()

    End Sub

+    Private Sub Button_Format_Click(sender As Object, e As EventArgs) Handles Button_Format.Click
+        Dim kartica As String = ComboBox1.Text.Replace("\", "")
+        Dim karticaTip As String = LabelTip.Text
+        Dim msgFormat = MsgBox("Formatiranje pogona [" + kartica + "]. Nadaljujem?", vbOKCancel, "Formatiranje kartice...")
+
+        If msgFormat = DialogResult.OK Then
+            Shell("cmd /c format " + kartica + " /FS:" + karticaTip + " /V:PCCARD /Q", AppWinStyle.NormalFocus)
+        Else
+            MsgBox("Postopek prekinjen.", vbOKOnly)
+        End If
+
+    End Sub
+
+    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
+        Dim allDrives() As DriveInfo = DriveInfo.GetDrives()
+        Dim d As DriveInfo
+
+        For Each d In allDrives
+            If d.Name = ComboBox1.Text Then
+                LabelSize.Text = Format(d.TotalSize / 1000 / 1000, "0").ToString + " MB"
+                LabelPogonIme.Text = d.VolumeLabel.ToString
+                LabelTip.Text = d.DriveFormat.ToString
+            End If
+        Next
+
+        Button_Format.Enabled = True
+        Button_Pripravi.Enabled = True
+
+    End Sub
 End Class
--- a/DialogZavarovanje.Designer.vb
+++ b/DialogZavarovanje.Designer.vb
@ -22,6 +22,7 @@ Partial Class DialogZavarovanje
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DialogZavarovanje))
        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
        Me.OK_Button = New System.Windows.Forms.Button()
        Me.Cancel_Button = New System.Windows.Forms.Button()
@ -46,31 +47,38 @@ Partial Class DialogZavarovanje
        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(178, 155)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(128, 144)
        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
        Me.TableLayoutPanel1.RowCount = 1
        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(196, 40)
        Me.TableLayoutPanel1.TabIndex = 0
        '
        'OK_Button
        '
-        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.OK_Button.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.OK_Button.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_advance2_24
        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
        Me.OK_Button.Name = "OK_Button"
-        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+        Me.OK_Button.Size = New System.Drawing.Size(92, 34)
        Me.OK_Button.TabIndex = 0
        Me.OK_Button.Text = "Zavaruj"
+        Me.OK_Button.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
        '
        'Cancel_Button
        '
-        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.Cancel_Button.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+        Me.Cancel_Button.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_24
+        Me.Cancel_Button.Location = New System.Drawing.Point(122, 3)
        Me.Cancel_Button.Name = "Cancel_Button"
-        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+        Me.Cancel_Button.Size = New System.Drawing.Size(71, 34)
        Me.Cancel_Button.TabIndex = 1
        Me.Cancel_Button.Text = "Zapri"
+        Me.Cancel_Button.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
        '
        'Label1
        '
@ -110,7 +118,7 @@ Partial Class DialogZavarovanje
        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!))
-        Me.TableLayoutPanel2.Size = New System.Drawing.Size(308, 83)
+        Me.TableLayoutPanel2.Size = New System.Drawing.Size(308, 69)
        Me.TableLayoutPanel2.TabIndex = 3
        '
        'Label4
@ -118,7 +126,7 @@ Partial Class DialogZavarovanje
        Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.Label4.AutoSize = True
        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(34, 53)
+        Me.Label4.Location = New System.Drawing.Point(34, 42)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(40, 18)
        Me.Label4.TabIndex = 4
@ -130,7 +138,7 @@ Partial Class DialogZavarovanje
        Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
        Me.Label2.AutoSize = True
        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(22, 11)
+        Me.Label2.Location = New System.Drawing.Point(22, 8)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(52, 18)
        Me.Label2.TabIndex = 0
@ -142,7 +150,7 @@ Partial Class DialogZavarovanje
        Me.ComboBox1.Anchor = System.Windows.Forms.AnchorStyles.Left
        Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Location = New System.Drawing.Point(80, 7)
+        Me.ComboBox1.Location = New System.Drawing.Point(80, 4)
        Me.ComboBox1.Name = "ComboBox1"
        Me.ComboBox1.Size = New System.Drawing.Size(100, 26)
        Me.ComboBox1.TabIndex = 1
@ -151,7 +159,7 @@ Partial Class DialogZavarovanje
        '
        Me.TextBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Left Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TextBox1.Location = New System.Drawing.Point(80, 50)
+        Me.TextBox1.Location = New System.Drawing.Point(80, 39)
        Me.TextBox1.Name = "TextBox1"
        Me.TextBox1.Size = New System.Drawing.Size(148, 24)
        Me.TextBox1.TabIndex = 2
@ -160,7 +168,7 @@ Partial Class DialogZavarovanje
        '
        Me.LabelSize.Anchor = System.Windows.Forms.AnchorStyles.Left
        Me.LabelSize.AutoSize = True
-        Me.LabelSize.Location = New System.Drawing.Point(234, 14)
+        Me.LabelSize.Location = New System.Drawing.Point(234, 10)
        Me.LabelSize.Name = "LabelSize"
        Me.LabelSize.Size = New System.Drawing.Size(44, 13)
        Me.LabelSize.TabIndex = 5
@ -179,6 +187,7 @@ Partial Class DialogZavarovanje
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.TableLayoutPanel1)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.MaximizeBox = False
        Me.MinimizeBox = False
        Me.Name = "DialogZavarovanje"
--- a/DialogZavarovanje.resx
+++ b/DialogZavarovanje.resx
--- a/Doc/Home.html
+++ b/Doc/Home.html
--- a/Doc/Kodiranje-podatkov.html
+++ b/Doc/Kodiranje-podatkov.html
--- a/Doc/Navodila-nastavitve.html
+++ b/Doc/Navodila-nastavitve.html
--- a/Doc/Navodila-orodja.html
+++ b/Doc/Navodila-orodja.html
--- a/Doc/Navodila-osnovna.html
+++ b/Doc/Navodila-osnovna.html
--- a/Form1.Designer.vb
+++ b/Form1.Designer.vb
@ -47,20 +47,6 @@ Partial Class Form1
        Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
        Me.OpenFileDialogTocke = New System.Windows.Forms.OpenFileDialog()
        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
-        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ManagerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.tsbUvoziTocke = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ShraniToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.OrodjaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.IzračunHzKotaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.PripraviKarticoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.tsbPripravaZav = New System.Windows.Forms.ToolStripMenuItem()
-        Me.tsbPripravaFormat = New System.Windows.Forms.ToolStripMenuItem()
        Me.MenuToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.OdpriGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
@ -70,6 +56,20 @@ Partial Class Form1
        Me.InfoOAplikacijiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator()
        Me.IzhodToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ManagerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.tsbUvoziTocke = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator13 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ShraniToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.OrodjaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PripraviKarticoToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.tsbPripravaFormat = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+        Me.tsbPripravaZav = New System.Windows.Forms.ToolStripMenuItem()
+        Me.tsbMapaZav = New System.Windows.Forms.ToolStripMenuItem()
        Me.FolderDialogKartica = New System.Windows.Forms.FolderBrowserDialog()
        Me.ToolStrip2 = New System.Windows.Forms.ToolStrip()
        Me.ToolStripLabel2 = New System.Windows.Forms.ToolStripLabel()
@ -150,7 +150,7 @@ Partial Class Form1
        '
        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonpROJ, Me.ToolStripSeparator8, Me.ToolStripButton2, Me.tsbOpenFile, Me.ToolStripButtonPripravi, Me.ToolStripSeparator11, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.ToolStripButtonGeo, Me.tsbPointsOnly, Me.ToolStripButton3, Me.ToolStripSeparator4, Me.ToolStripLabel1})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonpROJ, Me.ToolStripButton2, Me.ToolStripSeparator8, Me.tsbOpenFile, Me.ToolStripButtonPripravi, Me.ToolStripSeparator11, Me.ButtonUrediDat, Me.ToolStripSeparator1, Me.tsbConvert, Me.ToolStripButtonGeo, Me.tsbPointsOnly, Me.ToolStripButton3, Me.ToolStripSeparator4, Me.ToolStripLabel1})
        Me.ToolStrip1.Location = New System.Drawing.Point(0, 24)
        Me.ToolStrip1.Name = "ToolStrip1"
        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(5)
@ -283,18 +283,82 @@ Partial Class Form1
        '
        'MenuStrip1
        '
-        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.OrodjaToolStripMenuItem, Me.MenuToolStripMenuItem})
+        Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuToolStripMenuItem, Me.ToolStripMenuItem1, Me.OrodjaToolStripMenuItem})
        Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
        Me.MenuStrip1.Name = "MenuStrip1"
        Me.MenuStrip1.Size = New System.Drawing.Size(1251, 24)
        Me.MenuStrip1.TabIndex = 3
        Me.MenuStrip1.Text = "MenuStrip1"
        '
+        'MenuToolStripMenuItem
+        '
+        Me.MenuToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem, Me.ToolStripSeparator6, Me.PripraviGSIToolStripMenuItem, Me.ToolStripSeparator7, Me.PosodobitevToolStripMenuItem, Me.InfoOAplikacijiToolStripMenuItem, Me.ToolStripSeparator12, Me.IzhodToolStripMenuItem})
+        Me.MenuToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_menu_50
+        Me.MenuToolStripMenuItem.Name = "MenuToolStripMenuItem"
+        Me.MenuToolStripMenuItem.Size = New System.Drawing.Size(81, 20)
+        Me.MenuToolStripMenuItem.Text = "Program"
+        '
+        'OdpriGSIToolStripMenuItem
+        '
+        Me.OdpriGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_tools_50
+        Me.OdpriGSIToolStripMenuItem.Name = "OdpriGSIToolStripMenuItem"
+        Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.OdpriGSIToolStripMenuItem.Text = "Nastavitve"
+        Me.OdpriGSIToolStripMenuItem.ToolTipText = "Odpri Nastavitve aplikacije..."
+        '
+        'ToolStripSeparator6
+        '
+        Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(146, 6)
+        '
+        'PripraviGSIToolStripMenuItem
+        '
+        Me.PripraviGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48
+        Me.PripraviGSIToolStripMenuItem.Name = "PripraviGSIToolStripMenuItem"
+        Me.PripraviGSIToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.PripraviGSIToolStripMenuItem.Text = "Navodila"
+        Me.PripraviGSIToolStripMenuItem.ToolTipText = "Odpri navodila za uporabo aplikacije..."
+        '
+        'ToolStripSeparator7
+        '
+        Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
+        Me.ToolStripSeparator7.Size = New System.Drawing.Size(146, 6)
+        '
+        'PosodobitevToolStripMenuItem
+        '
+        Me.PosodobitevToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_rotate_48
+        Me.PosodobitevToolStripMenuItem.Name = "PosodobitevToolStripMenuItem"
+        Me.PosodobitevToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.PosodobitevToolStripMenuItem.Text = "Posodobitev..."
+        Me.PosodobitevToolStripMenuItem.ToolTipText = "Preveri za nove posodobitve..."
+        '
+        'InfoOAplikacijiToolStripMenuItem
+        '
+        Me.InfoOAplikacijiToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_information_50
+        Me.InfoOAplikacijiToolStripMenuItem.Name = "InfoOAplikacijiToolStripMenuItem"
+        Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.InfoOAplikacijiToolStripMenuItem.Text = "Info"
+        Me.InfoOAplikacijiToolStripMenuItem.ToolTipText = "Pokaži podatke o aplikaciji..."
+        '
+        'ToolStripSeparator12
+        '
+        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
+        Me.ToolStripSeparator12.Size = New System.Drawing.Size(146, 6)
+        '
+        'IzhodToolStripMenuItem
+        '
+        Me.IzhodToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
+        Me.IzhodToolStripMenuItem.Name = "IzhodToolStripMenuItem"
+        Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
+        Me.IzhodToolStripMenuItem.Text = "I&zhod"
+        Me.IzhodToolStripMenuItem.ToolTipText = "Izhod iz programa..."
+        '
        'ToolStripMenuItem1
        '
        Me.ToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ManagerToolStripMenuItem, Me.ToolStripSeparator10, Me.ToolStripMenuItem2, Me.ToolStripMenuItem4, Me.tsbUvoziTocke, Me.ToolStripSeparator13, Me.ShraniToolStripMenuItem})
+        Me.ToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_folder_tree_50
        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(59, 20)
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(75, 20)
        Me.ToolStripMenuItem1.Text = "Podatki"
        '
        'ManagerToolStripMenuItem
@ -316,6 +380,7 @@ Partial Class Form1
        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(209, 22)
        Me.ToolStripMenuItem2.Text = "&Odpri Job"
+        Me.ToolStripMenuItem2.ToolTipText = "Odpri GSI Job..."
        '
        'ToolStripMenuItem4
        '
@ -323,7 +388,7 @@ Partial Class Form1
        Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4"
        Me.ToolStripMenuItem4.Size = New System.Drawing.Size(209, 22)
        Me.ToolStripMenuItem4.Text = "&Uvozi Job"
-        Me.ToolStripMenuItem4.ToolTipText = "Odpri GSI za procesiranje"
+        Me.ToolStripMenuItem4.ToolTipText = "Uvozi GSI v aktivni projekt..."
        '
        'tsbUvoziTocke
        '
@ -331,6 +396,7 @@ Partial Class Form1
        Me.tsbUvoziTocke.Name = "tsbUvoziTocke"
        Me.tsbUvoziTocke.Size = New System.Drawing.Size(209, 22)
        Me.tsbUvoziTocke.Text = "Uvozi Točke"
+        Me.tsbUvoziTocke.ToolTipText = "Uvozi TXT/KOO in pretvori v GSI format."
        '
        'ToolStripSeparator13
        '
@ -348,107 +414,50 @@ Partial Class Form1
        '
        'OrodjaToolStripMenuItem
        '
-        Me.OrodjaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.IzračunHzKotaToolStripMenuItem, Me.ToolStripMenuItem5, Me.PripraviKarticoToolStripMenuItem})
+        Me.OrodjaToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PripraviKarticoToolStripMenuItem})
+        Me.OrodjaToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_support_50
        Me.OrodjaToolStripMenuItem.Name = "OrodjaToolStripMenuItem"
-        Me.OrodjaToolStripMenuItem.Size = New System.Drawing.Size(55, 20)
+        Me.OrodjaToolStripMenuItem.Size = New System.Drawing.Size(71, 20)
        Me.OrodjaToolStripMenuItem.Text = "Orodja"
        Me.OrodjaToolStripMenuItem.ToolTipText = "Uvozi točke iz TXT v GSI"
        '
-        'IzračunHzKotaToolStripMenuItem
-        '
-        Me.IzračunHzKotaToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_land_surveying_48
-        Me.IzračunHzKotaToolStripMenuItem.Name = "IzračunHzKotaToolStripMenuItem"
-        Me.IzračunHzKotaToolStripMenuItem.Size = New System.Drawing.Size(197, 22)
-        Me.IzračunHzKotaToolStripMenuItem.Text = "Izračun Hz Kota..."
-        '
-        'ToolStripMenuItem5
-        '
-        Me.ToolStripMenuItem5.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50
-        Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5"
-        Me.ToolStripMenuItem5.Size = New System.Drawing.Size(197, 22)
-        Me.ToolStripMenuItem5.Text = "&Uvozi Točke (TXT > GSI)"
-        Me.ToolStripMenuItem5.ToolTipText = "Pretvori TXT v GSI"
-        '
        'PripraviKarticoToolStripMenuItem
        '
-        Me.PripraviKarticoToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbPripravaZav, Me.tsbPripravaFormat})
+        Me.PripraviKarticoToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbPripravaFormat, Me.ToolStripSeparator3, Me.tsbPripravaZav, Me.tsbMapaZav})
        Me.PripraviKarticoToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_sd_50
        Me.PripraviKarticoToolStripMenuItem.Name = "PripraviKarticoToolStripMenuItem"
-        Me.PripraviKarticoToolStripMenuItem.Size = New System.Drawing.Size(197, 22)
+        Me.PripraviKarticoToolStripMenuItem.Size = New System.Drawing.Size(130, 22)
        Me.PripraviKarticoToolStripMenuItem.Text = "PC-Kartica"
        Me.PripraviKarticoToolStripMenuItem.ToolTipText = "Pripravi kartico instrumenta za delo..."
        '
-        'tsbPripravaZav
-        '
-        Me.tsbPripravaZav.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_program_50
-        Me.tsbPripravaZav.Name = "tsbPripravaZav"
-        Me.tsbPripravaZav.Size = New System.Drawing.Size(138, 22)
-        Me.tsbPripravaZav.Text = "Zavarovanje"
-        '
        'tsbPripravaFormat
        '
        Me.tsbPripravaFormat.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_micro_sd_50
        Me.tsbPripravaFormat.Name = "tsbPripravaFormat"
-        Me.tsbPripravaFormat.Size = New System.Drawing.Size(138, 22)
-        Me.tsbPripravaFormat.Text = "Priprava"
+        Me.tsbPripravaFormat.Size = New System.Drawing.Size(191, 22)
+        Me.tsbPripravaFormat.Text = "Priprava Kartice"
+        Me.tsbPripravaFormat.ToolTipText = "Pripravi kartico za delo z instrumentom..."
        '
-        'MenuToolStripMenuItem
+        'ToolStripSeparator3
        '
-        Me.MenuToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem, Me.ToolStripSeparator6, Me.PripraviGSIToolStripMenuItem, Me.ToolStripSeparator7, Me.PosodobitevToolStripMenuItem, Me.InfoOAplikacijiToolStripMenuItem, Me.ToolStripSeparator12, Me.IzhodToolStripMenuItem})
-        Me.MenuToolStripMenuItem.Name = "MenuToolStripMenuItem"
-        Me.MenuToolStripMenuItem.Size = New System.Drawing.Size(65, 20)
-        Me.MenuToolStripMenuItem.Text = "Program"
+        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(188, 6)
        '
-        'OdpriGSIToolStripMenuItem
+        'tsbPripravaZav
        '
-        Me.OdpriGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_tools_50
-        Me.OdpriGSIToolStripMenuItem.Name = "OdpriGSIToolStripMenuItem"
-        Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
-        Me.OdpriGSIToolStripMenuItem.Text = "Nastavitve"
+        Me.tsbPripravaZav.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_program_50
+        Me.tsbPripravaZav.Name = "tsbPripravaZav"
+        Me.tsbPripravaZav.Size = New System.Drawing.Size(191, 22)
+        Me.tsbPripravaZav.Text = "Zavarovanje Podatkov"
+        Me.tsbPripravaZav.ToolTipText = "Zavaruj podatke kartice v zavarovanja..."
        '
-        'ToolStripSeparator6
+        'tsbMapaZav
        '
-        Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(146, 6)
-        '
-        'PripraviGSIToolStripMenuItem
-        '
-        Me.PripraviGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_question_mark_48
-        Me.PripraviGSIToolStripMenuItem.Name = "PripraviGSIToolStripMenuItem"
-        Me.PripraviGSIToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
-        Me.PripraviGSIToolStripMenuItem.Text = "Navodila"
-        '
-        'ToolStripSeparator7
-        '
-        Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
-        Me.ToolStripSeparator7.Size = New System.Drawing.Size(146, 6)
-        '
-        'PosodobitevToolStripMenuItem
-        '
-        Me.PosodobitevToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_rotate_48
-        Me.PosodobitevToolStripMenuItem.Name = "PosodobitevToolStripMenuItem"
-        Me.PosodobitevToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
-        Me.PosodobitevToolStripMenuItem.Text = "Posodobitev..."
-        '
-        'InfoOAplikacijiToolStripMenuItem
-        '
-        Me.InfoOAplikacijiToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_information_50
-        Me.InfoOAplikacijiToolStripMenuItem.Name = "InfoOAplikacijiToolStripMenuItem"
-        Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
-        Me.InfoOAplikacijiToolStripMenuItem.Text = "Info"
-        '
-        'ToolStripSeparator12
-        '
-        Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
-        Me.ToolStripSeparator12.Size = New System.Drawing.Size(146, 6)
-        '
-        'IzhodToolStripMenuItem
-        '
-        Me.IzhodToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50
-        Me.IzhodToolStripMenuItem.Name = "IzhodToolStripMenuItem"
-        Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(149, 22)
-        Me.IzhodToolStripMenuItem.Text = "I&zhod"
-        Me.IzhodToolStripMenuItem.ToolTipText = "Izhod iz programa..."
+        Me.tsbMapaZav.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_browse_folder_50_2
+        Me.tsbMapaZav.Name = "tsbMapaZav"
+        Me.tsbMapaZav.Size = New System.Drawing.Size(191, 22)
+        Me.tsbMapaZav.Text = "Pokaži Mapo..."
+        Me.tsbMapaZav.ToolTipText = "Odpri mapo z zavarovanji podatkov..."
        '
        'FolderDialogKartica
        '
@ -469,7 +478,7 @@ Partial Class Form1
        '
        'ToolStripLabel2
        '
-        Me.ToolStripLabel2.ForeColor = System.Drawing.SystemColors.ControlDarkDark
+        Me.ToolStripLabel2.ForeColor = System.Drawing.SystemColors.ControlText
        Me.ToolStripLabel2.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_micro_sd_50
        Me.ToolStripLabel2.Name = "ToolStripLabel2"
        Me.ToolStripLabel2.Size = New System.Drawing.Size(80, 24)
@ -586,14 +595,12 @@ Partial Class Form1
    Friend WithEvents ToolStripSeparator10 As ToolStripSeparator
    Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem
    Friend WithEvents ToolStripMenuItem4 As ToolStripMenuItem
-    Friend WithEvents ToolStripMenuItem5 As ToolStripMenuItem
    Friend WithEvents IzhodToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ToolStripSeparator12 As ToolStripSeparator
    Friend WithEvents PripraviKarticoToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents FolderDialogKartica As FolderBrowserDialog
    Friend WithEvents ToolStripSeparator13 As ToolStripSeparator
    Friend WithEvents ShraniToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents IzračunHzKotaToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ToolStrip2 As ToolStrip
    Friend WithEvents ToolStripLabel2 As ToolStripLabel
    Friend WithEvents ToolStripButtonpROJ As ToolStripButton
@ -605,4 +612,6 @@ Partial Class Form1
    Friend WithEvents tsbUvoziTocke As ToolStripMenuItem
    Friend WithEvents tsbPripravaFormat As ToolStripMenuItem
    Friend WithEvents tsbPripravaZav As ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
+    Friend WithEvents tsbMapaZav As ToolStripMenuItem
 End Class
--- a/Form1.vb
+++ b/Form1.vb
@ -193,7 +193,7 @@ Public Class Form1
        OpenFileDialog1.Dispose()
    End Sub

-    Private Sub UvoziGsiJob()
+    Public Sub UvoziGsiJob()
        If OpenFileDialog1.ShowDialog = DialogResult.OK Then
            Dim delovnaMapa = My.Application.Info.DirectoryPath.ToString + "\" + My.Settings.ProjektMapa.ToString + "\"
            Dim fileUvoz = OpenFileDialog1.FileName
@ -919,7 +919,7 @@ Public Class Form1
    End Sub

    Private Sub PripraviGSIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PripraviGSIToolStripMenuItem.Click
-        Process.Start("https://multibox.nohost.me/gitea/boris/TPS1100-Convert/wiki")
+        Process.Start(My.Application.Info.DirectoryPath.ToString + "\Doc\Home.html")
    End Sub

    Private Sub OdpriGSIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OdpriGSIToolStripMenuItem.Click
@ -941,7 +941,7 @@ Public Class Form1
        Form2.ShowDialog()
    End Sub

-    Private Sub ToolStripButtonPripravi_Click(sender As Object, e As EventArgs) Handles ToolStripButtonPripravi.Click, ToolStripMenuItem5.Click
+    Private Sub ToolStripButtonPripravi_Click(sender As Object, e As EventArgs) Handles ToolStripButtonPripravi.Click
        PripraviDatotekoGsi()
        ToolStripButton3.Enabled = False

@ -1015,8 +1015,10 @@ Public Class Form1
    End Sub

    Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click, ToolStripMenuItem2.Click
-        OpenFileDialog1.InitialDirectory = My.Application.Info.DirectoryPath.ToString + "\" + My.Settings.ProjektMapa.ToString
-        OdpriDatotekoGsi()
+        ' OpenFileDialog1.InitialDirectory = My.Application.Info.DirectoryPath.ToString + "\" + My.Settings.ProjektMapa.ToString
+        ' OdpriDatotekoGsi()
+        DialogJobOdpri.ShowDialog()
+
        ToolStripButton3.Enabled = False

    End Sub
@ -1030,7 +1032,7 @@ Public Class Form1
        Application.Exit()
    End Sub

-    Private Sub IzračunHzKotaToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles IzračunHzKotaToolStripMenuItem.Click
+    Private Sub IzračunHzKotaToolStripMenuItem_Click(sender As Object, e As EventArgs)
        DialogIzracunHzCor.ShowDialog()

    End Sub
@ -1046,4 +1048,9 @@ Public Class Form1
    Private Sub tsbPripravaZav_Click(sender As Object, e As EventArgs) Handles tsbPripravaZav.Click
        DialogZavarovanje.ShowDialog()
    End Sub
+
+    Private Sub tsbMapaZav_Click(sender As Object, e As EventArgs) Handles tsbMapaZav.Click
+        Dim mapaZav = My.Application.Info.DirectoryPath.ToString + "\Zavarovanja"
+        Process.Start(mapaZav)
+    End Sub
 End Class
--- a/FormGsiJobs.Designer.vb
+++ b/FormGsiJobs.Designer.vb
@ -25,8 +25,8 @@ Partial Class FormGsiJobs
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormGsiJobs))
        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
@ -86,15 +86,6 @@ Partial Class FormGsiJobs
        Me.ToolStrip1.TabIndex = 2
        Me.ToolStrip1.Text = "ToolStrip1"
        '
-        'ToolStripButton4
-        '
-        Me.ToolStripButton4.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_folder_tree_50
-        Me.ToolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton4.Name = "ToolStripButton4"
-        Me.ToolStripButton4.Size = New System.Drawing.Size(73, 43)
-        Me.ToolStripButton4.Text = "Nov Projekt"
-        Me.ToolStripButton4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
-        '
        'ToolStripButton5
        '
        Me.ToolStripButton5.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_caps_lock_on_501
@ -104,6 +95,15 @@ Partial Class FormGsiJobs
        Me.ToolStripButton5.Text = "Delovni Projekt"
        Me.ToolStripButton5.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
        '
+        'ToolStripButton4
+        '
+        Me.ToolStripButton4.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_folder_tree_50
+        Me.ToolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton4.Name = "ToolStripButton4"
+        Me.ToolStripButton4.Size = New System.Drawing.Size(73, 43)
+        Me.ToolStripButton4.Text = "Nov Projekt"
+        Me.ToolStripButton4.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        '
        'ToolStripSeparator3
        '
        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
@ -500,6 +500,8 @@ Partial Class FormGsiJobs
        Me.Controls.Add(Me.ToolStrip1)
        Me.Controls.Add(Me.StatusStrip1)
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
        Me.MinimumSize = New System.Drawing.Size(720, 480)
        Me.Name = "FormGsiJobs"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
--- a/FormGsiJobs.vb
+++ b/FormGsiJobs.vb
@ -126,6 +126,7 @@ Public Class FormGsiJobs
        Form1.NaloziGsiJob()
        Me.Close()
    End Sub
+
    Private Sub ListViewProj_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListViewProj.SelectedIndexChanged
        Dim izbran As ListView.SelectedListViewItemCollection = Me.ListViewProj.SelectedItems
        Dim item As ListViewItem
--- a/Project/Icons/icons8-caps-lock-on-24.png
+++ b/Project/Icons/icons8-caps-lock-on-24.png
--- a/Project/Icons/icons8-close-24.png
+++ b/Project/Icons/icons8-close-24.png
--- a/Project/Icons/icons8-error-24.png
+++ b/Project/Icons/icons8-error-24.png
--- a/Project/Icons/icons8-move-to-folder-24.png
+++ b/Project/Icons/icons8-move-to-folder-24.png
--- a/Project/Icons/icons8-product-documents-24.png
+++ b/Project/Icons/icons8-product-documents-24.png
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -541,6 +541,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_caps_lock_on_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-caps-lock-on-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
@ -601,6 +611,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_close_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-close-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
@ -701,6 +721,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_error_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-error-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
@ -841,6 +871,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_move_to_folder_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-move-to-folder-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
@ -901,6 +941,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized resource of type System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property icons8_product_documents_24() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("icons8-product-documents-24", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@ -136,8 +136,11 @@
  <data name="icons8_undo_48" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-undo-48.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 name="icons8-compare-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-compare-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_info_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-info-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -160,14 +163,11 @@
  <data name="73" xml:space="preserve">
    <value>Remark 3</value>
  </data>
-  <data name="icons8-compare-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-compare-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="icons8_done_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-done-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="59" xml:space="preserve">
-    <value>PPM</value>
+  <data name="digital_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\digital_24.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>
@ -220,9 +220,6 @@
  <data name="83" xml:space="preserve">
    <value>Elevation</value>
  </data>
-  <data name="icons8-sd-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-sd-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>Icons\Circled-Right-2-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -232,12 +229,18 @@
  <data name="icons8-edit-text-file-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-edit-text-file-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="icons8-close-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-close-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="51" xml:space="preserve">
    <value>PPM/mm</value>
  </data>
  <data name="icons8_folder_50_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-folder-50-2.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>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_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>
@ -250,15 +253,15 @@
  <data name="85" xml:space="preserve">
    <value>St. Northing</value>
  </data>
-  <data name="digital_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\digital_24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="icons8-checklist-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-checklist-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="86" xml:space="preserve">
    <value>St. Height</value>
  </data>
+  <data name="icons8-product-documents-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-product-documents-24.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>
@ -292,6 +295,9 @@
  <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-caps-lock-on-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-caps-lock-on-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="icons8-caps-lock-on-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-caps-lock-on-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -301,11 +307,14 @@
  <data name="icons8-menu-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-menu-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="icons8-error-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-error-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="44" xml:space="preserve">
    <value>Information 3</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 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="72" xml:space="preserve">
    <value>Remark 2</value>
@ -361,8 +370,8 @@
  <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_save_as_50" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-sd-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-sd-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="icons8-move-to-folder-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-move-to-folder-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -403,12 +412,18 @@
  <data name="87" xml:space="preserve">
    <value>Reflector height</value>
  </data>
+  <data name="59" xml:space="preserve">
+    <value>PPM</value>
+  </data>
  <data name="icons8-rename-50" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-rename-50.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-advance2-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-advance2-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="icons8_browse_folder_50_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>Icons\icons8-browse-folder-50-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -439,7 +454,7 @@
  <data name="12" xml:space="preserve">
    <value>Serial number</value>
  </data>
-  <data name="icons8-advance2-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Icons\icons8-advance2-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icons8-move-to-folder-24" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Icons\icons8-move-to-folder-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Convert.vbproj
+++ b/Convert.vbproj
@ -128,6 +128,12 @@
    <Compile Include="DialogIzracunHzCor.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="DialogJobOdpri.Designer.vb">
+      <DependentUpon>DialogJobOdpri.vb</DependentUpon>
+    </Compile>
+    <Compile Include="DialogJobOdpri.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="DialogNovProj.Designer.vb">
      <DependentUpon>DialogNovProj.vb</DependentUpon>
    </Compile>
@ -223,6 +229,9 @@
    <EmbeddedResource Include="DialogIzracunHzCor.resx">
      <DependentUpon>DialogIzracunHzCor.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="DialogJobOdpri.resx">
+      <DependentUpon>DialogJobOdpri.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="DialogNovProj.resx">
      <DependentUpon>DialogNovProj.vb</DependentUpon>
    </EmbeddedResource>
@ -298,6 +307,26 @@
    <None Include="My Project\Icons\digital_32.png" />
    <None Include="My Project\Icons\digital_24.png" />
    <None Include="My Project\Icons\icons8-advance2-24.png" />
+    <Content Include="Doc\Home.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Doc\Kodiranje-podatkov.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Doc\Navodila-nastavitve.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Doc\Navodila-orodja.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Doc\Navodila-osnovna.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="My Project\Icons\icons8-caps-lock-on-24.png" />
+    <None Include="My Project\Icons\icons8-error-24.png" />
+    <None Include="My Project\Icons\icons8-close-24.png" />
+    <None Include="My Project\Icons\icons8-product-documents-24.png" />
+    <None Include="My Project\Icons\icons8-move-to-folder-24.png" />
    <Content Include="tps1100_projekti.txt">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>