Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Commit de27c12

Browse files
kc284kc284
authored
Merge pull request #3248 from kc284/dvdisolist
CP-43651, one inconsistency, layout tweaks, and minor refactoring on MultipleDvdIsoList.
2 parents 368aa63 + 22e1973 commit de27c12

10 files changed

+288
-329
lines changed

Diff for: ‎XenAdmin/ConsoleView/VNCTabView.Designer.cs

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎XenAdmin/ConsoleView/VNCTabView.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -1291,10 +1291,12 @@ internal void VMPowerOff()
12911291
{
12921292
toggleConsoleButton.Enabled = false;
12931293

1294-
VBD cddrive = source.FindVMCDROM();
1295-
bool allowEject = cddrive != null ? cddrive.allowed_operations.Contains(vbd_operations.eject) : false;
1296-
bool allowInsert = cddrive != null ? cddrive.allowed_operations.Contains(vbd_operations.insert) : false;
1297-
multipleDvdIsoList1.Enabled = (source.power_state == vm_power_state.Halted) && (allowEject || allowInsert);
1294+
VBD cdDrive = source.FindVMCDROM();
1295+
1296+
multipleDvdIsoList1.Enabled = cdDrive == null ||
1297+
source.power_state == vm_power_state.Halted &&
1298+
(cdDrive.allowed_operations.Contains(vbd_operations.eject) ||
1299+
cdDrive.allowed_operations.Contains(vbd_operations.insert));
12981300

12991301
sendCAD.Enabled = false;
13001302
}

Diff for: ‎XenAdmin/ConsoleView/VNCTabView.resx

