Skip to content

Commit 57f31bf

Browse files
Konstantina ChremmouKonstantina Chremmou
Konstantina Chremmou
authored and
Konstantina Chremmou
committed
CP-46828: Added button to open the status report location when completed.
Signed-off-by: Konstantina Chremmou <[email protected]>
1 parent 5c858be commit 57f31bf

File tree

3 files changed

+146
-44
lines changed

3 files changed

+146
-44
lines changed

‎XenAdmin/Wizards/BugToolWizard/BugToolPageRetrieveData.Designer.cs‎

Lines changed: 22 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎XenAdmin/Wizards/BugToolWizard/BugToolPageRetrieveData.cs‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public partial class BugToolPageRetrieveData : XenTabPage
4747
private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
4848

4949
private const int MAX_DOWNLOADS_PER_CONNECTION = 3;
50-
public string OutputFile { get; set; }
50+
private bool _packagedReport;
5151

5252
public BugToolPageRetrieveData()
5353
{
@@ -80,6 +80,8 @@ protected override void PageLoadedCore(PageLoadedDirection direction)
8080
protected override void PageLeaveCore(PageLoadedDirection direction, ref bool cancel)
8181
{
8282
_packagedReport = false;
83+
buttonOpenLocation.Visible = false;
84+
8385
if (direction == PageLoadedDirection.Forward)
8486
return;
8587

@@ -97,7 +99,7 @@ public override void PageCancelled(ref bool cancel)
9799
public List<Host> SelectedHosts { private get; set; }
98100
public List<Capability> CapabilityList { private get; set; }
99101
public string OutputFolder { get; private set; }
100-
private bool _packagedReport;
102+
public string OutputFile { get; set; }
101103
#endregion
102104

103105
/// <summary>
@@ -325,10 +327,12 @@ private void Row_RowStatusCompleted(StatusReportRow row)
325327
else if (!failureExists)
326328
{
327329
labelError.Text = Messages.ACTION_SYSTEM_STATUS_COMPILE_SUCCESSFUL;
330+
buttonOpenLocation.Visible = true;
328331
}
329332
else
330333
{
331334
labelError.Text = Messages.ACTION_SYSTEM_STATUS_COMPILE_PARTIAL;
335+
buttonOpenLocation.Visible = true;
332336
}
333337

334338
_packagedReport = false;
@@ -397,5 +401,17 @@ private void linkLabelBlurb_LinkClicked(object sender, LinkLabelLinkClickedEvent
397401
dlg.ShowDialog(Program.MainWindow);
398402
}
399403
}
404+
405+
private void buttonOpenLocation_Click(object sender, EventArgs e)
406+
{
407+
try
408+
{
409+
Process.Start("explorer.exe", $"/select, \"{OutputFile}\"");
410+
}
411+
catch (Exception ex)
412+
{
413+
Log.Debug(ex);
414+
}
415+
}
400416
}
401417
}

‎XenAdmin/Wizards/BugToolWizard/BugToolPageRetrieveData.resx‎

