[Engine-patches] Change in ovirt-engine[master]: revert changes button removed, ugly grey border removed

[jniederm]

Jakub Niedermertl has uploaded a new change for review.

Change subject: revert changes button removed, ugly grey border removed
......................................................................

revert changes button removed, ugly grey border removed

Change-Id: I02012a2632f6471ecdccf8291995a48b6bdca24d
Signed-off-by: Jakub Niedermertl <jnied...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.ui.xml
2 files changed, 6 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/37924/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.java
index 9fe7344..f9dd5d6 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.java
@@ -56,9 +56,6 @@
     protected Button defaultButton;
 
     @UiField
-    protected Button discardChangesButton;
-
-    @UiField
     protected Label errorMessageLabel;
 
     /**
@@ -72,12 +69,6 @@
      * in dataUri format
      */
     private String defaultIcon;
-
-    /**
-     * value that came to editorWidget as (current) icon <br/>
-     * in dataUri format
-     */
-    private String originalIcon;
 
     public IconEditorWidget(CommonApplicationConstants constants,
                             CommonApplicationResources resources) {
@@ -97,7 +88,6 @@
     public void setValue(IconWithDefault value) {
         setIcon(value.getIcon());
         defaultIcon = value.getDefaultIcon();
-        originalIcon = value.getIcon();
     }
 
     @Override
@@ -119,11 +109,6 @@
     @UiHandler("defaultButton")
     void onDefaultIconButton(ClickEvent event) {
         setIcon(defaultIcon);
-    }
-
-    @UiHandler("discardChangesButton")
-    void onDiscardIconButton(ClickEvent event) {
-        setIcon(originalIcon);
     }
 
     /**
@@ -177,4 +162,10 @@
     public HandlerRegistration 
addValueChangeHandler(ValueChangeHandler<IconWithDefault> handler) {
         return this.addHandler(handler, ValueChangeEvent.getType());
     }
+
+    @Override
+    public void markAsValid() {
+        super.markAsValid();
+        getValidatedWidgetStyle().setBorderColor("transparent"); //$NON-NLS-1$
+    }
 }
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.ui.xml
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.ui.xml
index 352f6a2..c64c72d 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.ui.xml
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/IconEditorWidget.ui.xml
@@ -66,8 +66,6 @@
                 </g:FlowPanel>
                 <g:Button ui:field="defaultButton" 
text="{constants.useDefaultIconVmPopup}"
                           addStyleNames="{style.iconButton}"/>
-                <g:Button ui:field="discardChangesButton" 
text="{constants.discardChangesIconVmPopup}"
-                          addStyleNames="{style.iconButton}"/>
             </g:VerticalPanel>
         </g:HorizontalPanel>
         <g:Label ui:field="errorMessageLabel" 
addStyleNames="{style.iconErrorLabel}"/>


-- 
To view, visit http://gerrit.ovirt.org/37924
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02012a2632f6471ecdccf8291995a48b6bdca24d
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