Ensure that only one logging or download thread runs at a time.

Increase the number of vouchers per page.
Add HTTP compression support.
Use SecureString for password.

BulkPrinting/BulkPrinting/BatchForm.Designer.cs

@@ -61,6 +61,7 @@
             // 
             // contextMenuStrip1
             // 
+            this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.contextMenuStrip1.Name = "contextMenuStrip1";
             this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
             // 
@@ -79,9 +80,10 @@
             this.pnlSplitGrids.Controls.Add(this.btnReExport);
             this.pnlSplitGrids.Controls.Add(this.btnOrder);
             this.pnlSplitGrids.Dock = System.Windows.Forms.DockStyle.Top;
-            this.pnlSplitGrids.Location = new System.Drawing.Point(0, 10);
+            this.pnlSplitGrids.Location = new System.Drawing.Point(0, 12);
+            this.pnlSplitGrids.Margin = new System.Windows.Forms.Padding(4);
             this.pnlSplitGrids.Name = "pnlSplitGrids";
-            this.pnlSplitGrids.Size = new System.Drawing.Size(1287, 103);
+            this.pnlSplitGrids.Size = new System.Drawing.Size(1716, 127);
             this.pnlSplitGrids.TabIndex = 3;
             this.pnlSplitGrids.Paint += new System.Windows.Forms.PaintEventHandler(this.pnlSplitGrids_Paint);
             // 
@@ -89,56 +91,64 @@
             // 
             this.btnOrderReport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
             this.btnOrderReport.BackgroundImage = global::BulkPrinting.Properties.Resources.Asset201clear;
+            this.btnOrderReport.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnOrderReport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOrderReport.Location = new System.Drawing.Point(118, 0);
+            this.btnOrderReport.Location = new System.Drawing.Point(157, 0);
+            this.btnOrderReport.Margin = new System.Windows.Forms.Padding(4);
             this.btnOrderReport.Name = "btnOrderReport";
-            this.btnOrderReport.Size = new System.Drawing.Size(100, 100);
+            this.btnOrderReport.Size = new System.Drawing.Size(133, 123);
             this.btnOrderReport.TabIndex = 5;
             this.btnOrderReport.UseVisualStyleBackColor = true;
             this.btnOrderReport.Click += new System.EventHandler(this.btnOrderReport_Click);
-            this.btnOrderReport.Paint += new System.Windows.Forms.PaintEventHandler(this.btnOrderReport_Paint);
+            this.btnOrderReport.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // btnViewPINs
             // 
             this.btnViewPINs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnViewPINs.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
             this.btnViewPINs.BackgroundImage = global::BulkPrinting.Properties.Resources.Asset601clear;
+            this.btnViewPINs.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnViewPINs.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnViewPINs.Location = new System.Drawing.Point(696, 0);
+            this.btnViewPINs.Location = new System.Drawing.Point(928, 0);
+            this.btnViewPINs.Margin = new System.Windows.Forms.Padding(4);
             this.btnViewPINs.Name = "btnViewPINs";
-            this.btnViewPINs.Size = new System.Drawing.Size(100, 100);
+            this.btnViewPINs.Size = new System.Drawing.Size(133, 123);
             this.btnViewPINs.TabIndex = 4;
             this.btnViewPINs.UseVisualStyleBackColor = false;
             this.btnViewPINs.Click += new System.EventHandler(this.btnViewPINs_Click);
-            this.btnViewPINs.Paint += new System.Windows.Forms.PaintEventHandler(this.btnViewPINs_Paint);
+            this.btnViewPINs.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // btnExport
             // 
             this.btnExport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
             this.btnExport.BackgroundImage = global::BulkPrinting.Properties.Resources.Asset501clear;
+            this.btnExport.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnExport.Location = new System.Drawing.Point(436, 0);
+            this.btnExport.Location = new System.Drawing.Point(581, 0);
+            this.btnExport.Margin = new System.Windows.Forms.Padding(4);
             this.btnExport.Name = "btnExport";
-            this.btnExport.Size = new System.Drawing.Size(100, 100);
+            this.btnExport.Size = new System.Drawing.Size(133, 123);
             this.btnExport.TabIndex = 4;
             this.btnExport.UseVisualStyleBackColor = false;
             this.btnExport.Click += new System.EventHandler(this.btnExport_Click);
