diff --git a/Form1.Designer.vb b/Form1.Designer.vb
index f8ee513..60b63c2 100644
--- a/Form1.Designer.vb
+++ b/Form1.Designer.vb
@@ -36,15 +36,16 @@ Partial Class Form1
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.tsbPointsOnly = New System.Windows.Forms.ToolStripButton()
+ Me.tsbHelp = New System.Windows.Forms.ToolStripButton()
+ Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
+ 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.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
- Me.tsbHelp = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
Me.StatusStrip1.SuspendLayout()
Me.ToolStrip1.SuspendLayout()
Me.SuspendLayout()
@@ -57,11 +58,11 @@ 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(0, 29)
+ Me.RichTextBox1.Location = New System.Drawing.Point(9, 29)
Me.RichTextBox1.Margin = New System.Windows.Forms.Padding(0)
Me.RichTextBox1.Name = "RichTextBox1"
Me.RichTextBox1.ReadOnly = True
- Me.RichTextBox1.Size = New System.Drawing.Size(1251, 690)
+ Me.RichTextBox1.Size = New System.Drawing.Size(1233, 690)
Me.RichTextBox1.TabIndex = 1
Me.RichTextBox1.Text = ""
'
@@ -147,14 +148,29 @@ Partial Class Form1
'
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.tsbFileName, Me.ToolStripSeparator1, Me.tsbConvert, Me.tsbPointsOnly, Me.tsbHelp, Me.ToolStripSeparator4, Me.tsbSaveAs, Me.ToolStripButton1, Me.ToolStripSeparator3, Me.ToolStripComboBox2, Me.ToolStripLabel2, Me.ToolStripComboBox1, Me.ToolStripLabel1})
+ 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"
'
+ 'ToolStripButton1
+ '
+ 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 >"
+ '
'tsbPointsOnly
'
Me.tsbPointsOnly.Enabled = False
@@ -165,6 +181,26 @@ Partial Class Form1
Me.tsbPointsOnly.Text = "Točke"
Me.tsbPointsOnly.ToolTipText = "Points Only"
'
+ 'tsbHelp
+ '
+ Me.tsbHelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+ Me.tsbHelp.Image = CType(resources.GetObject("tsbHelp.Image"), System.Drawing.Image)
+ Me.tsbHelp.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.tsbHelp.Name = "tsbHelp"
+ Me.tsbHelp.Size = New System.Drawing.Size(71, 26)
+ Me.tsbHelp.Text = "Pomoč"
+ '
+ 'ToolStripSeparator4
+ '
+ Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
+ Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 29)
+ '
+ 'ToolStripSeparator3
+ '
+ Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+ Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+ Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 29)
+ '
'ToolStripComboBox2
'
Me.ToolStripComboBox2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
@@ -199,35 +235,6 @@ Partial Class Form1
Me.ToolStripLabel1.Size = New System.Drawing.Size(101, 26)
Me.ToolStripLabel1.Text = "Uporabi kodiranje"
'
- 'ToolStripSeparator3
- '
- Me.ToolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
- Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 29)
- '
- 'tsbHelp
- '
- Me.tsbHelp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- Me.tsbHelp.Image = CType(resources.GetObject("tsbHelp.Image"), System.Drawing.Image)
- Me.tsbHelp.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.tsbHelp.Name = "tsbHelp"
- Me.tsbHelp.Size = New System.Drawing.Size(71, 26)
- Me.tsbHelp.Text = "Pomoč"
- '
- 'ToolStripSeparator4
- '
- Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
- Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 29)
- '
- 'ToolStripButton1
- '
- Me.ToolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
- 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(88, 26)
- Me.ToolStripButton1.Text = "Nastavitve"
- '
'Form1
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -271,4 +278,5 @@ Partial Class Form1
Friend WithEvents tsbHelp As ToolStripButton
Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
Friend WithEvents ToolStripButton1 As ToolStripButton
+ Friend WithEvents ToolStripLabel3 As ToolStripLabel
End Class
diff --git a/Form1.resx b/Form1.resx
index 737c4f5..3722f6c 100644
--- a/Form1.resx
+++ b/Form1.resx
@@ -130,183 +130,183 @@
iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- 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
+ 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
- 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
- RU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAV7SURBVGhD7VhbbBRVGN7oi9FoTCy+UETwDeODylVaS+83
+ ti2FxMSExFBAfahtwYhhW6YXurTsbvc2szs7M3ud3d7oDUswJooI4cGY6DPhRRCNSXd7IxpNC7/nzPwz
+ HeRBgS2dJv2SL7v7f2fOfOc//79ndi1rWINJcSFnU/XYuk23z6/b+MsXOZsrMbx6QI1PrnsNVL5yC8Or
+ B0vmVWJ49WAwZxMkXnpV4RB5j+HVgfmq92qv55XDdHk9TJftg+u7SmGutN6KsrkxV3mgZ77iAMxX7Ie5
+ csKyemJ+H8yW1MFMcV03DjMn5sv3195vWjU+W1wLs0U1MFNYA9MF1r043HyYLa2/rGe7qPZCuqh6fbpg
+ X+7MHuvFmT17YaZgL2Tyqi/hcPNhtrjqzmyRmu10QUUuhi2Z/NoN0/lVMJ1HuLtkHsPmw0xh1R2SbSXT
+ 9y+gbENmdwVk3imHzJsmXkAmv/Lb6XerQc12+cX09opcan5qV+mX6Z2lkN5RAumtxd/gcPPh97zKOj3T
+ u8pANU24vQSmthXD1NYiuL21sAaHmw+ugLT/q4Mf66bTaHrq7UKYemsPXHz/CHiD8Vocbj5EBycmXZwE
+ 0cYT8BM5C37bXgy/biuCH8mBFmn8DPoCEZD6xydwuLkgyKO5gejEYmRgAoKxAXCyIti6+r622d2X6KL4
+ 2CBE+schHB1YiA1NrsfLzIPwwHh7ZGBcNUkopsags094vdsb3CKR9zQW7qevhKnRNrzMHBgeHn46nBq7
+ aTTZx8d+RtniDsVvER3oQqTUKIQS527Ra1BeeYipcauaWc3kGNjd/CcoW7o9oRZqXGFSpZgaqUJ55SGl
+ Ria17FKyXORvhmGeQlkBK8l/ickR0CmPmKOZafOy4dFFPbPEnN0TGkVZxxmvMI7GCc+BEJUXgrGhlW9m
+ UR5tN2Y2FB+GM319m1HW0eVgN/LxIRCoecrEOSCfV7aZaSMS0ze1zFJjvVz4OsoP4CwXuSEkhkkT61zZ
+ ZhYTI1Y9o5jV02fZD6gmJSeu0TMBeZXG2l1cg2Kc7FKI7AZlMD64cs3MJ4YmNeM0sx5B/BMlC/1GMhLD
+ Fqcv/gctJZ3k+EbpyYI2r0+QF/VyIFklzRtH2SIa+oISw+QrlU/SU5kySBmNLX8zH2puvXa4pRWMZHr9
+ aFwtBS7aDx8eZ3Sd7oiRWvzop6eADfej+QGFbT1eXdfY0NyqlF1WQCczTn7kWBv4xeRSGRB2OgP3GTBq
+ lEat08UpxgMK+4FsnDKnccyhFtsVvH32wScGrYoxQyl09nD1KCtQzS0RwwoYt6+OGg9ElshGUk+umUnj
+ Teo1TJ48ewLCHEo6uHAKjMSwDqc/Ms9FiEZJx0ipJ9PMgiznuvnYola/lB0uLoCyDp8oX/VLMqiMPVAO
+ HQ6O1xbHhpOEUdLMseU/mYnhdmP9OvzSPcbtfhHl/w2G8b7gFWJ3WYmY1yjKy3sy01OTDaduGmvX7uG/
+ R/mhYXdzP5CHPHWXRBm8ocTynsykXq3UNKeQbD3JWkePpxTlh0Zbr7fQJyQU836RvibAI8aXr5mJ6Sat
+ bil7WSGN0iPD7mMzPmKcLsQnxMErxBtRyj4CklzDKQ2n1my7w9+L0iPjVK/PQY2jefDx0WqUsg9/JPmG
+ 1nBuPnqX/Gh5FqVHBsNEn+l2BRa9oRjpAcJgeAtK2YckSc9rDdflCFzG8GOj08leoeY9fAwcicRzGM4+
+ jh5jcpq7nAtdTvbeydOunRh+bLTZ3Tvaz/ruNXU4Fj46zryM4eyjodn2ufqc0pr1U7Oh+eR5fA46gaHs
+ 43Cj7Qa9SUOLrQJDWQOdU1kAuQeGsg9yg+8ammyX//2PQzZA59Tmx9Aa1rCG/4TF8g8ohWovShiqjQAA
+ AABJRU5ErkJggg==
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
- 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
+ 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
17, 17
+
+
+ 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
- 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
- QmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAYqSURBVGhD7VprbBRVFK74xwfusoV2d7aLJsT4AzFBaPnl
+ D40mVtzSAi2PShWff4wxxgT8JZiYCAoo8pCZWdjyMoGCD/5h0bYYFf/5iFGbYGdmIQZDhDaxmiKM55s9
+ 7d6ZuTu72+6KRb7kpO09557H3HvPPfekVdfxv4FtT5nfO3iivnvwd1BD32A3xpg7eTD35FANOW+LhDFm
+ Tx5M6kASm62b46r5kKKbr9SlM+97A8GYohlr4ynjQcjytP8I1tlTlJTVEtWMD6t16y9Ft2xQ3Z6MKwgn
+ EBob5UM2qpsfKJrZDB2s7SrAtm+I6ZlVUd34edQ5kQoFIlKtav5EP9uhk7X/O4hrZ+6q1a2TXodEKiWQ
+ HBm9Cd26k81UFnHdXK5sM4fkjoAGLsV064u6zkzaFwiNxTTzS8jI5xJp1mAsZbaxucqAHHxZ2dZ/ReYA
+ OfhNXLeerN7fH4JsUNaKqKfD8ZT1VGyX8a1MF2zEdPMlyJYd9KVekBmtUQ2LstRzVYftG1nUwYJT50MN
+ PecujwVCv2OM2VnQIcfXV1TrtEw3PhxLlgfZ7SRdiUOKevYWFvOhoXdocX3f4AbQgpNDLTzsQ3Tfr7eS
+ ri6P7uzKaEYri00MONi+M+EsvfVqWbMMsqBmrfN9MDozE08ApFxRzR6XYiIniAqBtul6rz1kyAl9NNwT
+ XqVEhyqa7/HxZNtMs1ayRImgw+u77HZZRtCZKBdgo0Y3TdE2rcqP46oAUHaIikCxlNHB7IqD0u8TXvtU
+ xy1idvFA7SQqwT1R6heZdbgtrHS2zwdF1LYwDxcHpGbfPWMeYW5xQGUqFoAgXHbMLojEgdX3JPZ3HKtL
+ P3YpvrfdVtIr7djulpGaVOuxaGrZHBYrCLL7jOhDZJv15x3pgZuYXRjZUjyngGhk9MYuhMTBVS0zUh3D
+ dftW2bkgVtgUgF2rtdmhXcnh6TuW5L1TRJDT07zlTDSVeYDZhYH3hDgZ9RGzAoGVCAqiRm21Z7y31A7t
+ eGQ4sr3pbp4WCCokT4m+EK1hVh7Qe/q+zy9GQDM7zxxEpTpKMzszKYzP7jk3laWlcLZTgSCm71hsV29v
+ sSNbmz/maVLAFmyS/bToSyJt7h/1Ez6zeA5oFIgFnpSOn7tS33thCU9xwTnY+1pHxoLYExDEu832tA3J
+ keqtjdLtWt93YSlsSX1wUzdPyaHhxPnfJIIyWs9TXJi5t6O+6CDeabLDbyft8JbkPJ7uAmx4bMqJfOYp
+ OUw0ECfNjgWxPH8QW5vsaQhi86N2eFPjvTzdBdjw2JSTNBBaJp+gl1CWU0XLU1zAPRHb0zISHMSisSBC
+ ry/Mv7Vo+7qeAHmovmfwOE8RUIbDXpNafswVxM5cEBExiE0L7ds2Nn7E06QY92EX4U2/9PdXzAoEnYs5
+ ITU5XCiIqW/e/8fUtxpn87RAKKrxtduXQulXAPpO7skDl/A8ZXYgcNmFdi4cRhDV+YJ44+FmFg/E7TvN
+ CL1P/hZ9KelCRImCckBUgDc2swsClx3uicjG5IgTxJbsmcB2KnYlAEXLPCv6ENH7h0sqUQCneSYoQQFX
+ atGIw4wUG96YnJfvYOcFPSNoJ3wn+kDUxdzigQ6gRwlKlceZXXFENXO1135cN5uYXQLoi3AHcEwRHjto
+ FLBExQAb2e6MEIhm/TCuhxVACtpdyrLUhecoi5QfzlPXPOK1i04OS4wDUKqZn3mVotvBEmUH2XvNa0/R
+ jL4Jfzy0YtCScSl2+k0UTDlXJrsS633tIN26WLvbnMVSE4PTDfQbAHUFnRmn1Oi9sDZL8tIGyDbo/NtJ
+ 0fsvx/SMtNoeN6Ka9bzfELobAxlyQt4yPS6U4kEtU936xasXVLH+LxTnWRkiyvma9TSep5CdG9DEdm5s
+ XHbqwPdyXf2XFdV8EbIVA3qxvjPjIryxjVOJ9NlObyAYc2onT9nhoYukP+82LCucBCBppYqEStUbCMZk
+ sgJ9WraDXTQoy8RVawU6gBKHSguELju6yZex5qsEOrDoANIKHRULzUKBoACkn11O2THeG7tSQGWKMpsc
+ XBPvPHPAGwjGwINMyVXs1UJQ1ppUuGYCoWQwhZzvFv6p5hOMMfc6rnFUVf0DUv8amBHCEwAAAAAASUVO
+ RK5CYII=
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
- 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
+ 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
diff --git a/Form1.vb b/Form1.vb
index 3544962..7fff033 100644
--- a/Form1.vb
+++ b/Form1.vb
@@ -3,6 +3,7 @@ Imports System.IO
Imports TPS1100_Convert.My
Public Class Form1
+ Public DatFileName As String
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
ToolStripComboBox2.Text = My.Settings.DecimalnoLocilo
@@ -10,11 +11,14 @@ Public Class Form1
Private Sub tsbOpenFile_Click(sender As Object, e As EventArgs) Handles tsbOpenFile.Click
If OpenFileDialog1.ShowDialog = DialogResult.OK Then
tsbFileName.Text = OpenFileDialog1.SafeFileName
+ DatFileName = OpenFileDialog1.SafeFileName.ToString
RichTextBox1.Clear()
tsbSaveAs.Text = "Shrani ..."
tsbSaveAs.Enabled = False
tsbConvert.Enabled = True
tsbPointsOnly.Enabled = True
+ OpenFileDialog1.Dispose()
+
Else
tsbFileName.Text = "Odpri GSI datoteko..."
RichTextBox1.Clear()
@@ -395,7 +399,9 @@ Public Class Form1
End Sub
Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+
Form2.ShowDialog()
+
End Sub
End Class
diff --git a/Form2.Designer.vb b/Form2.Designer.vb
index a5ee6c7..d461000 100644
--- a/Form2.Designer.vb
+++ b/Form2.Designer.vb
@@ -24,28 +24,112 @@ 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.MenuStrip1 = New System.Windows.Forms.MenuStrip()
- Me.PropertyGrid1 = New System.Windows.Forms.PropertyGrid()
+ Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
+ Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+ Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel()
+ Me.ComBoxKoda = New System.Windows.Forms.ToolStripComboBox()
+ 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.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.ToolStrip1.SuspendLayout()
+ Me.StatusStrip1.SuspendLayout()
CType(Me.MyApplicationBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MyApplicationBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
- 'MenuStrip1
+ 'RichTextBox1
'
- Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
- Me.MenuStrip1.Name = "MenuStrip1"
- Me.MenuStrip1.Size = New System.Drawing.Size(800, 24)
- Me.MenuStrip1.TabIndex = 1
- Me.MenuStrip1.Text = "MenuStrip1"
+ 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
'
- 'PropertyGrid1
+ 'ToolStrip1
'
- Me.PropertyGrid1.Location = New System.Drawing.Point(0, 12)
- Me.PropertyGrid1.Name = "PropertyGrid1"
- Me.PropertyGrid1.Size = New System.Drawing.Size(299, 342)
- Me.PropertyGrid1.TabIndex = 2
+ 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.Location = New System.Drawing.Point(0, 0)
+ Me.ToolStrip1.Name = "ToolStrip1"
+ Me.ToolStrip1.Size = New System.Drawing.Size(1084, 31)
+ Me.ToolStrip1.TabIndex = 3
+ Me.ToolStrip1.Text = "ToolStrip1"
+ '
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+ '
+ 'ToolStripLabel1
+ '
+ Me.ToolStripLabel1.Name = "ToolStripLabel1"
+ Me.ToolStripLabel1.Size = New System.Drawing.Size(69, 28)
+ Me.ToolStripLabel1.Text = "Vstavi Kodo"
+ '
+ '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.Name = "ComBoxKoda"
+ Me.ComBoxKoda.Size = New System.Drawing.Size(121, 31)
+ Me.ComBoxKoda.ToolTipText = "Izberi kodo..."
+ '
+ 'StatusStrip1
+ '
+ Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1})
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 589)
+ Me.StatusStrip1.Name = "StatusStrip1"
+ Me.StatusStrip1.Size = New System.Drawing.Size(1084, 22)
+ Me.StatusStrip1.TabIndex = 4
+ Me.StatusStrip1.Text = "StatusStrip1"
+ '
+ 'ToolStripStatusLabel1
+ '
+ Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1"
+ Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(69, 17)
+ Me.ToolStripStatusLabel1.Text = "Nalaganje..."
+ '
+ 'ToolStripSeparator2
+ '
+ 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"
'
'MyApplicationBindingSource
'
@@ -55,17 +139,25 @@ Partial Class Form2
'
Me.MyApplicationBindingSource1.DataSource = GetType(TPS1100_Convert.My.MyApplication)
'
+ 'SaveFileDialog1
+ '
+ Me.SaveFileDialog1.Filter = "GSI Files|*.GSI"
+ '
'Form2
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(800, 450)
- Me.Controls.Add(Me.PropertyGrid1)
- Me.Controls.Add(Me.MenuStrip1)
+ Me.ClientSize = New System.Drawing.Size(1084, 611)
+ Me.Controls.Add(Me.StatusStrip1)
+ Me.Controls.Add(Me.ToolStrip1)
+ Me.Controls.Add(Me.RichTextBox1)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MainMenuStrip = Me.MenuStrip1
Me.Name = "Form2"
Me.Text = "TPS1100 Convert: Settings"
+ Me.ToolStrip1.ResumeLayout(False)
+ Me.ToolStrip1.PerformLayout()
+ Me.StatusStrip1.ResumeLayout(False)
+ Me.StatusStrip1.PerformLayout()
CType(Me.MyApplicationBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MyApplicationBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
@@ -74,7 +166,17 @@ Partial Class Form2
End Sub
Friend WithEvents MyApplicationBindingSource As BindingSource
- Friend WithEvents MenuStrip1 As MenuStrip
Friend WithEvents MyApplicationBindingSource1 As BindingSource
- Friend WithEvents PropertyGrid1 As PropertyGrid
+ Friend WithEvents RichTextBox1 As RichTextBox
+ Friend WithEvents ToolStrip1 As ToolStrip
+ Friend WithEvents BtnShraniF2 As ToolStripButton
+ Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
+ Friend WithEvents ToolStripLabel1 As ToolStripLabel
+ Friend WithEvents ComBoxKoda As ToolStripComboBox
+ Friend WithEvents ToolStripButton2 As ToolStripButton
+ Friend WithEvents StatusStrip1 As StatusStrip
+ Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel
+ Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
+ Friend WithEvents ToolStripButton1 As ToolStripButton
+ Friend WithEvents SaveFileDialog1 As SaveFileDialog
End Class
diff --git a/Form2.resx b/Form2.resx
index 31df06d..c3506da 100644
--- a/Form2.resx
+++ b/Form2.resx
@@ -117,8 +117,11 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 226, 17
+
+ 556, 17
+
+
+ 662, 17
17, 17
@@ -126,6 +129,9 @@
341, 17
+
+ 778, 17
+
diff --git a/Form2.vb b/Form2.vb
index f68bf35..71c54ae 100644
--- a/Form2.vb
+++ b/Form2.vb
@@ -1,9 +1,95 @@
-Public Class Form2
- Private Sub Form2_Load(sender As Object, e As EventArgs) Handles MyBase.Load
- PropertyGrid1.SelectedObject = My.Settings
- ' Attribute for the user-scope settings.
- Dim userAttr As New System.Configuration.UserScopedSettingAttribute
- Dim attrs As New System.ComponentModel.AttributeCollection(userAttr)
- PropertyGrid1.BrowsableAttributes = attrs
+Imports System.IO
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement
+
+Public Class Form2
+
+ Public DatotekaSpemembe As Boolean = False
+ Private Sub Form2_Load(sender As Object, e As EventArgs) Handles MyBase.Activated
+ ' PropertyGrid1.SelectedObject = My.Settings
+ ' ' Attribute for the user-scope settings.
+ ' Dim userAttr As New System.Configuration.UserScopedSettingAttribute
+ ' Dim attrs As New System.ComponentModel.AttributeCollection(userAttr)
+ ' PropertyGrid1.BrowsableAttributes = attrs
+ Form1.Hide()
+ BtnShraniF2.Enabled = False
+ RichTextBox1.Clear()
+
+ ' prepare StreamReader
+ Dim streamReader As StreamReader = New StreamReader(Form1.OpenFileDialog1.FileName)
+ 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)
+ i = i + 1
+ Loop
+ ToolStripStatusLabel1.Text = "Vrstic: " + i.ToString + "| Datoteka: " + Form1.OpenFileDialog1.FileName
+ DatotekaSpemembe = False
+ streamReader.Close()
+ 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
+ Form1.Show()
+ End Sub
+
+ Private Sub RichTextBox1_TextChanged(sender As Object, e As EventArgs) Handles RichTextBox1.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
+ BtnShraniF2.Enabled = False
+ DatotekaSpemembe = False
+ End If
+ End Sub
+
+ Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click
+ RichTextBox1.Focus()
+ RichTextBox1.SelectionStart = RichTextBox1.GetFirstCharIndexOfCurrentLine
+ SendKeys.Send("+{HOME}")
+ If ComBoxKoda.SelectedIndex = 0 Then
+ RichTextBox1.SelectedText = "*410000+0000000000000010 " + vbCrLf
+ BtnShraniF2.Enabled = True
+ DatotekaSpemembe = True
+ ElseIf ComBoxKoda.SelectedIndex = 1 Then
+ RichTextBox1.SelectedText = "*410000+0000000000000020 " + vbCrLf
+ BtnShraniF2.Enabled = True
+ DatotekaSpemembe = True
+ ElseIf ComBoxKoda.SelectedIndex = 2 Then
+ RichTextBox1.SelectedText = "*410000+0000000000000030 " + vbCrLf
+ BtnShraniF2.Enabled = True
+ DatotekaSpemembe = True
+ ElseIf ComBoxKoda.SelectedIndex = 3 Then
+ RichTextBox1.SelectedText = "*410000+0000000000000040 " + vbCrLf
+ BtnShraniF2.Enabled = True
+ DatotekaSpemembe = True
+ ElseIf ComBoxKoda.SelectedIndex = 4 Then
+ RichTextBox1.SelectedText = "*410000+0000000000000050 " + vbCrLf
+ BtnShraniF2.Enabled = True
+ DatotekaSpemembe = True
+ ElseIf ComBoxKoda.SelectedIndex = 5 Then
+ RichTextBox1.SelectedText = "*410000+0000000000000090 " + vbCrLf
+ BtnShraniF2.Enabled = True
+ DatotekaSpemembe = True
+ End If
+
+ End Sub
+
+ Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
+ RichTextBox1.Undo()
End Sub
End Class
\ No newline at end of file
diff --git a/My Project/Resources.Designer.vb b/My Project/Resources.Designer.vb
index f0c1b6b..1203f2f 100644
--- a/My Project/Resources.Designer.vb
+++ b/My Project/Resources.Designer.vb
@@ -59,5 +59,55 @@ Namespace My.Resources
resourceCulture = value
End Set
End Property
+
+ '''
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property icons8_advance_48() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("icons8-advance-48", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property icons8_clear_symbol_50() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("icons8-clear-symbol-50", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property icons8_save_as_50() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("icons8-save-as-50", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property icons8_undo_48() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("icons8-undo-48", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property Save_as_24() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("Save-as-24", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
End Module
End Namespace
diff --git a/My Project/Resources.resx b/My Project/Resources.resx
index af7dbeb..bdb1eda 100644
--- a/My Project/Resources.resx
+++ b/My Project/Resources.resx
@@ -46,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
: and then encoded with base64 encoding.
-->
+
@@ -68,9 +69,10 @@
-
+
+
@@ -85,9 +87,10 @@
-
+
+
@@ -109,9 +112,25 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ ..\icons8-clear-symbol-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Save-as-24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\icons8-advance-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\icons8-save-as-50.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\icons8-undo-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj
index 5e70ec2..fc23a40 100644
--- a/TPS1100 Convert.vbproj
+++ b/TPS1100 Convert.vbproj
@@ -179,6 +179,11 @@
+
+
+
+
+
diff --git a/bin/Release/TPS1100 Convert.exe b/bin/Release/TPS1100 Convert.exe
index a725d3e..7794910 100644
Binary files a/bin/Release/TPS1100 Convert.exe and b/bin/Release/TPS1100 Convert.exe differ
diff --git a/bin/Release/TPS1100 Convert.xml b/bin/Release/TPS1100 Convert.xml
index 64e8976..ce3c646 100644
--- a/bin/Release/TPS1100 Convert.xml
+++ b/bin/Release/TPS1100 Convert.xml
@@ -22,6 +22,31 @@ TPS1100 Convert
resource lookups using this strongly typed resource class.
+
+
+ Looks up a localized resource of type System.Drawing.Bitmap.
+
+
+
+
+ Looks up a localized resource of type System.Drawing.Bitmap.
+
+
+
+
+ Looks up a localized resource of type System.Drawing.Bitmap.
+
+
+
+
+ Looks up a localized resource of type System.Drawing.Bitmap.
+
+
+
+
+ Looks up a localized resource of type System.Drawing.Bitmap.
+
+
Znak za decimalno ločilo
diff --git a/icons8-advance-48.png b/icons8-advance-48.png
new file mode 100644
index 0000000..d0518ae
Binary files /dev/null and b/icons8-advance-48.png differ
diff --git a/icons8-clear-symbol-50.png b/icons8-clear-symbol-50.png
new file mode 100644
index 0000000..0fe0e4c
Binary files /dev/null and b/icons8-clear-symbol-50.png differ
diff --git a/icons8-save-as-50.png b/icons8-save-as-50.png
new file mode 100644
index 0000000..9a1153f
Binary files /dev/null and b/icons8-save-as-50.png differ
diff --git a/icons8-undo-48.png b/icons8-undo-48.png
new file mode 100644
index 0000000..658ae30
Binary files /dev/null and b/icons8-undo-48.png differ