diff --git a/.vs/Gästeliste/v14/.suo b/.vs/Gästeliste/v14/.suo index 9c9906a..e06a99c 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 0aa6517..6e3e8ce 100644 --- a/Gästeliste/Gästeliste.vbproj +++ b/Gästeliste/Gästeliste.vbproj @@ -32,7 +32,7 @@ Dominic Reich 1.0.0.0 false - 8 + 12 1.0.0.%2a true true diff --git a/Gästeliste/frmAbout.Designer.vb b/Gästeliste/frmAbout.Designer.vb index 739eb6c..4babc3e 100644 --- a/Gästeliste/frmAbout.Designer.vb +++ b/Gästeliste/frmAbout.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmAbout Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -29,7 +29,7 @@ Partial Class frmAbout 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAbout)) Me.TableLayoutPanel = New System.Windows.Forms.TableLayoutPanel() @@ -42,7 +42,6 @@ Partial Class frmAbout Me.OKButton = New System.Windows.Forms.Button() Me.FlowLayoutPanel1 = New System.Windows.Forms.FlowLayoutPanel() Me.lnkWebsite = New System.Windows.Forms.LinkLabel() - Me.lblInfoBetaSoftware = New System.Windows.Forms.Label() Me.TableLayoutPanel.SuspendLayout() CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).BeginInit() Me.FlowLayoutPanel1.SuspendLayout() @@ -162,7 +161,6 @@ Partial Class frmAbout 'FlowLayoutPanel1 ' Me.FlowLayoutPanel1.Controls.Add(Me.lnkWebsite) - Me.FlowLayoutPanel1.Controls.Add(Me.lblInfoBetaSoftware) Me.FlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill Me.FlowLayoutPanel1.Location = New System.Drawing.Point(133, 206) Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1" @@ -180,17 +178,6 @@ Partial Class frmAbout Me.lnkWebsite.TabStop = True Me.lnkWebsite.Text = "Zur Webseite" ' - 'lblInfoBetaSoftware - ' - Me.lblInfoBetaSoftware.AutoSize = True - Me.lblInfoBetaSoftware.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblInfoBetaSoftware.ForeColor = System.Drawing.SystemColors.MenuHighlight - Me.lblInfoBetaSoftware.Location = New System.Drawing.Point(80, 0) - Me.lblInfoBetaSoftware.Name = "lblInfoBetaSoftware" - Me.lblInfoBetaSoftware.Size = New System.Drawing.Size(164, 13) - Me.lblInfoBetaSoftware.TabIndex = 3 - Me.lblInfoBetaSoftware.Text = "Das ist eine BETA Version!!" - ' 'frmAbout ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -217,5 +204,4 @@ Partial Class frmAbout Friend WithEvents FlowLayoutPanel1 As FlowLayoutPanel Friend WithEvents lnkWebsite As LinkLabel - Friend WithEvents lblInfoBetaSoftware As Label End Class diff --git a/Gästeliste/frmAbout.vb b/Gästeliste/frmAbout.vb index 5cce680..56d3f24 100644 --- a/Gästeliste/frmAbout.vb +++ b/Gästeliste/frmAbout.vb @@ -27,15 +27,7 @@ Process.Start("http://tmsn.at/?tools&gaesteliste") End Sub - Private Sub lblInfoBetaSoftware_Click(sender As Object, e As EventArgs) Handles lblInfoBetaSoftware.Click - MsgBox("Diese Version des Programmes ist noch nicht für den produktiven Einsatz vorgesehen und muss noch ausreichend getestet werden!" + Chr(13) + "Wenn dieser Hinweistext verschwunden ist, kann das Programm wirklich produktiv genutzt werden!" + Chr(13) + Chr(13) + "Vielen Dank für dein Verständnis!", vbExclamation, "Dies ist eine BETA Version (Testversion)") - End Sub - - Private Sub lblInfoBetaSoftware_MouseLeave(sender As Object, e As EventArgs) Handles lblInfoBetaSoftware.MouseLeave - Me.lblInfoBetaSoftware.ForeColor = SystemColors.MenuHighlight - End Sub - - Private Sub lblInfoBetaSoftware_MouseEnter(sender As Object, e As EventArgs) Handles lblInfoBetaSoftware.MouseEnter + 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 d6a9bb3..91297ae 100644 --- a/Gästeliste/frmMain.Designer.vb +++ b/Gästeliste/frmMain.Designer.vb @@ -49,11 +49,14 @@ Partial Class frmMain Me.OnlineHilfeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripSeparator() Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.statusVersionLabel = New System.Windows.Forms.ToolStripStatusLabel() CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GästeBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GästeDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.mnuContext.SuspendLayout() Me.mnuMain.SuspendLayout() + Me.StatusStrip1.SuspendLayout() Me.SuspendLayout() ' 'DataGridView1 @@ -252,11 +255,27 @@ Partial Class frmMain Me.UpdateToolStripMenuItem.Size = New System.Drawing.Size(139, 22) Me.UpdateToolStripMenuItem.Text = "Update" ' + 'StatusStrip1 + ' + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.statusVersionLabel}) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 505) + Me.StatusStrip1.Name = "StatusStrip1" + Me.StatusStrip1.Size = New System.Drawing.Size(967, 22) + Me.StatusStrip1.TabIndex = 6 + Me.StatusStrip1.Text = "StatusStrip1" + ' + 'statusVersionLabel + ' + Me.statusVersionLabel.Name = "statusVersionLabel" + Me.statusVersionLabel.Size = New System.Drawing.Size(45, 17) + Me.statusVersionLabel.Text = "Version" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(967, 527) + Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.DataGridView1) Me.Controls.Add(Me.mnuMain) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) @@ -269,6 +288,8 @@ Partial Class frmMain Me.mnuContext.ResumeLayout(False) Me.mnuMain.ResumeLayout(False) Me.mnuMain.PerformLayout() + Me.StatusStrip1.ResumeLayout(False) + Me.StatusStrip1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -299,4 +320,6 @@ Partial Class frmMain Friend WithEvents StammgastDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn Friend WithEvents BlockiertDataGridViewCheckBoxColumn As DataGridViewCheckBoxColumn Friend WithEvents AnmerkungDataGridViewTextBoxColumn As DataGridViewTextBoxColumn + Friend WithEvents StatusStrip1 As StatusStrip + Friend WithEvents statusVersionLabel As ToolStripStatusLabel End Class diff --git a/Gästeliste/frmMain.resx b/Gästeliste/frmMain.resx index 5dd25ae..42bbb55 100644 --- a/Gästeliste/frmMain.resx +++ b/Gästeliste/frmMain.resx @@ -129,6 +129,9 @@ 303, 17 + + 526, 17 + diff --git a/Gästeliste/frmMain.vb b/Gästeliste/frmMain.vb index 598b926..89d2c91 100644 --- a/Gästeliste/frmMain.vb +++ b/Gästeliste/frmMain.vb @@ -54,6 +54,12 @@ Public Class frmMain 'TODO: Save some colors in registry. Me.DataGridView1.RowsDefaultCellStyle.BackColor = Color.Azure Me.DataGridView1.AlternatingRowsDefaultCellStyle.BackColor = Color.Beige + + If ApplicationDeployment.IsNetworkDeployed Then + statusVersionLabel.Text = "Version " & ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString & " (" & ApplicationDeployment.CurrentDeployment.UpdatedVersion.ToString & ")" + Else + statusVersionLabel.Text = "Lokale Version: " & My.Application.Info.Version.ToString + End If End Sub Private Sub InfoToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles InfoToolStripMenuItem.Click