From cc80af9d93858c3ece6fcb42653c792c555af15e Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Thu, 16 Oct 2014 10:49:08 +0000 Subject: [PATCH] For the functionality of TablesList the "canc" button of the window that displays the tables list has been removed and has been added icon at the top of the window (as well as in submitQuery and Samplings dialogs. In addition, on top of the window has been also removed icon that minimizes window and has been added icon that maximizes the window. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/databases-manager-portlet@100753 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/panels/GxtBorderLayoutPanel.java | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java index d4a9026..ce7a659 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java @@ -653,7 +653,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { tablesLoaded = new Dialog(); tablesLoaded.setLayout(new FitLayout()); // ADD CANCEL BUTTON - tablesLoaded.addButton(new Button("CANCEL")); +// tablesLoaded.addButton(new Button("CANCEL")); tablesLoaded.setHeading("Tables"); tablesLoaded.setResizable(false); tablesLoaded.setModal(true); @@ -662,7 +662,8 @@ public class GxtBorderLayoutPanel extends ContentPanel { tablesLoaded.setScrollMode(Scroll.NONE); tablesLoaded.setHideOnButtonClick(true); tablesLoaded.setMaximizable(true); - tablesLoaded.setClosable(false); + tablesLoaded.setMinimizable(false); + tablesLoaded.setClosable(true); tablesLoaded.setBottomComponent(toolBar); // toolBarTop.getAriaSupport().setLabel("Table Search"); @@ -691,8 +692,9 @@ public class GxtBorderLayoutPanel extends ContentPanel { final Button ok = (Button) tablesLoaded.getButtonBar().getWidget(0); ok.disable(); rootLogger.log(Level.INFO, "button: " + ok.getText()); - Button canc = (Button) tablesLoaded.getButtonBar().getWidget(1); - rootLogger.log(Level.INFO, "button: " + canc.getText()); + +// Button canc = (Button) tablesLoaded.getButtonBar().getWidget(1); +// rootLogger.log(Level.INFO, "button: " + canc.getText()); // listener for buttons ok.addSelectionListener(new SelectionListener() { @@ -725,17 +727,30 @@ public class GxtBorderLayoutPanel extends ContentPanel { } }); - canc.addSelectionListener(new SelectionListener() { + //CANC BUTTON that closes the window +// canc.addSelectionListener(new SelectionListener() { +// @Override +// public void componentSelected(ButtonEvent ce) { +// keyword = null; +// startSearchTable = false; +// // refresh the database information panel +// // centerUpper.removeAll(); +// // centerUpper.layout(true); +// tablesLoaded.hide(); +// } +// }); + + tablesLoaded.addListener(Events.Hide, new Listener() { @Override - public void componentSelected(ButtonEvent ce) { + public void handleEvent(WindowEvent be) { + keyword = null; startSearchTable = false; - // refresh the database information panel - // centerUpper.removeAll(); - // centerUpper.layout(true); tablesLoaded.hide(); - } - }); + + rootLogger.log(Level.INFO, "Window Tables closed"); + + }}); // listener to manage the table selection in the grid grid.getSelectionModel().addSelectionChangedListener(