-            this.btnExport.Paint += new System.Windows.Forms.PaintEventHandler(this.btnExport_Paint);
+            this.btnExport.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // btnReprint
             // 
             this.btnReprint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnReprint.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(100)))), ((int)(((byte)(176)))));
             this.btnReprint.BackgroundImage = global::BulkPrinting.Properties.Resources.Asset801clear;
+            this.btnReprint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnReprint.Enabled = false;
             this.btnReprint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnReprint.Location = new System.Drawing.Point(908, 0);
+            this.btnReprint.Location = new System.Drawing.Point(1211, 0);
+            this.btnReprint.Margin = new System.Windows.Forms.Padding(4);
             this.btnReprint.Name = "btnReprint";
-            this.btnReprint.Size = new System.Drawing.Size(100, 100);
+            this.btnReprint.Size = new System.Drawing.Size(133, 123);
             this.btnReprint.TabIndex = 4;
             this.btnReprint.UseVisualStyleBackColor = false;
             this.btnReprint.Click += new System.EventHandler(this.btnReprint_Click);
-            this.btnReprint.Paint += new System.Windows.Forms.PaintEventHandler(this.btnReprint_Paint);
+            this.btnReprint.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // grpFilter
             // 
@@ -153,10 +163,12 @@
             this.grpFilter.Controls.Add(this.dtpFilterStartDate);
             this.grpFilter.Dock = System.Windows.Forms.DockStyle.Right;
             this.grpFilter.ForeColor = System.Drawing.Color.White;
-            this.grpFilter.Location = new System.Drawing.Point(1014, 0);
-            this.grpFilter.MaximumSize = new System.Drawing.Size(273, 100);
+            this.grpFilter.Location = new System.Drawing.Point(1352, 0);
+            this.grpFilter.Margin = new System.Windows.Forms.Padding(4);
+            this.grpFilter.MaximumSize = new System.Drawing.Size(364, 123);
             this.grpFilter.Name = "grpFilter";
-            this.grpFilter.Size = new System.Drawing.Size(273, 100);
+            this.grpFilter.Padding = new System.Windows.Forms.Padding(4);
+            this.grpFilter.Size = new System.Drawing.Size(364, 123);
             this.grpFilter.TabIndex = 3;
             this.grpFilter.TabStop = false;
             this.grpFilter.Text = "Filter";
@@ -164,9 +176,10 @@
             // rdoFilterExported
             // 
             this.rdoFilterExported.AutoSize = true;
-            this.rdoFilterExported.Location = new System.Drawing.Point(132, 69);
+            this.rdoFilterExported.Location = new System.Drawing.Point(176, 85);
+            this.rdoFilterExported.Margin = new System.Windows.Forms.Padding(4);
             this.rdoFilterExported.Name = "rdoFilterExported";
-            this.rdoFilterExported.Size = new System.Drawing.Size(115, 17);
+            this.rdoFilterExported.Size = new System.Drawing.Size(149, 21);
             this.rdoFilterExported.TabIndex = 3;
             this.rdoFilterExported.Text = "Exported Vouchers";
             this.rdoFilterExported.UseVisualStyleBackColor = true;
@@ -175,9 +188,10 @@
             // rdoFilterReprinted
             // 
             this.rdoFilterReprinted.AutoSize = true;
-            this.rdoFilterReprinted.Location = new System.Drawing.Point(132, 46);
+            this.rdoFilterReprinted.Location = new System.Drawing.Point(176, 57);
+            this.rdoFilterReprinted.Margin = new System.Windows.Forms.Padding(4);
             this.rdoFilterReprinted.Name = "rdoFilterReprinted";
-            this.rdoFilterReprinted.Size = new System.Drawing.Size(119, 17);
+            this.rdoFilterReprinted.Size = new System.Drawing.Size(155, 21);
             this.rdoFilterReprinted.TabIndex = 3;
             this.rdoFilterReprinted.Text = "Reprinted Vouchers";
             this.rdoFilterReprinted.UseVisualStyleBackColor = true;
