diff --git a/CHANGELOG.md b/CHANGELOG.md index f2fafd5..102b588 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ Zapisnik razvoja programa TPS1100 Convert. +--- + +## v2.7.0.4 (2024/06/20) + +### Novo + +- Dodano preverjanje za posodobitve + + --- ## v2.7.0.3 (2024/06/20) diff --git a/Form1.Designer.vb b/Form1.Designer.vb index 3803424..c21055f 100644 --- a/Form1.Designer.vb +++ b/Form1.Designer.vb @@ -57,6 +57,8 @@ Partial Class Form1 Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.PripraviGSIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.InfoOAplikacijiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PosodobitevToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.StatusStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() Me.MenuStrip1.SuspendLayout() @@ -260,44 +262,44 @@ Partial Class Form1 ' Me.OdpriGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50 Me.OdpriGSIToolStripMenuItem1.Name = "OdpriGSIToolStripMenuItem1" - Me.OdpriGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.OdpriGSIToolStripMenuItem1.Size = New System.Drawing.Size(134, 22) Me.OdpriGSIToolStripMenuItem1.Text = "&Odpri GSI" ' 'PripraviGSIToolStripMenuItem1 ' Me.PripraviGSIToolStripMenuItem1.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_send_file_50 Me.PripraviGSIToolStripMenuItem1.Name = "PripraviGSIToolStripMenuItem1" - Me.PripraviGSIToolStripMenuItem1.Size = New System.Drawing.Size(180, 22) + Me.PripraviGSIToolStripMenuItem1.Size = New System.Drawing.Size(134, 22) Me.PripraviGSIToolStripMenuItem1.Text = "&Pripravi GSI" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(131, 6) ' 'ShraniToolStripMenuItem ' Me.ShraniToolStripMenuItem.Enabled = False Me.ShraniToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50 Me.ShraniToolStripMenuItem.Name = "ShraniToolStripMenuItem" - Me.ShraniToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ShraniToolStripMenuItem.Size = New System.Drawing.Size(134, 22) Me.ShraniToolStripMenuItem.Text = "&Shrani..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(131, 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(180, 22) + Me.IzhodToolStripMenuItem.Size = New System.Drawing.Size(134, 22) Me.IzhodToolStripMenuItem.Text = "I&zhod" ' 'MenuToolStripMenuItem ' - Me.MenuToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem, Me.ToolStripSeparator6, Me.PripraviGSIToolStripMenuItem, Me.InfoOAplikacijiToolStripMenuItem}) + Me.MenuToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OdpriGSIToolStripMenuItem, Me.ToolStripSeparator6, Me.PosodobitevToolStripMenuItem, Me.PripraviGSIToolStripMenuItem, Me.ToolStripSeparator7, Me.InfoOAplikacijiToolStripMenuItem}) 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) @@ -307,28 +309,40 @@ Partial Class Form1 ' Me.OdpriGSIToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_open_end_wrench_50 Me.OdpriGSIToolStripMenuItem.Name = "OdpriGSIToolStripMenuItem" - Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(154, 22) + Me.OdpriGSIToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.OdpriGSIToolStripMenuItem.Text = "Nastavitve" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(151, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 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(154, 22) + Me.PripraviGSIToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.PripraviGSIToolStripMenuItem.Text = "Navodila" ' 'InfoOAplikacijiToolStripMenuItem ' Me.InfoOAplikacijiToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_information_50 Me.InfoOAplikacijiToolStripMenuItem.Name = "InfoOAplikacijiToolStripMenuItem" - Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(154, 22) + Me.InfoOAplikacijiToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.InfoOAplikacijiToolStripMenuItem.Text = "Info o aplikaciji" ' + 'PosodobitevToolStripMenuItem + ' + Me.PosodobitevToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_rotate_48 + Me.PosodobitevToolStripMenuItem.Name = "PosodobitevToolStripMenuItem" + Me.PosodobitevToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PosodobitevToolStripMenuItem.Text = "Posodobitev..." + ' + 'ToolStripSeparator7 + ' + Me.ToolStripSeparator7.Name = "ToolStripSeparator7" + Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 6) + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -389,4 +403,6 @@ Partial Class Form1 Friend WithEvents ShraniToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripSeparator2 As ToolStripSeparator Friend WithEvents IzhodToolStripMenuItem As ToolStripMenuItem + Friend WithEvents PosodobitevToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ToolStripSeparator7 As ToolStripSeparator End Class diff --git a/Form1.vb b/Form1.vb index 15948c6..2390728 100644 --- a/Form1.vb +++ b/Form1.vb @@ -708,5 +708,46 @@ Public Class Form1 Me.Close() Application.Exit() + End Sub + + Private Sub PosodobitevToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PosodobitevToolStripMenuItem.Click + ' Preveri verzijo programa iz Gitea - MultiBox + Dim infoVerzija As String = My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString + "." + My.Application.Info.Version.Revision.ToString + Dim gitVerzija As String = "" + Dim verReader As StreamReader = New StreamReader("https://multibox.nohost.me/gitea/boris/TPS1100-Convert/raw/branch/main/version.txt") + + ' Branje datoteke + Do Until verReader.EndOfStream + ' Preberi vrstico z verzijo na git + gitVerzija = verReader.ReadLine() + Loop + + If gitVerzija = infoVerzija Then + Dim Msg, Style, Title, Response + + Msg = "Trenutna verzija: " + infoVerzija + vbCrLf + "Ni posodobitev..." ' Define message. + Title = "Preverjanje posodobitev" ' Define title. + Style = vbOK + + ' Display message. + Response = MsgBox(Msg, Style, Title) + Else + Dim Msg, Style, Title, Response, MyString + + Msg = "Trenutna verzija: " + infoVerzija + vbCrLf + "Nova verzija: " + gitVerzija + vbCrLf + vbCrLf + "Odprem stran za prenos?" ' Define message. + Title = "Preverjanje posodobitev" ' Define title. + Style = vbOKCancel + + ' Display message. + Response = MsgBox(Msg, Style, Title) + + If Response = vbOK Then ' User chose Yes. + Process.Start("https://multibox.nohost.me/gitea/boris/TPS1100-Convert/releases") + End If + End If + + + + End Sub End Class diff --git a/FormNastavitve.Designer.vb b/FormNastavitve.Designer.vb index e73b88c..830665b 100644 --- a/FormNastavitve.Designer.vb +++ b/FormNastavitve.Designer.vb @@ -70,8 +70,8 @@ Partial Class FormNastavitve Me.SaveFileDialogNast = New System.Windows.Forms.SaveFileDialog() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.DatotekaToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.IzvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.IzvoziKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PonastaviKodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.ZapriToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -673,37 +673,37 @@ Partial Class FormNastavitve Me.DatotekaToolStripMenuItem.Size = New System.Drawing.Size(82, 20) Me.DatotekaToolStripMenuItem.Text = "&Datoteka" ' - 'IzvoziKodeToolStripMenuItem - ' - Me.IzvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50 - Me.IzvoziKodeToolStripMenuItem.Name = "IzvoziKodeToolStripMenuItem" - Me.IzvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.IzvoziKodeToolStripMenuItem.Text = "&Shrani Kode" - ' 'UvoziKodeToolStripMenuItem ' Me.UvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_opened_folder_50 Me.UvoziKodeToolStripMenuItem.Name = "UvoziKodeToolStripMenuItem" - Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.UvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.UvoziKodeToolStripMenuItem.Text = "&Uvozi Kode" ' + 'IzvoziKodeToolStripMenuItem + ' + Me.IzvoziKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_save_as_50 + Me.IzvoziKodeToolStripMenuItem.Name = "IzvoziKodeToolStripMenuItem" + Me.IzvoziKodeToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.IzvoziKodeToolStripMenuItem.Text = "&Shrani Kode" + ' 'PonastaviKodeToolStripMenuItem ' Me.PonastaviKodeToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_rotate_48 Me.PonastaviKodeToolStripMenuItem.Name = "PonastaviKodeToolStripMenuItem" - Me.PonastaviKodeToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PonastaviKodeToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.PonastaviKodeToolStripMenuItem.Text = "Ponastavi Kode" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(152, 6) ' 'ZapriToolStripMenuItem ' Me.ZapriToolStripMenuItem.Image = Global.TPS1100_Convert.My.Resources.Resources.icons8_close_50 Me.ZapriToolStripMenuItem.Name = "ZapriToolStripMenuItem" - Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ZapriToolStripMenuItem.Size = New System.Drawing.Size(155, 22) Me.ZapriToolStripMenuItem.Text = "&Zapri" ' 'ButtonShraniZapri diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 755c51b..9160cbe 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/My Project/img/imgsc1.png b/My Project/img/imgsc1.png new file mode 100644 index 0000000..18c2c8d Binary files /dev/null and b/My Project/img/imgsc1.png differ diff --git a/TPS1100 Convert.vbproj b/TPS1100 Convert.vbproj index 3c8d5f2..762bee6 100644 --- a/TPS1100 Convert.vbproj +++ b/TPS1100 Convert.vbproj @@ -31,7 +31,7 @@ 2B geoinformatika d.o.o. 2.1.0.4 publish.html - 3 + 4 2.7.0.%2a false true @@ -205,6 +205,7 @@ Always + MyApplicationCodeGenerator diff --git a/bin/Release/TPS1100 Convert.application b/bin/Release/TPS1100 Convert.application index 93a6051..ac82dfb 100644 --- a/bin/Release/TPS1100 Convert.application +++ b/bin/Release/TPS1100 Convert.application @@ -1,6 +1,6 @@  - + @@ -9,14 +9,14 @@ - - + + - N5C+oRH7VYnSMhb6eQcXKR1wHXezvTSWJEz5QkJL448= + fL9IZbgLltrDNiVT3j6xsCFFzLeOHuEhLd4qrrvX5NE= diff --git a/bin/Release/TPS1100 Convert.exe b/bin/Release/TPS1100 Convert.exe index 1477692..ac2be86 100644 Binary files a/bin/Release/TPS1100 Convert.exe and b/bin/Release/TPS1100 Convert.exe differ diff --git a/bin/Release/TPS1100 Convert.exe.manifest b/bin/Release/TPS1100 Convert.exe.manifest index 982e467..536928b 100644 --- a/bin/Release/TPS1100 Convert.exe.manifest +++ b/bin/Release/TPS1100 Convert.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,24 +43,24 @@ - - + + - 9MbQdsngL/DHeK3cDx94oj68MzP5KjB+q9WSEUtgKKA= + 2EdOprQDPWWzBpfUnVZGDGbK2kcMlkpfYfX+780uX2k= - + - TnL6bdrblDtfQ1Ivt3Cvr9XTXjAr+ofmFHcsg3XXil0= + MIJ8P9KBihEVq+RAyMxvPLC5CfEfxMFEPw1SYExqe50= @@ -126,6 +126,15 @@ 74qm9dMNKX/YirNPCGO0q9XYo6Tzd8K6cBxxg17LnsU= + + + + + + + mNmAlgFrhbUzVYOqihJIyFyJwHrZr0+dXBsUtIvCb9g= + +