瀏覽代碼

Add spaces in front of vendor ID on voucher.
Move print settings button to alignment dialog.

Brett Credo 8 年之前
父節點
當前提交
d9bdd35bb5

+ 84 - 47
BulkPrinting/BulkPrinting/PrintAlignmentDialog.Designer.cs

@@ -45,6 +45,7 @@
45 45
             this.label8 = new System.Windows.Forms.Label();
46 46
             this.lblPrintDescription = new System.Windows.Forms.Label();
47 47
             this.grpAlignment = new System.Windows.Forms.GroupBox();
48
+            this.settingsButton = new System.Windows.Forms.Button();
48 49
             this.btnExpand = new System.Windows.Forms.Button();
49 50
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
50 51
             this.lblBusyPrinting = new System.Windows.Forms.Label();
@@ -59,10 +60,11 @@
59 60
             // 
60 61
             this.label1.AutoSize = true;
61 62
             this.label1.ForeColor = System.Drawing.Color.White;
62
-            this.label1.Location = new System.Drawing.Point(6, 191);
63
+            this.label1.Location = new System.Drawing.Point(8, 235);
64
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
63 65
             this.label1.Name = "label1";
64
-            this.label1.Size = new System.Drawing.Size(423, 104);
65
-            this.label1.TabIndex = 1;
66
+            this.label1.Size = new System.Drawing.Size(565, 136);
67
+            this.label1.TabIndex = 3;
66 68
             this.label1.Text = resources.GetString("label1.Text");
67 69
             // 
68 70
             // btnPrintJob
@@ -71,10 +73,11 @@
71 73
             this.btnPrintJob.FlatAppearance.BorderColor = System.Drawing.Color.Black;
72 74
             this.btnPrintJob.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
73 75
             this.btnPrintJob.ForeColor = System.Drawing.Color.White;
74
-            this.btnPrintJob.Location = new System.Drawing.Point(152, 146);
76
+            this.btnPrintJob.Location = new System.Drawing.Point(203, 180);
77
+            this.btnPrintJob.Margin = new System.Windows.Forms.Padding(4);
75 78
             this.btnPrintJob.Name = "btnPrintJob";
76
-            this.btnPrintJob.Size = new System.Drawing.Size(113, 23);
77
-            this.btnPrintJob.TabIndex = 2;
79
+            this.btnPrintJob.Size = new System.Drawing.Size(151, 28);
80
+            this.btnPrintJob.TabIndex = 0;
78 81
             this.btnPrintJob.Text = "Print Job";
79 82
             this.btnPrintJob.UseVisualStyleBackColor = false;
80 83
             this.btnPrintJob.Click += new System.EventHandler(this.btnPrintJob_Click);
@@ -85,10 +88,11 @@
85 88
             this.btnAlignment.FlatAppearance.BorderColor = System.Drawing.Color.Black;
86 89
             this.btnAlignment.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
87 90
             this.btnAlignment.ForeColor = System.Drawing.Color.White;
88
-            this.btnAlignment.Location = new System.Drawing.Point(151, 310);
91
+            this.btnAlignment.Location = new System.Drawing.Point(316, 382);
92
+            this.btnAlignment.Margin = new System.Windows.Forms.Padding(4);
89 93
             this.btnAlignment.Name = "btnAlignment";
90
-            this.btnAlignment.Size = new System.Drawing.Size(113, 23);
91
-            this.btnAlignment.TabIndex = 2;
94
+            this.btnAlignment.Size = new System.Drawing.Size(151, 28);
95
+            this.btnAlignment.TabIndex = 1;
92 96
             this.btnAlignment.Text = "Print Alignment";
93 97
             this.btnAlignment.UseVisualStyleBackColor = false;
94 98
             this.btnAlignment.Click += new System.EventHandler(this.btnAlignment_Click);
@@ -97,18 +101,20 @@
97 101
             // 
98 102
             this.lblBatchNumber.AutoSize = true;
99 103
             this.lblBatchNumber.ForeColor = System.Drawing.Color.White;
100
-            this.lblBatchNumber.Location = new System.Drawing.Point(248, 70);
104
+            this.lblBatchNumber.Location = new System.Drawing.Point(331, 86);
105
+            this.lblBatchNumber.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
101 106
             this.lblBatchNumber.Name = "lblBatchNumber";
102
-            this.lblBatchNumber.Size = new System.Drawing.Size(0, 13);
107
+            this.lblBatchNumber.Size = new System.Drawing.Size(0, 17);
103 108
             this.lblBatchNumber.TabIndex = 26;
