diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataStoreServicesGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataStoreServicesGrid.java
index 3119e36768e9c67e74159b88c8f4ec935bb6a08e..e7b743198d3e753e8aa29525c14d0f2b63815796 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataStoreServicesGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataStoreServicesGrid.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import com.extjs.gxt.ui.client.Events;
-import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
import com.extjs.gxt.ui.client.Style.SelectionMode;
import com.extjs.gxt.ui.client.Style.SortDir;
import com.extjs.gxt.ui.client.data.ModelData;
@@ -78,6 +77,8 @@ class DataStoreServicesGrid extends ContentPanel
setLayout(new FitLayout());
setWidth(4 * ColumnConfigFactory.DEFAULT_COLUMN_WIDTH);
+ // - setting auto width causes some grid resize problems
+ // setAutoWidth(true);
setHeight(200);
setHeaderVisible(true);
@@ -110,25 +111,21 @@ class DataStoreServicesGrid extends ContentPanel
ListStore<PluginTaskDescriptionModel> store = new ListStore<PluginTaskDescriptionModel>();
setStoreContent(servicesOrNull, store);
- final ContentPanel cp = new ContentPanel();
-
- cp.setBodyBorder(false);
- cp.setHeaderVisible(false);
- cp.setButtonAlign(HorizontalAlignment.CENTER);
-
- cp.setLayout(new FitLayout());
-
grid = new Grid<PluginTaskDescriptionModel>(store, cm);
grid.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
grid.getSelectionModel().addListener(Events.SelectionChange,
createGridSelectionChangeListener());
grid.setId(TABLE_ID);
grid.setBorders(true);
+ // - setting auto width causes some grid resize problems
+ // - setting height does not help because form height is fixed
+ // grid.setAutoExpandColumn(cm.getColumnId(cm.getColumnCount() - 1));
+ // grid.setAutoWidth(true);
+
String displayTypeID = DisplayTypeIDGenerator.PLUGIN_TASKS_BROWSER_GRID.createID();
displaySettingsManager.prepareGrid(displayTypeID, grid);
- cp.add(grid);
- add(cp);
+ add(grid);
layout();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
index a589cebaee5c80e4586dea3b44392ac6e2f643d7..54d9db03a0f864bd0418161907ba6d0539f5c181 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
@@ -34,8 +34,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMess
class EntityChooserDialog<T> extends SimpleDialog
{
- private static final int PAGING_TOOLBAR_HEIGHT = 65;
-
private static final int WIDTH = 730;
private static final int HEIGHT = 600;
@@ -55,7 +53,6 @@ class EntityChooserDialog<T> extends SimpleDialog
this.onAcceptAction = createAcceptAction(chosenEntitySetter, entityBrowser);
this.onCancelAction = createCancelAction(chosenEntitySetter, entityBrowser);
- entityBrowser.getComponent().setHeight("" + (HEIGHT - PAGING_TOOLBAR_HEIGHT));
setWidth(WIDTH);
setHeight(HEIGHT);
sinkEvents(Event.ONDBLCLICK);
@@ -97,16 +94,15 @@ class EntityChooserDialog<T> extends SimpleDialog
}
private static <T> IDelegatedAction createCancelAction(
- final ChosenEntitySetter<T> chosenEntitySetter,
- final IDisposableComponent componentDisposer)
+ final ChosenEntitySetter<T> chosenEntitySetter, final IDisposableComponent entityBrowser)
{
return new IDelegatedAction()
{
public void execute()
{
- componentDisposer.dispose();
+ entityBrowser.dispose();
chosenEntitySetter.setChosenEntity(null);
}
};
}
-}
+}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.java
index 6b25bb6a7711b00b56c733b20db1844a1f52993b..d41d7d3add94f78ff13bb699e1f6546eafa47d9b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.java
@@ -37,6 +37,7 @@ import com.extjs.gxt.ui.client.widget.button.Button;
import com.extjs.gxt.ui.client.widget.form.FormPanel;
import com.extjs.gxt.ui.client.widget.form.TextArea;
import com.extjs.gxt.ui.client.widget.form.TextField;
+import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import com.google.gwt.user.client.rpc.AsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
@@ -79,7 +80,11 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKin
*/
public class VocabularyTermGrid extends AbstractSimpleBrowserGrid<VocabularyTermWithStats>
{
- private static final int FIELD_WITH_IN_REPLACEMENT_DIALOG = 200;
+ private static final int NEW_TERMS_DIALOG_WIDTH = 300;
+
+ private static final int NEW_TERMS_DIALOG_HEIGHT = 250;
+
+ private static final int FIELD_WIDTH_IN_REPLACEMENT_DIALOG = 200;
private static final int LABEL_WIDTH_IN_REPLACEMENT_DIALOG = 200;
@@ -290,19 +295,19 @@ public class VocabularyTermGrid extends AbstractSimpleBrowserGrid<VocabularyTerm
private void askForNewTerms()
{
final TextArea textArea = new TextArea();
- textArea.setWidth(250);
- textArea.setHeight(200);
textArea.setEmptyText(viewContext.getMessage(Dict.VOCABULARY_TERMS_EMPTY));
textArea.setValidator(new VocabularyTermValidator(viewContext));
String heading = viewContext.getMessage(Dict.ADD_VOCABULARY_TERMS_TITLE);
String okButtonLabel = viewContext.getMessage(Dict.ADD_VOCABULARY_TERMS_OK_BUTTON);
HorizontalPanel panel = new HorizontalPanel();
- panel.setWidth(300);
+ panel.setLayout(new FitLayout());
panel.add(textArea);
panel.setBorders(false);
final SimpleDialog dialog = new SimpleDialog(panel, heading, okButtonLabel, viewContext);
- dialog.setScrollMode(Scroll.NONE);
- dialog.setResizable(false);
+ dialog.setWidth(NEW_TERMS_DIALOG_WIDTH);
+ textArea.setWidth(NEW_TERMS_DIALOG_WIDTH - 65);
+ dialog.setHeight(NEW_TERMS_DIALOG_HEIGHT);
+ textArea.setHeight(NEW_TERMS_DIALOG_HEIGHT - 65);
textArea.addKeyListener(new KeyListener()
{
@Override
@@ -322,6 +327,7 @@ public class VocabularyTermGrid extends AbstractSimpleBrowserGrid<VocabularyTerm
}
});
dialog.setEnableOfAcceptButton(false);
+ dialog.layout();
dialog.show();
}
@@ -439,7 +445,7 @@ public class VocabularyTermGrid extends AbstractSimpleBrowserGrid<VocabularyTerm
Dict.DELETE_VOCABULARY_TERMS_CONFIRMATION_MESSAGE_FOR_REPLACEMENTS, totalNumber)));
final FormPanel formPanel = new FormPanel();
formPanel.setLabelWidth(LABEL_WIDTH_IN_REPLACEMENT_DIALOG);
- formPanel.setFieldWidth(FIELD_WITH_IN_REPLACEMENT_DIALOG);
+ formPanel.setFieldWidth(FIELD_WIDTH_IN_REPLACEMENT_DIALOG);
formPanel.setBorders(false);
formPanel.setHeaderVisible(false);
formPanel.setBodyBorder(false);
@@ -448,7 +454,7 @@ public class VocabularyTermGrid extends AbstractSimpleBrowserGrid<VocabularyTerm
String okButtonLable = viewContext.getMessage(Dict.ADD_VOCABULARY_TERMS_OK_BUTTON);
final SimpleDialog dialog = new SimpleDialog(panel, title, okButtonLable, viewContext);
dialog.setScrollMode(Scroll.AUTOY);
- dialog.setWidth(LABEL_WIDTH_IN_REPLACEMENT_DIALOG + FIELD_WITH_IN_REPLACEMENT_DIALOG + 50);
+ dialog.setWidth(LABEL_WIDTH_IN_REPLACEMENT_DIALOG + FIELD_WIDTH_IN_REPLACEMENT_DIALOG + 50);
dialog.setEnableOfAcceptButton(false);
for (final VocabularyTermReplacement termToBeReplaced : termsToBeReplaced)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java
index 483d3c6c9b5bf17ab3587e0f56e45a158a9041b9..184938bd4ccb28223e2b6a0cc2fc2b4deddf8c7a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java
@@ -23,6 +23,7 @@ import com.extjs.gxt.ui.client.event.WindowEvent;
import com.extjs.gxt.ui.client.event.WindowListener;
import com.extjs.gxt.ui.client.widget.Dialog;
import com.extjs.gxt.ui.client.widget.button.Button;
+import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import com.google.gwt.user.client.ui.Widget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
@@ -43,12 +44,11 @@ public class SimpleDialog extends Dialog
private final IMessageProvider messageProvider;
private final Button acceptButton;
-
+
private IDelegatedAction acceptActionOrNull;
private IDelegatedAction cancelActionOrNull;
-
public SimpleDialog(final Widget widget, final String heading, String acceptButtonLabel,
IMessageProvider messageProvider)
{
@@ -60,6 +60,7 @@ public class SimpleDialog extends Dialog
setHideOnButtonClick(true);
setModal(true);
+ setLayout(new FitLayout());
add(widget);
acceptButton = createAcceptButton(acceptButtonLabel);
addButton(acceptButton);
@@ -74,12 +75,12 @@ public class SimpleDialog extends Dialog
}
});
}
-
+
public void setEnableOfAcceptButton(boolean enable)
{
acceptButton.setEnabled(enable);
}
-
+
private Button createCancelButton()
{
final Button button =