@@ -187,9 +201,10 @@
             // 
             this.rdoFilterUnprinted.AutoSize = true;
             this.rdoFilterUnprinted.Checked = true;
-            this.rdoFilterUnprinted.Location = new System.Drawing.Point(6, 69);
+            this.rdoFilterUnprinted.Location = new System.Drawing.Point(8, 85);
+            this.rdoFilterUnprinted.Margin = new System.Windows.Forms.Padding(4);
             this.rdoFilterUnprinted.Name = "rdoFilterUnprinted";
-            this.rdoFilterUnprinted.Size = new System.Drawing.Size(119, 17);
+            this.rdoFilterUnprinted.Size = new System.Drawing.Size(155, 21);
             this.rdoFilterUnprinted.TabIndex = 3;
             this.rdoFilterUnprinted.TabStop = true;
             this.rdoFilterUnprinted.Text = "Unprinted Vouchers";
@@ -199,9 +214,10 @@
             // rdoFilterPrinted
             // 
             this.rdoFilterPrinted.AutoSize = true;
-            this.rdoFilterPrinted.Location = new System.Drawing.Point(6, 46);
+            this.rdoFilterPrinted.Location = new System.Drawing.Point(8, 57);
+            this.rdoFilterPrinted.Margin = new System.Windows.Forms.Padding(4);
             this.rdoFilterPrinted.Name = "rdoFilterPrinted";
-            this.rdoFilterPrinted.Size = new System.Drawing.Size(106, 17);
+            this.rdoFilterPrinted.Size = new System.Drawing.Size(138, 21);
             this.rdoFilterPrinted.TabIndex = 3;
             this.rdoFilterPrinted.Text = "Printed Vouchers";
             this.rdoFilterPrinted.UseVisualStyleBackColor = true;
@@ -210,36 +226,40 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(137, 19);
+            this.label2.Location = new System.Drawing.Point(183, 23);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(23, 13);
+            this.label2.Size = new System.Drawing.Size(29, 17);
             this.label2.TabIndex = 2;
             this.label2.Text = "To:";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(6, 19);
+            this.label1.Location = new System.Drawing.Point(8, 23);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(33, 13);
+            this.label1.Size = new System.Drawing.Size(44, 17);
             this.label1.TabIndex = 2;
             this.label1.Text = "From:";
             // 
             // dtpFilterEndDate
             // 
             this.dtpFilterEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpFilterEndDate.Location = new System.Drawing.Point(160, 16);
+            this.dtpFilterEndDate.Location = new System.Drawing.Point(213, 20);
+            this.dtpFilterEndDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtpFilterEndDate.Name = "dtpFilterEndDate";
-            this.dtpFilterEndDate.Size = new System.Drawing.Size(96, 20);
+            this.dtpFilterEndDate.Size = new System.Drawing.Size(127, 22);
             this.dtpFilterEndDate.TabIndex = 0;
             this.dtpFilterEndDate.CloseUp += new System.EventHandler(this.dtpFilterEndDate_CloseUp);
             // 
             // dtpFilterStartDate
             // 
             this.dtpFilterStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpFilterStartDate.Location = new System.Drawing.Point(40, 16);
+            this.dtpFilterStartDate.Location = new System.Drawing.Point(53, 20);
+            this.dtpFilterStartDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtpFilterStartDate.Name = "dtpFilterStartDate";
-            this.dtpFilterStartDate.Size = new System.Drawing.Size(96, 20);
+            this.dtpFilterStartDate.Size = new System.Drawing.Size(127, 22);
             this.dtpFilterStartDate.TabIndex = 0;
             this.dtpFilterStartDate.CloseUp += new System.EventHandler(this.dtpFilterStartDate_CloseUp);
             // 
@@ -249,40 +269,45 @@
             this.btnLogout.BackgroundImage = global::BulkPrinting.Properties.Resources.Asset101clear;
             this.btnLogout.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnLogout.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnLogout.Location = new System.Drawing.Point(12, 0);
+            this.btnLogout.Location = new System.Drawing.Point(16, 0);
+            this.btnLogout.Margin = new System.Windows.Forms.Padding(4);
             this.btnLogout.Name = "btnLogout";