104 109
             // 
105 110
             // label6
106 111
             // 
107 112
             this.label6.AutoSize = true;
108 113
             this.label6.ForeColor = System.Drawing.Color.White;
109
-            this.label6.Location = new System.Drawing.Point(164, 70);
114
+            this.label6.Location = new System.Drawing.Point(219, 86);
115
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
110 116
             this.label6.Name = "label6";
111
-            this.label6.Size = new System.Drawing.Size(78, 13);
117
+            this.label6.Size = new System.Drawing.Size(102, 17);
112 118
             this.label6.TabIndex = 25;
113 119
             this.label6.Text = "Batch Number:";
114 120
             // 
@@ -116,45 +122,50 @@
116 122
             // 
117 123
             this.lblNetwork.AutoSize = true;
118 124
             this.lblNetwork.ForeColor = System.Drawing.Color.White;
119
-            this.lblNetwork.Location = new System.Drawing.Point(248, 130);
125
+            this.lblNetwork.Location = new System.Drawing.Point(331, 160);
126
+            this.lblNetwork.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
120 127
             this.lblNetwork.Name = "lblNetwork";
121
-            this.lblNetwork.Size = new System.Drawing.Size(0, 13);
128
+            this.lblNetwork.Size = new System.Drawing.Size(0, 17);
122 129
             this.lblNetwork.TabIndex = 19;
123 130
             // 
124 131
             // lblVoucherType
125 132
             // 
126 133
             this.lblVoucherType.AutoSize = true;
127 134
             this.lblVoucherType.ForeColor = System.Drawing.Color.White;
128
-            this.lblVoucherType.Location = new System.Drawing.Point(248, 115);
135
+            this.lblVoucherType.Location = new System.Drawing.Point(331, 142);
136
+            this.lblVoucherType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
129 137
             this.lblVoucherType.Name = "lblVoucherType";
130
-            this.lblVoucherType.Size = new System.Drawing.Size(0, 13);
138
+            this.lblVoucherType.Size = new System.Drawing.Size(0, 17);
131 139
             this.lblVoucherType.TabIndex = 20;
132 140
             // 
133 141
             // lblFaceValue
134 142
             // 
135 143
             this.lblFaceValue.AutoSize = true;
136 144
             this.lblFaceValue.ForeColor = System.Drawing.Color.White;
137
-            this.lblFaceValue.Location = new System.Drawing.Point(248, 100);
145
+            this.lblFaceValue.Location = new System.Drawing.Point(331, 123);
146
+            this.lblFaceValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
138 147
             this.lblFaceValue.Name = "lblFaceValue";
139
-            this.lblFaceValue.Size = new System.Drawing.Size(0, 13);
148
+            this.lblFaceValue.Size = new System.Drawing.Size(0, 17);
140 149
             this.lblFaceValue.TabIndex = 21;
141 150
             // 
142 151
             // lblBatchOrderDate
143 152
             // 
144 153
             this.lblBatchOrderDate.AutoSize = true;
145 154
             this.lblBatchOrderDate.ForeColor = System.Drawing.Color.White;
146
-            this.lblBatchOrderDate.Location = new System.Drawing.Point(248, 85);
155
+            this.lblBatchOrderDate.Location = new System.Drawing.Point(331, 105);
156
+            this.lblBatchOrderDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
147 157
             this.lblBatchOrderDate.Name = "lblBatchOrderDate";
148
-            this.lblBatchOrderDate.Size = new System.Drawing.Size(0, 13);
158
+            this.lblBatchOrderDate.Size = new System.Drawing.Size(0, 17);
149 159
             this.lblBatchOrderDate.TabIndex = 24;
150 160
             // 
151 161
             // label7
152 162
             // 
153 163
             this.label7.AutoSize = true;
154 164
             this.label7.ForeColor = System.Drawing.Color.White;
155
-            this.label7.Location = new System.Drawing.Point(192, 130);
165
+            this.label7.Location = new System.Drawing.Point(256, 160);
166
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
156 167
             this.label7.Name = "label7";
157
-            this.label7.Size = new System.Drawing.Size(50, 13);
168
+            this.label7.Size = new System.Drawing.Size(63, 17);
158 169
             this.label7.TabIndex = 17;
159 170
             this.label7.Text = "Network:";
160 171
             // 
@@ -162,9 +173,10 @@
162 173
             // 
163 174
             this.label5.AutoSize = true;
164 175
             this.label5.ForeColor = System.Drawing.Color.White;
