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

Merge pull request #1613 from minli1/feature/Asianux-Turbo-Linux-support/master

Browse Source 
req-398/req-440: ICON support for Asianux Linux and Turbo Linux.
This commit is contained in:
Mihaela Stoica 2017-06-01 14:30:25 +01:00 committed by GitHub
commit 5291c3aa7d
14 changed files with 109 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Images.cs
View File

@ -132,6 +132,8 @@ namespace XenAdmin
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("asianux_16x.png", Properties.Resources.asianux_16x);
ImageList16.Images.Add("turbo_16x.png", Properties.Resources.turbo_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/asianux_16x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 540 B

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

@ -2473,6 +2473,29 @@ namespace XenAdmin.Properties {
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap asianux_16x {
get {
object obj = ResourceManager.GetObject("asianux_16x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap turbo_16x {
get {
object obj = ResourceManager.GetObject("turbo_16x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap notif_alerts_16 {
get {
object obj = ResourceManager.GetObject("notif_alerts_16", resourceCulture);

6
XenAdmin/Properties/Resources.resx
View File

@ -1093,4 +1093,10 @@
<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>
<data name="asianux_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\asianux_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="turbo_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\turbo_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

6
XenAdmin/Properties/Resources.zh-CN.resx
View File

@ -1093,4 +1093,10 @@
<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>
<data name="asianux_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\asianux_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="turbo_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Images\turbo_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

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

@ -319,6 +319,10 @@ namespace XenAdmin.Wizards.NewVMWizard
return Messages.NEW_VM_WIZARD_TEMPLATEPAGE_UBUNTU;
case VM.VmTemplateType.NeoKylin:
return Messages.NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN;
case VM.VmTemplateType.Asianux:
return Messages.NEW_VM_WIZARD_TEMPLATEPAGE_ASIANUX;
case VM.VmTemplateType.Turbo:
return Messages.NEW_VM_WIZARD_TEMPLATEPAGE_TURBO;
case VM.VmTemplateType.Citrix:
return Messages.NEWVMWIZARD_TEMPLATEPAGE_CITRIX;
case VM.VmTemplateType.Solaris:
@ -358,6 +362,10 @@ namespace XenAdmin.Wizards.NewVMWizard
return Resources.ubuntu_16x;
case VM.VmTemplateType.NeoKylin:
return Resources.neokylin_16x;
case VM.VmTemplateType.Asianux:
return Resources.asianux_16x;
case VM.VmTemplateType.Turbo:
return Resources.turbo_16x;
case VM.VmTemplateType.Citrix:
return Resources.Logo;
case VM.VmTemplateType.Solaris:

2
XenAdmin/XenAdmin.csproj
View File

@ -4367,6 +4367,8 @@
<None Include="Images\PausedDC_16.png" />
<None Include="Images\padlock.png" />
<None Include="Images\neokylin_16x.png" />
<None Include="Images\asianux_16x.png" />
<None Include="Images\turbo_16x.png" />
<Content Include="Images\Refresh16.png" />
<None Include="Images\saved_searches_16.png" />
<None Include="Images\server_up_16.png" />

2
XenModel/Icons.cs
View File

@ -108,6 +108,8 @@ namespace XenAdmin
Ubuntu,
SciLinux,
NeoKylin,
Asianux,
Turbo,
Windows,
CoreOS,

20
XenModel/Messages.Designer.cs generated
View File

@ -23275,6 +23275,26 @@ namespace XenAdmin {
return ResourceManager.GetString("NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Asianux.
/// </summary>
public static string NEW_VM_WIZARD_TEMPLATEPAGE_ASIANUX {
get {
return ResourceManager.GetString("NEW_VM_WIZARD_TEMPLATEPAGE_ASIANUX", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Turbo.
/// </summary>
public static string NEW_VM_WIZARD_TEMPLATEPAGE_TURBO {
get {
return ResourceManager.GetString("NEW_VM_WIZARD_TEMPLATEPAGE_TURBO", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Ubuntu.

6
XenModel/Messages.resx
View File

@ -8733,6 +8733,12 @@ It is strongly recommended that you Cancel and apply the latest version of the p
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN" xml:space="preserve">
<value>NeoKylin</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_ASIANUX" xml:space="preserve">
<value>Asianux</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_TURBO" xml:space="preserve">
<value>Turbo</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_UBUNTU" xml:space="preserve">
<value>Ubuntu</value>
</data>

6
XenModel/Messages.zh-CN.resx
View File

@ -8850,6 +8850,12 @@ VM 克隆使用文件管理器的快照和克隆功能来实现高性能，并
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_NEOKYLIN" xml:space="preserve">
<value>NeoKylin</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_ASIANUX" xml:space="preserve">
<value>Asianux</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_TURBO" xml:space="preserve">
<value>Turbo</value>
</data>
<data name="NEW_VM_WIZARD_TEMPLATEPAGE_UBUNTU" xml:space="preserve">
<value>Ubuntu</value>
</data>

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

@ -1006,7 +1006,7 @@ namespace XenAPI
/// Sort in the following order:
/// 1) User Templates
/// 2) Windows VMs
/// 3) Other VMs (e.g. Linux)
/// 3) Other VMs (e.g. Linux . Names in alphabetical order)
/// 4) Citrix VMs (e.g. XenApp templates)
/// 5) Misc VMs
/// 6) Regular snapshots
@ -1019,21 +1019,23 @@ namespace XenAPI
Custom = 1,
Windows = 2,
LegacyWindows = 3,
Centos = 4,
CoreOS = 5,
Debian = 6,
NeoKylin = 7,
Oracle = 8,
RedHat = 9,
SciLinux = 10,
Suse = 11,
Ubuntu = 12,
Citrix = 13,
Solaris = 14,
Misc = 15,
Snapshot = 16,
SnapshotFromVmpp = 17,
Count = 18 //bump this if values are added
Asianux = 4,
Centos = 5,
CoreOS = 6,
Debian = 7,
NeoKylin = 8,
Oracle = 9,
RedHat = 10,
SciLinux = 11,
Suse = 12,
Turbo = 13,
Ubuntu = 14,
Citrix = 15,
Solaris = 16,
Misc = 17,
Snapshot = 18,
SnapshotFromVmpp = 19,
Count = 20 //bump this if values are added
}
public VmTemplateType TemplateType
@ -1087,6 +1089,12 @@ namespace XenAPI
if (os.Contains("kylin"))
return VmTemplateType.NeoKylin;
if (os.Contains("asianux"))
return VmTemplateType.Asianux;
if (os.Contains("turbo"))
return VmTemplateType.Turbo;
if (os.Contains("solaris"))
return VmTemplateType.Solaris;

4
XenModel/XenSearch/Common.cs
View File

@ -1255,6 +1255,10 @@ namespace XenAdmin.XenSearch
return Icons.SciLinux;
if (os.Contains("kylin"))
return Icons.NeoKylin;
if (os.Contains("asianux"))
return Icons.Asianux;
if (os.Contains("turbo"))
return Icons.Turbo;
if (os.Contains("windows"))
return Icons.Windows;
if (os.Contains("coreos"))