-            this.btnLogout.Size = new System.Drawing.Size(100, 100);
+            this.btnLogout.Size = new System.Drawing.Size(133, 123);
             this.btnLogout.TabIndex = 1;
             this.btnLogout.UseVisualStyleBackColor = false;
             this.btnLogout.Click += new System.EventHandler(this.btnLogout_Click);
-            this.btnLogout.Paint += new System.Windows.Forms.PaintEventHandler(this.btnLogout_Paint);
+            this.btnLogout.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // btnPrint
             // 
             this.btnPrint.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
             this.btnPrint.BackgroundImage = global::BulkPrinting.Properties.Resources.Asset401clear;
+            this.btnPrint.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnPrint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnPrint.Location = new System.Drawing.Point(330, 0);
+            this.btnPrint.Location = new System.Drawing.Point(440, 0);
+            this.btnPrint.Margin = new System.Windows.Forms.Padding(4);
             this.btnPrint.Name = "btnPrint";
-            this.btnPrint.Size = new System.Drawing.Size(100, 100);
+            this.btnPrint.Size = new System.Drawing.Size(133, 123);
             this.btnPrint.TabIndex = 0;
             this.btnPrint.UseVisualStyleBackColor = false;
             this.btnPrint.Click += new System.EventHandler(this.btnPrint_Click);
-            this.btnPrint.Paint += new System.Windows.Forms.PaintEventHandler(this.btnPrint_Paint);
+            this.btnPrint.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // btnReExport
             // 
             this.btnReExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnReExport.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(100)))), ((int)(((byte)(176)))));
             this.btnReExport.BackgroundImage = global::BulkPrinting.Properties.Resources.Asset701clear;
+            this.btnReExport.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnReExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnReExport.Location = new System.Drawing.Point(802, 0);
+            this.btnReExport.Location = new System.Drawing.Point(1069, 0);
+            this.btnReExport.Margin = new System.Windows.Forms.Padding(4);
             this.btnReExport.Name = "btnReExport";
-            this.btnReExport.Size = new System.Drawing.Size(100, 100);
+            this.btnReExport.Size = new System.Drawing.Size(133, 123);
             this.btnReExport.TabIndex = 0;
             this.btnReExport.UseVisualStyleBackColor = false;
             this.btnReExport.Click += new System.EventHandler(this.btnReExport_Click);
-            this.btnReExport.Paint += new System.Windows.Forms.PaintEventHandler(this.btnReExport_Paint);
+            this.btnReExport.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // btnOrder
             // 
@@ -291,13 +316,14 @@
             this.btnOrder.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnOrder.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.btnOrder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnOrder.Location = new System.Drawing.Point(224, 0);
+            this.btnOrder.Location = new System.Drawing.Point(299, 0);
+            this.btnOrder.Margin = new System.Windows.Forms.Padding(4);
             this.btnOrder.Name = "btnOrder";
-            this.btnOrder.Size = new System.Drawing.Size(100, 100);
+            this.btnOrder.Size = new System.Drawing.Size(133, 123);
             this.btnOrder.TabIndex = 0;
             this.btnOrder.UseVisualStyleBackColor = false;
             this.btnOrder.Click += new System.EventHandler(this.btnOrder_Click);
-            this.btnOrder.Paint += new System.Windows.Forms.PaintEventHandler(this.btnOrder_Paint);
+            this.btnOrder.Paint += new System.Windows.Forms.PaintEventHandler(this.btn_Paint);
             // 
             // dgvBatches
             // 
@@ -312,11 +338,12 @@
             this.dgvBatches.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(157)))), ((int)(((byte)(233)))));
             this.dgvBatches.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvBatches.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
-            this.dgvBatches.Location = new System.Drawing.Point(12, 119);
+            this.dgvBatches.Location = new System.Drawing.Point(16, 146);
+            this.dgvBatches.Margin = new System.Windows.Forms.Padding(4);
             this.dgvBatches.MultiSelect = false;
             this.dgvBatches.Name = "dgvBatches";
             this.dgvBatches.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvBatches.Size = new System.Drawing.Size(1263, 544);
+            this.dgvBatches.Size = new System.Drawing.Size(1684, 670);
             this.dgvBatches.TabIndex = 4;
             this.dgvBatches.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvBatches_CellContentClick);
             // 