165
-            this.label5.Location = new System.Drawing.Point(165, 115);
176
+            this.label5.Location = new System.Drawing.Point(220, 142);
177
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
166 178
             this.label5.Name = "label5";
167
-            this.label5.Size = new System.Drawing.Size(77, 13);
179
+            this.label5.Size = new System.Drawing.Size(101, 17);
168 180
             this.label5.TabIndex = 18;
169 181
             this.label5.Text = "Voucher Type:";
170 182
             // 
@@ -172,9 +184,10 @@
172 184
             // 
173 185
             this.label4.AutoSize = true;
174 186
             this.label4.ForeColor = System.Drawing.Color.White;
175
-            this.label4.Location = new System.Drawing.Point(178, 100);
187
+            this.label4.Location = new System.Drawing.Point(237, 123);
188
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
176 189
             this.label4.Name = "label4";
177
-            this.label4.Size = new System.Drawing.Size(64, 13);
190
+            this.label4.Size = new System.Drawing.Size(83, 17);
178 191
             this.label4.TabIndex = 16;
179 192
             this.label4.Text = "Face Value:";
180 193
             // 
@@ -182,9 +195,10 @@
182 195
             // 
183 196
             this.label8.AutoSize = true;
184 197
             this.label8.ForeColor = System.Drawing.Color.White;
185
-            this.label8.Location = new System.Drawing.Point(149, 85);
198
+            this.label8.Location = new System.Drawing.Point(199, 105);
199
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
186 200
             this.label8.Name = "label8";
187
-            this.label8.Size = new System.Drawing.Size(93, 13);
201
+            this.label8.Size = new System.Drawing.Size(123, 17);
188 202
             this.label8.TabIndex = 13;
189 203
             this.label8.Text = "Batch Order Date:";
190 204
             // 
@@ -192,27 +206,46 @@
192 206
             // 
193 207
             this.lblPrintDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
194 208
             this.lblPrintDescription.ForeColor = System.Drawing.Color.White;
195
-            this.lblPrintDescription.Location = new System.Drawing.Point(17, 5);
209
+            this.lblPrintDescription.Location = new System.Drawing.Point(23, 6);
210
+            this.lblPrintDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
196 211
             this.lblPrintDescription.Name = "lblPrintDescription";
197
-            this.lblPrintDescription.Size = new System.Drawing.Size(397, 65);
212
+            this.lblPrintDescription.Size = new System.Drawing.Size(529, 80);
198 213
             this.lblPrintDescription.TabIndex = 12;
199 214
             this.lblPrintDescription.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
200 215
             // 
201 216
             // grpAlignment
202 217
             // 
218
+            this.grpAlignment.Controls.Add(this.settingsButton);
203 219
             this.grpAlignment.Controls.Add(this.btnExpand);
204 220
             this.grpAlignment.Controls.Add(this.pictureBox1);
205 221
             this.grpAlignment.Controls.Add(this.label1);
206 222
             this.grpAlignment.Controls.Add(this.btnAlignment);
207 223
             this.grpAlignment.ForeColor = System.Drawing.Color.White;
208
-            this.grpAlignment.Location = new System.Drawing.Point(1, 173);
224
+            this.grpAlignment.Location = new System.Drawing.Point(1, 213);
225
+            this.grpAlignment.Margin = new System.Windows.Forms.Padding(4);
209 226
             this.grpAlignment.Name = "grpAlignment";
210
-            this.grpAlignment.Size = new System.Drawing.Size(428, 341);
211
-            this.grpAlignment.TabIndex = 27;
227
+            this.grpAlignment.Padding = new System.Windows.Forms.Padding(4);
228
+            this.grpAlignment.Size = new System.Drawing.Size(571, 418);
229
+            this.grpAlignment.TabIndex = 1;
212 230
             this.grpAlignment.TabStop = false;
213 231
             this.grpAlignment.Text = "Alignment";
214 232
             this.grpAlignment.Enter += new System.EventHandler(this.grpAlignment_Enter);
215 233
             // 
234
+            // settingsButton
235
+            // 
236
+            this.settingsButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
237
+            this.settingsButton.FlatAppearance.BorderColor = System.Drawing.Color.Black;
238
+            this.settingsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
239
+            this.settingsButton.ForeColor = System.Drawing.Color.White;
240
+            this.settingsButton.Location = new System.Drawing.Point(108, 382);
241
+            this.settingsButton.Margin = new System.Windows.Forms.Padding(4);
242
+            this.settingsButton.Name = "settingsButton";
243
+            this.settingsButton.Size = new System.Drawing.Size(151, 28);
244
+            this.settingsButton.TabIndex = 2;
245
+            this.settingsButton.Text = "Advanced Settings";
246
+            this.settingsButton.UseVisualStyleBackColor = false;
247
+            this.settingsButton.Click += new System.EventHandler(this.settingsButton_Click);
248
+            // 
216 249
             // btnExpand