+62-74
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
<value>NoControl</value>
200200
</data>
201201
<data name="labelGeneralInformationMessage.Location" type="System.Drawing.Point, System.Drawing">
202-
<value>223, 4</value>
202+
<value>223, 2</value>
203203
</data>
204204
<data name="labelGeneralInformationMessage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
205205
<value>0, 0, 3, 0</value>
@@ -208,7 +208,7 @@
208208
<value>0, 30</value>
209209
</data>
210210
<data name="labelGeneralInformationMessage.Size" type="System.Drawing.Size, System.Drawing">
211-
<value>200, 26</value>
211+
<value>205, 30</value>
212212
</data>
213213
<data name="labelGeneralInformationMessage.TabIndex" type="System.Int32, mscorlib">
214214
<value>5</value>
@@ -429,6 +429,42 @@
429429
<metadata name="tip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
430430
<value>17, 17</value>
431431
</metadata>
432+
<data name="toggleConsoleButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
433+
<value>Left</value>
434+
</data>
435+
<data name="toggleConsoleButton.Enabled" type="System.Boolean, mscorlib">
436+
<value>False</value>
437+
</data>
438+
<data name="toggleConsoleButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
439+
<value>NoControl</value>
440+
</data>
441+
<data name="toggleConsoleButton.Location" type="System.Drawing.Point, System.Drawing">
442+
<value>525, 6</value>
443+
</data>
444+
<data name="toggleConsoleButton.Size" type="System.Drawing.Size, System.Drawing">
445+
<value>175, 24</value>
446+
</data>
447+
<data name="toggleConsoleButton.TabIndex" type="System.Int32, mscorlib">
448+
<value>3</value>
449+
</data>
450+
<data name="toggleConsoleButton.Text" xml:space="preserve">
451+
<value>Looking for guest console...</value>
452+
</data>
453+
<data name="toggleConsoleButton.ToolTip" xml:space="preserve">
454+
<value>Remote access is not enabled on this guest</value>
455+
</data>
456+
<data name="&gt;&gt;toggleConsoleButton.Name" xml:space="preserve">
457+
<value>toggleConsoleButton</value>
458+
</data>
459+
<data name="&gt;&gt;toggleConsoleButton.Type" xml:space="preserve">
460+
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
461+
</data>
462+
<data name="&gt;&gt;toggleConsoleButton.Parent" xml:space="preserve">
463+
<value>tableLayoutPanel2</value>
464+
</data>
465+
<data name="&gt;&gt;toggleConsoleButton.ZOrder" xml:space="preserve">
466+
<value>2</value>
467+
</data>
432468
<metadata name="LifeCycleMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
433469
<value>81, 17</value>
434470
</metadata>
@@ -513,33 +549,30 @@
513549
<data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
514550
<value>5</value>
515551
</data>
552+
<data name="HostLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
553+
<value>Left</value>
554+
</data>
516555
<data name="HostLabel.AutoSize" type="System.Boolean, mscorlib">
517556
<value>True</value>
518557
</data>
519-
<data name="HostLabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
520-
<value>Fill</value>
521-
</data>
522558
<data name="HostLabel.Font" type="System.Drawing.Font, System.Drawing">
523559
<value>Segoe UI, 11.25pt</value>
524560
</data>
525561
<data name="HostLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
526562
<value>NoControl</value>
527563
</data>
528564
<data name="HostLabel.Location" type="System.Drawing.Point, System.Drawing">
529-
<value>3, 0</value>
565+
<value>3, 8</value>
530566
</data>
531567
<data name="HostLabel.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
532568
<value>8, 0, 0, 0</value>
533569
</data>
534570
<data name="HostLabel.Size" type="System.Drawing.Size, System.Drawing">
535-
<value>8, 37</value>
571+
<value>8, 20</value>
536572
</data>
537573
<data name="HostLabel.TabIndex" type="System.Int32, mscorlib">
538574
<value>0</value>
539575
</data>
540-
<data name="HostLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
541-
<value>MiddleLeft</value>
542-
</data>
543576
<data name="&gt;&gt;HostLabel.Name" xml:space="preserve">
544577
<value>HostLabel</value>
545578
</data>
@@ -553,7 +586,7 @@
553586
<value>0</value>
554587
</data>
555588
<data name="buttonSSH.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
556-
<value>Top, Right</value>
589+
<value>Left</value>
557590
</data>
558591
<data name="buttonSSH.AutoSize" type="System.Boolean, mscorlib">
559592
<value>True</value>
@@ -565,13 +598,10 @@
565598
<value>NoControl</value>
566599
</data>
567600
<data name="buttonSSH.Location" type="System.Drawing.Point, System.Drawing">
568-
<value>399, 6</value>
569-
</data>
570-
<data name="buttonSSH.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
571-
<value>3, 6, 6, 6</value>
601+
<value>397, 7</value>
572602
</data>
573603
<data name="buttonSSH.Size" type="System.Drawing.Size, System.Drawing">
574-
<value>114, 23</value>
604+
<value>122, 23</value>
575605
</data>
576606
<data name="buttonSSH.TabIndex" type="System.Int32, mscorlib">
577607
<value>2</value>
@@ -591,56 +621,20 @@
591621
<data name="&gt;&gt;buttonSSH.ZOrder" xml:space="preserve">
592622
<value>1</value>
593623
</data>
594-
<data name="toggleConsoleButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
595-
<value>Top, Right</value>
624+
<data name="multipleDvdIsoList1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
625+
<value>Left, Right</value>
596626
</data>
597-
<data name="toggleConsoleButton.Enabled" type="System.Boolean, mscorlib">
598-
<value>False</value>
599-
</data>
600-
<data name="toggleConsoleButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
601-
<value>NoControl</value>
602-
</data>
603-
<data name="toggleConsoleButton.Location" type="System.Drawing.Point, System.Drawing">
604-
<value>522, 6</value>
605-
</data>
606-
<data name="toggleConsoleButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
607-
<value>3, 6, 6, 6</value>
608-
</data>
609-
<data name="toggleConsoleButton.Size" type="System.Drawing.Size, System.Drawing">
610-
<value>175, 24</value>
611-
</data>
612-
<data name="toggleConsoleButton.TabIndex" type="System.Int32, mscorlib">
613-
<value>3</value>
614-
</data>
615-
<data name="toggleConsoleButton.Text" xml:space="preserve">
616-
<value>Looking for guest console...</value>
617-
</data>
618-
<data name="toggleConsoleButton.ToolTip" xml:space="preserve">
619-
<value>Remote access is not enabled on this guest</value>
620-
</data>
621-
<data name="&gt;&gt;toggleConsoleButton.Name" xml:space="preserve">
622-
<value>toggleConsoleButton</value>
623-
</data>
624-
<data name="&gt;&gt;toggleConsoleButton.Type" xml:space="preserve">
625-
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
626-
</data>
627-
<data name="&gt;&gt;toggleConsoleButton.Parent" xml:space="preserve">
628-
<value>tableLayoutPanel2</value>
629-
</data>
630-
<data name="&gt;&gt;toggleConsoleButton.ZOrder" xml:space="preserve">
631-
<value>2</value>
627+
<data name="multipleDvdIsoList1.AutoSize" type="System.Boolean, mscorlib">
628+
<value>True</value>
632629
</data>
633-
<data name="multipleDvdIsoList1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
634-
<value>Fill</value>
630+
<data name="multipleDvdIsoList1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
631+
<value>GrowAndShrink</value>
635632
</data>
636633
<data name="multipleDvdIsoList1.Location" type="System.Drawing.Point, System.Drawing">
637-
<value>47, 3</value>
638-
</data>
639-
<data name="multipleDvdIsoList1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
640-
<value>3, 3, 12, 3</value>
634+
<value>47, 5</value>
641635
</data>
642636
<data name="multipleDvdIsoList1.Size" type="System.Drawing.Size, System.Drawing">
643-
<value>337, 31</value>
637+
<value>344, 27</value>
644638
</data>
645639
<data name="multipleDvdIsoList1.TabIndex" type="System.Int32, mscorlib">
646640
<value>1</value>
@@ -649,34 +643,28 @@
649643
<value>multipleDvdIsoList1</value>
650644
</data>
651645
<data name="&gt;&gt;multipleDvdIsoList1.Type" xml:space="preserve">
652-
<value>XenAdmin.Controls.MultipleDvdIsoList, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
646+
<value>XenAdmin.Controls.MultipleDvdIsoList, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
653647
</data>
654648
<data name="&gt;&gt;multipleDvdIsoList1.Parent" xml:space="preserve">
655649
<value>tableLayoutPanel2</value>
656650
</data>
657651
<data name="&gt;&gt;multipleDvdIsoList1.ZOrder" xml:space="preserve">
658652
<value>3</value>
659653
</data>
654+
<data name="pictureBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
655+
<value>Left</value>
656+
</data>
660657
<data name="pictureBox1.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
661658
<value>None</value>
662659
</data>
663-
<data name="pictureBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
664-
<value>Fill</value>
665-
</data>
666660
<data name="pictureBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
667661
<value>NoControl</value>
668662
</data>
669663
<data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
670-
<value>15, 1</value>
671-
</data>
672-
<data name="pictureBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
673-
<value>1, 1, 1, 1</value>
664+
<value>17, 6</value>
674665
</data>
675666
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
676-
<value>28, 35</value>
677-
</data>
678-
<data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
679-
<value>CenterImage</value>
667+
<value>24, 24</value>
680668
</data>
681669
<data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
682670
<value>8</value>
@@ -730,7 +718,7 @@
730718
<value>0</value>
731719
</data>
732720
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
733-
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="HostLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonSSH" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="toggleConsoleButton" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="multipleDvdIsoList1" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="pictureBox1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="Percent,100,Absolute,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
721+
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="HostLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="buttonSSH" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="toggleConsoleButton" Row="0" RowSpan="1" Column="5" ColumnSpan="1" /&gt;&lt;Control Name="multipleDvdIsoList1" Row="0" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="pictureBox1" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="Percent,100,Absolute,37" /&gt;&lt;/TableLayoutSettings&gt;</value>
734722
</data>
735723
<data name="gradientPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
736724
<value>Top</value>
@@ -748,7 +736,7 @@
748736
<value>gradientPanel1</value>
749737
</data>
750738
<data name="&gt;&gt;gradientPanel1.Type" xml:space="preserve">
751-
<value>XenAdmin.Controls.GradientPanel.GradientPanel, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
739+
<value>XenAdmin.Controls.GradientPanel.HorizontalGradientPanel, [XenCenter], Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
752740
</data>
753741
<data name="&gt;&gt;gradientPanel1.Parent" xml:space="preserve">
754742
<value>$this</value>

Diff for: ‎XenAdmin/Controls/ComboBoxes/ISODropDownBox.cs

+2
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ private void AddSR(ToStringWrapper<SR> srWrapper)
232232
}
233233
}
234234

235+
[Browsable(false)]
236+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
235237
public IXenConnection connection
236238
{
237239
set

0 commit comments

Comments
 (0)