Lior Vernia has uploaded a new change for review.
Change subject: webadmin: KeyValueWidget to accept field width
......................................................................
webadmin: KeyValueWidget to accept field width
Enable KeyValueLineWidget to accept any arbitrary field width as
argument, to better style it for different dialogs.
Change-Id: Ic39c010099c49f8af8612233a5257249e2e7d069
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.ui.xml
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
3 files changed, 27 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/26649/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
index 1bc63f7..aefecbd 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.java
@@ -14,7 +14,6 @@
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.resources.client.CssResource;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
@@ -34,9 +33,6 @@
private boolean enabled = true;
@UiField
- WidgetStyle style;
-
- @UiField
@Ignore
HorizontalPanel panel;
@@ -54,22 +50,29 @@
private final Driver driver = GWT.create(Driver.class);
- private String rowWidth;
+ private String rowWidth = "400px"; //$NON-NLS-1$
+ private String fieldWidth = "180px"; //$NON-NLS-1$
- KeyValueLineWidget(String rowWidth) {
- this.rowWidth = rowWidth;
+ KeyValueLineWidget(String rowWidth, String fieldWidth) {
+ if (rowWidth != null) {
+ this.rowWidth = rowWidth;
+ }
+ if (fieldWidth != null) {
+ this.fieldWidth = fieldWidth;
+ }
initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this));
driver.initialize(this);
addStyles();
}
private void addStyles() {
- keyField.addContentWidgetStyleName(style.fieldWidth());
- valueField.addContentWidgetStyleName(style.fieldWidth());
- valuesField.addContentWidgetStyleName(style.fieldWidth());
- if (rowWidth != null) {
- panel.setWidth(rowWidth);
- }
+ keyField.setWidth(fieldWidth);
+ valueField.setWidth(fieldWidth);
+ valuesField.setWidth(fieldWidth);
+ keyField.getContentWidgetContainer().setWidth(fieldWidth);
+ valueField.getContentWidgetContainer().setWidth(fieldWidth);
+ valuesField.getContentWidgetContainer().setWidth(fieldWidth);
+ panel.setWidth(rowWidth);
hideLabels();
}
@@ -107,10 +110,6 @@
@Override
public KeyValueLineModel flush() {
return driver.flush();
- }
-
- interface WidgetStyle extends CssResource {
- String fieldWidth();
}
@Override
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.ui.xml
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.ui.xml
index 3c3fe25..086e578 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.ui.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueLineWidget.ui.xml
@@ -5,18 +5,10 @@
xmlns:e="urn:import:org.ovirt.engine.ui.common.widget.editor"
xmlns:ge="urn:import:org.ovirt.engine.ui.common.widget.editor.generic">
- <ui:with field='resources'
type='org.ovirt.engine.ui.common.CommonApplicationResources' />
-
- <ui:style
type="org.ovirt.engine.ui.common.widget.form.key_value.KeyValueLineWidget.WidgetStyle">
- .fieldWidth {
- width: 180px;
- }
- </ui:style>
-
- <g:HorizontalPanel ui:field="panel" height="30px" width="400px">
- <e:ListModelListBoxEditor ui:field="keyField"
addStyleNames="{style.fieldWidth}"/>
- <ge:StringEntityModelTextBoxEditor ui:field="valueField"
addStyleNames="{style.fieldWidth}"/>
- <e:ListModelListBoxEditor ui:field="valuesField"
addStyleNames="{style.fieldWidth}"/>
+ <g:HorizontalPanel ui:field="panel" height="30px">
+ <e:ListModelListBoxEditor ui:field="keyField" />
+ <ge:StringEntityModelTextBoxEditor ui:field="valueField" />
+ <e:ListModelListBoxEditor ui:field="valuesField" />
</g:HorizontalPanel>
</ui:UiBinder>
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
index 79d4fbe..dda8e4c 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
@@ -20,6 +20,7 @@
private final LinkedList<KeyValueLineWidget> widgets = new
LinkedList<KeyValueLineWidget>();
private boolean enabled = true;
String rowWidth = null;
+ String fieldWidth = null;
KeyValueWidget() {
initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this));
@@ -28,6 +29,11 @@
public KeyValueWidget(String rowWidth) {
this();
this.rowWidth = rowWidth;
+ }
+
+ public KeyValueWidget(String rowWidth, String fieldWidth) {
+ this(rowWidth);
+ this.fieldWidth = fieldWidth;
}
@Override
@@ -62,7 +68,7 @@
@Override
protected KeyValueLineWidget createWidget(KeyValueLineModel value) {
- KeyValueLineWidget keyValueLineWidget = new
KeyValueLineWidget(rowWidth);
+ KeyValueLineWidget keyValueLineWidget = new
KeyValueLineWidget(rowWidth, fieldWidth);
keyValueLineWidget.edit(value);
widgets.add(keyValueLineWidget);
return keyValueLineWidget;
--
To view, visit http://gerrit.ovirt.org/26649
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic39c010099c49f8af8612233a5257249e2e7d069
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
