Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 12:30:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

New user and group icons.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2019-08-11 16:30:55 +01:00 committed by Mihaela Stoica
parent bf6f06457e
commit faa662c9ec
14 changed files with 72 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/Dialogs/ReconnectAsDialog.Designer.cs generated
View File

@ -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

76
XenAdmin/Dialogs/ReconnectAsDialog.resx
View File

@ -139,7 +139,7 @@
<value>3, 3</value>
</data>
<data name="pictureBoxAdPicture.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 39</value>
<value>32, 32</value>
</data>
<data name="pictureBoxAdPicture.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>CenterImage</value>
@ -159,20 +159,20 @@
<data name="&gt;&gt;pictureBoxAdPicture.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="labelUsername.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="labelUsername.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelUsername.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="labelUsername.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelUsername.Location" type="System.Drawing.Point, System.Drawing">
<value>55, 92</value>
<value>41, 97</value>
</data>
<data name="labelUsername.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 29</value>
<value>63, 15</value>
</data>
<data name="labelUsername.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -195,20 +195,17 @@
<data name="&gt;&gt;labelUsername.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="textBoxUsername.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
<data name="textBoxUsername.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left, Right</value>
</data>
<data name="textBoxUsername.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="textBoxUsername.Location" type="System.Drawing.Point, System.Drawing">
<value>124, 95</value>
</data>
<data name="textBoxUsername.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 20, 3</value>
<value>110, 93</value>
</data>
<data name="textBoxUsername.Size" type="System.Drawing.Size, System.Drawing">
<value>317, 23</value>
<value>328, 23</value>
</data>
<data name="textBoxUsername.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -225,20 +222,20 @@
<data name="&gt;&gt;textBoxUsername.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="labelPassword.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left</value>
</data>
<data name="labelPassword.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labelPassword.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="labelPassword.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="labelPassword.Location" type="System.Drawing.Point, System.Drawing">
<value>55, 121</value>
<value>41, 126</value>
</data>
<data name="labelPassword.Size" type="System.Drawing.Size, System.Drawing">
<value>63, 29</value>
<value>60, 15</value>
</data>
<data name="labelPassword.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -261,20 +258,17 @@
<data name="&gt;&gt;labelPassword.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="textBoxPassword.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
<data name="textBoxPassword.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Left, Right</value>
</data>
<data name="textBoxPassword.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="textBoxPassword.Location" type="System.Drawing.Point, System.Drawing">
<value>124, 124</value>
</data>
<data name="textBoxPassword.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 20, 3</value>
<value>110, 122</value>
</data>
<data name="textBoxPassword.Size" type="System.Drawing.Size, System.Drawing">
<value>317, 23</value>
<value>328, 23</value>
</data>
<data name="textBoxPassword.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -291,11 +285,17 @@
<data name="&gt;&gt;textBoxPassword.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="flowLayoutPanel1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<data name="buttonCancel.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
</data>
<data name="buttonCancel.Location" type="System.Drawing.Point, System.Drawing">
<value>256, 3</value>
<value>250, 3</value>
</data>
<data name="buttonCancel.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -325,7 +325,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="buttonOK.Location" type="System.Drawing.Point, System.Drawing">
<value>175, 3</value>
<value>169, 3</value>
</data>
<data name="buttonOK.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
@ -358,13 +358,13 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="flowLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>124, 160</value>
<value>110, 158</value>
</data>
<data name="flowLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 10, 3, 3</value>
</data>
<data name="flowLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>334, 32</value>
<value>328, 29</value>
</data>
<data name="flowLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -388,7 +388,7 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
<value>10, 10</value>
</data>
<data name="tableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
@ -397,7 +397,7 @@
<value>4</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>461, 195</value>
<value>441, 190</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -415,7 +415,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="pictureBoxAdPicture" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelBlurb" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="labelUsername" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxUsername" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="labelPassword" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxPassword" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="flowLayoutPanel1" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,52,AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="pictureBoxAdPicture" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelBlurb" Row="0" RowSpan="1" Column="1" ColumnSpan="2" /&gt;&lt;Control Name="labelUsername" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxUsername" Row="1" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="labelPassword" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="textBoxPassword" Row="2" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;Control Name="flowLayoutPanel1" Row="3" RowSpan="1" Column="2" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="labelBlurb.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -424,16 +424,13 @@
<value>Segoe UI, 9pt</value>
</data>
<data name="labelBlurb.Location" type="System.Drawing.Point, System.Drawing">
<value>58, 6</value>
</data>
<data name="labelBlurb.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
<value>41, 0</value>
</data>
<data name="labelBlurb.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>397, 80</value>
</data>
<data name="labelBlurb.Size" type="System.Drawing.Size, System.Drawing">
<value>397, 80</value>
<value>397, 90</value>
</data>
<data name="labelBlurb.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -462,7 +459,7 @@ To log out of this server and log in again using a different user account, enter
<value>96, 96</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>461, 195</value>
<value>461, 210</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt</value>
@ -470,6 +467,9 @@ To log out of this server and log in again using a different user account, enter
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>10, 10, 10, 10</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Reconnect As Different User</value>
</data>

2
XenAdmin/Dialogs/RoleSelectionDialog.cs
View File

@ -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)
{

1
XenAdmin/Images.cs
View File

@ -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;

BIN
XenAdmin/Images/000_UserAndGroup_h32bit_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
XenAdmin/Images/000_UserAndGroup_h32bit_24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
XenAdmin/Images/000_UserAndGroup_h32bit_32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
XenAdmin/Images/000_User_h32bit_16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 627 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
XenAdmin/Images/000_User_h32bit_24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
XenAdmin/Images/000_User_h32bit_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

22
XenAdmin/Properties/Resources.Designer.cs generated
View File

@ -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 {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _000_User_h32bit_32 {
get {
object obj = ResourceManager.GetObject("_000_User_h32bit_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _000_UserAndGroup_h32bit_16 {
get {
object obj = ResourceManager.GetObject("_000_UserAndGroup_h32bit_16", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

6
XenAdmin/Properties/Resources.resx
View File

@ -1114,4 +1114,10 @@
<data name="usb_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\usb_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_UserAndGroup_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\000_userandgroup_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_000_User_h32bit_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\000_user_h32bit_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

2
XenAdmin/TabPages/AdPage.cs
View File

@ -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

2
XenAdmin/XenAdmin.csproj
View File

@ -4407,6 +4407,8 @@
<Content Include="Images\000_Sites_h32bit_16.png" />
<None Include="Images\000_TCP-IPGroup_h32bit_16.png" />
<None Include="Images\015_Download_h32bit_16.png" />
<Content Include="Images\000_UserAndGroup_h32bit_16.png" />
<Content Include="Images\000_User_h32bit_32.png" />
<Content Include="Images\asterisk.png" />
<Content Include="Images\attach_24.png" />
<None Include="Images\cancelled_action_16.png" />