@@ -331,9 +358,10 @@
             this.lblLoading.AutoSize = true;
             this.lblLoading.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(107)))), ((int)(((byte)(157)))), ((int)(((byte)(233)))));
             this.lblLoading.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblLoading.Location = new System.Drawing.Point(516, 377);
+            this.lblLoading.Location = new System.Drawing.Point(688, 464);
+            this.lblLoading.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblLoading.Name = "lblLoading";
-            this.lblLoading.Size = new System.Drawing.Size(245, 55);
+            this.lblLoading.Size = new System.Drawing.Size(302, 69);
             this.lblLoading.TabIndex = 6;
             this.lblLoading.Text = "Loading...";
             // 
@@ -344,17 +372,18 @@
             // 
             // BatchForm
             // 
-            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(1287, 675);
+            this.ClientSize = new System.Drawing.Size(1716, 831);
             this.Controls.Add(this.lblLoading);
             this.Controls.Add(this.dgvBatches);
             this.Controls.Add(this.pnlSplitGrids);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MinimumSize = new System.Drawing.Size(1149, 714);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.MinimumSize = new System.Drawing.Size(1526, 868);
             this.Name = "BatchForm";
-            this.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0);
+            this.Padding = new System.Windows.Forms.Padding(0, 12, 0, 0);
             this.Text = "Bulk Printing";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BatchForm_FormClosing);
             this.Load += new System.EventHandler(this.BatchForm_Load);

BulkPrinting/BulkPrinting/BatchForm.cs

@@ -19,7 +19,9 @@ namespace BulkPrinting
 {
     public partial class BatchForm : ObservedForm
     {
+        EventWaitHandle LoadingThreadEvent;
         Thread LoadingThread;
+
         public BatchForm()
         {
             InitializeComponent();
@@ -247,6 +249,7 @@ namespace BulkPrinting
             dtpFilterStartDate.Value = DateTime.Now.AddMonths(-3);
             Globals.OpenBatches = new List<int>();
 
+            LoadingThreadEvent = new EventWaitHandle(true, EventResetMode.AutoReset);
             LoadingThread = new Thread(() =>
             {
                 Invoke(new Action(() =>
@@ -255,14 +258,18 @@ namespace BulkPrinting
                     PopulateGrid();
                     this.Enabled = true;
                 }));
-                if (Globals.SessionMode == SessionModes.Online)
+
+                while (LoadingThreadEvent.WaitOne())
                 {
-                    Utility.SyncAllBatches();
+                    if (Globals.SessionMode == SessionModes.Online)
+                    {
+                        Utility.SyncAllBatches();
+                        Invoke(new Action(() =>
+                        {
+                            PopulateGrid();
+                        }));
+                    }
                 }
-                Invoke(new Action(() =>
-                {
-                    PopulateGrid();
-                }));
             });
             LoadingThread.Start();
             Utility.InitialiseUserLimits();
@@ -349,7 +356,7 @@ namespace BulkPrinting
                 return;
             }
 
-            if (LoadingThread.IsAlive)
+            if ((LoadingThread != null) && (LoadingThread.IsAlive))
             {
                 LoadingThread.Abort();
             }
@@ -525,77 +532,7 @@ namespace BulkPrinting
             ViewPINs.Show();
         }
 
