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

Merge pull request #1389 from Frezzle/CAR-2214

Browse Source 
Merged master into CAR-2214 and made changes to enable build
This commit is contained in:
Mihaela Stoica 2017-01-19 14:50:10 +00:00 committed by GitHub
commit 076599d549
429 changed files with 10853 additions and 7622 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Branding/branding.sh
View File

@ -4,33 +4,50 @@
#also we know that xenadmin.git is not a patch queue style repository
BRANDING_CSET_NUMBER=$(cd ${REPO} && git rev-list HEAD -1 && echo "")
#bring in version and branding info from latest xe-phase-1
wget ${WGET_OPT} -P "${SCRATCH_DIR}" "${WEB_XE_PHASE_1}/globals"
# bring versions from the server branding repo
ROOT="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
OUTPUT_DIR=${ROOT}/output
BRANDING_COMPANY_NAME_LEGAL=$(cat ${SCRATCH_DIR}/globals | grep -w COMPANY_NAME_LEGAL | sed -e 's/COMPANY_NAME_LEGAL=//g' -e 's/"//g')
BRANDING_COMPANY_NAME_SHORT=$(cat ${SCRATCH_DIR}/globals | grep -w COMPANY_NAME_SHORT | sed -e 's/COMPANY_NAME_SHORT=//g' -e 's/"//g')
rm -rf ${ROOT}/branding.git
BRANDING_REMOTE=https://code.citrite.net/scm/xs/branding.git
if [ -z "$(git ls-remote --heads ${BRANDING_REMOTE} | grep ${XS_BRANCH})" ] ; then
echo "Branch ${XS_BRANCH} not found on branding.git. Reverting to master."
git clone -b master ${BRANDING_REMOTE} ${ROOT}/branding.git
else
git clone -b ${XS_BRANCH} ${BRANDING_REMOTE} ${ROOT}/branding.git
fi
SERVER_BRANDING_TIP=$(cd ${ROOT}/branding.git && git rev-parse HEAD)
echo "branding branding.git ${SERVER_BRANDING_TIP}" >> ${OUTPUT_DIR}/manifest
TOPLEVEL_VERSIONS=${ROOT}/branding.git/Citrix/XenServer/toplevel-versions
TOPLEVEL_BRANDING=${ROOT}/branding.git/Citrix/XenServer/toplevel-branding
BRANDING_COMPANY_NAME_LEGAL=$(cat ${TOPLEVEL_BRANDING} | grep -F "COMPANY_NAME_LEGAL := " | sed -e 's/COMPANY_NAME_LEGAL := //g')
BRANDING_COMPANY_NAME_SHORT=$(cat ${TOPLEVEL_BRANDING} | grep -F "COMPANY_NAME_SHORT := " | sed -e 's/COMPANY_NAME_SHORT := //g')
BRANDING_COPYRIGHT=\"Copyright\ ©\ ${BRANDING_COMPANY_NAME_LEGAL}\"
BRANDING_COPYRIGHT_2=\"Copyright\ \\\\251\ ${BRANDING_COMPANY_NAME_LEGAL}\"
BRANDING_PRODUCT_BRAND=XenServer
BRANDING_COMPANY_URL=www.citrix.com
BRANDING_PRODUCT_VERSION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_VERSION | sed -e 's/PRODUCT_VERSION=//g' -e 's/"//g')
BRANDING_PRODUCT_VERSION_TEXT=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_VERSION_TEXT | sed -e 's/PRODUCT_VERSION_TEXT=//g' -e 's/"//g')
BRANDING_PRODUCT_MAJOR_VERSION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_MAJOR_VERSION | sed -e 's/PRODUCT_MAJOR_VERSION=//g' -e 's/"//g')
BRANDING_PRODUCT_MINOR_VERION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_MINOR_VERSION | sed -e 's/PRODUCT_MINOR_VERSION=//g' -e 's/"//g')
BRANDING_PRODUCT_BRAND=$(cat ${TOPLEVEL_BRANDING} | grep -F "PRODUCT_BRAND := " | sed -e 's/PRODUCT_BRAND := //g')
BRANDING_COMPANY_URL=www.$(cat ${TOPLEVEL_BRANDING} | grep -F "COMPANY_DOMAIN := " | sed -e 's/COMPANY_DOMAIN := //g')
BRANDING_PRODUCT_VERSION_TEXT=$(cat ${TOPLEVEL_VERSIONS} | grep -F "PRODUCT_VERSION_TEXT := " | sed -e 's/PRODUCT_VERSION_TEXT := //g')
BRANDING_PRODUCT_MAJOR_VERSION=$(cat ${TOPLEVEL_VERSIONS} | grep -F "PRODUCT_MAJOR_VERSION := " | sed -e 's/PRODUCT_MAJOR_VERSION := //g')
BRANDING_PRODUCT_MINOR_VERSION=$(cat ${TOPLEVEL_VERSIONS} | grep -F "PRODUCT_MINOR_VERSION := " | sed -e 's/PRODUCT_MINOR_VERSION := //g')
BRANDING_SEARCH=xensearch
BRANDING_UPDATE=xsupdate
BRANDING_BACKUP=xbk
BRANDING_SERVER=XenServer
BRANDING_BRAND_CONSOLE=$(cat ${SCRATCH_DIR}/globals | grep -w BRAND_CONSOLE | sed -e 's/BRAND_CONSOLE=//g' -e 's/"//g')
BRANDING_SERVER=${BRANDING_PRODUCT_BRAND}
BRANDING_BRAND_CONSOLE=$(cat ${TOPLEVEL_BRANDING} | grep -F "BRAND_CONSOLE := " | sed -e 's/BRAND_CONSOLE := //g')
# Check for the micro version override from declarations.sh and use it if present otherwise use the one from branding
if [ -n "${PRODUCT_MICRO_VERSION_OVERRIDE+x}" ]; then
BRANDING_PRODUCT_MICRO_VERSION=$PRODUCT_MICRO_VERSION_OVERRIDE
echo Using override for micro product number of: $BRANDING_PRODUCT_MICRO_VERSION
BRANDING_PRODUCT_MICRO_VERSION=${PRODUCT_MICRO_VERSION_OVERRIDE}
echo Using override for micro product number of: ${BRANDING_PRODUCT_MICRO_VERSION}
else
BRANDING_PRODUCT_MICRO_VERSION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_MICRO_VERSION | sed -e 's/PRODUCT_MICRO_VERSION=//g' -e 's/"//g')
BRANDING_PRODUCT_MICRO_VERSION=$(cat ${TOPLEVEL_VERSIONS} | grep -F "PRODUCT_MICRO_VERSION := " | sed -e 's/PRODUCT_MICRO_VERSION := //g')
fi
BRANDING_XC_PRODUCT_VERSION=${BRANDING_PRODUCT_MAJOR_VERSION}.${BRANDING_PRODUCT_MINOR_VERION}.${BRANDING_PRODUCT_MICRO_VERSION}
BRANDING_XC_PRODUCT_VERSION=${BRANDING_PRODUCT_MAJOR_VERSION}.${BRANDING_PRODUCT_MINOR_VERSION}.${BRANDING_PRODUCT_MICRO_VERSION}
BRANDING_XC_PRODUCT_5_6_VERSION=5.6
BRANDING_XC_PRODUCT_6_0_VERSION=6.0
BRANDING_XC_PRODUCT_6_2_VERSION=6.2
@ -55,4 +72,4 @@ BRANDING_REGISTRY_ENTRIES_GUID=193BAE1F-F2AE-4451-94DC-4B105DB5179C
BRANDING_APPLICAION_SHOTCUT_GUID=6B875059-26BC-4fa7-ACB7-0B9A4E4665CA
BRANDING_README_FILE_GUID=47427a60-4064-4fdb-878d-04309a0fd9ce
BRANDING_XSUPDATE_FILE_GUID=1cfbf607-cc80-4bf8-b2fc-37e69c872316
BRANDING_HEALTH_CHECK_GUID=9D686BFC-B4FD-435F-AC74-0ACE29425095
BRANDING_HEALTH_CHECK_GUID=9D686BFC-B4FD-435F-AC74-0ACE29425095