217 250
             // 
218 251
             this.btnExpand.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
@@ -220,19 +253,21 @@
220 253
             this.btnExpand.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
221 254
             this.btnExpand.ForeColor = System.Drawing.Color.Black;
222 255
             this.btnExpand.Image = global::BulkPrinting.Properties.Resources.whitedown;
223
-            this.btnExpand.Location = new System.Drawing.Point(58, 0);
256
+            this.btnExpand.Location = new System.Drawing.Point(77, 0);
257
+            this.btnExpand.Margin = new System.Windows.Forms.Padding(4);
224 258
             this.btnExpand.Name = "btnExpand";
225
-            this.btnExpand.Size = new System.Drawing.Size(19, 15);
226
-            this.btnExpand.TabIndex = 28;
259
+            this.btnExpand.Size = new System.Drawing.Size(25, 18);
260
+            this.btnExpand.TabIndex = 0;
227 261
             this.btnExpand.UseVisualStyleBackColor = false;
228 262
             this.btnExpand.Click += new System.EventHandler(this.btnExpand_Click);
229 263
             // 
230 264
             // pictureBox1
231 265
             // 
232 266
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
233
-            this.pictureBox1.Location = new System.Drawing.Point(74, 19);
267
+            this.pictureBox1.Location = new System.Drawing.Point(99, 23);
268
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
234 269
             this.pictureBox1.Name = "pictureBox1";
235
-            this.pictureBox1.Size = new System.Drawing.Size(276, 169);
270
+            this.pictureBox1.Size = new System.Drawing.Size(368, 208);
236 271
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
237 272
             this.pictureBox1.TabIndex = 0;
238 273
             this.pictureBox1.TabStop = false;
@@ -241,9 +276,10 @@
241 276
             // 
242 277
             this.lblBusyPrinting.AutoSize = true;
243 278
             this.lblBusyPrinting.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
244
-            this.lblBusyPrinting.Location = new System.Drawing.Point(34, 285);
279
+            this.lblBusyPrinting.Location = new System.Drawing.Point(45, 351);
280
+            this.lblBusyPrinting.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
245 281
             this.lblBusyPrinting.Name = "lblBusyPrinting";
246
-            this.lblBusyPrinting.Size = new System.Drawing.Size(363, 111);
282
+            this.lblBusyPrinting.Size = new System.Drawing.Size(455, 138);
247 283
             this.lblBusyPrinting.TabIndex = 3;
248 284
             this.lblBusyPrinting.Text = "Printing in progress\r\nPlease do not close this \r\ndialog until it is finished.";
249 285
             this.lblBusyPrinting.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -258,19 +294,20 @@
258 294
             // pictureBox2
259 295
             // 
260 296
             this.pictureBox2.Image = global::BulkPrinting.Properties.Resources.r_g_bulk_icon;
261
-            this.pictureBox2.Location = new System.Drawing.Point(3, 70);
297
+            this.pictureBox2.Location = new System.Drawing.Point(4, 86);
298
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4);
262 299
             this.pictureBox2.Name = "pictureBox2";
263
-            this.pictureBox2.Size = new System.Drawing.Size(121, 104);
300
+            this.pictureBox2.Size = new System.Drawing.Size(161, 128);
264 301
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
265 302
             this.pictureBox2.TabIndex = 28;
266 303
             this.pictureBox2.TabStop = false;
267 304
             // 
268 305
             // PrintAlignmentDialog
269 306
             // 
270
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
307
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
271 308
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
272 309
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(63)))), ((int)(((byte)(145)))));
273
-            this.ClientSize = new System.Drawing.Size(431, 188);
310
+            this.ClientSize = new System.Drawing.Size(572, 630);
274 311
             this.Controls.Add(this.pictureBox2);
275 312
             this.Controls.Add(this.grpAlignment);
276 313
             this.Controls.Add(this.lblBatchNumber);
@@ -288,10 +325,9 @@
288 325
             this.Controls.Add(this.btnPrintJob);
289 326
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
290 327
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
328
+            this.Margin = new System.Windows.Forms.Padding(4);
291 329
             this.MaximizeBox = false;