-        private void btnLogout_Paint(object sender, PaintEventArgs e)
-        {
-            Button b = sender as Button;
-            if (!b.Enabled)
-            {
-                e.Graphics.Clear(Color.Gray);
-                e.Graphics.DrawImage(b.BackgroundImage, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle.Width, e.ClipRectangle.Height);
-            }
-        }
-
-        private void btnOrderReport_Paint(object sender, PaintEventArgs e)
-        {
-            Button b = sender as Button;
-            if (!b.Enabled)
-            {
-                e.Graphics.Clear(Color.Gray);
-                e.Graphics.DrawImage(b.BackgroundImage, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle.Width, e.ClipRectangle.Height);
-            }
-        }
-
-        private void btnOrder_Paint(object sender, PaintEventArgs e)
-        {
-            Button b = sender as Button;
-            if (!b.Enabled)
-            {
-                e.Graphics.Clear(Color.Gray);
-                e.Graphics.DrawImage(b.BackgroundImage, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle.Width, e.ClipRectangle.Height);
-            }
-        }
-
-        private void btnPrint_Paint(object sender, PaintEventArgs e)
-        {
-            Button b = sender as Button;
-            if (!b.Enabled)
-            {
-                e.Graphics.Clear(Color.Gray);
-                e.Graphics.DrawImage(b.BackgroundImage, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle.Width, e.ClipRectangle.Height);
-            }
-        }
-
-        private void btnExport_Paint(object sender, PaintEventArgs e)
-        {
-            Button b = sender as Button;
-            if (!b.Enabled)
-            {
-                e.Graphics.Clear(Color.Gray);
-                e.Graphics.DrawImage(b.BackgroundImage, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle.Width, e.ClipRectangle.Height);
-            }
-        }
-
-        private void btnViewPINs_Paint(object sender, PaintEventArgs e)
-        {
-            Button b = sender as Button;
-            if (!b.Enabled)
-            {
-                e.Graphics.Clear(Color.Gray);
-                e.Graphics.DrawImage(b.BackgroundImage, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle.Width, e.ClipRectangle.Height);
-            }
-        }
-
-        private void btnReExport_Paint(object sender, PaintEventArgs e)
-        {
-            Button b = sender as Button;
-            if (!b.Enabled)
-            {
-                e.Graphics.Clear(Color.Gray);
-                e.Graphics.DrawImage(b.BackgroundImage, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle.Width, e.ClipRectangle.Height);
-            }
-        }
-
-        private void btnReprint_Paint(object sender, PaintEventArgs e)
+        private void btn_Paint(object sender, PaintEventArgs e)
         {
             Button b = sender as Button;
             if (!b.Enabled)
@@ -607,18 +544,7 @@ namespace BulkPrinting
 
         private void ReSyncTimer_Tick(object sender, EventArgs e)
         {
-            LoadingThread = new Thread(() =>
-            {
-                if (Globals.SessionMode == SessionModes.Online)
-                {
-                    Utility.SyncAllBatches();
-                    Invoke(new Action(() =>
-                    {
-                        PopulateGrid();
-                    }));
-                }
-            });
-            LoadingThread.Start();
+            LoadingThreadEvent.Set();
         }
     }
 }

BulkPrinting/BulkPrinting/BatchForm.resx

@@ -127,7 +127,7 @@
     <value>398, 3</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>59</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">

BulkPrinting/BulkPrinting/Configuration.cs

@@ -9,8 +9,8 @@ namespace BulkPrinting
 {
     public static class Configuration
     {
-        public const string ServerDN = "196.31.118.146";//"localhost";
-        public const string ServerPort = "443";//"50069";
+        public const string ServerBaseURL = "https://196.31.118.146";
+        //public const string ServerBaseURL = "http://localhost:50069";
         public const string MaxDBFileName = "maxdata.dat";
         public const string MaxDataPathName = "M@X";
         //public const IDictionary<string>

BulkPrinting/BulkPrinting/Globals.cs

@@ -23,8 +23,8 @@ namespace BulkPrinting
         public static Printer MaxPrinter;
         public static List<int> OpenBatches;
         public static UserLimits UserCurrentUsage;
+        public static EventWaitHandle LogSyncThreadEvent;
         public static Thread LogSyncThread;
-        public static bool LogSyncWaiting;
-        public static bool LogSyncRunning;
+        public static bool LogSyncThreadAborted;
     }
 }

BulkPrinting/BulkPrinting/Models.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security;
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -50,7 +52,28 @@ namespace BulkPrinting
         public string Username { get; set; }
 
         [JsonProperty("password")]
-        public string Password { get; set; }
+        public string Password
+        {
+            get
+            {
+                if (SecurePassword != null)
+                {
+                    IntPtr valuePtr = IntPtr.Zero;
+                    try
+                    {
+                        valuePtr = Marshal.SecureStringToGlobalAllocUnicode(SecurePassword);
+                        return Marshal.PtrToStringUni(valuePtr);
+                    }
+                    finally
+                    {
+                        Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
+                    }
+                }
+                return null;
+            }
+        }
+
+        public SecureString SecurePassword;
     }
 
     public class OrderPlacementData