19
VNCControl/VNCControl.csproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -16,7 +16,7 @@
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@ -42,6 +42,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -52,6 +53,7 @@
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RegisterForComInterop>true</RegisterForComInterop>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\XenAdmin\Properties\Resources.Designer.cs">
@ -93,9 +95,8 @@
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
</ItemGroup>
<ItemGroup>
<Reference Include="CookComputing.XmlRpcV2, Version=2.1.0.5, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\XenServer.NET\CookComputing.XmlRpcV2.dll</HintPath>
<Reference Include="CookComputing.XmlRpcV2">
<HintPath>..\xml-rpc.net\obj\Release\CookComputing.XmlRpcV2.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -111,10 +112,6 @@
<Reference Include="System.Security" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.XML" />
<Reference Include="XenServer, Version=6.0.50.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\XenServer.NET\XenServer.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
@ -142,6 +139,10 @@
<Project>{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}</Project>
<Name>XenCenterVNC</Name>
</ProjectReference>
<ProjectReference Include="..\XenServer\XenServer.csproj">
<Project>{5c33ca41-ac71-4b61-b3e8-15ab9da62844}</Project>
<Name>XenServer</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

12
VNCControl/VNCControl.sln
View File

@ -1,12 +1,16 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VNCControl", "VNCControl.csproj", "{8513A3E9-7048-4DDB-A787-EDA202E230BF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenCenterLib", "..\XenCenterLib\XenCenterLib.csproj", "{9861DFA1-B41F-432D-A43F-226257DEBBB9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenCenterVNC", "..\XenCenterVNC\XenCenterVNC.csproj", "{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XenServer", "..\XenServer\XenServer.csproj", "{5C33CA41-AC71-4B61-B3E8-15AB9DA62844}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -25,6 +29,10 @@ Global
{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD345C89-E8F4-4767-9BE0-1F0EAB7FA927}.Release|Any CPU.Build.0 = Release|Any CPU
{5C33CA41-AC71-4B61-B3E8-15AB9DA62844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C33CA41-AC71-4B61-B3E8-15AB9DA62844}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C33CA41-AC71-4B61-B3E8-15AB9DA62844}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C33CA41-AC71-4B61-B3E8-15AB9DA62844}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
XenAdmin/Actions/GUIActions/MeddlingAction.cs
View File

@ -47,7 +47,7 @@ namespace XenAdmin.Actions.GUIActions
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public MeddlingAction(Task task)
: base(task.MeddlingActionTitle ?? task.Title, task.Description, false, false)
: base(task.Title, task.Description, false, false)
{
RelatedTask = new XenRef<Task>(task.opaque_ref);

5
XenAdmin/Commands/AddHostCommand.cs
View File

@ -95,7 +95,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_AddApplicationServer_h32bit_16;
return Images.StaticImages._000_AddApplicationServer_h32bit_16;
}
}
@ -103,7 +103,8 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_AddApplicationServer_h32bit_24;
return Images.StaticImages._000_AddApplicationServer_h32bit_24;
}
}

2
XenAdmin/Commands/AddNewHostToPoolCommand.cs
View File

@ -68,7 +68,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_AddApplicationServer_h32bit_16;
return Images.StaticImages._000_AddApplicationServer_h32bit_16;
}
}

2
XenAdmin/Commands/Controls/AddHostToSelectedPoolToolStripMenuItem.cs
View File

@ -109,7 +109,7 @@ namespace XenAdmin.Commands
}
AddHostToPoolCommand cmd = new AddHostToPoolCommand(Command.MainWindowCommandInterface, new Host[] { host }, Helpers.GetPool(connection), true);
CommandToolStripMenuItem hostMenuItem = new CommandToolStripMenuItem(cmd, hostName.EscapeAmpersands(), Resources._000_TreeConnected_h32bit_16);
CommandToolStripMenuItem hostMenuItem = new CommandToolStripMenuItem(cmd, hostName.EscapeAmpersands(), Images.StaticImages._000_TreeConnected_h32bit_16);
base.DropDownItems.Add(hostMenuItem);
}

2
XenAdmin/Commands/Controls/AddSelectedHostToPoolToolStripMenuItem.cs
View File

@ -80,7 +80,7 @@ namespace XenAdmin.Commands
{
String poolName = Helpers.GetName(connection).EscapeAmpersands().Ellipsise(Helpers.DEFAULT_NAME_TRIM_LENGTH);
AddHostToPoolCommand cmd = new AddHostToPoolCommand(Command.MainWindowCommandInterface, selection.AsXenObjects<Host>(), Helpers.GetPool(connection), true);
base.DropDownItems.Add(new CommandToolStripMenuItem(cmd, poolName, Resources._000_PoolConnected_h32bit_16));
base.DropDownItems.Add(new CommandToolStripMenuItem(cmd, poolName, Images.StaticImages._000_PoolConnected_h32bit_16));
}
}

3
XenAdmin/Commands/Controls/EditPropertiesToolStripMenuItem.cs
View File

@ -29,6 +29,7 @@
* SUCH DAMAGE.
*/
using XenAdmin.Properties;
namespace XenAdmin.Commands
{
@ -40,7 +41,7 @@ namespace XenAdmin.Commands
}
public PropertiesToolStripMenuItem(PropertiesCommand cmd)
: base(cmd, Messages.EDIT, Properties.Resources.edit_16)
: base(cmd, Messages.EDIT, Images.StaticImages.edit_16)
{ }
}
}

2
XenAdmin/Commands/Controls/MultipleWarningDialog.cs
View File