Lines changed: 106 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,14 @@
133133
</data>
134134
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
135135
<data name="labelError.Location" type="System.Drawing.Point, System.Drawing">
136-
<value>3, 407</value>
136+
<value>3, 400</value>
137137
</data>
138138
<data name="labelError.Size" type="System.Drawing.Size, System.Drawing">
139139
<value>677, 13</value>
140140
</data>
141141
<data name="labelError.TabIndex" type="System.Int32, mscorlib">
142142
<value>4</value>
143143
</data>
144-
<data name="labelError.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
145-
<value>MiddleLeft</value>
146-
</data>
147144
<data name="&gt;&gt;labelError.Name" xml:space="preserve">
148145
<value>labelError</value>
149146
</data>
@@ -156,33 +153,6 @@
156153
<data name="&gt;&gt;labelError.ZOrder" xml:space="preserve">
157154
<value>0</value>
158155
</data>
159-
<data name="progressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
160-
<value>Left, Right</value>
161-
</data>
162-
<data name="progressBar1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
163-
<value>NoControl</value>
164-
</data>
165-
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
166-
<value>3, 423</value>
167-
</data>
168-
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
169-
<value>677, 16</value>
170-
</data>
171-
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
172-
<value>5</value>
173-
</data>
174-
<data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
175-
<value>progressBar1</value>
176-
</data>
177-
<data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
178-
<value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
179-
</data>
180-
<data name="&gt;&gt;progressBar1.Parent" xml:space="preserve">
181-
<value>tableLayoutPanel1</value>
182-
</data>
183-
<data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
184-
<value>1</value>
185-
</data>
186156
<metadata name="columnHostImage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
187157
<value>True</value>
188158
</metadata>
@@ -254,13 +224,13 @@
254224
<value>Fill</value>
255225
</data>
256226
<data name="dataGridViewEx1.Location" type="System.Drawing.Point, System.Drawing">
257-
<value>3, 61</value>
227+
<value>3, 56</value>
258228
</data>
259229
<data name="dataGridViewEx1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
260-
<value>3, 10, 3, 10</value>
230+
<value>3, 12, 3, 10</value>
261231
</data>
262232
<data name="dataGridViewEx1.Size" type="System.Drawing.Size, System.Drawing">
263-
<value>677, 336</value>
233+
<value>677, 334</value>
264234
</data>
265235
<data name="dataGridViewEx1.TabIndex" type="System.Int32, mscorlib">
266236
<value>3</value>
@@ -269,13 +239,13 @@
269239
<value>dataGridViewEx1</value>
270240
</data>
271241
<data name="&gt;&gt;dataGridViewEx1.Type" xml:space="preserve">
272-
<value>XenAdmin.Controls.DataGridViewEx.DataGridViewEx, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
242+
<value>XenAdmin.Controls.DataGridViewEx.DataGridViewEx, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
273243
</data>
274244
<data name="&gt;&gt;dataGridViewEx1.Parent" xml:space="preserve">
275245
<value>tableLayoutPanel1</value>
276246
</data>
277247
<data name="&gt;&gt;dataGridViewEx1.ZOrder" xml:space="preserve">
278-
<value>2</value>
248+
<value>1</value>
279249
</data>
280250
<data name="labelBlurb.AutoSize" type="System.Boolean, mscorlib">
281251
<value>True</value>
@@ -308,7 +278,7 @@
308278
<value>tableLayoutPanel1</value>
309279
</data>
310280
<data name="&gt;&gt;labelBlurb.ZOrder" xml:space="preserve">
311-
<value>3</value>
281+
<value>2</value>
312282
</data>
313283
<data name="linkLabelBlurb.AutoSize" type="System.Boolean, mscorlib">
314284
<value>True</value>
@@ -338,7 +308,7 @@
338308
<value>tableLayoutPanel1</value>
339309
</data>
340310
<data name="&gt;&gt;linkLabelBlurb.ZOrder" xml:space="preserve">
341-
<value>4</value>
311+
<value>3</value>
342312
</data>
343313
<data name="labelBlurbCis.AutoSize" type="System.Boolean, mscorlib">
344314
<value>True</value>
@@ -368,8 +338,104 @@
368338
<value>tableLayoutPanel1</value>
369339
</data>
370340
<data name="&gt;&gt;labelBlurbCis.ZOrder" xml:space="preserve">
341+
<value>4</value>
342+
</data>
343+
<data name="tableLayoutPanel2.AutoSize" type="System.Boolean, mscorlib">
344+
<value>True</value>
345+
</data>
346+
<data name="tableLayoutPanel2.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
347+
<value>GrowAndShrink</value>
348+
</data>
349+
<data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
350+
<value>2</value>
351+
</data>
352+
<data name="buttonOpenLocation.Location" type="System.Drawing.Point, System.Drawing">
353+
<value>540, 3</value>
354+
</data>
355+
<data name="buttonOpenLocation.Size" type="System.Drawing.Size, System.Drawing">
356+
<value>140, 23</value>
357+
</data>
358+
<data name="buttonOpenLocation.TabIndex" type="System.Int32, mscorlib">
359+
<value>1</value>
360+
</data>
361+
<data name="buttonOpenLocation.Text" xml:space="preserve">
362+
<value>&amp;Open report location</value>
363+
</data>
364+
<data name="buttonOpenLocation.Visible" type="System.Boolean, mscorlib">
365+
<value>False</value>
366+
</data>
367+
<data name="&gt;&gt;buttonOpenLocation.Name" xml:space="preserve">
368+
<value>buttonOpenLocation</value>
369+
</data>
370+
<data name="&gt;&gt;buttonOpenLocation.Type" xml:space="preserve">
371+
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
372+
</data>
373+
<data name="&gt;&gt;buttonOpenLocation.Parent" xml:space="preserve">
374+
<value>tableLayoutPanel2</value>
375+
</data>
376+
<data name="&gt;&gt;buttonOpenLocation.ZOrder" xml:space="preserve">
377+
<value>0</value>
378+
</data>
379+
<data name="progressBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
380+
<value>Left, Right</value>
381+
</data>
382+
<data name="progressBar1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
383+
<value>NoControl</value>
384+
</data>
385+
<data name="progressBar1.Location" type="System.Drawing.Point, System.Drawing">
386+
<value>3, 4</value>
387+
</data>
388+
<data name="progressBar1.Size" type="System.Drawing.Size, System.Drawing">
389+
<value>531, 21</value>
390+
</data>
391+
<data name="progressBar1.TabIndex" type="System.Int32, mscorlib">
392+
<value>0</value>
393+
</data>
394+
<data name="&gt;&gt;progressBar1.Name" xml:space="preserve">
395+
<value>progressBar1</value>
396+
</data>
397+
<data name="&gt;&gt;progressBar1.Type" xml:space="preserve">
398+
<value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
399+
</data>
400+
<data name="&gt;&gt;progressBar1.Parent" xml:space="preserve">
401+
<value>tableLayoutPanel2</value>
402+
</data>
403+
<data name="&gt;&gt;progressBar1.ZOrder" xml:space="preserve">
404+
<value>1</value>
405+
</data>
406+
<data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
407+
<value>Fill</value>
408+
</data>
409+
<data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
410+
<value>0, 413</value>
411+
</data>
412+
<data name="tableLayoutPanel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
413+
<value>0, 0, 0, 0</value>
414+
</data>
415+
<data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
416+
<value>1</value>
417+
</data>
418+
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
419+
<value>683, 29</value>
420+
</data>
421+
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
371422
<value>5</value>
372423
</data>
424+
<data name="&gt;&gt;tableLayoutPanel2.Name" xml:space="preserve">
425+
<value>tableLayoutPanel2</value>
426+
</data>
427+
<data name="&gt;&gt;tableLayoutPanel2.Type" xml:space="preserve">
428+
<value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
429+
</data>
430+
<data name="&gt;&gt;tableLayoutPanel2.Parent" xml:space="preserve">
431+
<value>tableLayoutPanel1</value>
432+
</data>
433+
<data name="&gt;&gt;tableLayoutPanel2.ZOrder" xml:space="preserve">
434+
<value>5</value>
435+
</data>
436+
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
437+
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="buttonOpenLocation" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="progressBar1" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
438+
</data>
373439
<data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
374440
<value>Fill</value>
375441
</data>
@@ -401,7 +467,7 @@
401467
<value>0</value>
402468
</data>
403469
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
404-
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelError" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="progressBar1" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="dataGridViewEx1" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="labelBlurb" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="linkLabelBlurb" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelBlurbCis" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,Absolute,20,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
470+
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelError" Row="3" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="dataGridViewEx1" Row="2" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="labelBlurb" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="linkLabelBlurb" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelBlurbCis" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel2" Row="4" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100,Absolute,20" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
405471
</data>
406472
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
407473
<value>True</value>
@@ -437,6 +503,6 @@
437503
<value>BugToolPageRetrieveData</value>
438504
</data>
439505
<data name="&gt;&gt;$this.Type" xml:space="preserve">
440-
<value>XenAdmin.Controls.XenTabPage, [XenCenter_No_Space], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
506+
<value>XenAdmin.Controls.XenTabPage, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
441507
</data>
442508
</root>

0 commit comments

Comments
 (0)