Просмотр исходного кода

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

Brett Credo лет назад: 8
Родитель
Сommit
d9bdd35bb5

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

45
             this.label8 = new System.Windows.Forms.Label();
45
             this.label8 = new System.Windows.Forms.Label();
46
             this.lblPrintDescription = new System.Windows.Forms.Label();
46
             this.lblPrintDescription = new System.Windows.Forms.Label();
47
             this.grpAlignment = new System.Windows.Forms.GroupBox();
47
             this.grpAlignment = new System.Windows.Forms.GroupBox();
48
+            this.settingsButton = new System.Windows.Forms.Button();
48
             this.btnExpand = new System.Windows.Forms.Button();
49
             this.btnExpand = new System.Windows.Forms.Button();
49
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
50
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
50
             this.lblBusyPrinting = new System.Windows.Forms.Label();
51
             this.lblBusyPrinting = new System.Windows.Forms.Label();
59
             // 
60
             // 
60
             this.label1.AutoSize = true;
61
             this.label1.AutoSize = true;
61
             this.label1.ForeColor = System.Drawing.Color.White;
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
             this.label1.Name = "label1";
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
             this.label1.Text = resources.GetString("label1.Text");
68
             this.label1.Text = resources.GetString("label1.Text");
67
             // 
69
             // 
68
             // btnPrintJob
70
             // btnPrintJob
71
             this.btnPrintJob.FlatAppearance.BorderColor = System.Drawing.Color.Black;
73
             this.btnPrintJob.FlatAppearance.BorderColor = System.Drawing.Color.Black;
72
             this.btnPrintJob.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
74
             this.btnPrintJob.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
73
             this.btnPrintJob.ForeColor = System.Drawing.Color.White;
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
             this.btnPrintJob.Name = "btnPrintJob";
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
             this.btnPrintJob.Text = "Print Job";
81
             this.btnPrintJob.Text = "Print Job";
79
             this.btnPrintJob.UseVisualStyleBackColor = false;
82
             this.btnPrintJob.UseVisualStyleBackColor = false;
80
             this.btnPrintJob.Click += new System.EventHandler(this.btnPrintJob_Click);
83
             this.btnPrintJob.Click += new System.EventHandler(this.btnPrintJob_Click);
85
             this.btnAlignment.FlatAppearance.BorderColor = System.Drawing.Color.Black;
88
             this.btnAlignment.FlatAppearance.BorderColor = System.Drawing.Color.Black;
86
             this.btnAlignment.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
89
             this.btnAlignment.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
87
             this.btnAlignment.ForeColor = System.Drawing.Color.White;
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
             this.btnAlignment.Name = "btnAlignment";
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
             this.btnAlignment.Text = "Print Alignment";
96
             this.btnAlignment.Text = "Print Alignment";
93
             this.btnAlignment.UseVisualStyleBackColor = false;
97
             this.btnAlignment.UseVisualStyleBackColor = false;
94
             this.btnAlignment.Click += new System.EventHandler(this.btnAlignment_Click);
98
             this.btnAlignment.Click += new System.EventHandler(this.btnAlignment_Click);
97
             // 
101
             // 
98
             this.lblBatchNumber.AutoSize = true;
102
             this.lblBatchNumber.AutoSize = true;
99
             this.lblBatchNumber.ForeColor = System.Drawing.Color.White;
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
             this.lblBatchNumber.Name = "lblBatchNumber";
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
             this.lblBatchNumber.TabIndex = 26;
108
             this.lblBatchNumber.TabIndex = 26;
104
             // 
109
             // 
105
             // label6
110
             // label6
106
             // 
111
             // 
107
             this.label6.AutoSize = true;
112
             this.label6.AutoSize = true;
108
             this.label6.ForeColor = System.Drawing.Color.White;
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
             this.label6.Name = "label6";
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
             this.label6.TabIndex = 25;
118
             this.label6.TabIndex = 25;
113
             this.label6.Text = "Batch Number:";
119
             this.label6.Text = "Batch Number:";
114
             // 
120
             // 
116
             // 
122
             // 
117
             this.lblNetwork.AutoSize = true;
123
             this.lblNetwork.AutoSize = true;
118
             this.lblNetwork.ForeColor = System.Drawing.Color.White;
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
             this.lblNetwork.Name = "lblNetwork";
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
             this.lblNetwork.TabIndex = 19;
129
             this.lblNetwork.TabIndex = 19;
123
             // 
130
             // 
124
             // lblVoucherType
131
             // lblVoucherType
125
             // 
132
             // 
