From 0254eb1a9c033bc1b9e89ba5162eca078d29ac82 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 18 Dec 2013 16:33:25 +0000 Subject: [PATCH] structure view cimplete git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@87167 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 2 +- .settings/org.eclipse.wst.common.component | 3 +++ .../reportgenerator/client/Headerbar.java | 4 ++-- .../client/Presenter/CommonCommands.java | 12 +++++++++-- .../client/Presenter/Presenter.java | 20 +++++++++++++----- .../reportgenerator/client/ToolboxPanel.java | 2 ++ .../client/toolbar/Images.java | 4 ++++ .../RichTextToolbar$Strings.properties | 3 ++- .../client/toolbar/RichTextToolbar.java | 8 ++++++- .../client/toolbar/structureView.png | Bin 0 -> 3945 bytes 10 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/structureView.png diff --git a/.classpath b/.classpath index a007caa..122aad1 100644 --- a/.classpath +++ b/.classpath @@ -26,7 +26,7 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 593edac..c93ac0c 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -7,6 +7,9 @@ uses + + uses + diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java index 1e64b4c..956e110 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java @@ -540,7 +540,7 @@ public class Headerbar extends Composite{ Command showReportStructure = new Command() { public void execute() { - presenter.showReportStructure(); + presenter.toggleReportStructure(); } }; @@ -553,7 +553,7 @@ public class Headerbar extends Composite{ MenuItem toReturn = new MenuItem("View", optionsMenu); optionsMenu.addItem("View Properties", openPageProperties); - optionsMenu.addItem("View Structure", showReportStructure); + optionsMenu.addItem("View/Hide Structure", showReportStructure); optionsMenu.addSeparator(); return toReturn; diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java index 8f27c05..861433e 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/CommonCommands.java @@ -51,7 +51,11 @@ public class CommonCommands { /** * */ - public Command saveTemplate; + public Command saveTemplate; + /** + * + */ + public Command structureView; /** * */ @@ -65,7 +69,11 @@ public class CommonCommands { */ public CommonCommands(final Presenter presenter) { this.presenter = presenter; - + structureView = new Command() { + public void execute() { + presenter.toggleReportStructure(); + } + }; newTemplate = new Command() { public void execute() { presenter.changeTemplateName(TemplateModel.DEFAULT_NAME); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java index 19aa5b2..94249cf 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java @@ -417,6 +417,7 @@ public class Presenter { */ HashMap toReturn = new HashMap(); + toReturn.put("structureView", commonCommands.structureView); toReturn.put("save", commonCommands.saveTemplate); toReturn.put("newdoc", commonCommands.newTemplate); toReturn.put("open_report", commonCommands.openReport); @@ -808,8 +809,7 @@ public class Presenter { if (currPage > 1) titleBar.getSectionSwitchPanel().showPrevButton(); - //show the structure - showReportStructure(); + } /** @@ -1126,9 +1126,19 @@ public class Presenter { areaForBiblio = d4sArea; } - - public void showReportStructure() { - toolBoxPanel.showStructure(new ReportStructurePanel(eventBus, model.getSerializableModel(), ToolboxPanel.TOOLBOX_WIDTH+"px", ToolboxPanel.TOOLBOX_HEIGHT+"px")); + /** + * show/hide the structure view + */ + boolean hidden = true; + public void toggleReportStructure() { + if (hidden) { + toolBoxPanel.showStructure(new ReportStructurePanel(eventBus, model.getSerializableModel(), ToolboxPanel.TOOLBOX_WIDTH+"px", ToolboxPanel.TOOLBOX_HEIGHT+"px")); + hidden = false; + } + else { + toolBoxPanel.collapse(); + hidden = true; + } } public HorizontalPanel getExportsPanel() { diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java index 0c71234..aec73f5 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java @@ -43,6 +43,8 @@ public class ToolboxPanel extends VerticalPanel { } public void collapse() { + clear(); + GWT.log("collapse"); setWidth("20px"); } diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java index fbf00d6..668b311 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/Images.java @@ -87,6 +87,10 @@ public interface Images extends ImageBundle { * @return . */ AbstractImagePrototype db_save(); + /** + * @return . + */ + AbstractImagePrototype structureView(); /** * @return . */ diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties index 14f00b7..48f5a76 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar$Strings.properties @@ -39,4 +39,5 @@ open_template = Open Template open_report = Open Report from Workspace importing = Import from Template forecolors = Text Color -close_report = Close Report \ No newline at end of file +close_report = Close Report +structureView = Show/Hide Structure View \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java index 04747ec..4981fa7 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/RichTextToolbar.java @@ -80,6 +80,8 @@ public class RichTextToolbar extends Composite { commands.get("save").execute(); } else if (sender == newdoc) { commands.get("newdoc").execute(); + }else if (sender == structureView) { + commands.get("structureView").execute(); }else if (sender == close) { commands.get("newdoc").execute(); } else if (sender == open_report) { @@ -163,7 +165,8 @@ public class RichTextToolbar extends Composite { private VerticalPanel outer = new VerticalPanel(); private HorizontalPanel topPanel = new HorizontalPanel(); - private HorizontalPanel bottomPanel = new HorizontalPanel(); + private HorizontalPanel bottomPanel = new HorizontalPanel(); + private ToggleButton structureView; private ToggleButton bold; private ToggleButton italic; private ToggleButton underline; @@ -233,6 +236,7 @@ public class RichTextToolbar extends Composite { richText.addStyleName("hasRichTextToolbar"); if (basic != null) { + topPanel.add(structureView = createToggleButton(images.structureView(), strings.structureView())); if (! isVme) { //add the new template button topPanel.add(newdoc = createPushButton(images.newdoc(), strings.newdoc())); @@ -520,6 +524,8 @@ public class RichTextToolbar extends Composite { String small(); String strikeThrough(); + + String structureView(); String ul(); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/structureView.png b/src/main/java/org/gcube/portlets/user/reportgenerator/client/toolbar/structureView.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc9817647e5b81fdc23c98df146d89927b299e4 GIT binary patch literal 3945 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 WhxM}**`ep(FQm#H