BulkPrinting/BulkPrinting/UserLoginForm.cs

@@ -1,18 +1,11 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
+using System.Data.SQLite;
+using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.IO;
-using System.Net;
-using System.Management;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System.Data.SQLite;
 
 namespace BulkPrinting
 {
@@ -33,7 +26,12 @@ namespace BulkPrinting
             UserLoginData.SerialNumber = Globals.HDDSerialNumber;
             UserLoginData.UserId = int.Parse(this.txtUserID.Text);
             UserLoginData.Username = this.txtUsername.Text;
-            UserLoginData.Password = this.txtPassword.Text;
+            UserLoginData.SecurePassword = new System.Security.SecureString();
+            foreach (var c in txtPassword.Text)
+            {
+                UserLoginData.SecurePassword.AppendChar(c);
+            }
+            UserLoginData.SecurePassword.MakeReadOnly();
             if (chkOffline.Checked == true) {
                 byte[] userKey;
                 if (Globals.SessionSalt == null || Globals.SessionIterations == 0){
@@ -128,7 +126,7 @@ namespace BulkPrinting
                             Globals.DBConnection.Open();
                         }
                         Migrations.CheckMigrations();
-                        Utility.SyncLogs(); //Perform log sync before any logging happens to ensure synchronicity with server
+                        Utility.TriggerLogSync(); //Perform log sync before any logging happens to ensure synchronicity with server
                     }
                 }
             }
@@ -166,7 +164,6 @@ namespace BulkPrinting
 
         private void UserLoginForm_Load(object sender, EventArgs e)
         {
-            Globals.LogSyncWaiting = false; //Ensure LogSync starts in correct state
             this.lblHDDSerial.Text = Globals.HDDSerialNumber;
             this.txtUsername.Text = Utility.LoadSetting("Username");
             this.txtUserID.Text = Utility.LoadSetting("UserID");

BulkPrinting/BulkPrinting/Utility.cs

@@ -55,7 +55,7 @@ namespace BulkPrinting
             string PostData = JsonConvert.SerializeObject(UserLoginData);
             byte[] data = Encoding.ASCII.GetBytes(PostData);
 
-            HttpWebRequest request = WebRequest.Create("https://" + Configuration.ServerDN + ":" + Configuration.ServerPort + "/api/login") as HttpWebRequest;
+            HttpWebRequest request = WebRequest.Create(Configuration.ServerBaseURL + "/api/login") as HttpWebRequest;
             request.ServerCertificateValidationCallback = delegate { return true; };
 
             request.Method = "POST";
@@ -122,7 +122,8 @@ namespace BulkPrinting
         public static bool RESTRequest<T, R>(T POSTData, ref R Result, string RESTPath) {
             string MaxDBPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Configuration.MaxDataPathName);
 
-            HttpWebRequest request = WebRequest.Create("https://" + Configuration.ServerDN + ":" + Configuration.ServerPort + RESTPath) as HttpWebRequest;
+            HttpWebRequest request = WebRequest.Create(Configuration.ServerBaseURL + RESTPath) as HttpWebRequest;
+            request.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip;
             request.ServerCertificateValidationCallback = delegate { return true; };
             request.Headers.Add("Authorization", "Bearer " + Globals.SessionData.AccessToken);
             request.ContentType = "application/json";
@@ -337,7 +338,7 @@ namespace BulkPrinting
             string Sql;
             SQLiteCommand Command;
             Page<Voucher> VoucherBatch = new Page<Voucher>();
-            bool BatchResult = Utility.RESTRequest<Page<Voucher>>(ref VoucherBatch, String.Format("/api/batches/{0}/vouchers/?page={1}&pageSize=1000", BatchItem.Id,PageNumber));
+            bool BatchResult = Utility.RESTRequest<Page<Voucher>>(ref VoucherBatch, String.Format("/api/batches/{0}/vouchers/?page={1}&pageSize=2000", BatchItem.Id,PageNumber));
             if (PageNumber == 1) //Execute on first pass only
             {
                 Sql = "DELETE FROM Voucher WHERE BatchId=@id";
@@ -548,9 +549,14 @@ namespace BulkPrinting
                 Command.Parameters.Add(new SQLiteParameter("@value", SessionDataJson));
                 Command.ExecuteNonQuery();
                 Utility.LogEvent(VendorEvent.VendorEventType.Logout);
-                while (Globals.LogSyncRunning || Globals.LogSyncThread.IsAlive)
+                if (Globals.LogSyncThread != null)
                 {
-                    Globals.LogSyncThread.Join();
+                    Globals.LogSyncThreadAborted = true;
+                    Globals.LogSyncThreadEvent.Set();
+                    if (Globals.LogSyncThread.IsAlive)
+                    {
+                        Globals.LogSyncThread.Join();
+                    }
                 }
 
                 Globals.DBConnection.Close();
@@ -576,11 +582,8 @@ namespace BulkPrinting
 
         public static bool SyncLogs()
         {
-            Globals.LogSyncRunning = true;
-            bool ReSyncLogs = true;
-            while (ReSyncLogs)
+            while (Globals.LogSyncThreadEvent.WaitOne() && ! Globals.LogSyncThreadAborted)
             {
-                ReSyncLogs = false;
                 int LastSyncedLogID = GetLastSyncedLogID();
                 string Sql = "SELECT MAX(Id) FROM Logs";
                 SQLiteCommand Command = new SQLiteCommand(Sql, Globals.DBConnection);
@@ -668,16 +671,21 @@ namespace BulkPrinting
                         }
                     }
                 }
-                if (Globals.LogSyncWaiting)
-                {
-                    Globals.LogSyncWaiting = false;
-                    ReSyncLogs = true;
-                }
             }
