From eee2a17e6d93e47e2266b00e1992c7ee030ca185 Mon Sep 17 00:00:00 2001
From: Dominic Reich <dominic@mm.st>
Date: Wed, 16 Mar 2016 23:42:31 +0100
Subject: [PATCH] Version 1.0.1.17 / mainly usable.

---
 .vs/Gästeliste/v14/.suo        | Bin 47616 -> 41984 bytes
 Gästeliste/Gästeliste.vbproj  |   4 ++--
 Gästeliste/frmAbout.vb         |   4 ----
 Gästeliste/frmMain.Designer.vb |   8 ++++----
 Gästeliste/frmMain.vb          |  21 ++++++++++++++++++++-
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.vs/Gästeliste/v14/.suo b/.vs/Gästeliste/v14/.suo
index e06a99c063fee68c8c07109b80e1eb50509aa585..ee261793a2e5caa3855efdb72c4ebde16e7d4516 100644
GIT binary patch
delta 780
zcmb8rQAkr!7y#g%v%BqXVA`D1#j<6!Y)z-OYOSsAG-Qb21_codvK1t>98(D+=_ZJS
zR_xy2hoZ>1ND{H-b|Ug=qeS*nQPFD{^wdN7(1ZA3{TC~UeCdae^K<U`?|;rOey3uE
zW&>n%A?TsT<Y@lW`)hBBjg9DU5SerDG;1`PI#h!!$cn0w0o9`)7!ctckaT)=`*CAU
z>fgKd044{K4+W5V>UV^ts0SQ62XRT!l1wieleVR_+O!>;PLnz}o^SnCQ;Ta0@<`Dg
z#3V&);S6t)l3tiIa=SSE(1vt~M@F=UT{>{xhrH+z*4X`+97aK;-r@+ZN0ESJqd;5`
z+P#fLr0BF_qKbveTZY;2rYXXB(+W|{RB7b?>}E*OzQD1Crhq}Q(xPjH(u9$%y7kq{
zS(DPk$q|7hSZMsI&Z_=?J(f!+Fi}T&>>aev--B-x9WZ!V$3CVrlzq9<Me0w-<Nnyl
z(D~F*?A%~t;L<=mrq;stM1Vi}#-!#Ncs1&S^3`U@Pd3P7BA7!KXz4LQ<1+=sCk8MS
z0_rUA;L>9!wC2np79x<%C5z6A7Ak!{^}1~3I9~;w*Zs_YYf%d?f=$qS#|{FNK^)^D
zJY@y@-OqA1Rr577d1|(o+hgmj@~r0i!%$9H+3oumh$85f847ZDjK#WV48?I9ftSw{
z<gd3u+x#MPOnjhLb?oc0T<XK58T~Vd*V=~C|IUDkH$_@}nAU=r^|A6Jfm5<n$x|Q?
RHhffZu8V9uASMLL<R>+g1$zJh

delta 1504
zcmajee@q)y902fpk5bCfl>((J4n{?Sj16HM8!fimA%&5Gj6#7~>LNcQNn5u5&;*RV
zL|D))neA5?C<+|Lm>Avc{b7tTyPz>fvoT`gAKTPTr_m`B-PjMa48OM(LpF`qeD1yX
z{r0{0?e!i1Ipwd?mn|gyeQOETa5WQOo(?aNEQVqDT`)ig$W2(LVR9Bi2_NKVU^o+{
zAst%5OOLG<C86~Q8Wl!$E_URke8F=HL-ND%z>bKceA7-Glp_<Wh$kM!)`F~PcRW@b
zaXbXZL?d}3;>casj!_rdhi*qYAWA*Syzlifx!x^eNI69^3o*3`$=kBn7NFFKBZCyl
zD?O#sC3-NTz|{<!<6le0R)rGLZMoXx`9@-v=j_6pio>wHS~Qu<k=rI5HzOx%L9M6_
z<wP9Kkgd>04sZfX1s#oPR8;!{W`@u(I)uQ$)@tQl)`A1<h~k8ty~TRMa^@TkzCquj
z@6dU40ez2tKo`-E=qL0m`WgL#E+KjTZ`dxP%jkEsg#JK(qATbsT1MB<b+o1$2&ZHT
z=~PhDXogWV=A9=|b&%W;L+TYmCLyE=lh<Gw@2^5AHB2VN<qh)+@l(Bp2u4-ReS^|P
zjri9VWvVvzF`Yhaa<y(B@}K?aonvjHR#+lJJ{2q)!9}BXE@e@}F!G5~GG9TReJZh|
zvp*Ds_ZmydsWs!v_RVQ0iLIg(KZEA#ZIx!Td8gpk3Kmvuw_m5^p2-PH#s+r#ym+O7
z5`7V_zk10>Z4TMw<?TWffra6g_^!Cix|CkOw^FX*k!Lzxpgp<)PEMC?TpO&aaJK|{
z`~kPE-`nTw>vG$~m1;uaLbFA+`aL+dw?;3Yrn}eDiR^gKc2A+}GgqhJe#Z7{U+~$G
zzxT=R)t&YKn*OJ-wHtC`QsYemx9awb`<wR?J=4LsnR=$5>B61|`;~GHP(5f(+BYx1
z7!15PXa=sO&`^eNVK;I!d+=NZm>|=GGx`|dk4WS=kfz;2EroQe4vK47*ywX=3u?^D
zchmQ{#x8xh@H}UAgVdylaetx6c{maq$|7P`-8n_teNSFgzVw#Dz&uvm?7aJDZa0;8
zb#66v7vCvp*jWe*kLy(N0vV`unB)p!#$gcoBRmy+be8uLVUR?llF0jbGRwU}V9uKd
z>OeMdgAz#nDyWU>A^YH)pe|zJ3;(tM$X^60zzG8cJO{Ud(enVPA^5+)QXKa`O=6Qg
z0UjhM4HQ7{XdaAAn?z}pBf<cUMMn}~E}#SVXucd%2$OVH5=eBW3O;GI0@v0^SctTh
zh@8ORiIyHJg2lRw*ing)7(VS8c-xx}!Pa_F8s|vb*hJAA=F>S<g7b{=YsINEEL1j>
h-1ln1gDtr*)!>AzVK2DqKV!|NvW}h|TRV!&{s#Y+|9Joa

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 @@
     <PublisherName>Dominic Reich</PublisherName>
     <MinimumRequiredVersion>1.0.0.0</MinimumRequiredVersion>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>12</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationRevision>18</ApplicationRevision>
+    <ApplicationVersion>1.0.1.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
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