diff --git a/.vs/Gästeliste/v14/.suo b/.vs/Gästeliste/v14/.suo
index e06a99c..ee26179 100644
Binary files a/.vs/Gästeliste/v14/.suo and b/.vs/Gästeliste/v14/.suo differ
diff --git a/Gästeliste/Gästeliste.vbproj b/Gästeliste/Gästeliste.vbproj
index 6e3e8ce..53455e4 100644
--- a/Gästeliste/Gästeliste.vbproj
+++ b/Gästeliste/Gästeliste.vbproj
@@ -32,8 +32,8 @@
Dominic Reich
1.0.0.0
false
- 12
- 1.0.0.%2a
+ 18
+ 1.0.1.%2a
true
true
true
diff --git a/Gästeliste/frmAbout.vb b/Gästeliste/frmAbout.vb
index 56d3f24..5b23dc7 100644
--- a/Gästeliste/frmAbout.vb
+++ b/Gästeliste/frmAbout.vb
@@ -26,8 +26,4 @@
Private Sub lnkWebsite_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lnkWebsite.LinkClicked
Process.Start("http://tmsn.at/?tools&gaesteliste")
End Sub
-
- Private Sub lblInfoBetaSoftware_MouseEnter(sender As Object, e As EventArgs)
- Me.lblInfoBetaSoftware.ForeColor = Color.Red
- End Sub
End Class
diff --git a/Gästeliste/frmMain.Designer.vb b/Gästeliste/frmMain.Designer.vb
index 91297ae..ec24014 100644
--- a/Gästeliste/frmMain.Designer.vb
+++ b/Gästeliste/frmMain.Designer.vb
@@ -232,27 +232,27 @@ Partial Class frmMain
'
Me.InfoToolStripMenuItem.Name = "InfoToolStripMenuItem"
Me.InfoToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No
- Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(139, 22)
+ Me.InfoToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.InfoToolStripMenuItem.Text = "Info"
'
'OnlineHilfeToolStripMenuItem
'
Me.OnlineHilfeToolStripMenuItem.Name = "OnlineHilfeToolStripMenuItem"
Me.OnlineHilfeToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No
- Me.OnlineHilfeToolStripMenuItem.Size = New System.Drawing.Size(139, 22)
+ Me.OnlineHilfeToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.OnlineHilfeToolStripMenuItem.Text = "Online-Hilfe"
'
'ToolStripMenuItem1
'
Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
Me.ToolStripMenuItem1.RightToLeft = System.Windows.Forms.RightToLeft.No
- Me.ToolStripMenuItem1.Size = New System.Drawing.Size(136, 6)
+ Me.ToolStripMenuItem1.Size = New System.Drawing.Size(149, 6)
'
'UpdateToolStripMenuItem
'
Me.UpdateToolStripMenuItem.Name = "UpdateToolStripMenuItem"
Me.UpdateToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No
- Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(139, 22)
+ Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.UpdateToolStripMenuItem.Text = "Update"
'
'StatusStrip1
diff --git a/Gästeliste/frmMain.vb b/Gästeliste/frmMain.vb
index 89d2c91..aaf76be 100644
--- a/Gästeliste/frmMain.vb
+++ b/Gästeliste/frmMain.vb
@@ -55,8 +55,17 @@ Public Class frmMain
Me.DataGridView1.RowsDefaultCellStyle.BackColor = Color.Azure
Me.DataGridView1.AlternatingRowsDefaultCellStyle.BackColor = Color.Beige
+ Dim Info As UpdateCheckInfo
If ApplicationDeployment.IsNetworkDeployed Then
- statusVersionLabel.Text = "Version " & ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString & " (" & ApplicationDeployment.CurrentDeployment.UpdatedVersion.ToString & ")"
+ Dim AD As ApplicationDeployment = ApplicationDeployment.CurrentDeployment
+
+ Info = AD.CheckForDetailedUpdate
+ If Info.UpdateAvailable Then
+ statusVersionLabel.Text = "Version " & AD.CurrentVersion.ToString & " (Update verfügbar: " & Info.AvailableVersion.ToString & ")"
+ statusVersionLabel.Tag = "update"
+ Else
+ statusVersionLabel.Text = "Version " & AD.CurrentVersion.ToString
+ End If
Else
statusVersionLabel.Text = "Lokale Version: " & My.Application.Info.Version.ToString
End If
@@ -81,14 +90,18 @@ Public Class frmMain
Info = AD.CheckForDetailedUpdate
If Info.UpdateAvailable Then
+ statusVersionLabel.Text = "Version " & AD.CurrentVersion.ToString & " (Update verfügbar: " & Info.AvailableVersion.ToString & ")"
+ statusVersionLabel.Tag = "update"
If MsgBox("Ein Update ist verfügbar und wird jetzt installiert." + Chr(13) + "Die Anwendung wird danach neu gestartet.", vbOKCancel) = vbOK Then
AD.Update()
System.Windows.Forms.Application.Restart()
End If
Else
+ statusVersionLabel.Text = "Version " & AD.CurrentVersion.ToString
MsgBox("Es ist kein Update verfügbar.")
End If
Else
+ statusVersionLabel.Text = "Lokale Version: " & My.Application.Info.Version.ToString
MsgBox("Die Anwendung wurde nicht aus dem Internet bezogen und kann daher nicht aktualisiert werden.")
End If
End Sub
@@ -195,4 +208,10 @@ Public Class frmMain
mnuContext.Show(Cursor.Position)
End If
End Sub
+
+ Private Sub statusVersionLabel_Click(sender As Object, e As EventArgs) Handles statusVersionLabel.Click
+ If statusVersionLabel.Tag = "update" Then
+ UpdateToolStripMenuItem_Click(statusVersionLabel, Nothing)
+ End If
+ End Sub
End Class