-            Globals.LogSyncRunning = false;
             return true;
         }
 
+        public static void TriggerLogSync()
+        {
+            if (Globals.LogSyncThread == null)
+            {
+                Globals.LogSyncThreadEvent = new EventWaitHandle(false, EventResetMode.AutoReset);
+                Globals.LogSyncThread = new Thread(() => SyncLogs());
+                Globals.LogSyncThread.Start();
+            }
+            Globals.LogSyncThreadEvent.Set();
+        }
+
         public static void LogBulkEvents(List<EventLog> EventLogs)
         {
             string Sql = "INSERT INTO Logs (UserId, VoucherId, EventDate, EventType, Retry) VALUES (@userid, @voucherid, @eventdate, @eventtype, @retry)";
@@ -703,15 +711,7 @@ namespace BulkPrinting
             //SQLiteCommand Command = new SQLiteCommand(Sql, Globals.DBConnection);
             if (Globals.SessionMode == SessionModes.Online)
             {
-                //if (Globals.LogSyncTask != null && Globals.LogSyncTask.Status == TaskStatus.Running)
-                if (Globals.LogSyncRunning)
-                {
-                    Globals.LogSyncWaiting = true;
-                    return;
-                }
-                Globals.LogSyncThread = new Thread(() => SyncLogs());
-                Globals.LogSyncThread.Start();
-                //var Result = await Task.Run(() => SyncLogs()).ConfigureAwait(false);
+                TriggerLogSync();
             }
         }
 
@@ -731,15 +731,7 @@ namespace BulkPrinting
             //SQLiteCommand Command = new SQLiteCommand(Sql, Globals.DBConnection);
             if (Globals.SessionMode == SessionModes.Online)
             {
-                //if (Globals.LogSyncTask != null && Globals.LogSyncTask.Status == TaskStatus.Running)
-                if (Globals.LogSyncRunning)
-                {
-                    Globals.LogSyncWaiting = true;
-                    return;
-                }
-                Globals.LogSyncThread = new Thread(() => SyncLogs());
-                Globals.LogSyncThread.Start();
-                //var Result = await Task.Run(() => SyncLogs()).ConfigureAwait(false);
+                TriggerLogSync();
             }
         }
 
@@ -1064,6 +1056,7 @@ namespace BulkPrinting
             return UnprintedVouchers;
         }
 
+        /*
         public class BulkLogger : IDisposable
         {
             SQLiteTransaction transaction;
@@ -1153,6 +1146,7 @@ namespace BulkPrinting
             }
             #endregion
         }
+        */
     }
 }