gCubeSystem
/
tabular-data-manager
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-portlet@94964 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-04-17 10:49:08 +00:00
parent 8b1ec0fecb
commit 2927ffafd4
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
View File

@ -399,7 +399,7 @@ public class TabularDataController {
break; break;
case HISTORY: case HISTORY:
break; break;
case DISCARD: case UNDO:
callDiscard(); callDiscard();
break; break;
case DISCARDALL: case DISCARDALL:

42
src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
View File

@ -63,8 +63,8 @@ public class FileToolBar {
// History // History
protected TextButton historyButton; protected TextButton historyButton;
protected TextButton discardButton; protected TextButton undoButton;
protected TextButton discardAllButton; //protected TextButton discardAllButton;
protected TextButton helpButton; protected TextButton helpButton;
@ -440,19 +440,23 @@ public class FileToolBar {
historyLayout.setWidget(0, 0, historyButton); historyLayout.setWidget(0, 0, historyButton);
historyLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); historyLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
discardButton = new TextButton("Discard", undoButton = new TextButton("Undo",
TabularDataResources.INSTANCE.discard()); TabularDataResources.INSTANCE.discard32());
discardButton.disable(); undoButton.disable();
discardButton.setToolTip("Discard the last operation"); undoButton.setScale(ButtonScale.LARGE);
historyLayout.setWidget(0, 1, discardButton); undoButton.setIconAlign(IconAlign.TOP);
discardButton.addSelectHandler(new SelectHandler() { undoButton.setToolTip("Discard last operation");
undoButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
undoButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.DISCARD)); eventBus.fireEvent(new RibbonEvent(RibbonType.UNDO));
} }
}); });
historyLayout.setWidget(0, 1, undoButton);
historyLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
discardAllButton = new TextButton("Discard All", /*discardAllButton = new TextButton("Discard All",
TabularDataResources.INSTANCE.discardAll()); TabularDataResources.INSTANCE.discardAll());
discardAllButton.disable(); discardAllButton.disable();
discardAllButton.setToolTip("Discard all unsaved operations"); discardAllButton.setToolTip("Discard all unsaved operations");
@ -462,7 +466,7 @@ public class FileToolBar {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent(RibbonType.DISCARDALL)); eventBus.fireEvent(new RibbonEvent(RibbonType.DISCARDALL));
} }
}); });*/
cleanCells(historyLayout.getElement()); cleanCells(historyLayout.getElement());
@ -538,8 +542,8 @@ public class FileToolBar {
templateDeleteButton.enable(); templateDeleteButton.enable();
timelineButton.disable(); timelineButton.disable();
historyButton.disable(); historyButton.disable();
discardButton.disable(); undoButton.disable();
discardAllButton.disable(); //discardAllButton.disable();
break; break;
case TR_CLOSE: case TR_CLOSE:
case TR_READONLY: case TR_READONLY:
@ -560,8 +564,8 @@ public class FileToolBar {
templateDeleteButton.enable(); templateDeleteButton.enable();
timelineButton.disable(); timelineButton.disable();
historyButton.disable(); historyButton.disable();
discardButton.disable(); undoButton.disable();
discardAllButton.disable(); //discardAllButton.disable();
break; break;
case TR_OPEN: case TR_OPEN:
case TABLEUPDATE: case TABLEUPDATE:
@ -588,8 +592,8 @@ public class FileToolBar {
templateDeleteButton.enable(); templateDeleteButton.enable();
timelineButton.enable(); timelineButton.enable();
historyButton.enable(); historyButton.enable();
discardButton.enable(); undoButton.enable();
discardAllButton.disable(); //discardAllButton.disable();
break; break;
case WIZARD_OPEN: case WIZARD_OPEN:
openButton.disable(); openButton.disable();
@ -609,8 +613,8 @@ public class FileToolBar {
templateDeleteButton.disable(); templateDeleteButton.disable();
timelineButton.disable(); timelineButton.disable();
historyButton.disable(); historyButton.disable();
discardButton.disable(); undoButton.disable();
discardAllButton.disable(); //discardAllButton.disable();
break; break;
default: default:
break; break;