gCubeSystem
/
tabular-data-toolbox-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-toolbox-widget@90707 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-01-29 17:55:17 +00:00 committed by Giancarlo Panichi
parent 419c8c2694
commit 5c794373d4
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBox.java
View File

@ -13,7 +13,9 @@ import com.sencha.gxt.widget.core.client.TabItemConfig;
import com.sencha.gxt.widget.core.client.TabPanel; import com.sencha.gxt.widget.core.client.TabPanel;
import com.sencha.gxt.widget.core.client.button.TextButton; import com.sencha.gxt.widget.core.client.button.TextButton;
import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent; import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent;
import com.sencha.gxt.widget.core.client.event.BeforeShowEvent;
import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent.BeforeCloseHandler; import com.sencha.gxt.widget.core.client.event.BeforeCloseEvent.BeforeCloseHandler;
import com.sencha.gxt.widget.core.client.event.BeforeShowEvent.BeforeShowHandler;
import com.sencha.gxt.widget.core.client.event.SelectEvent; import com.sencha.gxt.widget.core.client.event.SelectEvent;
//import org.gcube.portlets.user.td.taskswidget.client.TdTaskController; //import org.gcube.portlets.user.td.taskswidget.client.TdTaskController;
@ -33,7 +35,7 @@ public class ToolBox extends TabPanel {
this.eventBus = eventBus; this.eventBus = eventBus;
this.toolBoxPanel = toolBoxPanel; this.toolBoxPanel = toolBoxPanel;
setId(name); setId(name);
setBodyBorder(false);
setAnimScroll(true); setAnimScroll(true);
setTabScroll(true); setTabScroll(true);
setCloseContextMenu(true); setCloseContextMenu(true);
@ -45,10 +47,11 @@ public class ToolBox extends TabPanel {
public void closeTabs() { public void closeTabs() {
Log.debug("Close ToolBox Tabs"); Log.debug("Close ToolBox Tabs");
remove(helpPanel); if(trProperties!=null){
helpPanel=null; remove(trProperties);
remove(trProperties); trProperties=null;
trProperties=null; }
//remove(taskPanel); //remove(taskPanel);
// remove(tdTaskMainPanel); // remove(tdTaskMainPanel);
//tdTaskMainWindow=null; //tdTaskMainWindow=null;
@ -96,18 +99,8 @@ public class ToolBox extends TabPanel {
helpPanel.setHeaderVisible(false); helpPanel.setHeaderVisible(false);
add(helpPanel, propertiesItemConf); add(helpPanel, propertiesItemConf);
addBeforeCloseHandler(new BeforeCloseHandler<Widget>() {
public void onBeforeClose(BeforeCloseEvent<Widget> event) {
if (getWidgetCount() == 1) {
toolBoxPanel.closePanelOnly();
remove(helpPanel);
}
}
});
}; };

10
src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/ToolBoxPanel.java
View File

@ -26,6 +26,7 @@ public class ToolBoxPanel extends ContentPanel {
setWidth(310); setWidth(310);
setHeaderVisible(false); setHeaderVisible(false);
setResize(true); setResize(true);
setBodyBorder(false);
toolBox = new ToolBox("ToolBox",eventBus,this); toolBox = new ToolBox("ToolBox",eventBus,this);
add(toolBox); add(toolBox);
startPanel(); startPanel();
@ -74,6 +75,7 @@ public class ToolBoxPanel extends ContentPanel {
case START: case START:
break; break;
case TR_CLOSE: case TR_CLOSE:
this.enable();
closePanel(); closePanel();
break; break;
case TR_OPEN: case TR_OPEN:
@ -93,10 +95,7 @@ public class ToolBoxPanel extends ContentPanel {
protected void doToolBoxPanelOpenSwitch(){ protected void doToolBoxPanelOpenSwitch(){
if (uiStateType == UIStateType.TR_OPEN) { if (uiStateType == UIStateType.TR_OPEN) {
if (state == ToolBoxPanelState.OPENED) { if (state == ToolBoxPanelState.OPENED) {
collapse();
disable();
state = ToolBoxPanelState.CLOSED;
toolBox.closeTabs(); toolBox.closeTabs();
Log.debug("ToolBoxPanel Closed"); Log.debug("ToolBoxPanel Closed");
} else { } else {
@ -121,9 +120,6 @@ public class ToolBoxPanel extends ContentPanel {
} }
public void closePanel(){ public void closePanel(){
collapse();
disable();
state=ToolBoxPanelState.CLOSED;
toolBox.closeTabs(); toolBox.closeTabs();
Log.debug("ToolBoxPanel Closed"); Log.debug("ToolBoxPanel Closed");
} }
@ -132,7 +128,7 @@ public class ToolBoxPanel extends ContentPanel {
enable(); enable();
expand(); expand();
state = ToolBoxPanelState.OPENED; state = ToolBoxPanelState.OPENED;
toolBox.openTabs(); toolBox.startTabs();
} }

4
src/main/java/org/gcube/portlets/user/td/toolboxwidget/client/help/HelpPanel.java
View File

@ -50,7 +50,7 @@ public class HelpPanel extends FramedPanel {
public void addContents() { public void addContents() {
HTML title=new HTML("<H2>Tabular Data Manager Help<H2>"); HTML title=new HTML("<H2>Tabular Data Manager Help<H2>");
add(title); vl.add(title,new VerticalLayoutData(-1, -1, new Margins(1,1,6,1)));
contents = new FieldSet(); contents = new FieldSet();
contents.setHeadingText("Contents"); contents.setHeadingText("Contents");
@ -69,7 +69,7 @@ public class HelpPanel extends FramedPanel {
layoutCaptions.add(info, layoutCaptions.add(info,
new VerticalLayoutData(-1, -1, new Margins(1))); new VerticalLayoutData(-1, -1, new Margins(1)));
vl.add(contents); vl.add(contents,new VerticalLayoutData(-1, -1, new Margins(1)));
} }