292
-            this.MaximumSize = new System.Drawing.Size(447, 553);
293 330
             this.MinimizeBox = false;
294
-            this.MinimumSize = new System.Drawing.Size(447, 227);
295 331
             this.Name = "PrintAlignmentDialog";
296 332
             this.Text = "Print Vouchers";
297 333
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.PrintAlignmentDialog_FormClosed);
@@ -327,5 +363,6 @@
327 363
         private System.Windows.Forms.Timer tmrPrinterKeepalive;
328 364
         private System.Windows.Forms.Button btnExpand;
329 365
         private System.Windows.Forms.PictureBox pictureBox2;
366
+        private System.Windows.Forms.Button settingsButton;
330 367
     }
331 368
 }

+ 28 - 12
BulkPrinting/BulkPrinting/PrintAlignmentDialog.cs

@@ -1,14 +1,8 @@
1 1
 using System;
2
-using System.Collections.Generic;
3
-using System.ComponentModel;
4
-using System.Data;
5
-using System.Drawing;
6
-using System.Linq;
7
-using System.Text;
8
-using System.Threading.Tasks;
9
-using System.Windows.Forms;
10 2
 using System.Data.SQLite;
3
+using System.Drawing;
11 4
 using System.Threading;
5
+using System.Windows.Forms;
12 6
 
13 7
 namespace BulkPrinting
14 8
 {
@@ -29,9 +23,20 @@ namespace BulkPrinting
29 23
         public int? FirstSeqNo;
30 24
         public int? LastSeqNo;
31 25
 
26
+        private bool expanded;
27
+        int minHeight;
28
+        int maxHeight;
29
+
32 30
         private void PrintAlignmentDialog_Load(object sender, EventArgs e)
33 31
         {
34
-            this.Height = 227;
32
+            var btnExpandScreenRectangle = btnExpand.Parent.RectangleToScreen(btnExpand.Bounds);
33
+            var grpAlignmentScreenRectangle = grpAlignment.Parent.RectangleToScreen(grpAlignment.Bounds);
34
+
35
+            minHeight = btnExpandScreenRectangle.Bottom - Bounds.Top + 10;
36
+            maxHeight = grpAlignmentScreenRectangle.Bottom - Bounds.Top + 10;
37
+
38
+            Height = minHeight;
39
+
35 40
             grpAlignment.Show();
36 41
             lblBusyPrinting.Hide();
37 42
 
@@ -152,14 +157,25 @@ namespace BulkPrinting
152 157
 
153 158
         private void btnExpand_Click(object sender, EventArgs e)
154 159
         {
155
-            if (this.Height == 227) {
156
-                this.Height = 553;
160
+            expanded = !expanded;
161
+            if (expanded) {
162
+                Height = maxHeight;
157 163
                 btnExpand.Image = Properties.Resources.whiteup;
158 164
             }
159 165
             else {
160
-                this.Height = 227;
166
+                Height = minHeight;
161 167
                 btnExpand.Image = Properties.Resources.whitedown;
162 168
             }
163 169
         }
170
+
171
+        private void settingsButton_Click(object sender, EventArgs e)
172
+        {
173
+            var dialog = new PrinterSettingsForm();
174
+            dialog.InitString = Utility.GetSavedParameter(Globals.DB, "PrinterInitString");
175
+            if (dialog.ShowDialog() == DialogResult.OK)
176
+            {
177
+                Utility.UpdateSavedParameter(Globals.DB, "PrinterInitString", dialog.InitString);
178
+            }
179
+        }
164 180
     }
165 181
 }

+ 0 - 3
BulkPrinting/BulkPrinting/PrintAlignmentDialog.resx

@@ -290,9 +290,6 @@ positioning in the image above.
290 290
   <metadata name="tmrPrinterKeepalive.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
291 291
     <value>17, 17</value>
292 292
   </metadata>
293
-  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
294
-    <value>True</value>
295
-  </metadata>
296 293
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
297 294
     <value>57</value>
298 295
   </metadata>

+ 0 - 17
BulkPrinting/BulkPrinting/PrintForm.Designer.cs

@@ -48,7 +48,6 @@
48 48
             this.numNumVouchers = new System.Windows.Forms.NumericUpDown();
49 49
             this.label7 = new System.Windows.Forms.Label();
50 50
             this.lblNetwork = new System.Windows.Forms.Label();
51
-            this.btnAdvanced = new System.Windows.Forms.Button();
52 51
             ((System.ComponentModel.ISupportInitialize)(this.numNumVouchers)).BeginInit();
53 52
             this.SuspendLayout();
54 53
             // 
@@ -260,20 +259,6 @@
260 259
             this.lblNetwork.Size = new System.Drawing.Size(0, 17);
261 260
             this.lblNetwork.TabIndex = 7;
262 261
             // 
263
-            // btnAdvanced
264
-            // 
265
-            this.btnAdvanced.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
266
-            this.btnAdvanced.FlatAppearance.BorderColor = System.Drawing.Color.Black;
267
-            this.btnAdvanced.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
268
-            this.btnAdvanced.Location = new System.Drawing.Point(13, 211);
269
-            this.btnAdvanced.Margin = new System.Windows.Forms.Padding(4);
270
-            this.btnAdvanced.Name = "btnAdvanced";
271
-            this.btnAdvanced.Size = new System.Drawing.Size(96, 28);
272
-            this.btnAdvanced.TabIndex = 3;
273
-            this.btnAdvanced.Text = "Advanced";
274
-            this.btnAdvanced.UseVisualStyleBackColor = false;
275
-            this.btnAdvanced.Click += new System.EventHandler(this.btnAdvanced_Click);
276
-            // 
277 262
             // PrintForm
278 263
             // 
279 264
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -282,7 +267,6 @@
282 267
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(63)))), ((int)(((byte)(145)))));
283 268
             this.ClientSize = new System.Drawing.Size(379, 257);