@ -170,7 +170,7 @@ namespace XenAdmin.Commands.Controls
{
DataGridViewRow row = new DataGridViewRow();
DataGridViewImageCell warningImageCell = new DataGridViewImageCell();
warningImageCell.Value = Resources._000_Alert2_h32bit_16;
warningImageCell.Value = Images.StaticImages._000_Alert2_h32bit_16;
DataGridViewTextBoxCell warningCell = new DataGridViewTextBoxCell();
warningCell.Value = string.Format("{0}\n\r\n\r{1}", ActionTitle, WarningMessage);

6
XenAdmin/Commands/Controls/VMOperationToolStripMenuItem.cs
View File

@ -93,18 +93,18 @@ namespace XenAdmin.Commands
if (wlb)
{
base.DropDownItems.Add(new VMOperationToolStripMenuSubItem(Messages.WLB_OPT_MENU_OPTIMAL_SERVER, Resources._000_ServerWlb_h32bit_16));
base.DropDownItems.Add(new VMOperationToolStripMenuSubItem(Messages.WLB_OPT_MENU_OPTIMAL_SERVER, Images.StaticImages._000_ServerWlb_h32bit_16));
}
else
{
base.DropDownItems.Add(new VMOperationToolStripMenuSubItem(Messages.HOME_SERVER_MENU_ITEM, Resources._000_ServerHome_h32bit_16));
base.DropDownItems.Add(new VMOperationToolStripMenuSubItem(Messages.HOME_SERVER_MENU_ITEM, Images.StaticImages._000_ServerHome_h32bit_16));
}
List<Host> hosts = new List<Host>(connection.Cache.Hosts);
hosts.Sort();
foreach (Host host in hosts)
{
VMOperationToolStripMenuSubItem item = new VMOperationToolStripMenuSubItem(String.Format(Messages.MAINWINDOW_CONTEXT_UPDATING, host.name_label.EscapeAmpersands()), Resources._000_ServerDisconnected_h32bit_16);
VMOperationToolStripMenuSubItem item = new VMOperationToolStripMenuSubItem(String.Format(Messages.MAINWINDOW_CONTEXT_UPDATING, host.name_label.EscapeAmpersands()), Images.StaticImages._000_ServerDisconnected_h32bit_16);
item.Tag = host;
base.DropDownItems.Add(item);
}

2
XenAdmin/Commands/CrossPoolCopyVMCommand.cs
View File

@ -100,7 +100,7 @@ namespace XenAdmin.Commands
public new static bool CanExecute(VM vm, Host preSelectedHost)
{
if (vm == null || !vm.is_a_template || vm.Locked)
if (vm == null || !vm.is_a_template || vm.DefaultTemplate || vm.Locked)
return false;
return CrossPoolMigrateCommand.CanExecute(vm, preSelectedHost);

2
XenAdmin/Commands/CrossPoolMigrateCommand.cs
View File

@ -70,7 +70,7 @@ namespace XenAdmin.Commands
public override Image MenuImage
{
get { return preSelectedHost == null ? Resources._000_MigrateVM_h32bit_16 : Resources._000_TreeConnected_h32bit_16; }
get { return preSelectedHost == null ? Images.StaticImages._000_MigrateVM_h32bit_16 : Images.StaticImages._000_TreeConnected_h32bit_16; }
}
protected override void ExecuteCore(SelectedItemCollection selection)

2
XenAdmin/Commands/CrossPoolMigrateToHomeCommand.cs
View File

@ -56,7 +56,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_ServerHome_h32bit_16;
return Images.StaticImages._000_ServerHome_h32bit_16;
}
}
}

2
XenAdmin/Commands/EditTagsCommand.cs
View File

@ -157,7 +157,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_Tag_h32bit_16;
return Images.StaticImages._000_Tag_h32bit_16;
}
}
}

4
XenAdmin/Commands/ForceVMRebootCommand.cs
View File

@ -116,7 +116,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_ForceReboot_h32bit_16;
return Images.StaticImages._001_ForceReboot_h32bit_16;
}
}
@ -124,7 +124,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_ForceReboot_h32bit_24;
return Images.StaticImages._001_ForceReboot_h32bit_24;
}
}

4
XenAdmin/Commands/ForceVMShutDownCommand.cs
View File

@ -96,7 +96,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_ForceShutDown_h32bit_16;
return Images.StaticImages._001_ForceShutDown_h32bit_16;
}
}
@ -104,7 +104,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_ForceShutDown_h32bit_24;
return Images.StaticImages._001_ForceShutDown_h32bit_24;
}
}

2
XenAdmin/Commands/InstallNewUpdateCommand.cs
View File

@ -75,7 +75,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_HostUnpatched_h32bit_16;
return Images.StaticImages._000_HostUnpatched_h32bit_16;
}
}

2
XenAdmin/Commands/NewFolderCommand.cs
View File

@ -171,7 +171,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_Folder_open_h32bit_16;
return Images.StaticImages._000_Folder_open_h32bit_16;
}
}

2
XenAdmin/Commands/NewPoolCommand.cs
View File

@ -90,7 +90,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_PoolNew_h32bit_16;
return Images.StaticImages._000_PoolNew_h32bit_16;
}
}
}

4
XenAdmin/Commands/NewSRCommand.cs
View File

@ -114,7 +114,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_NewStorage_h32bit_16;
return Images.StaticImages._000_NewStorage_h32bit_16;
}
}
@ -122,7 +122,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_NewStorage_h32bit_24;
return Images.StaticImages._000_NewStorage_h32bit_24;
}
}
}

4
XenAdmin/Commands/NewVMCommand.cs
View File

@ -123,7 +123,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_CreateVM_h32bit_24;
return Images.StaticImages._000_CreateVM_h32bit_24;
}
}
@ -131,7 +131,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_CreateVM_h32bit_16;
return Images.StaticImages._001_CreateVM_h32bit_16;
}
}

2
XenAdmin/Commands/NewVMFromSnapshotCommand.cs
View File

@ -93,7 +93,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_CreateVM_h32bit_16;
return Images.StaticImages._001_CreateVM_h32bit_16;
}
}
}

2
XenAdmin/Commands/NewVMFromTemplateCommand.cs
View File

@ -88,7 +88,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_CreateVM_h32bit_16;
return Images.StaticImages._001_CreateVM_h32bit_16;
}
}

4
XenAdmin/Commands/PauseDockerContainerCommand.cs
View File

@ -50,9 +50,9 @@ namespace XenAdmin.Commands
public override string MenuText { get { return Messages.MAINWINDOW_PAUSE; } }
public override Image MenuImage { get { return Resources._000_paused_h32bit_16; } }
public override Image MenuImage { get { return Images.StaticImages._000_paused_h32bit_16; } }
public override Image ToolBarImage { get { return Resources._000_Paused_h32bit_24; } }
public override Image ToolBarImage { get { return Images.StaticImages._000_Paused_h32bit_24; } }
protected override bool CanExecuteCore(SelectedItemCollection selection)
{

2
XenAdmin/Commands/PowerOnHostCommand.cs
View File

@ -85,7 +85,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_PowerOn_h32bit_16;
return Images.StaticImages._001_PowerOn_h32bit_16;
}
}

2
XenAdmin/Commands/PropertiesCommands.cs
View File

@ -102,7 +102,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources.edit_16;
return Images.StaticImages.edit_16;
}
}
}

2
XenAdmin/Commands/RebootCommand.cs
View File

@ -95,7 +95,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_Reboot_h32bit_24;
return Images.StaticImages._001_Reboot_h32bit_24;
}
}
}

2
XenAdmin/Commands/RebootHostCommand.cs
View File

@ -104,7 +104,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_Reboot_h32bit_16;
return Images.StaticImages._001_Reboot_h32bit_16;
}
}

2
XenAdmin/Commands/RebootVMCommand.cs
View File

@ -107,7 +107,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_Reboot_h32bit_16;
return Images.StaticImages._001_Reboot_h32bit_16;
}
}

