Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/xenadmin

Browse Source
This commit is contained in:
Mihaela Stoica 2013-11-20 13:52:00 +00:00
commit 0c90ddccc4
12 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Controls/MainWindowControls/NavigationPane.cs
View File

@ -161,7 +161,7 @@ namespace XenAdmin.Controls.MainWindowControls
public void UpdateNotificationsButton(NotificationsSubMode mode, int entries)
{
notificationsView.UpdateEntries(mode, entries);
buttonNotifyBig.Text = string.Format("Notifications ({0})", notificationsView.GetTotalEntries());
buttonNotifyBig.Text = buttonNotifySmall.Text = string.Format("Notifications ({0})", notificationsView.GetTotalEntries());
}
public void XenConnectionCollectionChanged(CollectionChangeEventArgs e)

10
XenAdmin/Controls/MainWindowControls/NavigationPane.resx
View File

@ -394,7 +394,7 @@
<value>23, 22</value>
</data>
<data name="buttonNotifySmall.Text" xml:space="preserve">
<value>toolStripButton1</value>
<value>Notifications</value>
</data>
<data name="buttonSearchesSmall.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
@ -406,7 +406,7 @@
<value>29, 22</value>
</data>
<data name="buttonSearchesSmall.Text" xml:space="preserve">
<value>toolStripButton1</value>
<value>Saved Searches</value>
</data>
<data name="buttonOrganizationSmall.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
@ -418,7 +418,7 @@
<value>29, 22</value>
</data>
<data name="buttonOrganizationSmall.Text" xml:space="preserve">
<value>toolStripButton1</value>
<value>Organization Views</value>
</data>
<data name="buttonObjectsSmall.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
@ -430,7 +430,7 @@
<value>23, 22</value>
</data>
<data name="buttonObjectsSmall.Text" xml:space="preserve">
<value>toolStripButton1</value>
<value>Objects</value>
</data>
<data name="buttonInfraSmall.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
@ -442,7 +442,7 @@
<value>23, 22</value>
</data>
<data name="buttonInfraSmall.Text" xml:space="preserve">
<value>toolStripButton1</value>
<value>Infrastructure</value>
</data>
<data name="toolStripSmall.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 401</value>

2
XenAdmin/MainWindow.cs
View File

@ -1176,7 +1176,7 @@ namespace XenAdmin
/// </summary>
public void RequestRefreshTreeView()
{
navigationPane.RequestRefreshTreeView();
Program.Invoke(this, navigationPane.RequestRefreshTreeView);
}
private void UpdateHeaderAndTabPages()

6
XenAdmin/MainWindow.resx
View File

@ -1465,16 +1465,16 @@
<value>Magenta</value>
</data>
<data name="ForceShutdownToolbarButton.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 28</value>
<value>117, 28</value>
</data>
<data name="ForceShutdownToolbarButton.Text" xml:space="preserve">
<value>Force Shut down</value>
<value>Force Shut Down</value>
</data>
<data name="ForceShutdownToolbarButton.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="ForceShutdownToolbarButton.ToolTipText" xml:space="preserve">
<value>Force VM Shut down (destructive)</value>
<value>Force VM Shut Down (destructive)</value>
</data>
<data name="ForceShutdownToolbarButton.Visible" type="System.Boolean, mscorlib">
<value>False</value>

6
XenAdmin/SettingsPanels/GpuEditPage.cs
View File

@ -210,7 +210,11 @@ namespace XenAdmin.SettingsPanels
}
}
gpu_groups = Connection.Cache.GPU_groups.Where(g => g.PGPUs.Count > 0 && g.supported_VGPU_types.Count != 0).ToArray();//not showing empty groups
gpu_groups = Helpers.FeatureForbidden(Connection, Host.RestrictVgpu)
? Connection.Cache.GPU_groups
: Connection.Cache.GPU_groups.Where(g => g.PGPUs.Count > 0 && g.supported_VGPU_types.Count != 0).ToArray();
//not showing empty groups
gpusAvailable = gpu_groups.Length > 0;
if (gpusAvailable)

6
XenAdminTests/TabsAndMenus/MainMenuGeorge.cs
View File