126
             this.lblVoucherType.AutoSize = true;
133
             this.lblVoucherType.AutoSize = true;
127
             this.lblVoucherType.ForeColor = System.Drawing.Color.White;
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
             this.lblVoucherType.Name = "lblVoucherType";
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
             this.lblVoucherType.TabIndex = 20;
139
             this.lblVoucherType.TabIndex = 20;
132
             // 
140
             // 
133
             // lblFaceValue
141
             // lblFaceValue
134
             // 
142
             // 
135
             this.lblFaceValue.AutoSize = true;
143
             this.lblFaceValue.AutoSize = true;
136
             this.lblFaceValue.ForeColor = System.Drawing.Color.White;
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
             this.lblFaceValue.Name = "lblFaceValue";
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
             this.lblFaceValue.TabIndex = 21;
149
             this.lblFaceValue.TabIndex = 21;
141
             // 
150
             // 
142
             // lblBatchOrderDate
151
             // lblBatchOrderDate
143
             // 
152
             // 
144
             this.lblBatchOrderDate.AutoSize = true;
153
             this.lblBatchOrderDate.AutoSize = true;
145
             this.lblBatchOrderDate.ForeColor = System.Drawing.Color.White;
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
             this.lblBatchOrderDate.Name = "lblBatchOrderDate";
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
             this.lblBatchOrderDate.TabIndex = 24;
159
             this.lblBatchOrderDate.TabIndex = 24;
150
             // 
160
             // 
151
             // label7
161
             // label7
152
             // 
162
             // 
153
             this.label7.AutoSize = true;
163
             this.label7.AutoSize = true;
154
             this.label7.ForeColor = System.Drawing.Color.White;
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
             this.label7.Name = "label7";
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
             this.label7.TabIndex = 17;
169
             this.label7.TabIndex = 17;
159
             this.label7.Text = "Network:";
170
             this.label7.Text = "Network:";
160
             // 
171
             // 
162
             // 
173
             // 
163
             this.label5.AutoSize = true;
174
             this.label5.AutoSize = true;
164
             this.label5.ForeColor = System.Drawing.Color.White;
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
             this.label5.Name = "label5";
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
             this.label5.TabIndex = 18;
180
             this.label5.TabIndex = 18;
169
             this.label5.Text = "Voucher Type:";
181
             this.label5.Text = "Voucher Type:";
170
             // 
182
             // 
172
             // 
184
             // 
173
             this.label4.AutoSize = true;
185
             this.label4.AutoSize = true;
174
             this.label4.ForeColor = System.Drawing.Color.White;
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
             this.label4.Name = "label4";
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
             this.label4.TabIndex = 16;
191
             this.label4.TabIndex = 16;
179
             this.label4.Text = "Face Value:";
192
             this.label4.Text = "Face Value:";
180
             // 
193
             // 
182
             // 
195
             // 
183
             this.label8.AutoSize = true;
196
             this.label8.AutoSize = true;
184
             this.label8.ForeColor = System.Drawing.Color.White;
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
             this.label8.Name = "label8";
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
             this.label8.TabIndex = 13;
202
             this.label8.TabIndex = 13;
189
             this.label8.Text = "Batch Order Date:";
203
             this.label8.Text = "Batch Order Date:";
190
             // 
204
             // 
192
             // 
206
             // 
193
             this.lblPrintDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
207
             this.lblPrintDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
194
             this.lblPrintDescription.ForeColor = System.Drawing.Color.White;
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
             this.lblPrintDescription.Name = "lblPrintDescription";
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
             this.lblPrintDescription.TabIndex = 12;
213
             this.lblPrintDescription.TabIndex = 12;
199
             this.lblPrintDescription.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
214
             this.lblPrintDescription.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
200
             // 
215
             // 
201
             // grpAlignment
216
             // grpAlignment
202
             // 
217
             // 
218
+            this.grpAlignment.Controls.Add(this.settingsButton);
203
             this.grpAlignment.Controls.Add(this.btnExpand);
219
             this.grpAlignment.Controls.Add(this.btnExpand);
204
             this.grpAlignment.Controls.Add(this.pictureBox1);
220
             this.grpAlignment.Controls.Add(this.pictureBox1);
205
             this.grpAlignment.Controls.Add(this.label1);
221
             this.grpAlignment.Controls.Add(this.label1);
206
             this.grpAlignment.Controls.Add(this.btnAlignment);
222
             this.grpAlignment.Controls.Add(this.btnAlignment);
207
             this.grpAlignment.ForeColor = System.Drawing.Color.White;
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
             this.grpAlignment.Name = "grpAlignment";
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
             this.grpAlignment.TabStop = false;
