diff --git a/XenAdmin/Images.cs b/XenAdmin/Images.cs index 60c005337..7cb9c86ad 100644 --- a/XenAdmin/Images.cs +++ b/XenAdmin/Images.cs @@ -172,6 +172,11 @@ namespace XenAdmin ImageList16.Images.Add("infra_view_16_textured.png", Properties.Resources.infra_view_16_textured); ImageList16.Images.Add("objects_16_textured.png", Properties.Resources.objects_16_textured); + ImageList16.Images.Add("RunningDC_16.png", Properties.Resources.RunningDC_16); + ImageList16.Images.Add("StoppedDC_16.png", Properties.Resources.StoppedDC_16); + ImageList16.Images.Add("PausedDC_16.png", Properties.Resources.PausedDC_16); + + System.Diagnostics.Trace.Assert(ImageList16.Images.Count == Enum.GetValues(typeof(Icons)).Length, "Programmer error - you must add an entry to the image list when you add a new icon to the enum"); @@ -572,11 +577,11 @@ namespace XenAdmin switch (dockerContainer.power_state) { case vm_power_state.Paused: - return Icons.VmSuspended; + return Icons.DCPaused; case vm_power_state.Running: - return Icons.VmRunning; + return Icons.DCRunning; default: - return Icons.VmStopped; + return Icons.DCStopped; } } } diff --git a/XenAdmin/Images/PausedDC_16.png b/XenAdmin/Images/PausedDC_16.png new file mode 100644 index 000000000..16547f206 Binary files /dev/null and b/XenAdmin/Images/PausedDC_16.png differ diff --git a/XenAdmin/Images/RunningDC_16.png b/XenAdmin/Images/RunningDC_16.png new file mode 100644 index 000000000..8d8bd08ee Binary files /dev/null and b/XenAdmin/Images/RunningDC_16.png differ diff --git a/XenAdmin/Images/StoppedDC_16.png b/XenAdmin/Images/StoppedDC_16.png new file mode 100644 index 000000000..60c27647b Binary files /dev/null and b/XenAdmin/Images/StoppedDC_16.png differ diff --git a/XenAdmin/Properties/Resources.Designer.cs b/XenAdmin/Properties/Resources.Designer.cs index 7d35a9d15..3e1d6ce2b 100644 --- a/XenAdmin/Properties/Resources.Designer.cs +++ b/XenAdmin/Properties/Resources.Designer.cs @@ -2620,6 +2620,16 @@ namespace XenAdmin.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap PausedDC_16 { + get { + object obj = ResourceManager.GetObject("PausedDC_16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -2710,6 +2720,16 @@ namespace XenAdmin.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap RunningDC_16 { + get { + object obj = ResourceManager.GetObject("RunningDC_16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -2940,6 +2960,16 @@ namespace XenAdmin.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap StoppedDC_16 { + get { + object obj = ResourceManager.GetObject("StoppedDC_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 f4f31f7bd..830f875bf 100644 --- a/XenAdmin/Properties/Resources.resx +++ b/XenAdmin/Properties/Resources.resx @@ -1084,4 +1084,13 @@ ..\Images\coreos-globe-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Images\RunningDC_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Images\PausedDC_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Images\StoppedDC_16.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/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj index f4755b8ad..bbdc4ba3b 100644 --- a/XenAdmin/XenAdmin.csproj +++ b/XenAdmin/XenAdmin.csproj @@ -247,6 +247,11 @@ UpsellDialog.cs + + True + True + Resources.resx + UserControl @@ -278,11 +283,6 @@ WlbThresholdsPage.cs - - True - True - Resources.resx - UserControl @@ -4003,10 +4003,12 @@ + + @@ -4071,6 +4073,7 @@ + diff --git a/XenModel/Icons.cs b/XenModel/Icons.cs index 80cf5ec79..9433b804f 100644 --- a/XenModel/Icons.cs +++ b/XenModel/Icons.cs @@ -156,6 +156,14 @@ namespace XenAdmin PifSecondary, Home, - Objects + Objects, + + #region DockerContainer Icons + + DCRunning, + DCStopped, + DCPaused + + #endregion } }