2
XenAdmin/Commands/RepairSRCommand.cs
View File

@ -104,7 +104,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_StorageBroken_h32bit_16;
return Images.StaticImages._000_StorageBroken_h32bit_16;
}
}

4
XenAdmin/Commands/RestartDockerContainerCommand.cs
View File

@ -50,9 +50,9 @@ namespace XenAdmin.Commands
public override string MenuText { get { return Messages.MAINWINDOW_RESTART; } }
public override Image MenuImage { get { return Resources._001_Reboot_h32bit_16; } }
public override Image MenuImage { get { return Images.StaticImages._001_Reboot_h32bit_16; } }
public override Image ToolBarImage { get { return Resources._001_Reboot_h32bit_24; } }
public override Image ToolBarImage { get { return Images.StaticImages._001_Reboot_h32bit_24; } }
protected override bool CanExecuteCore(SelectedItemCollection selection)
{

4
XenAdmin/Commands/RestoreHostFromBackupCommand.cs
View File

@ -41,7 +41,7 @@ using XenAdmin.Core;
using System.Collections.ObjectModel;
using System.IO;
using System.Drawing;
using XenAdmin.Properties;
namespace XenAdmin.Commands
{
@ -118,7 +118,7 @@ namespace XenAdmin.Commands
SelectHostDialog hostdialog = new SelectHostDialog();
hostdialog.TheHost = host;
hostdialog.DispString = Messages.BACKUP_SELECT_HOST;
hostdialog.SetPicture = Properties.Resources.backup_restore_32;
hostdialog.SetPicture = Images.StaticImages.backup_restore_32;
hostdialog.HelpString = "Backup"; // dont i18n
hostdialog.Text = Messages.BACKUP_SELECT_HOST_TITLE;
hostdialog.okbutton.Text = Messages.BACKUP_SELECT_HOST_BUTTON;

4
XenAdmin/Commands/ResumeDockerContainerCommand.cs
View File

@ -50,9 +50,9 @@ namespace XenAdmin.Commands
public override string MenuText { get { return Messages.MAINWINDOW_RESUME; } }
public override Image MenuImage { get { return Resources._000_Resumed_h32bit_16; } }
public override Image MenuImage { get { return Images.StaticImages._000_Resumed_h32bit_16; } }
public override Image ToolBarImage { get { return Resources._000_Resumed_h32bit_24; } }
public override Image ToolBarImage { get { return Images.StaticImages._000_Resumed_h32bit_24; } }
protected override bool CanExecuteCore(SelectedItemCollection selection)
{

4
XenAdmin/Commands/ResumeVMCommand.cs
View File

@ -112,7 +112,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_Resumed_h32bit_16;
return Images.StaticImages._000_Resumed_h32bit_16;
}
}
@ -120,7 +120,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_Resumed_h32bit_24;
return Images.StaticImages._000_Resumed_h32bit_24;
}
}

2
XenAdmin/Commands/SetAsDefaultSRCommand.cs
View File

@ -89,7 +89,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_StorageDefault_h32bit_16;
return Images.StaticImages._000_StorageDefault_h32bit_16;
}
}

2
XenAdmin/Commands/ShutDownCommand.cs
View File

@ -90,7 +90,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_ShutDown_h32bit_24;
return Images.StaticImages._001_ShutDown_h32bit_24;
}
}

2
XenAdmin/Commands/ShutDownHostCommand.cs
View File

@ -101,7 +101,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_ShutDown_h32bit_16;
return Images.StaticImages._001_ShutDown_h32bit_16;
}
}

2
XenAdmin/Commands/ShutDownVMCommand.cs
View File

@ -91,7 +91,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_ShutDown_h32bit_16;
return Images.StaticImages._001_ShutDown_h32bit_16;
}
}

4
XenAdmin/Commands/StartDockerContainerCommand.cs
View File

@ -50,9 +50,9 @@ namespace XenAdmin.Commands
public override string MenuText { get { return Messages.MAINWINDOW_START; } }
public override Image MenuImage { get { return Resources._001_PowerOn_h32bit_16; } }
public override Image MenuImage { get { return Images.StaticImages._001_PowerOn_h32bit_16; } }
public override Image ToolBarImage { get { return Resources._001_PowerOn_h32bit_24; } }
public override Image ToolBarImage { get { return Images.StaticImages._001_PowerOn_h32bit_24; } }
protected override bool CanExecuteCore(SelectedItemCollection selection)
{

4
XenAdmin/Commands/StartVMCommand.cs
View File

@ -148,7 +148,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_PowerOn_h32bit_24;
return Images.StaticImages._001_PowerOn_h32bit_24;
}
}
@ -164,7 +164,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._001_PowerOn_h32bit_16;
return Images.StaticImages._001_PowerOn_h32bit_16;
}
}

4
XenAdmin/Commands/StopDockerContainerCommand.cs
View File

@ -50,9 +50,9 @@ namespace XenAdmin.Commands
public override string MenuText { get { return Messages.MAINWINDOW_STOP; } }
public override Image MenuImage { get { return Resources._001_ShutDown_h32bit_16; } }
public override Image MenuImage { get { return Images.StaticImages._001_ShutDown_h32bit_16; } }
public override Image ToolBarImage { get { return Resources._001_ShutDown_h32bit_24; } }
public override Image ToolBarImage { get { return Images.StaticImages._001_ShutDown_h32bit_24; } }
protected override bool CanExecuteCore(SelectedItemCollection selection)
{

4
XenAdmin/Commands/SuspendVMCommand.cs
View File

@ -95,7 +95,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_paused_h32bit_16;
return Images.StaticImages._000_paused_h32bit_16;
}
}
@ -103,7 +103,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_Paused_h32bit_24;
return Images.StaticImages._000_Paused_h32bit_24;
}
}

2
XenAdmin/Commands/VMOperationHomeServerCommand.cs
View File

@ -51,7 +51,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_ServerHome_h32bit_16;
return Images.StaticImages._000_ServerHome_h32bit_16;
}
}
}

2
XenAdmin/Commands/VMOperationHostCommand.cs
View File

@ -100,7 +100,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_TreeConnected_h32bit_16;
return Images.StaticImages._000_TreeConnected_h32bit_16;
}
}

26
XenAdmin/Commands/VMOperationWlbHostCommand.cs
View File