230
             this.grpAlignment.TabStop = false;
213
             this.grpAlignment.Text = "Alignment";
231
             this.grpAlignment.Text = "Alignment";
214
             this.grpAlignment.Enter += new System.EventHandler(this.grpAlignment_Enter);
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
             // btnExpand
249
             // btnExpand
217
             // 
250
             // 
218
             this.btnExpand.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
251
             this.btnExpand.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(132)))), ((int)(((byte)(186)))));
220
             this.btnExpand.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
253
             this.btnExpand.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
221
             this.btnExpand.ForeColor = System.Drawing.Color.Black;
254
             this.btnExpand.ForeColor = System.Drawing.Color.Black;
222
             this.btnExpand.Image = global::BulkPrinting.Properties.Resources.whitedown;
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
             this.btnExpand.Name = "btnExpand";
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
             this.btnExpand.UseVisualStyleBackColor = false;
261
             this.btnExpand.UseVisualStyleBackColor = false;
228
             this.btnExpand.Click += new System.EventHandler(this.btnExpand_Click);
262
             this.btnExpand.Click += new System.EventHandler(this.btnExpand_Click);
229
             // 
263
             // 
230
             // pictureBox1
264
             // pictureBox1
231
             // 
265
             // 
232
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
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
             this.pictureBox1.Name = "pictureBox1";
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
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
271
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
237
             this.pictureBox1.TabIndex = 0;
272
             this.pictureBox1.TabIndex = 0;
238
             this.pictureBox1.TabStop = false;
273
             this.pictureBox1.TabStop = false;
241
             // 
276
             // 
242
             this.lblBusyPrinting.AutoSize = true;
277
             this.lblBusyPrinting.AutoSize = true;
243
             this.lblBusyPrinting.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
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
             this.lblBusyPrinting.Name = "lblBusyPrinting";
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
             this.lblBusyPrinting.TabIndex = 3;
283
             this.lblBusyPrinting.TabIndex = 3;
248
             this.lblBusyPrinting.Text = "Printing in progress\r\nPlease do not close this \r\ndialog until it is finished.";
284
             this.lblBusyPrinting.Text = "Printing in progress\r\nPlease do not close this \r\ndialog until it is finished.";
249
             this.lblBusyPrinting.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
285
             this.lblBusyPrinting.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
258
             // pictureBox2
294
             // pictureBox2
259
             // 
295
             // 
260
             this.pictureBox2.Image = global::BulkPrinting.Properties.Resources.r_g_bulk_icon;
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
             this.pictureBox2.Name = "pictureBox2";
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
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
301
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
265
             this.pictureBox2.TabIndex = 28;
302
             this.pictureBox2.TabIndex = 28;
266
             this.pictureBox2.TabStop = false;
303
             this.pictureBox2.TabStop = false;
267
             // 
304
             // 
268
             // PrintAlignmentDialog
305
             // PrintAlignmentDialog
269
             // 
306
             // 
270
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
307
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
271
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
308
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
272
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(63)))), ((int)(((byte)(145)))));
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
             this.Controls.Add(this.pictureBox2);
311
             this.Controls.Add(this.pictureBox2);
275
             this.Controls.Add(this.grpAlignment);
312
             this.Controls.Add(this.grpAlignment);
276
             this.Controls.Add(this.lblBatchNumber);
313
             this.Controls.Add(this.lblBatchNumber);
288
             this.Controls.Add(this.btnPrintJob);
325
             this.Controls.Add(this.btnPrintJob);
289
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
326
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
290
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
327
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
328
+            this.Margin = new System.Windows.Forms.Padding(4);
291
             this.MaximizeBox = false;
329
             this.MaximizeBox = false;
292
-            this.MaximumSize = new System.Drawing.Size(447, 553);
293
             this.MinimizeBox = false;
330
             this.MinimizeBox = false;
294
-            this.MinimumSize = new System.Drawing.Size(447, 227);
295
             this.Name = "PrintAlignmentDialog";
331
             this.Name = "PrintAlignmentDialog";
296
             this.Text = "Print Vouchers";
332
             this.Text = "Print Vouchers";
297
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.PrintAlignmentDialog_FormClosed);
333
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.PrintAlignmentDialog_FormClosed);
327
         private System.Windows.Forms.Timer tmrPrinterKeepalive;
363
         private System.Windows.Forms.Timer tmrPrinterKeepalive;
328
         private System.Windows.Forms.Button btnExpand;
364
         private System.Windows.Forms.Button btnExpand;
