Jakub Niedermertl has uploaded a new change for review.
Change subject: VM Icons - part of UI
......................................................................
VM Icons - part of UI
Change-Id: I0b7794000264f795a995cef4b3e0c32517abafc0
Signed-off-by: Jakub Niedermertl <jnied...@redhat.com>
---
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/widget/uicommon/popup/AbstractVmPopupWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
3 files changed, 93 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/37917/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 6ede749..7123c41 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
@@ -748,6 +748,27 @@
@DefaultStringValue("Clone Name")
String clonedVmName();
+ @DefaultStringValue("Icon")
+ String iconTabVmPopup();
+
+ @DefaultStringValue("New Icon")
+ String newIconVmPopup();
+
+ @DefaultStringValue("Current Icon")
+ String currentIconVmPopup();
+
+ @DefaultStringValue("Upload")
+ String uploadIconVmPopup();
+
+ @DefaultStringValue("Use default")
+ String useDefaultIconVmPopup();
+
+ @DefaultStringValue("Discard changes")
+ String discardChangesIconVmPopup();
+
+ @DefaultStringValue("Icons limitations: max dimensions: width 150px,
heigth 120px; max size 24kB; supported formats: jpg, png, gif")
+ String iconLimitationsIconVmPopup();
+
// Permissions
@DefaultStringValue("Inherited Permission")
String inheritedPermission();
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
index 40d907d..42cae77 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
@@ -4,6 +4,7 @@
import static
org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.simpleField;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.InputElement;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.editor.client.SimpleBeanEditorDriver;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -27,6 +28,7 @@
import com.google.gwt.user.client.ui.RadioButton;
import com.google.gwt.user.client.ui.ValueLabel;
import com.google.gwt.user.client.ui.Widget;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -864,6 +866,19 @@
@Ignore
protected DialogTabPanel mainTabPanel;
+ // ==Icon Tab==
+
+ @UiField
+ protected DialogTab iconTab;
+
+ @UiField(provided = true)
+ @Ignore
+ protected InfoIcon uploadIconInfoIcon;
+
+ @UiField
+ @Ignore
+ protected InputElement inputFileIcon;
+
private UnitVmModel unitVmModel;
private final Driver driver = GWT.create(Driver.class);
@@ -952,6 +967,7 @@
initSpiceProxy();
initTotalVcpus();
initDetachableFields();
+ initIconTab(resources);
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
@@ -1087,6 +1103,11 @@
});
numaInfoIcon = new InfoIcon(SafeHtmlUtils.fromTrustedString(""),
resources); //$NON-NLS-1$
+ }
+
+ protected void initIconTab(CommonApplicationResources resources) {
+ uploadIconInfoIcon = new InfoIcon(
+
SafeHtmlUtils.fromTrustedString(constants.iconLimitationsIconVmPopup()),
resources);
}
/**
@@ -1501,6 +1522,9 @@
numOfSocketsEditorWithDetachable.setLabel(constants.numOfSockets());
emulatedMachine.setLabel(constants.emulatedMachineLabel());
customCpu.setLabel(constants.cpuModelLabel());
+
+ // Icon tab
+ iconTab.setLabel(constants.iconTabVmPopup());
}
protected void applyStyles() {
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
index c6c8901..005b6be 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml
@@ -426,6 +426,31 @@
.overrideMigrationDowntimeContentEditor {
width: 20px;
}
+
+ .iconImage {
+ height: 120px;
+ width: 150px;
+ border: thin solid rgb(211, 211, 211);
+ display: block;
+ margin: 0px 5px;
+ }
+
+ .inline-block {
+ display: inline-block
+ }
+
+ .iconButton {
+ margin: 2px;
+ }
+
+ .hidden {
+ display: none;
+ }
+
+ .iconInfoIcon {
+ margin: 0px 7px;
+ }
+
</ui:style>
<t:DialogTabPanel width="100%" height="100%" ui:field="mainTabPanel">
@@ -784,6 +809,29 @@
</t:content>
</t:DialogTab>
</t:tab>
+ <t:tab>
+ <t:DialogTab ui:field="iconTab">
+ <t:content>
+ <g:HorizontalPanel>
+ <g:VerticalPanel>
+ <g:Image ui:field="iconImage"
addStyleNames="{style.iconImage}" />
+ <g:Label ui:field="errorMessageIconLabel" />
+ </g:VerticalPanel>
+ <g:VerticalPanel>
+ <g:FlowPanel>
+ <g:Button ui:field="uploadIconButton"
text="{constants.uploadIconVmPopup}" addStyleNames="{style.inline-block}
{style.iconButton}"/>
+ <d:InfoIcon ui:field="uploadIconInfoIcon"
addStyleNames="{style.inline-block} {style.iconInfoIcon}"/>
+ <g:HTMLPanel addStyleNames="{style.hidden}">
+ <input type="file"
ui:field="inputFileIcon"/>
+ </g:HTMLPanel>
+ </g:FlowPanel>
+ <g:Button ui:field="defaultIconButton"
text="{constants.useDefaultIconVmPopup}" addStyleNames="{style.iconButton}"/>
+ <g:Button ui:field="discardChangesIconButton"
text="{constants.discardChangesIconVmPopup}"
addStyleNames="{style.iconButton}"/>
+ </g:VerticalPanel>
+ </g:HorizontalPanel>
+ </t:content>
+ </t:DialogTab>
+ </t:tab>
</t:DialogTabPanel>
</ui:UiBinder>
--
To view, visit http://gerrit.ovirt.org/37917
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b7794000264f795a995cef4b3e0c32517abafc0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jakub Niedermertl <jnied...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