@ -60,13 +60,13 @@ namespace XenAdmin.Commands
//Default or failure case, there is no score/star rating actually, just don't display star
_secondImage = null;
_menuImage = Resources._000_ServerDisconnected_h32bit_16;
_menuImage = Images.StaticImages._000_ServerDisconnected_h32bit_16;
_recommendation = recommendation;
if (CanExecute())
{
_starRating = _recommendation.StarRating;
_menuImage = Resources._000_TreeConnected_h32bit_16;
_menuImage = Images.StaticImages._000_TreeConnected_h32bit_16;
_secondImage = GetWLBStarImage(_starRating);
}
else
@ -138,28 +138,28 @@ namespace XenAdmin.Commands
/// </summary>
private static Image GetWLBStarImage(double stars)
{
Image img = Resources._000_host_0_star;
Image img = Images.StaticImages._000_host_0_star;
if (stars >= 4.8)
img = Resources._000_host_10_star;
img = Images.StaticImages._000_host_10_star;
else if (stars >= 4.3)
img = Resources._000_host_9_star;
img = Images.StaticImages._000_host_9_star;
else if (stars >= 3.8)
img = Resources._000_host_8_star;
img = Images.StaticImages._000_host_8_star;
else if (stars >= 3.3)
img = Resources._000_host_7_star;
img = Images.StaticImages._000_host_7_star;
else if (stars >= 2.8)
img = Resources._000_host_6_star;
img = Images.StaticImages._000_host_6_star;
else if (stars >= 2.3)
img = Resources._000_host_5_star;
img = Images.StaticImages._000_host_5_star;
else if (stars >= 1.8)
img = Resources._000_host_4_star;
img = Images.StaticImages._000_host_4_star;
else if (stars >= 1.3)
img = Resources._000_host_3_star;
img = Images.StaticImages._000_host_3_star;
else if (stars >= .8)
img = Resources._000_host_2_star;
img = Images.StaticImages._000_host_2_star;
else if (stars > 0)
img = Resources._000_host_1_star;
img = Images.StaticImages._000_host_1_star;
return img;
}

2
XenAdmin/Commands/VMOperationWlbOptimalServerCommand.cs
View File

@ -73,7 +73,7 @@ namespace XenAdmin.Commands
{
get
{
return Resources._000_ServerWlb_h32bit_16;
return Images.StaticImages._000_ServerWlb_h32bit_16;
}
}

2
XenAdmin/Commands/VappShutDownCommand.cs
View File

@ -53,7 +53,7 @@ namespace XenAdmin.Commands
public override string ContextMenuText { get { return Messages.VAPP_SHUTDOWN_CONTEXT_MENU; } }
public override Image MenuImage { get { return Resources._001_ShutDown_h32bit_16; } }
public override Image MenuImage { get { return Images.StaticImages._001_ShutDown_h32bit_16; } }
protected override bool ConfirmationRequired { get { return true; } }

2
XenAdmin/Commands/VappStartCommand.cs
View File

