Add version number display and logging, configurable via AssembyFileVersion in AssemblyInfo.cs

BulkPrinting/BulkPrinting/Program.cs

@@ -26,7 +26,7 @@ namespace BulkPrinting
                     restrictedToMinimumLevel: Serilog.Events.LogEventLevel.Information)
                 .CreateLogger();
 
-            Log.Information("Starting");
+            Log.Information("Version {0} starting", Application.ProductVersion);
 
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
 
@@ -36,7 +36,7 @@ namespace BulkPrinting
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new UserLoginForm());
 
-            Log.Information("Exiting");
+            Log.Information("Version {0} exiting", Application.ProductVersion);
         }
 
         private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)

BulkPrinting/BulkPrinting/Properties/AssemblyInfo.cs

@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("BulkPrinting")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("R-Group")]
 [assembly: AssemblyProduct("BulkPrinting")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyFileVersion("1.1")]

BulkPrinting/BulkPrinting/UserLoginForm.Designer.cs

@@ -43,29 +43,34 @@
             this.chkOffline = new System.Windows.Forms.CheckBox();
             this.chkRemember = new System.Windows.Forms.CheckBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.lblVersion = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
             // 
             // txtUsername
             // 
-            this.txtUsername.Location = new System.Drawing.Point(80, 86);
+            this.txtUsername.Location = new System.Drawing.Point(107, 106);
+            this.txtUsername.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtUsername.Name = "txtUsername";
-            this.txtUsername.Size = new System.Drawing.Size(192, 20);
+            this.txtUsername.Size = new System.Drawing.Size(255, 22);
             this.txtUsername.TabIndex = 0;
             // 
             // txtUserID
             // 
-            this.txtUserID.Location = new System.Drawing.Point(80, 112);
+            this.txtUserID.Location = new System.Drawing.Point(107, 138);
+            this.txtUserID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtUserID.Name = "txtUserID";
-            this.txtUserID.Size = new System.Drawing.Size(192, 20);
+            this.txtUserID.Size = new System.Drawing.Size(255, 22);
             this.txtUserID.TabIndex = 1;
             // 
             // txtPassword
             // 
-            this.txtPassword.Location = new System.Drawing.Point(80, 138);
+            this.txtPassword.Location = new System.Drawing.Point(107, 170);
+            this.txtPassword.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtPassword.Name = "txtPassword";
             this.txtPassword.PasswordChar = '*';
-            this.txtPassword.Size = new System.Drawing.Size(192, 20);
+            this.txtPassword.Size = new System.Drawing.Size(255, 22);
             this.txtPassword.TabIndex = 2;
             // 
             // btnLogin
@@ -74,9 +79,10 @@
             this.btnLogin.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.btnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnLogin.ForeColor = System.Drawing.Color.White;
-            this.btnLogin.Location = new System.Drawing.Point(12, 220);
+            this.btnLogin.Location = new System.Drawing.Point(21, 298);
+            this.btnLogin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnLogin.Name = "btnLogin";
-            this.btnLogin.Size = new System.Drawing.Size(75, 23);
+            this.btnLogin.Size = new System.Drawing.Size(100, 28);
             this.btnLogin.TabIndex = 6;
             this.btnLogin.Text = "Login";
             this.btnLogin.UseVisualStyleBackColor = false;
@@ -86,9 +92,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.ForeColor = System.Drawing.Color.White;
-            this.label1.Location = new System.Drawing.Point(13, 86);
+            this.label1.Location = new System.Drawing.Point(17, 106);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(55, 13);
+            this.label1.Size = new System.Drawing.Size(73, 17);
             this.label1.TabIndex = 5;
             this.label1.Text = "Username";
             this.label1.Click += new System.EventHandler(this.label1_Click);