329
         private System.Windows.Forms.PictureBox pictureBox2;
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
 using System;
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
 using System.Data.SQLite;
2
 using System.Data.SQLite;
3
+using System.Drawing;
11
 using System.Threading;
4
 using System.Threading;
5
+using System.Windows.Forms;
12
 
6
 
13
 namespace BulkPrinting
7
 namespace BulkPrinting
14
 {
8
 {
29
         public int? FirstSeqNo;
23
         public int? FirstSeqNo;
30
         public int? LastSeqNo;
24
         public int? LastSeqNo;
31
 
25
 
26
+        private bool expanded;
27
+        int minHeight;
28
+        int maxHeight;
29
+
32
         private void PrintAlignmentDialog_Load(object sender, EventArgs e)
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
             grpAlignment.Show();
40
             grpAlignment.Show();
36
             lblBusyPrinting.Hide();
41
             lblBusyPrinting.Hide();
37
 
42
 
152
 
157
 
153
         private void btnExpand_Click(object sender, EventArgs e)
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
                 btnExpand.Image = Properties.Resources.whiteup;
163
                 btnExpand.Image = Properties.Resources.whiteup;
158
             }
164
             }
159
             else {
165
             else {
160
-                this.Height = 227;
166
+                Height = minHeight;
161
                 btnExpand.Image = Properties.Resources.whitedown;
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
   <metadata name="tmrPrinterKeepalive.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
290
   <metadata name="tmrPrinterKeepalive.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
291
     <value>17, 17</value>
291
     <value>17, 17</value>
292
   </metadata>
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
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
293
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
297
     <value>57</value>
294
     <value>57</value>
298
   </metadata>
295
   </metadata>

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

48
             this.numNumVouchers = new System.Windows.Forms.NumericUpDown();
48
             this.numNumVouchers = new System.Windows.Forms.NumericUpDown();
49
             this.label7 = new System.Windows.Forms.Label();
49
             this.label7 = new System.Windows.Forms.Label();
50
             this.lblNetwork = new System.Windows.Forms.Label();
50
             this.lblNetwork = new System.Windows.Forms.Label();
51
-            this.btnAdvanced = new System.Windows.Forms.Button();
52
             ((System.ComponentModel.ISupportInitialize)(this.numNumVouchers)).BeginInit();
51
             ((System.ComponentModel.ISupportInitialize)(this.numNumVouchers)).BeginInit();
53
             this.SuspendLayout();
52
             this.SuspendLayout();
54
             // 
53
             // 
260
             this.lblNetwork.Size = new System.Drawing.Size(0, 17);
259
             this.lblNetwork.Size = new System.Drawing.Size(0, 17);
261
             this.lblNetwork.TabIndex = 7;
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
             // PrintForm
262
             // PrintForm
278
             // 
263
             // 
279
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
264
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
282
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(63)))), ((int)(((byte)(145)))));
267
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(63)))), ((int)(((byte)(145)))));
283
             this.ClientSize = new System.Drawing.Size(379, 257);
268
             this.ClientSize = new System.Drawing.Size(379, 257);
284
             this.ControlBox = false;
269
             this.ControlBox = false;
285
-            this.Controls.Add(this.btnAdvanced);
286
             this.Controls.Add(this.numNumVouchers);
270
             this.Controls.Add(this.numNumVouchers);
287
             this.Controls.Add(this.lblNumVouchers);
271
             this.Controls.Add(this.lblNumVouchers);
288
             this.Controls.Add(this.btnNext);
272
             this.Controls.Add(this.btnNext);
337
         private System.Windows.Forms.NumericUpDown numNumVouchers;
321
         private System.Windows.Forms.NumericUpDown numNumVouchers;
338
         private System.Windows.Forms.Label label7;
322
         private System.Windows.Forms.Label label7;
339
         private System.Windows.Forms.Label lblNetwork;
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
         {
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
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
31
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
32
 
32
 
33
 #if SIMULATE_HDD_SERIAL
33
 #if SIMULATE_HDD_SERIAL
34
-            Globals.HDDSerialNumber = "9VMTDFGX";
34
+            //Globals.HDDSerialNumber = "9VMTDFGX";
35
+            Globals.HDDSerialNumber = "2ZRA6NXL";
35
 #else
36
 #else
36
             Globals.HDDSerialNumber = Utility.GetHDDSerial();
37
             Globals.HDDSerialNumber = Utility.GetHDDSerial();
37
 #endif
38
 #endif

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

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

+ 1 - 1
BulkPrinting/BulkPrinting/Utility.cs

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