@ -51,7 +51,7 @@ namespace XenAdmin.Commands
public override string ContextMenuText { get { return Messages.VAPP_START_CONTEXT_MENU; } }
public override Image MenuImage { get { return Resources._001_PowerOn_h32bit_16; } }
public override Image MenuImage { get { return Images.StaticImages._001_PowerOn_h32bit_16; } }
protected override bool CanExecuteCore(SelectedItemCollection selection)
{

2
XenAdmin/ConsoleView/VNCTabView.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/ConsoleView/VNCTabView.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/ConsoleView/VNCView.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/ConsoleView/VNCView.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/ConsoleView/XSVNCScreen.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/ConsoleView/XSVNCScreen.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

34
XenAdmin/Controls/Ballooning/HostMemoryControls.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -132,7 +132,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="labelTotal.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<data name="labelTotal.TabIndex" type="System.Int32, mscorlib">
@ -169,7 +169,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="labelUsed.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<data name="labelUsed.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -199,13 +199,13 @@
<value>NoControl</value>
</data>
<data name="labelAvail.Location" type="System.Drawing.Point, System.Drawing">
<value>490, 36</value>
<value>490, 54</value>
</data>
<data name="labelAvail.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="labelAvail.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<data name="labelAvail.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -235,13 +235,13 @@
<value>NoControl</value>
</data>
<data name="labelTotDynMax.Location" type="System.Drawing.Point, System.Drawing">
<value>490, 54</value>
<value>490, 72</value>
</data>
<data name="labelTotDynMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="labelTotDynMax.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<data name="labelTotDynMax.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -271,7 +271,7 @@
<value>NoControl</value>
</data>
<data name="valueTotal.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 0</value>
<value>646, 0</value>
</data>
<data name="valueTotal.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -304,7 +304,7 @@
<value>NoControl</value>
</data>
<data name="valueUsed.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 18</value>
<value>646, 18</value>
</data>
<data name="valueUsed.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -337,7 +337,7 @@
<value>NoControl</value>
</data>
<data name="valueAvail.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 36</value>
<value>646, 54</value>
</data>
<data name="valueAvail.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -370,7 +370,7 @@
<value>NoControl</value>
</data>
<data name="valueTotDynMax.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 54</value>
<value>646, 72</value>
</data>
<data name="valueTotDynMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -403,7 +403,7 @@
<value>0, 0</value>
</data>
<data name="unitsTotal.Size" type="System.Drawing.Size, System.Drawing">
<value>26, 18</value>
<value>100, 23</value>
</data>
<data name="unitsTotal.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
@ -427,7 +427,7 @@
<value>0, 0</value>
</data>
<data name="unitsUsed.Size" type="System.Drawing.Size, System.Drawing">
<value>26, 18</value>
<value>100, 23</value>
</data>
<data name="unitsUsed.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
@ -451,7 +451,7 @@
<value>0, 0</value>
</data>
<data name="unitsTotDynMax.Size" type="System.Drawing.Size, System.Drawing">
<value>26, 18</value>
<value>100, 23</value>
</data>
<data name="unitsTotDynMax.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
@ -475,7 +475,7 @@
<value>NoControl</value>
</data>
<data name="labelOvercommit.Location" type="System.Drawing.Point, System.Drawing">
<value>490, 72</value>
<value>490, 90</value>
</data>
<data name="labelOvercommit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -577,7 +577,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="hostShinyBar.Size" type="System.Drawing.Size, System.Drawing">
<value>420, 90</value>
<value>420, 111</value>
</data>
<data name="hostShinyBar.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -607,7 +607,7 @@
<value>700, 90</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>700, 90</value>
<value>700, 111</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>HostMemoryControls</value>

34
XenAdmin/Controls/Ballooning/HostMemoryControls.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -132,7 +132,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="labelTotal.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<data name="labelTotal.TabIndex" type="System.Int32, mscorlib">
@ -169,7 +169,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="labelUsed.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<data name="labelUsed.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -199,13 +199,13 @@
<value>NoControl</value>
</data>
<data name="labelAvail.Location" type="System.Drawing.Point, System.Drawing">
<value>490, 36</value>
<value>490, 54</value>
</data>
<data name="labelAvail.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="labelAvail.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<data name="labelAvail.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -235,13 +235,13 @@
<value>NoControl</value>
</data>
<data name="labelTotDynMax.Location" type="System.Drawing.Point, System.Drawing">
<value>490, 54</value>
<value>490, 72</value>
</data>
<data name="labelTotDynMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="labelTotDynMax.Size" type="System.Drawing.Size, System.Drawing">
<value>111, 18</value>
<value>123, 18</value>
</data>
<data name="labelTotDynMax.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -271,7 +271,7 @@
<value>NoControl</value>
</data>
<data name="valueTotal.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 0</value>
<value>646, 0</value>
</data>
<data name="valueTotal.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -304,7 +304,7 @@
<value>NoControl</value>
</data>
<data name="valueUsed.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 18</value>
<value>646, 18</value>
</data>
<data name="valueUsed.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -337,7 +337,7 @@
<value>NoControl</value>
</data>
<data name="valueAvail.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 36</value>
<value>646, 54</value>
</data>
<data name="valueAvail.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -370,7 +370,7 @@
<value>NoControl</value>
</data>
<data name="valueTotDynMax.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 54</value>
<value>646, 72</value>
</data>
<data name="valueTotDynMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -403,7 +403,7 @@
<value>0, 0</value>
</data>
<data name="unitsTotal.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 18</value>
<value>100, 23</value>
</data>
<data name="unitsTotal.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
@ -427,7 +427,7 @@
<value>0, 0</value>
</data>
<data name="unitsUsed.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 18</value>
<value>100, 23</value>
</data>
<data name="unitsUsed.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
@ -451,7 +451,7 @@
<value>0, 0</value>
</data>
<data name="unitsTotDynMax.Size" type="System.Drawing.Size, System.Drawing">
<value>36, 18</value>
<value>100, 23</value>
</data>
<data name="unitsTotDynMax.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
@ -475,7 +475,7 @@
<value>NoControl</value>
</data>
<data name="labelOvercommit.Location" type="System.Drawing.Point, System.Drawing">
<value>490, 72</value>
<value>490, 90</value>
</data>
<data name="labelOvercommit.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -577,7 +577,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="hostShinyBar.Size" type="System.Drawing.Size, System.Drawing">
<value>420, 90</value>
<value>420, 111</value>
</data>
<data name="hostShinyBar.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -607,7 +607,7 @@
<value>700, 90</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>700, 90</value>
<value>700, 111</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>HostMemoryControls</value>

8
XenAdmin/Controls/Ballooning/HostMemoryRow.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -135,7 +135,7 @@
<value>700, 90</value>
</data>
<data name="hostMemoryControls.Size" type="System.Drawing.Size, System.Drawing">
<value>786, 90</value>
<value>786, 111</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<data name="hostMemoryControls.TabIndex" type="System.Int32, mscorlib">
@ -193,7 +193,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="panel.Size" type="System.Drawing.Size, System.Drawing">
<value>788, 118</value>
<value>788, 139</value>
</data>
<data name="panel.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -223,7 +223,7 @@
<value>700, 139</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>788, 118</value>
<value>788, 139</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>HostMemoryRow</value>

8
XenAdmin/Controls/Ballooning/HostMemoryRow.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -135,7 +135,7 @@
<value>700, 90</value>
</data>
<data name="hostMemoryControls.Size" type="System.Drawing.Size, System.Drawing">
<value>786, 90</value>
<value>786, 111</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<data name="hostMemoryControls.TabIndex" type="System.Int32, mscorlib">
@ -193,7 +193,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="panel.Size" type="System.Drawing.Size, System.Drawing">
<value>788, 118</value>
<value>788, 139</value>
</data>
<data name="panel.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -223,7 +223,7 @@
<value>700, 139</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>788, 118</value>
<value>788, 139</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>HostMemoryRow</value>

2
XenAdmin/Controls/Ballooning/HostShinyBar.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/Ballooning/HostShinyBar.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/Ballooning/ShinyBar.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

12
XenAdmin/Controls/Ballooning/VMMemoryControlsNoEdit.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -301,7 +301,7 @@
<value>NoControl</value>
</data>
<data name="valueDynMin.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 32</value>
<value>646, 32</value>
</data>
<data name="valueDynMin.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -334,7 +334,7 @@
<value>NoControl</value>
</data>
<data name="valueDynMax.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 51</value>
<value>646, 51</value>
</data>
<data name="valueDynMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -367,7 +367,7 @@
<value>NoControl</value>
</data>
<data name="valueStatMax.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 70</value>
<value>646, 70</value>
</data>
<data name="valueStatMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -400,13 +400,13 @@
<value>NoControl</value>
</data>
<data name="editButton.Location" type="System.Drawing.Point, System.Drawing">
<value>610, 4</value>
<value>630, 4</value>
</data>
<data name="editButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="editButton.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 22</value>
<value>66, 22</value>
</data>
<data name="editButton.TabIndex" type="System.Int32, mscorlib">
<value>12</value>

8
XenAdmin/Controls/Ballooning/VMMemoryControlsNoEdit.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@ -301,7 +301,7 @@
<value>NoControl</value>
</data>
<data name="valueDynMin.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 32</value>
<value>646, 32</value>
</data>
<data name="valueDynMin.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -334,7 +334,7 @@
<value>NoControl</value>
</data>
<data name="valueDynMax.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 51</value>
<value>646, 51</value>
</data>
<data name="valueDynMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
@ -367,7 +367,7 @@
<value>NoControl</value>
</data>
<data name="valueStatMax.Location" type="System.Drawing.Point, System.Drawing">
<value>605, 70</value>
<value>646, 70</value>
</data>
<data name="valueStatMax.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>

2
XenAdmin/Controls/Ballooning/VMMemoryRow.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/Ballooning/VMMemoryRow.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/Ballooning/VMShinyBar.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/Ballooning/VMShinyBar.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/ColorsHelper.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/ColorsHelper.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/CustomDataGraph/DataSet.cs
View File

@ -285,7 +285,7 @@ namespace XenAdmin.Controls.CustomDataGraph
}
dataSet.Type = DataType.Gpu;
}
else if (settype.StartsWith("pvscache"))
else if (settype.StartsWith("pvsaccelerator"))
{
if (settype.Contains("traffic") || settype.EndsWith("evicted"))
dataSet.CustomYRange = new DataRange(1, 0, 1, Unit.BytesPerSecond, RangeScaleMode.Auto);

1
XenAdmin/Controls/HaNtolControl.cs
View File

@ -116,6 +116,7 @@ namespace XenAdmin.Controls
[Browsable(false), ReadOnly(true)]
public Dictionary<VM, VM.HA_Restart_Priority> Settings
{
get { return settings; }
set
{
System.Diagnostics.Trace.Assert(value != null);

2
XenAdmin/Controls/HaNtolIndicatorSimple.ja.resx
View File

@ -528,4 +528,4 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
</root>

2
XenAdmin/Controls/HaNtolIndicatorSimple.zh-CN.resx
View File

@ -528,4 +528,4 @@
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
</root>

2
XenAdmin/Controls/HelpButton.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/HelpButton.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

1
XenAdmin/Controls/MainWindowControls/NavigationView.cs
View File

@ -105,7 +105,6 @@ namespace XenAdmin.Controls.MainWindowControls
//otherwise it's too close together on XP and the icons crash into each other
VirtualTreeNode n = new VirtualTreeNode(Messages.XENCENTER);
n.NodeFont = Program.DefaultFont;
treeView.Nodes.Add(n);
treeView.SelectedNode = treeView.Nodes[0];

2
XenAdmin/Controls/NetworkingTab/NetworkList.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

5
XenAdmin/Controls/PvsCacheStorageRow.Designer.cs generated
View File

@ -32,7 +32,7 @@
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.labelUnits = new System.Windows.Forms.Label();
this.numericUpDownCacheSize = new System.Windows.Forms.NumericUpDown();
this.comboBoxCacheSr = new EnableableComboBox();
this.comboBoxCacheSr = new XenAdmin.Controls.EnableableComboBox();
this.labelHostName = new System.Windows.Forms.Label();
this.labelCacheStorage = new System.Windows.Forms.Label();
this.labelCacheSize = new System.Windows.Forms.Label();
@ -69,9 +69,10 @@
//
// comboBoxCacheSr
//
resources.ApplyResources(this.comboBoxCacheSr, "comboBoxCacheSr");
this.comboBoxCacheSr.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
this.comboBoxCacheSr.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxCacheSr.FormattingEnabled = true;
resources.ApplyResources(this.comboBoxCacheSr, "comboBoxCacheSr");
this.comboBoxCacheSr.Name = "comboBoxCacheSr";
this.comboBoxCacheSr.SelectedIndexChanged += new System.EventHandler(this.comboBoxCacheSr_SelectedIndexChanged);
//

4
XenAdmin/Controls/PvsCacheStorageRow.cs
View File

@ -70,6 +70,8 @@ namespace XenAdmin.Controls
origCacheSizeGb = numericUpDownCacheSize.Value;
PopulateCacheSrCombobox();
ReadOnly = OrigPvsCacheStorage != null && OrigPvsCacheStorage.IsInUse;
comboBoxCacheSr.Enabled = numericUpDownCacheSize.Enabled = !ReadOnly;
}
private void PopulateCacheSrCombobox()
@ -180,6 +182,8 @@ namespace XenAdmin.Controls
}
}
public bool ReadOnly { get; private set; }
private void SomethingChanged(object sender, EventArgs e)
{
if (Changed != null)

10
XenAdmin/Controls/PvsCacheStorageRow.ja.resx
View File

@ -180,6 +180,9 @@
<data name="&gt;&gt;numericUpDownCacheSize.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="comboBoxCacheSr.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="comboBoxCacheSr.Location" type="System.Drawing.Point, System.Drawing">
<value>114, 22</value>
</data>
@ -193,7 +196,7 @@
<value>comboBoxCacheSr</value>
</data>
<data name="&gt;&gt;comboBoxCacheSr.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>XenAdmin.Controls.EnableableComboBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;comboBoxCacheSr.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -346,7 +349,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"?>&lt;TableLayoutSettings>&lt;Controls>&lt;Control Name="labelUnits" Row="1" RowSpan="1" Column="4" ColumnSpan="1" />&lt;Control Name="numericUpDownCacheSize" Row="1" RowSpan="1" Column="3" ColumnSpan="1" />&lt;Control Name="comboBoxCacheSr" Row="1" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelHostName" Row="1" RowSpan="1" Column="0" ColumnSpan="1" />&lt;Control Name="labelCacheStorage" Row="0" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelCacheSize" Row="0" RowSpan="1" Column="3" ColumnSpan="1" />&lt;/Controls>&lt;Columns Styles="Absolute,111,AutoSize,0,Absolute,8,AutoSize,0,Percent,100" />&lt;Rows Styles="AutoSize,0,AutoSize,0" />&lt;/TableLayoutSettings></value>
<value>&lt;?xml version="1.0" encoding="utf-16"?>&lt;TableLayoutSettings>&lt;Controls>&lt;Control Name="labelUnits" Row="1" RowSpan="1" Column="4" ColumnSpan="1" />&lt;Control Name="numericUpDownCacheSize" Row="1" RowSpan="1" Column="3" ColumnSpan="1" />&lt;Control Name="comboBoxCacheSr" Row="1" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelHostName" Row="1" RowSpan="1" Column="0" ColumnSpan="1" />&lt;Control Name="labelCacheStorage" Row="0" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelCacheSize" Row="0" RowSpan="1" Column="3" ColumnSpan="1" />&lt;/Controls>&lt;Columns Styles="Absolute,111,Percent,100,Absolute,8,AutoSize,0,AutoSize,0" />&lt;Rows Styles="AutoSize,0,AutoSize,0" />&lt;/TableLayoutSettings></value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -357,6 +360,9 @@
<data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>360, 21</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>431, 47</value>
</data>

24
XenAdmin/Controls/PvsCacheStorageRow.resx
View File

@ -130,7 +130,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="labelUnits.Location" type="System.Drawing.Point, System.Drawing">
<value>402, 22</value>
<value>421, 22</value>
</data>
<data name="labelUnits.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
@ -160,7 +160,7 @@
<value>0</value>
</data>
<data name="numericUpDownCacheSize.Location" type="System.Drawing.Point, System.Drawing">
<value>324, 22</value>
<value>343, 22</value>
</data>
<data name="numericUpDownCacheSize.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 20</value>
@ -180,11 +180,14 @@
<data name="&gt;&gt;numericUpDownCacheSize.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="comboBoxCacheSr.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="comboBoxCacheSr.Location" type="System.Drawing.Point, System.Drawing">
<value>114, 22</value>
</data>
<data name="comboBoxCacheSr.Size" type="System.Drawing.Size, System.Drawing">
<value>196, 21</value>
<value>215, 21</value>
</data>
<data name="comboBoxCacheSr.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@ -193,7 +196,7 @@
<value>comboBoxCacheSr</value>
</data>
<data name="&gt;&gt;comboBoxCacheSr.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>XenAdmin.Controls.EnableableComboBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;comboBoxCacheSr.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -253,7 +256,7 @@
<value>3, 3, 3, 3</value>
</data>
<data name="labelCacheStorage.Size" type="System.Drawing.Size, System.Drawing">
<value>196, 13</value>
<value>215, 13</value>
</data>
<data name="labelCacheStorage.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -289,7 +292,7 @@
<value>NoControl</value>
</data>
<data name="labelCacheSize.Location" type="System.Drawing.Point, System.Drawing">
<value>324, 3</value>
<value>343, 3</value>
</data>
<data name="labelCacheSize.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
@ -328,7 +331,7 @@
<value>2</value>
</data>
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
<value>431, 46</value>
<value>450, 46</value>
</data>
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -346,7 +349,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="labelUnits" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="numericUpDownCacheSize" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="comboBoxCacheSr" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelHostName" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelCacheStorage" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCacheSize" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,111,AutoSize,0,Absolute,8,AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="labelUnits" Row="1" RowSpan="1" Column="4" ColumnSpan="1" /&gt;&lt;Control Name="numericUpDownCacheSize" Row="1" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;Control Name="comboBoxCacheSr" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelHostName" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelCacheStorage" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelCacheSize" Row="0" RowSpan="1" Column="3" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Absolute,111,Percent,100,Absolute,8,AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -357,8 +360,11 @@
<data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>360, 21</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>431, 47</value>
<value>450, 47</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>PvsCacheStorageRow</value>

10
XenAdmin/Controls/PvsCacheStorageRow.zh-CN.resx
View File

@ -180,6 +180,9 @@
<data name="&gt;&gt;numericUpDownCacheSize.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="comboBoxCacheSr.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="comboBoxCacheSr.Location" type="System.Drawing.Point, System.Drawing">
<value>114, 22</value>
</data>
@ -193,7 +196,7 @@
<value>comboBoxCacheSr</value>
</data>
<data name="&gt;&gt;comboBoxCacheSr.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>XenAdmin.Controls.EnableableComboBox, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;comboBoxCacheSr.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@ -346,7 +349,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"?>&lt;TableLayoutSettings>&lt;Controls>&lt;Control Name="labelUnits" Row="1" RowSpan="1" Column="4" ColumnSpan="1" />&lt;Control Name="numericUpDownCacheSize" Row="1" RowSpan="1" Column="3" ColumnSpan="1" />&lt;Control Name="comboBoxCacheSr" Row="1" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelHostName" Row="1" RowSpan="1" Column="0" ColumnSpan="1" />&lt;Control Name="labelCacheStorage" Row="0" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelCacheSize" Row="0" RowSpan="1" Column="3" ColumnSpan="1" />&lt;/Controls>&lt;Columns Styles="Absolute,111,AutoSize,0,Absolute,8,AutoSize,0,Percent,100" />&lt;Rows Styles="AutoSize,0,AutoSize,0" />&lt;/TableLayoutSettings></value>
<value>&lt;?xml version="1.0" encoding="utf-16"?>&lt;TableLayoutSettings>&lt;Controls>&lt;Control Name="labelUnits" Row="1" RowSpan="1" Column="4" ColumnSpan="1" />&lt;Control Name="numericUpDownCacheSize" Row="1" RowSpan="1" Column="3" ColumnSpan="1" />&lt;Control Name="comboBoxCacheSr" Row="1" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelHostName" Row="1" RowSpan="1" Column="0" ColumnSpan="1" />&lt;Control Name="labelCacheStorage" Row="0" RowSpan="1" Column="1" ColumnSpan="1" />&lt;Control Name="labelCacheSize" Row="0" RowSpan="1" Column="3" ColumnSpan="1" />&lt;/Controls>&lt;Columns Styles="Absolute,111,Percent,100,Absolute,8,AutoSize,0,AutoSize,0" />&lt;Rows Styles="AutoSize,0,AutoSize,0" />&lt;/TableLayoutSettings></value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -357,6 +360,9 @@
<data name="$this.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>360, 21</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>431, 47</value>
</data>

2
XenAdmin/Controls/ShadowPanel.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/ShadowPanel.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/SnapshotTreeView.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/SnapshotTreeView.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/TransparentTrackBar.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/Wlb/WlbOptModeScheduler.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/Wlb/WlbOptimizePool.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/XenSearch/FolderNavigator.zh-CN.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

2
XenAdmin/Controls/XenTabControl.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

5
XenAdmin/Controls/XenTabPage.cs
View File

@ -191,6 +191,11 @@ namespace XenAdmin.Controls
/// Check whether this step needs to be disabled. Not always overriden in derived classes
/// </summary>
public virtual void CheckPageDisabled() { }
/// <summary>
/// Select a control on the page. Not always overriden in derived classes
/// </summary>
public virtual void SelectDefaultControl() { }
protected void OnPageUpdated()
{

2
XenAdmin/Controls/XenTabPage.ja.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

28
XenAdmin/Core/ActionBaseExtensions.cs
View File

@ -49,33 +49,33 @@ namespace XenAdmin.Core
{
if (action.IsCompleted)
return action.Succeeded
? Properties.Resources._000_Tick_h32bit_16
? Images.StaticImages._000_Tick_h32bit_16
: action.Exception is CancelledException
? Properties.Resources.cancelled_action_16
: Properties.Resources._000_error_h32bit_16;
? Images.StaticImages.cancelled_action_16
: Images.StaticImages._000_error_h32bit_16;
if (action.PercentComplete < 9)
return Properties.Resources.usagebar_0;
return Images.StaticImages.usagebar_0;
if (action.PercentComplete < 18)
return Properties.Resources.usagebar_1;
return Images.StaticImages.usagebar_1;
if (action.PercentComplete < 27)
return Properties.Resources.usagebar_2;
return Images.StaticImages.usagebar_2;
if (action.PercentComplete < 36)
return Properties.Resources.usagebar_3;
return Images.StaticImages.usagebar_3;
if (action.PercentComplete < 45)
return Properties.Resources.usagebar_4;
return Images.StaticImages.usagebar_4;
if (action.PercentComplete < 54)
return Properties.Resources.usagebar_5;
return Images.StaticImages.usagebar_5;
if (action.PercentComplete < 63)
return Properties.Resources.usagebar_6;
return Images.StaticImages.usagebar_6;
if (action.PercentComplete < 72)
return Properties.Resources.usagebar_7;
return Images.StaticImages.usagebar_7;
if (action.PercentComplete < 81)
return Properties.Resources.usagebar_8;
return Images.StaticImages.usagebar_8;
if (action.PercentComplete < 90)
return Properties.Resources.usagebar_9;
return Images.StaticImages.usagebar_9;
return Properties.Resources.usagebar_10;
return Images.StaticImages.usagebar_10;
}
internal static string GetDetails(this ActionBase action)

2
XenAdmin/Core/HealthCheck.cs
View File

@ -64,7 +64,7 @@ namespace XenAdmin.Core
}
else if (actions.Count > 1)
{
var parallelAction = new ParallelAction(null, "", "", "", actions);
var parallelAction = new ParallelAction(null, "", "", "", actions, true, true);
parallelAction.Completed += actionCompleted;
parallelAction.RunAsync();
}

6
XenAdmin/Diagnostics/Checks/DiskSpaceForBatchUpdatesCheck.cs
View File

@ -44,11 +44,11 @@ using System.Linq;
namespace XenAdmin.Diagnostics.Checks
{
class DiskSpaceForBatchUpdatesCheck : Check
class DiskSpaceForAutomatedUpdatesCheck : Check
{
private readonly long size = 0;
public DiskSpaceForBatchUpdatesCheck(Host host, long size)
public DiskSpaceForAutomatedUpdatesCheck(Host host, long size)
: base(host)
{
this.size = size;
@ -64,7 +64,7 @@ namespace XenAdmin.Diagnostics.Checks
if (Helpers.CreamOrGreater(Host.Connection))
{
var action = new GetDiskSpaceRequirementsAction(Host, size, true, DiskSpaceRequirements.OperationTypes.autoupdate);
var action = new GetDiskSpaceRequirementsAction(Host, size, true, DiskSpaceRequirements.OperationTypes.automatedUpdates);
try
{

6
XenAdmin/Diagnostics/Checks/PatchPrecheckCheck.cs
View File

@ -106,7 +106,7 @@ namespace XenAdmin.Diagnostics.Checks
return FindProblem(result);
}
else
else if (Helpers.ElyOrGreater(Host))
{
var livepatchStatus = Pool_update.precheck(session, Update.opaque_ref, Host.opaque_ref);
@ -114,9 +114,9 @@ namespace XenAdmin.Diagnostics.Checks
if (livePatchCodesByHost != null)
livePatchCodesByHost[Host.uuid] = livepatchStatus;
return null;
}
return null;
}
catch (Failure f)
{

2
XenAdmin/Diagnostics/Problems/HostProblem/ConflictingUpdatePresent.cs
View File

@ -49,7 +49,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
{
get
{
return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, confilctedUpdates);
return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, ServerName, confilctedUpdates);
}
}

2
XenAdmin/Diagnostics/Problems/HostProblem/HostDoesNotHaveHotfix.cs
View File

@ -55,7 +55,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public override string Description
{
get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, Server.Name); }
get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, ServerName); }
}
public override string HelpMessage

Some files were not shown because too many files have changed in this diff Show More