@@ -97,9 +104,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.ForeColor = System.Drawing.Color.White;
-            this.label2.Location = new System.Drawing.Point(12, 112);
+            this.label2.Location = new System.Drawing.Point(16, 138);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(43, 13);
+            this.label2.Size = new System.Drawing.Size(55, 17);
             this.label2.TabIndex = 6;
             this.label2.Text = "User ID";
             this.label2.Click += new System.EventHandler(this.label2_Click);
@@ -108,18 +116,20 @@
             // 
             this.label3.AutoSize = true;
             this.label3.ForeColor = System.Drawing.Color.White;
-            this.label3.Location = new System.Drawing.Point(12, 138);
+            this.label3.Location = new System.Drawing.Point(16, 170);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(53, 13);
+            this.label3.Size = new System.Drawing.Size(69, 17);
             this.label3.TabIndex = 7;
             this.label3.Text = "Password";
             this.label3.Click += new System.EventHandler(this.label3_Click);
             // 
             // txtVendorID
             // 
-            this.txtVendorID.Location = new System.Drawing.Point(80, 165);
+            this.txtVendorID.Location = new System.Drawing.Point(107, 203);
+            this.txtVendorID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtVendorID.Name = "txtVendorID";
-            this.txtVendorID.Size = new System.Drawing.Size(192, 20);
+            this.txtVendorID.Size = new System.Drawing.Size(255, 22);
             this.txtVendorID.TabIndex = 3;
             this.txtVendorID.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtVendorID_KeyPress);
             // 
@@ -127,9 +137,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.ForeColor = System.Drawing.Color.White;
-            this.label4.Location = new System.Drawing.Point(12, 165);
+            this.label4.Location = new System.Drawing.Point(16, 203);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(55, 13);
+            this.label4.Size = new System.Drawing.Size(71, 17);
             this.label4.TabIndex = 9;
             this.label4.Text = "Vendor ID";
             this.label4.Click += new System.EventHandler(this.label4_Click);
@@ -138,9 +149,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.ForeColor = System.Drawing.Color.White;
-            this.label5.Location = new System.Drawing.Point(12, 195);
+            this.label5.Location = new System.Drawing.Point(18, 240);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 13);
+            this.label5.Size = new System.Drawing.Size(82, 17);
             this.label5.TabIndex = 10;
             this.label5.Text = "Vendor Key";
             this.label5.Click += new System.EventHandler(this.label5_Click);
@@ -148,18 +160,20 @@
             // lblHDDSerial
             // 
             this.lblHDDSerial.AutoSize = true;
-            this.lblHDDSerial.Location = new System.Drawing.Point(81, 195);
+            this.lblHDDSerial.Location = new System.Drawing.Point(108, 240);
+            this.lblHDDSerial.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblHDDSerial.Name = "lblHDDSerial";
-            this.lblHDDSerial.Size = new System.Drawing.Size(0, 13);
+            this.lblHDDSerial.Size = new System.Drawing.Size(0, 17);
             this.lblHDDSerial.TabIndex = 11;
             // 
             // chkOffline
             // 
             this.chkOffline.AutoSize = true;
             this.chkOffline.ForeColor = System.Drawing.Color.White;
-            this.chkOffline.Location = new System.Drawing.Point(99, 224);
+            this.chkOffline.Location = new System.Drawing.Point(137, 303);
+            this.chkOffline.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkOffline.Name = "chkOffline";
-            this.chkOffline.Size = new System.Drawing.Size(56, 17);
+            this.chkOffline.Size = new System.Drawing.Size(71, 21);
             this.chkOffline.TabIndex = 5;
             this.chkOffline.Text = "Offline";
             this.chkOffline.UseVisualStyleBackColor = true;
@@ -169,9 +183,10 @@
             // 
             this.chkRemember.AutoSize = true;
             this.chkRemember.ForeColor = System.Drawing.Color.White;
