removes BETA notice in frmAbout, done lots of publishing recently for testing OneClick Deployment...

This commit is contained in:
Dominic Reich 2016-03-16 23:12:02 +01:00
parent d0cb9509f6
commit 19b7415a96
7 changed files with 37 additions and 27 deletions

Binary file not shown.

View file

@ -32,7 +32,7 @@
<PublisherName>Dominic Reich</PublisherName>
<MinimumRequiredVersion>1.0.0.0</MinimumRequiredVersion>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>8</ApplicationRevision>
<ApplicationRevision>12</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

View file

@ -1,9 +1,9 @@
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
Partial Class frmAbout
Inherits System.Windows.Forms.Form
'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
<System.Diagnostics.DebuggerNonUserCode()> _
<System.Diagnostics.DebuggerNonUserCode()>
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.
<System.Diagnostics.DebuggerStepThrough()> _
<System.Diagnostics.DebuggerStepThrough()>
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

View file

@ -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

View file

@ -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

View file

@ -129,6 +129,9 @@
<metadata name="mnuMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>303, 17</value>
</metadata>
<metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>526, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

View file

@ -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