@ -1598,7 +1598,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("Reb&oot", true),
new ExpectedTextMenuItem("Start in Reco&very Mode", false),
new ExpectedSeparator(),
new ExpectedTextMenuItem("Force Shut&down", true),
new ExpectedTextMenuItem("Force Shut &Down", true),
new ExpectedTextMenuItem("Force Re&boot", true),
new ExpectedSeparator(),
new ExpectedTextMenuItem("S&tart vApp", false),
@ -1732,7 +1732,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("&Start", false),
new ExpectedTextMenuItem("S&uspend", false), new ExpectedTextMenuItem("Reb&oot", false),
new ExpectedTextMenuItem("Start in Reco&very Mode", false), new ExpectedSeparator(),
new ExpectedTextMenuItem("Force Shut&down", true),
new ExpectedTextMenuItem("Force Shut &Down", true),
new ExpectedTextMenuItem("Force Re&boot", true),
new ExpectedSeparator(),
new ExpectedTextMenuItem("S&tart vApp", false),
@ -1858,7 +1858,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("Reb&oot", false),
new ExpectedTextMenuItem("Start in Reco&very Mode", true),
new ExpectedSeparator(),
new ExpectedTextMenuItem("Force Shut&down", false),
new ExpectedTextMenuItem("Force Shut &Down", false),
new ExpectedTextMenuItem("Force Re&boot", false),
new ExpectedSeparator(),
new ExpectedTextMenuItem("S&tart vApp", false),

4
XenAdminTests/TabsAndMenus/TabsAndMenusGeorge.cs
View File

