Tomas Jelinek has uploaded a new change for review. Change subject: frontend: [WIP] change VM status icons ......................................................................
frontend: [WIP] change VM status icons Change-Id: I82b16f63527158d4cd44b0b39aed5010d61c2115 Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java A frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/hibernate.png A frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_freeze.png A frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_migration.png A frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_pause_runonce.png M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/pause.png A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/running.png A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/starting.png A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/wait.png R frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/desktop.gif R frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/server.png A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_preview.png A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_stateless.png A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_preview.png A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_stateless.png D frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/wait.png 23 files changed, 232 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/16374/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index af90f15..bf712e7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1292,4 +1292,55 @@ @DefaultStringValue("Optimized for") String optimizedFor(); + + @DefaultStringValue("Server") + String server(); + + @DefaultStringValue("Desktop") + String desktop(); + + @DefaultStringValue("Stateless Server") + String statelessServer(); + + @DefaultStringValue("Stateless Desktop") + String statelessDesktop(); + + @DefaultStringValue("Desktop in Preview") + String desktopInPreview(); + + @DefaultStringValue("Server in Preview") + String serverInPreview(); + + @DefaultStringValue("Run Once") + String runOnce(); + + @DefaultStringValue("Up") + String up(); + + @DefaultStringValue("Rebooting") + String rebooting(); + + @DefaultStringValue("Image Locked") + String imageLocked(); + + @DefaultStringValue("Migrating") + String migrating(); + + @DefaultStringValue("Suspended") + String suspended(); + + @DefaultStringValue("Paused") + String paused(); + + @DefaultStringValue("Unknown") + String unknown(); + + @DefaultStringValue("Down") + String down(); + + @DefaultStringValue("Powering Up") + String poweringUp(); + + @DefaultStringValue("Restoring") + String restoring(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java index eee7da3..c7d1fde 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java @@ -220,4 +220,17 @@ @Source("images/comboBoxDropDownIcon.png") ImageResource comboBoxDropDownIcon(); + + @Source("images/vmStatus/vm_freeze.png") + ImageResource frozenImage(); + + @Source("images/vmStatus/vm_migration.png") + ImageResource migrationImage(); + + @Source("images/vmStatus/vm_pause_runonce.png") + ImageResource runOnceImage(); + + @Source("images/vmStatus/hibernate.png") + ImageResource suspendedImage(); + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/hibernate.png b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/hibernate.png new file mode 100644 index 0000000..0cf651a --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/hibernate.png Binary files differ diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_freeze.png b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_freeze.png new file mode 100644 index 0000000..65fe06e --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_freeze.png Binary files differ diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_migration.png b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_migration.png new file mode 100644 index 0000000..7571bdc --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_migration.png Binary files differ diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_pause_runonce.png b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_pause_runonce.png new file mode 100644 index 0000000..74453e3 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/vmStatus/vm_pause_runonce.png Binary files differ diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java index a862573..98eec17 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java @@ -277,7 +277,7 @@ @DefaultStringValue("Paused") String Paused(); - @DefaultStringValue("Paused") + @DefaultStringValue("Suspended") String Suspended(); @DefaultStringValue("Powering Down") diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java index 34104cc..44197e8 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmStatusColumn.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.userportal.widget.table.column; +import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.ui.uicommonweb.models.userportal.UserPortalItemModel; import com.google.gwt.resources.client.ImageResource; @@ -10,11 +11,22 @@ public ImageResource getValue(UserPortalItemModel item) { switch (item.getStatus()) { case Up: - return getApplicationResources().vmStatusRunning(); - case WaitForLaunch: - case ImageLocked: + VM vm = item.getVM(); + if (vm == null) { + return getApplicationResources().vmStatusRunning(); + } + + if (vm.isRunOnce()) { + getApplicationResources().runOnceImage(); + } else { + getApplicationResources().vmStatusRunning(); + } + case MigratingFrom: case MigratingTo: + return getApplicationResources().migrationImage(); + case WaitForLaunch: + case ImageLocked: case PreparingForHibernate: case SavingState: return getApplicationResources().vmStatusWaiting(); @@ -23,6 +35,7 @@ case RestoringState: return getApplicationResources().vmStatusStarting(); case Paused: + return getApplicationResources().frozenImage(); case Suspended: return getApplicationResources().vmStatusPaused(); case Unknown: diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java index cc64e66..bc6694b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java @@ -39,9 +39,6 @@ @Source("images/datacenters.png") ImageResource dataCentersImage(); - @Source("images/desktop.gif") - ImageResource desktopImage(); - @Override @Source("images/disk.png") ImageResource diskImage(); @@ -112,7 +109,7 @@ @Source("images/nonoperational.png") ImageResource nonOperationalImage(); - @Source("images/pause.gif") + @Source("images/pause.png") ImageResource pauseImage(); @Source("images/icn_pause_disabled.png") @@ -136,9 +133,6 @@ @Source("images/icon_providers.png") ImageResource providersImage(); - // @Source("images/question_mark.png") - // ImageResource questionMarkImage(); - @Source("images/log_warning.gif") ImageResource alertImage(); @@ -153,9 +147,6 @@ @Source("images/search_button.png") ImageResource searchButtonImage(); - - @Source("images/server.png") - ImageResource serverImage(); @Source("images/split.png") ImageResource splitImage(); @@ -330,4 +321,33 @@ @Source("images/icn_tree_networks.png") ImageResource networksTreeImage(); + + // Vm Types + @Source("images/vmType/desktop.gif") + ImageResource desktopImage(); + + @Source("images/vmType/server.png") + ImageResource serverImage(); + + @Source("images/vmType/vm_desktop_preview.png") + ImageResource desktopPreview(); + + @Source("images/vmType/vm_desktop_stateless.png") + ImageResource desktopStateless(); + + @Source("images/vmType/vm_server_preview.png") + ImageResource serverPreview(); + + @Source("images/vmType/vm_server_stateless.png") + ImageResource serverStateless(); + + // custom statuses + @Source("images/vmStatus/running.png") + ImageResource vmStatusRunning(); + + @Source("images/vmStatus/starting.png") + ImageResource vmStatusStarting(); + + @Source("images/vmStatus/wait.png") + ImageResource vmStatusWait(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java index 2fb4e56..009132d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationTemplates.java @@ -84,8 +84,8 @@ @Template("<div style=\"text-align: center; padding-top: 6px;\">{0}{1}</div>") SafeHtml statusWithAlertTemplate(SafeHtml statusImage, SafeHtml alertImage); - @Template("<div style=\"text-align: center; padding-top: 6px;\">{0}</div>") - SafeHtml statusTemplate(SafeHtml statusImage); + @Template("<div title=\"{1}\" style=\"text-align: center; padding-top: 6px;\">{0}</div>") + SafeHtml statusTemplate(SafeHtml statusImage, String title); @Template("<button type='button' tabindex='-1' style='float: right; height: 20px;'>" + diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java index 685b78e..a924058 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusCell.java @@ -3,6 +3,7 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VmPauseStatus; +import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.uicompat.EnumTranslator; import org.ovirt.engine.ui.uicompat.Translator; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -20,6 +21,8 @@ ApplicationResources resources = ClientGinjectorProvider.instance().getApplicationResources(); + CommonApplicationConstants constants = ClientGinjectorProvider.instance().getApplicationConstants(); + @Override public void render(Context context, VM vm, SafeHtmlBuilder sb) { // Nothing to render if no vm is provided: @@ -29,29 +32,55 @@ // Find the image corresponding to the status of the vm: VMStatus status = vm.getStatus(); - ImageResource statusImage = null; + ImageResource statusImage; + String tooltip; + switch (status) { case Up: - statusImage = resources.upImage(); + if (vm.isRunOnce()) { + tooltip = constants.runOnce(); + statusImage = resources.runOnceImage(); + } else { + tooltip = constants.up(); + statusImage = resources.vmStatusRunning(); + } + break; + case RestoringState: + tooltip = constants.restoring(); + statusImage = resources.vmStatusStarting(); break; case PoweringUp: + tooltip = constants.poweringUp(); + statusImage = resources.vmStatusStarting(); + break; case RebootInProgress: - statusImage = resources.playImage(); + tooltip = constants.rebooting(); + statusImage = resources.vmStatusStarting(); break; case WaitForLaunch: case ImageLocked: + tooltip = constants.imageLocked(); + statusImage = resources.vmStatusWait(); + break; case MigratingFrom: case MigratingTo: - statusImage = resources.waitImage(); + tooltip = constants.migrating(); + statusImage = resources.migrationImage(); break; case Suspended: + tooltip = constants.suspended(); + statusImage = resources.suspendedImage(); + break; case Paused: - statusImage = resources.pauseImage(); + tooltip = constants.paused(); + statusImage = resources.frozenImage(); break; case Unknown: + tooltip = constants.unknown(); statusImage = resources.questionMarkImage(); break; default: + tooltip = constants.down(); statusImage = resources.stopImage(); break; } @@ -66,9 +95,10 @@ ApplicationTemplates applicationTemplates = ClientGinjectorProvider.instance().getApplicationTemplates(); if (alertImageHtml != null) { + // this already has the tooltip set sb.append(applicationTemplates.statusWithAlertTemplate(statusImageHtml, alertImageHtml)); } else { - sb.append(applicationTemplates.statusTemplate(statusImageHtml)); + sb.append(applicationTemplates.statusTemplate(statusImageHtml, tooltip)); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java index 730da9c..7db888e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java @@ -1,28 +1,101 @@ package org.ovirt.engine.ui.webadmin.widget.table.column; -import org.ovirt.engine.core.common.businessentities.VM; - import com.google.gwt.resources.client.ImageResource; +import java.util.HashMap; +import java.util.Map; +import org.ovirt.engine.core.common.businessentities.Snapshot; +import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VmType; +import org.ovirt.engine.core.common.utils.Pair; +import org.ovirt.engine.ui.common.CommonApplicationConstants; +import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider; /** * Image column that corresponds to XAML {@code VmTypeTemplate}. */ public class VmTypeColumn extends WebAdminImageResourceColumn<VM> { + private Map<VmTypeConfig, Pair<ImageResource, String>> configToIcon; + + private static final CommonApplicationConstants constants = ClientGinjectorProvider.instance().getApplicationConstants(); + + public VmTypeColumn() { + configToIcon = new HashMap<VmTypeConfig, Pair<ImageResource, String>>(); + addConfig(true, false, VmType.Desktop, constants.statelessDesktop(), getApplicationResources().desktopStateless()); + addConfig(true, false, VmType.Server, constants.statelessServer(), getApplicationResources().serverStateless()); + addConfig(false, true, VmType.Desktop, constants.desktopInPreview(), getApplicationResources().desktopPreview()); + addConfig(false, true, VmType.Server, constants.serverInPreview(), getApplicationResources().serverPreview()); + addConfig(false, false, VmType.Desktop, constants.desktop(), getApplicationResources().desktopImage()); + addConfig(false, false, VmType.Server, constants.server(), getApplicationResources().serverImage()); + } + + private void addConfig(boolean stateless, boolean inPreview, VmType vmType, String tooltip, ImageResource imageResource) { + configToIcon.put(new VmTypeConfig(stateless, inPreview, vmType), new Pair<ImageResource, String>(imageResource, tooltip)); + } + @Override public ImageResource getValue(VM vm) { - if (vm.getVmPoolId() == null) { - switch (vm.getVmType()) { - case Desktop: - return getApplicationResources().desktopImage(); - case Server: - return getApplicationResources().serverImage(); - default: - return getApplicationResources().questionMarkImage(); + if (vm.getVmPoolId() == null) { + VmTypeConfig config = new VmTypeConfig(vm.isStateless(), isInPreview(vm), vm.getVmType()); + + if (configToIcon.containsKey(config)) { + Pair<ImageResource, String> value = configToIcon.get(config); + setTitle(value.getSecond()); + return value.getFirst(); + } else { + return getApplicationResources().manyDesktopsImage(); } } else { return getApplicationResources().manyDesktopsImage(); } } + private boolean isInPreview(VM vm) { + + for (Snapshot snapshot : vm.getSnapshots()) { + if (snapshot.getStatus() == Snapshot.SnapshotStatus.IN_PREVIEW) { + return true; + } + } + + return false; + } + + class VmTypeConfig { + + private boolean stateless; + + private boolean inPreview; + + private VmType vmType; + + public VmTypeConfig(boolean stateless, boolean inPreview, VmType vmType) { + this.stateless = stateless; + this.inPreview = inPreview; + this.vmType = vmType; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + VmTypeConfig that = (VmTypeConfig) o; + + if (inPreview != that.inPreview) return false; + if (stateless != that.stateless) return false; + if (vmType != that.vmType) return false; + + return true; + } + + @Override + public int hashCode() { + int result = (stateless ? 1 : 0); + result = 31 * result + (inPreview ? 1 : 0); + result = 31 * result + (vmType != null ? vmType.hashCode() : 0); + return result; + } + } + } diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/pause.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/pause.png new file mode 100644 index 0000000..ba568f3 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/pause.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/running.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/running.png new file mode 100644 index 0000000..edbcc93 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/running.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/starting.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/starting.png new file mode 100644 index 0000000..8c6a8e8 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/starting.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/wait.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/wait.png new file mode 100644 index 0000000..ec75461 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmStatus/wait.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/desktop.gif b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/desktop.gif similarity index 100% rename from frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/desktop.gif rename to frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/desktop.gif Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/server.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/server.png similarity index 100% rename from frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/server.png rename to frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/server.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_preview.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_preview.png new file mode 100644 index 0000000..2b8b47f --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_preview.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_stateless.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_stateless.png new file mode 100644 index 0000000..5839cf4 --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_desktop_stateless.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_preview.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_preview.png new file mode 100644 index 0000000..2b998cc --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_preview.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_stateless.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_stateless.png new file mode 100644 index 0000000..a1f72fa --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/vmType/vm_server_stateless.png Binary files differ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/wait.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/wait.png deleted file mode 100644 index 5de554b..0000000 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/wait.png +++ /dev/null Binary files differ -- To view, visit http://gerrit.ovirt.org/16374 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82b16f63527158d4cd44b0b39aed5010d61c2115 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
