Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1235 from MihaelaStoica/master

Browse Source 
CP-19257: Icon for Kylin Linux
This commit is contained in:
Konstantina Chremmou 2016-10-24 10:46:10 +01:00 committed by GitHub
commit 56d7f52b16
11 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
XenAdmin/Images.cs
View File

@ -131,6 +131,7 @@ namespace XenAdmin
ImageList16.Images.Add("suse_16x.png", Properties.Resources.suse_16x);
ImageList16.Images.Add("ubuntu_16x.png", Properties.Resources.ubuntu_16x);
ImageList16.Images.Add("scilinux_16x.png", Properties.Resources.scilinux_16x);
ImageList16.Images.Add("neokylin_16x.png", Properties.Resources.neokylin_16x);
ImageList16.Images.Add("windows_h32bit_16.png", Properties.Resources.windows_h32bit_16);
ImageList16.Images.Add("coreos-globe-icon.png", Properties.Resources.coreos_globe_icon);

BIN
XenAdmin/Images/neokylin_16x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 721 B

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

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -2460,6 +2460,16 @@ namespace XenAdmin.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap neokylin_16x {
get {
object obj = ResourceManager.GetObject("neokylin_16x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
XenAdmin/Properties/Resources.resx
View File

@ -1090,4 +1090,7 @@
<data name="_000_RemoveSite_h32bit_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\000_RemoveSite_h32bit_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="neokylin_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\neokylin_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

4
XenAdmin/Wizards/NewVMWizard/Page_Template.cs
View File

@ -316,6 +316,8 @@ namespace XenAdmin.Wizards.NewVMWizard
return Messages.NEWVMWIZARD_TEMPLATEPAGE_SUSE;
case VM.VmTemplateType.Ubuntu:
return Messages.NEW_VM_WIZARD_TEMPLATEPAGE_UBUNTU;
case VM.VmTemplateType.NeoKylin:
return Messages.NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN;
case VM.VmTemplateType.Citrix:
return Messages.NEWVMWIZARD_TEMPLATEPAGE_CITRIX;
case VM.VmTemplateType.Solaris:
@ -352,6 +354,8 @@ namespace XenAdmin.Wizards.NewVMWizard
return Resources.suse_16x;
case VM.VmTemplateType.Ubuntu:
return Resources.ubuntu_16x;
case VM.VmTemplateType.NeoKylin:
return Resources.neokylin_16x;
case VM.VmTemplateType.Citrix:
return Resources.Logo;
case VM.VmTemplateType.Solaris:

1
XenAdmin/XenAdmin.csproj
View File

@ -4366,6 +4366,7 @@
<None Include="Images\objects_16_textured.png" />
<None Include="Images\PausedDC_16.png" />
<None Include="Images\padlock.png" />
<None Include="Images\neokylin_16x.png" />
<Content Include="Images\Refresh16.png" />
<None Include="Images\saved_searches_16.png" />
<None Include="Images\server_up_16.png" />

1
XenModel/Icons.cs
View File

@ -107,6 +107,7 @@ namespace XenAdmin
SUSE,
Ubuntu,
SciLinux,
NeoKylin,
Windows,
CoreOS,

9
XenModel/Messages.Designer.cs generated
View File

@ -23303,6 +23303,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to NeoKylin.
/// </summary>
public static string NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN {
get {
return ResourceManager.GetString("NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Ubuntu.
/// </summary>

3
XenModel/Messages.resx
View File

@ -8724,6 +8724,9 @@ It is strongly recommended that you Cancel and apply the latest version of the p
<data name="NEW_VM_WIZARD_NO_SR_OR_SRS_FULL" xml:space="preserve">
<value>Cannot find a storage repository or all your storage repositories are full.</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN" xml:space="preserve">
<value>NeoKylin</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_UBUNTU" xml:space="preserve">
<value>Ubuntu</value>
</data>

26
XenModel/XenAPI-Extensions/VM.cs
View File

@ -1021,17 +1021,18 @@ namespace XenAPI
Centos = 3,
CoreOS = 4,
Debian = 5,
Oracle = 6,
RedHat = 7,
SciLinux = 8,
Suse = 9,
Ubuntu = 10,
Citrix = 11,
Solaris = 12,
Misc = 13,
Snapshot = 14,
SnapshotFromVmpp = 15,
Count = 16 //bump this if values are added
NeoKylin = 6,
Oracle = 7,
RedHat = 8,
SciLinux = 9,
Suse = 10,
Ubuntu = 11,
Citrix = 12,
Solaris = 13,
Misc = 14,
Snapshot = 15,
SnapshotFromVmpp = 16,
Count = 17 //bump this if values are added
}
public VmTemplateType TemplateType
@ -1079,6 +1080,9 @@ namespace XenAPI
if (os.Contains("ubuntu"))
return VmTemplateType.Ubuntu;
if (os.Contains("kylin"))
return VmTemplateType.NeoKylin;
if (os.Contains("solaris"))
return VmTemplateType.Solaris;

2
XenModel/XenSearch/Common.cs
View File

@ -1253,6 +1253,8 @@ namespace XenAdmin.XenSearch
return Icons.Ubuntu;
if (os.Contains("scientific"))
return Icons.SciLinux;
if (os.Contains("kylin"))
return Icons.NeoKylin;
if (os.Contains("windows"))
return Icons.Windows;
if (os.Contains("coreos"))