diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ac10df..7f14521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,16 @@ Zapisnik razvoja programa TPS1100 Convert. --- -## v2.7.0.6 (2024/06/26) +## v2.7.0.9 (2024/06/29) + +- Popravki nalaganja nastavitev iz datoteke "tps1100_kode.txt" pri zagonu aplikacije +- Popravki delovanja shranjevanja nastavitev v oknu za nastavitve + + +--- + + +## v2.7.0.8 (2024/06/26) - Preverjanje za posodobitev aplikacije - Popravljeno branje decimalnega ločila v "Pripravi GSI". diff --git a/FormNastavitve.vb b/FormNastavitve.vb index adb94d9..34da549 100644 --- a/FormNastavitve.vb +++ b/FormNastavitve.vb @@ -65,10 +65,34 @@ Public Class FormNastavitve My.Settings.Save() + ShraniNastDat() + Form1.DatotekaLogfile = My.Settings.DatLogfile Form1.RichTextBox1.Font = New Font(My.Settings.Pisava, My.Settings.PisavaVelikost) End Sub + Public Sub ShraniNastDat() + ' Izvoz kodiranja v TXT datoteko + Dim dataNast As String = "" + + dataNast = dataNast + "DecimalnoLocilo = " + My.Settings.DecimalnoLocilo + vbCrLf + dataNast = dataNast + "StolpciTab = " + My.Settings.Stolpci.ToString + vbCrLf + dataNast = dataNast + "KodaStojisce = " + My.Settings.KodaStojisce + vbCrLf + dataNast = dataNast + "KodaStojisceInfo = " + My.Settings.KodaStojisceInfo + vbCrLf + dataNast = dataNast + "KodaStojisceOri = " + My.Settings.KodaStojisceOri + vbCrLf + dataNast = dataNast + "KodaQuickSet = " + My.Settings.KodaQuickSet + vbCrLf + dataNast = dataNast + "KodaSetAzi = " + My.Settings.KodaSetAzi + vbCrLf + dataNast = dataNast + "KodaResection = " + My.Settings.KodaResection + vbCrLf + dataNast = dataNast + "KodaFreeStation = " + My.Settings.KodaFreeStation + vbCrLf + dataNast = dataNast + "KodaOriHtTrans = " + My.Settings.KodaOriHtTrans + vbCrLf + dataNast = dataNast + "KodaMeasOri = " + My.Settings.KodaMeasOri + vbCrLf + dataNast = dataNast + "KodaMeas = " + My.Settings.KodaMeas + vbCrLf + dataNast = dataNast + "KodaUserImport = " + My.Settings.KodaUserImport + vbCrLf + + My.Computer.FileSystem.WriteAllText("tps1100_kode.txt", dataNast, False) + + End Sub + Private Sub ButtonOdpriLog_Click(sender As Object, e As EventArgs) Handles ButtonOdpriLog.Click ' Pokaži pot do datoteke z zapisnikom procesiranja If SaveFileDialogLog.ShowDialog = DialogResult.OK Then diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 885eeea..c1885be 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj index c026109..5ff12d7 100644 --- a/TPS1100 Convert.vbproj +++ b/TPS1100 Convert.vbproj @@ -31,7 +31,7 @@ 2.1.0.4 publish.html true - 8 + 9 2.7.0.%2a false true @@ -206,6 +206,9 @@ Always + + Always + diff --git a/bin/TPS1100-Convert_2.7.0.8_Portable.zip b/bin/TPS1100-Convert_2.7.0.8_Portable.zip deleted file mode 100644 index 81d7331..0000000 Binary files a/bin/TPS1100-Convert_2.7.0.8_Portable.zip and /dev/null differ diff --git a/bin/TPS1100-Convert_2.7.0.9.zip b/bin/TPS1100-Convert_2.7.0.9.zip new file mode 100644 index 0000000..958fc48 Binary files /dev/null and b/bin/TPS1100-Convert_2.7.0.9.zip differ diff --git a/tps1100_kode.txt b/tps1100_kode.txt new file mode 100644 index 0000000..7ef5fd4 --- /dev/null +++ b/tps1100_kode.txt @@ -0,0 +1,13 @@ +DecimalnoLocilo = Pika +StolpciTab = 1 +KodaStojisce = 1 +KodaStojisceInfo = 2 +KodaStojisceOri = 3 +KodaQuickSet = 10 +KodaSetAzi = 20 +KodaResection = 30 +KodaFreeStation = 40 +KodaOriHtTrans = 50 +KodaMeasOri = 80 +KodaMeas = 90 +KodaUserImport = 99 diff --git a/version.txt b/version.txt index 549a016..173608e 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.7.0.8 \ No newline at end of file +2.7.0.9 \ No newline at end of file