diff --git a/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs b/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs index 3caf3ff77..810a516e5 100644 --- a/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs +++ b/XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs @@ -65,7 +65,7 @@ namespace XenAdmin.Dialogs // pictureBoxAdPicture // resources.ApplyResources(this.pictureBoxAdPicture, "pictureBoxAdPicture"); - this.pictureBoxAdPicture.Image = global::XenAdmin.Properties.Resources._000_User_h32bit_16; + this.pictureBoxAdPicture.Image = global::XenAdmin.Properties.Resources._000_User_h32bit_32; this.pictureBoxAdPicture.Name = "pictureBoxAdPicture"; this.pictureBoxAdPicture.TabStop = false; // @@ -94,9 +94,9 @@ namespace XenAdmin.Dialogs // // flowLayoutPanel1 // + resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); this.flowLayoutPanel1.Controls.Add(this.buttonCancel); this.flowLayoutPanel1.Controls.Add(this.buttonOK); - resources.ApplyResources(this.flowLayoutPanel1, "flowLayoutPanel1"); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; // // buttonCancel diff --git a/XenAdmin/Dialogs/ReconnectAsDialog.resx b/XenAdmin/Dialogs/ReconnectAsDialog.resx index d9600a961..90072907e 100644 --- a/XenAdmin/Dialogs/ReconnectAsDialog.resx +++ b/XenAdmin/Dialogs/ReconnectAsDialog.resx @@ -139,7 +139,7 @@ 3, 3 - 46, 39 + 32, 32 CenterImage @@ -159,20 +159,20 @@ 0 + + Left + True - - Fill - Segoe UI, 9pt - 55, 92 + 41, 97 - 63, 29 + 63, 15 1 @@ -195,20 +195,17 @@ 2 - - Top + + Left, Right Segoe UI, 9pt - 124, 95 - - - 3, 3, 20, 3 + 110, 93 - 317, 23 + 328, 23 2 @@ -225,20 +222,20 @@ 3 + + Left + True - - Fill - Segoe UI, 9pt - 55, 121 + 41, 126 - 63, 29 + 60, 15 3 @@ -261,20 +258,17 @@ 4 - - Top + + Left, Right Segoe UI, 9pt - 124, 124 - - - 3, 3, 20, 3 + 110, 122 - 317, 23 + 328, 23 4 @@ -291,11 +285,17 @@ 5 + + True + + + GrowAndShrink + Segoe UI, 9pt - 256, 3 + 250, 3 75, 23 @@ -325,7 +325,7 @@ Segoe UI, 9pt - 175, 3 + 169, 3 75, 23 @@ -358,13 +358,13 @@ Segoe UI, 9pt - 124, 160 + 110, 158 3, 10, 3, 3 - 334, 32 + 328, 29 5 @@ -388,7 +388,7 @@ Segoe UI, 9pt - 0, 0 + 10, 10 6, 6, 6, 6 @@ -397,7 +397,7 @@ 4 - 461, 195 + 441, 190 0 @@ -415,7 +415,7 @@ 0 - <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxAdPicture" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelBlurb" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelUsername" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="textBoxUsername" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelPassword" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="textBoxPassword" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="flowLayoutPanel1" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="Absolute,52,AutoSize,0,Percent,100" /><Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /></TableLayoutSettings> + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls><Control Name="pictureBoxAdPicture" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /><Control Name="labelBlurb" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /><Control Name="labelUsername" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="textBoxUsername" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="labelPassword" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /><Control Name="textBoxPassword" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /><Control Name="flowLayoutPanel1" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /></Controls><Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /><Rows Styles="Percent,100,AutoSize,0,AutoSize,0,AutoSize,0" /></TableLayoutSettings> Fill @@ -424,16 +424,13 @@ Segoe UI, 9pt - 58, 6 - - - 6, 6, 6, 6 + 41, 0 397, 80 - 397, 80 + 397, 90 0 @@ -462,7 +459,7 @@ To log out of this server and log in again using a different user account, enter 96, 96 - 461, 195 + 461, 210 Segoe UI, 9pt @@ -470,6 +467,9 @@ To log out of this server and log in again using a different user account, enter 0, 0, 0, 0 + + 10, 10, 10, 10 + Reconnect As Different User diff --git a/XenAdmin/Dialogs/RoleSelectionDialog.cs b/XenAdmin/Dialogs/RoleSelectionDialog.cs index a39e5897c..fb0e06e5e 100644 --- a/XenAdmin/Dialogs/RoleSelectionDialog.cs +++ b/XenAdmin/Dialogs/RoleSelectionDialog.cs @@ -66,7 +66,7 @@ namespace XenAdmin.Dialogs var allAreGroups = subjects.Length > 0 && subjects.All(s => s.IsGroup); var allAreUsers = subjects.Length > 0 && subjects.All(s => !s.IsGroup); - pictureBoxSubjectType.Image = allAreUsers ? Properties.Resources._000_User_h32bit_16 : Properties.Resources._000_UserAndGroup_h32bit_32; + pictureBoxSubjectType.Image = allAreUsers ? Properties.Resources._000_User_h32bit_32 : Properties.Resources._000_UserAndGroup_h32bit_32; if (subjects.Length == 1) { diff --git a/XenAdmin/Images.cs b/XenAdmin/Images.cs index ec2cf4fa7..7c42ab208 100644 --- a/XenAdmin/Images.cs +++ b/XenAdmin/Images.cs @@ -691,6 +691,7 @@ namespace XenAdmin public static Image _000_TreeConnected_h32bit_16 = Properties.Resources._000_TreeConnected_h32bit_16; public static Image _000_UpgradePool_h32bit_32 = Properties.Resources._000_UpgradePool_h32bit_32; public static Image _000_User_h32bit_16 = Properties.Resources._000_User_h32bit_16; + public static Image _000_UserAndGroup_h32bit_16 = Properties.Resources._000_UserAndGroup_h32bit_16; public static Image _000_UserAndGroup_h32bit_32 = Properties.Resources._000_UserAndGroup_h32bit_32; public static Image _000_UserTemplate_h32bit_16 = Properties.Resources._000_UserTemplate_h32bit_16; public static Image _000_ViewModeList_h32bit_16 = Properties.Resources._000_ViewModeList_h32bit_16; diff --git a/XenAdmin/Images/000_UserAndGroup_h32bit_16.png b/XenAdmin/Images/000_UserAndGroup_h32bit_16.png new file mode 100644 index 000000000..ca412e8d5 Binary files /dev/null and b/XenAdmin/Images/000_UserAndGroup_h32bit_16.png differ diff --git a/XenAdmin/Images/000_UserAndGroup_h32bit_24.png b/XenAdmin/Images/000_UserAndGroup_h32bit_24.png new file mode 100644 index 000000000..a84f3aac7 Binary files /dev/null and b/XenAdmin/Images/000_UserAndGroup_h32bit_24.png differ diff --git a/XenAdmin/Images/000_UserAndGroup_h32bit_32.png b/XenAdmin/Images/000_UserAndGroup_h32bit_32.png index d9bdfc22a..3cd087d53 100644 Binary files a/XenAdmin/Images/000_UserAndGroup_h32bit_32.png and b/XenAdmin/Images/000_UserAndGroup_h32bit_32.png differ diff --git a/XenAdmin/Images/000_User_h32bit_16.png b/XenAdmin/Images/000_User_h32bit_16.png index 5ce1617c4..a991f04a8 100644 Binary files a/XenAdmin/Images/000_User_h32bit_16.png and b/XenAdmin/Images/000_User_h32bit_16.png differ diff --git a/XenAdmin/Images/000_User_h32bit_24.png b/XenAdmin/Images/000_User_h32bit_24.png new file mode 100644 index 000000000..cef4a4504 Binary files /dev/null and b/XenAdmin/Images/000_User_h32bit_24.png differ diff --git a/XenAdmin/Images/000_User_h32bit_32.png b/XenAdmin/Images/000_User_h32bit_32.png new file mode 100644 index 000000000..5999dffec Binary files /dev/null and b/XenAdmin/Images/000_User_h32bit_32.png differ diff --git a/XenAdmin/Properties/Resources.Designer.cs b/XenAdmin/Properties/Resources.Designer.cs index e07acd4e7..ddf4bdbf8 100755 --- a/XenAdmin/Properties/Resources.Designer.cs +++ b/XenAdmin/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace XenAdmin.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -1300,6 +1300,26 @@ namespace XenAdmin.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _000_User_h32bit_32 { + get { + object obj = ResourceManager.GetObject("_000_User_h32bit_32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _000_UserAndGroup_h32bit_16 { + get { + object obj = ResourceManager.GetObject("_000_UserAndGroup_h32bit_16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/XenAdmin/Properties/Resources.resx b/XenAdmin/Properties/Resources.resx index 2da5b52b8..747cac894 100755 --- a/XenAdmin/Properties/Resources.resx +++ b/XenAdmin/Properties/Resources.resx @@ -1114,4 +1114,10 @@ ..\Images\usb_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\000_userandgroup_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\000_user_h32bit_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/XenAdmin/TabPages/AdPage.cs b/XenAdmin/TabPages/AdPage.cs index abc380511..7fb33b0ab 100644 --- a/XenAdmin/TabPages/AdPage.cs +++ b/XenAdmin/TabPages/AdPage.cs @@ -643,7 +643,7 @@ namespace XenAdmin.TabPages subject = subj; _cellExpander.Value = expanded ? Resources.expanded_triangle : Resources.contracted_triangle; - _cellGroupOrUser.Value = IsLocalRootRow || !subject.IsGroup ? Resources._000_User_h32bit_16 : Resources._000_UserAndGroup_h32bit_32; + _cellGroupOrUser.Value = IsLocalRootRow || !subject.IsGroup ? Resources._000_User_h32bit_16 : Resources._000_UserAndGroup_h32bit_16; _cellSubjectInfo.Value = expanded ? expandedSubjectInfo : contractedSubjectInfo; _cellRoles.Value = expanded ? expandedRoles : contractedRoles; _cellLoggedIn.Value = IsLocalRootRow || subject.IsGroup || statusLost diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index e7a66f0fd..e792757bf 100755 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -4407,6 +4407,8 @@ + +