-            this.chkRemember.Location = new System.Drawing.Point(162, 223);
+            this.chkRemember.Location = new System.Drawing.Point(216, 303);
+            this.chkRemember.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.chkRemember.Name = "chkRemember";
-            this.chkRemember.Size = new System.Drawing.Size(95, 17);
+            this.chkRemember.Size = new System.Drawing.Size(122, 21);
             this.chkRemember.TabIndex = 4;
             this.chkRemember.Text = "Remember Me";
             this.chkRemember.UseVisualStyleBackColor = true;
@@ -180,20 +195,43 @@
             // pictureBox1
             // 
             this.pictureBox1.Image = global::BulkPrinting.Properties.Resources.rgroup_bulk_print_app_260x70;
-            this.pictureBox1.Location = new System.Drawing.Point(12, 6);
+            this.pictureBox1.Location = new System.Drawing.Point(16, 7);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(260, 71);
+            this.pictureBox1.Size = new System.Drawing.Size(347, 87);
             this.pictureBox1.TabIndex = 12;
             this.pictureBox1.TabStop = false;
             this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
             // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.ForeColor = System.Drawing.Color.White;
+            this.label6.Location = new System.Drawing.Point(18, 267);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(56, 17);
+            this.label6.TabIndex = 13;
+            this.label6.Text = "Version";
+            // 
+            // lblVersion
+            // 
+            this.lblVersion.AutoSize = true;
+            this.lblVersion.Location = new System.Drawing.Point(108, 267);
+            this.lblVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblVersion.Name = "lblVersion";
+            this.lblVersion.Size = new System.Drawing.Size(0, 17);
+            this.lblVersion.TabIndex = 14;
+            // 
             // UserLoginForm
             // 
             this.AcceptButton = this.btnLogin;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(63)))), ((int)(((byte)(145)))));
-            this.ClientSize = new System.Drawing.Size(284, 253);
+            this.ClientSize = new System.Drawing.Size(376, 333);
+            this.Controls.Add(this.lblVersion);
+            this.Controls.Add(this.label6);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.chkRemember);
             this.Controls.Add(this.chkOffline);
@@ -211,10 +249,9 @@
             this.ForeColor = System.Drawing.Color.White;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(300, 292);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(300, 292);
             this.Name = "UserLoginForm";
             this.Text = "R-Group Bulk Printing";
             this.Load += new System.EventHandler(this.UserLoginForm_Load);
@@ -242,5 +279,7 @@
         private System.Windows.Forms.CheckBox chkOffline;
         private System.Windows.Forms.CheckBox chkRemember;
         private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label lblVersion;
     }
 }

BulkPrinting/BulkPrinting/UserLoginForm.cs

@@ -159,18 +159,19 @@ namespace BulkPrinting
 
         private void UserLoginForm_Load(object sender, EventArgs e)
         {
-            this.lblHDDSerial.Text = Globals.HDDSerialNumber;
-            this.txtUsername.Text = Utility.LoadSetting("Username");
-            this.txtUserID.Text = Utility.LoadSetting("UserID");
-            if (this.txtUsername.Text != "") {
+            lblVersion.Text = Application.ProductVersion; // Configurable via AssemblyFileVersion in AssemblyInfo.cs
+            lblHDDSerial.Text = Globals.HDDSerialNumber;
+            txtUsername.Text = Utility.LoadSetting("Username");
+            txtUserID.Text = Utility.LoadSetting("UserID");
+            if (txtUsername.Text != "") {
                 chkRemember.Checked = true;
             }
-            this.txtVendorID.Text = Utility.LoadSetting("VendorID");
-            if (this.txtVendorID.Text != "")
+            txtVendorID.Text = Utility.LoadSetting("VendorID");
+            if (txtVendorID.Text != "")
             {
                 txtVendorID.Enabled = false;
             }
-            this.CenterToScreen();
+            CenterToScreen();
         }
 
         private void txtVendorID_KeyPress(object sender, KeyPressEventArgs e)

BulkPrinting/BulkPrinting/UserLoginForm.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</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>