@ -401,7 +401,7 @@ namespace XenAdminTests.TabsAndMenus
expectedMenuItems.Add(new ExpectedTextMenuItem("S&uspend", true));
expectedMenuItems.Add(new ExpectedTextMenuItem("Reb&oot", true));
expectedMenuItems.Add(new ExpectedSeparator());
expectedMenuItems.Add(new ExpectedTextMenuItem("Force Shutdo&wn", true));
expectedMenuItems.Add(new ExpectedTextMenuItem("Force Shut Do&wn", true));
expectedMenuItems.Add(new ExpectedTextMenuItem("Force Re&boot", true));
expectedMenuItems.Add(new ExpectedSeparator());
@ -445,7 +445,7 @@ namespace XenAdminTests.TabsAndMenus
foreach (VM vm in GetAllXenObjects<VM>(NoTools))
{
VerifyContextMenu(vm, new ExpectedMenuItem[] {
new ExpectedTextMenuItem("Force Shutdo&wn", true),
new ExpectedTextMenuItem("Force Shut Do&wn", true),
new ExpectedTextMenuItem("Force Re&boot", true),
new ExpectedSeparator(),
new ExpectedTextMenuItem("Ta&ke a Snapshot...", true),

2
XenAdminTests/TabsAndMenus/TabsAndMenusTampa.cs
View File

@ -276,7 +276,7 @@ namespace XenAdminTests.TabsAndMenus
expectedMenuItems.Add(new ExpectedTextMenuItem("S&uspend", true));
expectedMenuItems.Add(new ExpectedTextMenuItem("Reb&oot", true));
expectedMenuItems.Add(new ExpectedSeparator());
expectedMenuItems.Add(new ExpectedTextMenuItem("Force Shutdo&wn", true));
expectedMenuItems.Add(new ExpectedTextMenuItem("Force Shut Do&wn", true));
expectedMenuItems.Add(new ExpectedTextMenuItem("Force Re&boot", true));
expectedMenuItems.Add(new ExpectedSeparator());

2
XenAdminTests/TabsAndMenus/ToolbarGeorge.cs
View File

@ -406,7 +406,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("Shut Down", false ),
new ExpectedTextMenuItem("Reboot", false ),
new ExpectedTextMenuItem("Suspend", false ),
new ExpectedTextMenuItem("Force Shut down", true ),
new ExpectedTextMenuItem("Force Shut Down", true ),
new ExpectedTextMenuItem("Force Reboot", true ),
};

8
XenAdminTests/TestResources/ContextMenuBuilderTestResults.xml
View File

@ -1270,7 +1270,7 @@
<ToolStripItem Text="S&amp;uspend" IsSeparator="False" Bold="False" Available="True" Index="2" />
<ToolStripItem Text="Reb&amp;oot" IsSeparator="False" Bold="False" Available="True" Index="3" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="4" />
<ToolStripItem Text="Force Shutdo&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="5" />
<ToolStripItem Text="Force Shut Do&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="5" />
<ToolStripItem Text="Force Re&amp;boot" IsSeparator="False" Bold="False" Available="True" Index="6" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="7" />
<ToolStripItem Text="Start on Ser&amp;ver" IsSeparator="False" Bold="False" Available="True" Index="8" />
@ -1315,7 +1315,7 @@
<ToolStripItem Text="S&amp;uspend" IsSeparator="False" Bold="False" Available="True" Index="2" />
<ToolStripItem Text="Reb&amp;oot" IsSeparator="False" Bold="False" Available="True" Index="3" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="4" />
<ToolStripItem Text="Force Shutdo&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="5" />
<ToolStripItem Text="Force Shut Do&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="5" />
<ToolStripItem Text="Force Re&amp;boot" IsSeparator="False" Bold="False" Available="True" Index="6" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="7" />
<ToolStripItem Text="Start on Ser&amp;ver" IsSeparator="False" Bold="False" Available="True" Index="8" />
@ -1337,7 +1337,7 @@
<ToolStripItem Text="S&amp;uspend" IsSeparator="False" Bold="False" Available="True" Index="1" />
<ToolStripItem Text="Reb&amp;oot" IsSeparator="False" Bold="False" Available="True" Index="2" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="3" />
<ToolStripItem Text="Force Shutdo&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="4" />
<ToolStripItem Text="Force Shut Do&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="4" />
<ToolStripItem Text="Force Re&amp;boot" IsSeparator="False" Bold="False" Available="True" Index="5" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="6" />
<ToolStripItem Text="M&amp;igrate to Server" IsSeparator="False" Bold="False" Available="True" Index="7" />
@ -1446,7 +1446,7 @@
<ToolStripItems>
<ToolStripItem Text="S&amp;tart" IsSeparator="False" Bold="False" Available="True" Index="0" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="1" />
<ToolStripItem Text="Force Shutdo&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="2" />
<ToolStripItem Text="Force Shut Do&amp;wn" IsSeparator="False" Bold="False" Available="True" Index="2" />
<ToolStripItem Text="Force Re&amp;boot" IsSeparator="False" Bold="False" Available="True" Index="3" />
<ToolStripItem Text="" IsSeparator="True" Bold="False" Available="True" Index="4" />
<ToolStripItem Text="Start on Ser&amp;ver" IsSeparator="False" Bold="False" Available="True" Index="5" />

13
XenModel/Messages.Designer.cs generated
View File

@ -13524,15 +13524,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Force Shut down.
/// </summary>
public static string FORCE_SHUTDOWN {
get {
return ResourceManager.GetString("FORCE_SHUTDOWN", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to &amp;Forget.
/// </summary>
@ -18478,7 +18469,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Force Shut&amp;down.
/// Looks up a localized string similar to Force Shut &amp;Down.
/// </summary>
public static string MAINWINDOW_FORCE_SHUTDOWN {
get {
@ -18487,7 +18478,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Force Shutdo&amp;wn.
/// Looks up a localized string similar to Force Shut Do&amp;wn.
/// </summary>
public static string MAINWINDOW_FORCE_SHUTDOWN_CONTEXT_MENU {
get {

7
XenModel/Messages.resx
View File

@ -4745,9 +4745,6 @@ Would you like to eject these ISOs before continuing?</value>
<data name="FORCE_REBOOT" xml:space="preserve">
<value>Force Reboot</value>
</data>
<data name="FORCE_SHUTDOWN" xml:space="preserve">
<value>Force Shut down</value>
</data>
<data name="FORGETTING_SRS" xml:space="preserve">
<value>Forgetting SRs</value>
</data>
@ -6443,10 +6440,10 @@ This will permanently delete and reinitialize all local storage on the servers.
<value>Force Re&amp;boot</value>
</data>
<data name="MAINWINDOW_FORCE_SHUTDOWN" xml:space="preserve">
<value>Force Shut&amp;down</value>
<value>Force Shut &amp;Down</value>
</data>
<data name="MAINWINDOW_FORCE_SHUTDOWN_CONTEXT_MENU" xml:space="preserve">
<value>Force Shutdo&amp;wn</value>
<value>Force Shut Do&amp;wn</value>
</data>
<data name="MAINWINDOW_FORGET_SAVED_PASSWORD" xml:space="preserve">
<value>&amp;Forget</value>