284 269
             this.ControlBox = false;
285
-            this.Controls.Add(this.btnAdvanced);
286 270
             this.Controls.Add(this.numNumVouchers);
287 271
             this.Controls.Add(this.lblNumVouchers);
288 272
             this.Controls.Add(this.btnNext);
@@ -337,6 +321,5 @@
337 321
         private System.Windows.Forms.NumericUpDown numNumVouchers;
338 322
         private System.Windows.Forms.Label label7;
339 323
         private System.Windows.Forms.Label lblNetwork;
340
-        private System.Windows.Forms.Button btnAdvanced;
341 324
     }
342 325
 }

+ 0 - 10
BulkPrinting/BulkPrinting/PrintForm.cs

@@ -119,15 +119,5 @@ namespace BulkPrinting
119 119
         {
120 120
 
121 121
         }
122
-
123
-        private void btnAdvanced_Click(object sender, EventArgs e)
124
-        {
125
-            var dialog = new PrinterSettingsForm();
126
-            dialog.InitString = Utility.GetSavedParameter(Globals.DB, "PrinterInitString");
127
-            if (dialog.ShowDialog() == DialogResult.OK)
128
-            {
129
-                Utility.UpdateSavedParameter(Globals.DB, "PrinterInitString", dialog.InitString);
130
-            }
131
-        }
132 122
     }
133 123
 }

+ 2 - 1
BulkPrinting/BulkPrinting/Program.cs

@@ -31,7 +31,8 @@ namespace BulkPrinting
31 31
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
32 32
 
33 33
 #if SIMULATE_HDD_SERIAL
34
-            Globals.HDDSerialNumber = "9VMTDFGX";
34
+            //Globals.HDDSerialNumber = "9VMTDFGX";
35
+            Globals.HDDSerialNumber = "2ZRA6NXL";
35 36
 #else
36 37
             Globals.HDDSerialNumber = Utility.GetHDDSerial();
37 38
 #endif

+ 1 - 1
BulkPrinting/BulkPrinting/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
33 33
 // by using the '*' as shown below:
34 34
 // [assembly: AssemblyVersion("1.0.*")]
35 35
 [assembly: AssemblyVersion("1.0.*")]
36
-[assembly: AssemblyFileVersion("1.5")]
36
+[assembly: AssemblyFileVersion("1.6")]

+ 1 - 1
BulkPrinting/BulkPrinting/Utility.cs

@@ -501,7 +501,7 @@ namespace BulkPrinting
501 501
                                 IndividualVoucher = VoucherRow[Column];
502 502
                                 PrintRow += (Column == 2 ? " " : "") + IndividualVoucher.Description.PadRight(30, ' ');
503 503
                             }
504
-                            PrintRow = PrintRow.TrimEnd() + "\r\n";
504
+                            PrintRow = PrintRow.TrimEnd() + "\r\n  ";
505 505
                             for (int Column = 0; Column < VoucherRow.Count(); Column++)
506 506
                             {
507 507
                                 PrintRow += (Column == 2 ? " " : "") + VendorId.PadRight(30, ' ');