This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new e06c27b HOP-2069 Put close and min/max button to the upper right
corner of tabfolder execution results
new 254c789 Merge pull request #808 from nadment/HOP-2069
e06c27b is described below
commit e06c27b23299837dfc901f8353a412511bc06f97
Author: nadment <[email protected]>
AuthorDate: Tue May 18 20:47:56 2021 +0200
HOP-2069 Put close and min/max button to the upper right corner of
tabfolder execution results
---
.../hopgui/file/pipeline/HopGuiPipelineGraph.java | 98 +++++++--------------
.../delegates/HopGuiPipelineGridDelegate.java | 2 +-
.../delegates/HopGuiPipelineLogDelegate.java | 2 +-
.../hopgui/file/workflow/HopGuiWorkflowGraph.java | 99 +++++++---------------
.../delegates/HopGuiWorkflowGridDelegate.java | 2 +-
.../delegates/HopGuiWorkflowLogDelegate.java | 2 +-
6 files changed, 67 insertions(+), 138 deletions(-)
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
index 9987de8..287beca 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/HopGuiPipelineGraph.java
@@ -326,11 +326,8 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
private List<AreaOwner> areaOwners;
- // private Text filenameLabel;
private SashForm sashForm;
- public Composite extraViewComposite;
-
public CTabFolder extraViewTabFolder;
private boolean initialized;
@@ -3914,7 +3911,7 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
}
*/
public boolean isExecutionResultsPaneVisible() {
- return extraViewComposite != null && !extraViewComposite.isDisposed();
+ return extraViewTabFolder != null && !extraViewTabFolder.isDisposed();
}
@GuiToolbarElement(
@@ -3942,7 +3939,7 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
private void disposeExtraView() {
- extraViewComposite.dispose();
+ extraViewTabFolder.dispose();
sashForm.layout();
sashForm.setWeights(
new int[] {
@@ -3962,15 +3959,15 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
// Minimize
//
sashForm.setMaximizedControl(null);
- minMaxButton.setImage(GuiResource.getInstance().getImageMaximizePanel());
- minMaxButton.setToolTipText(
+ minMaxItem.setImage(GuiResource.getInstance().getImageMaximizePanel());
+ minMaxItem.setToolTipText(
BaseMessages.getString(PKG,
"PipelineGraph.ExecutionResultsPanel.MaxButton.Tooltip"));
} else {
// Maximize
//
- sashForm.setMaximizedControl(extraViewComposite);
- minMaxButton.setImage(GuiResource.getInstance().getImageMinimizePanel());
- minMaxButton.setToolTipText(
+ sashForm.setMaximizedControl(extraViewTabFolder);
+ minMaxItem.setImage(GuiResource.getInstance().getImageMinimizePanel());
+ minMaxItem.setToolTipText(
BaseMessages.getString(PKG,
"PipelineGraph.ExecutionResultsPanel.MinButton.Tooltip"));
}
}
@@ -3985,69 +3982,17 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
this.toolBar = toolBar;
}
- private Label closeButton;
+ private ToolItem closeItem;
- private Label minMaxButton;
+ private ToolItem minMaxItem;
/** Add an extra view to the main composite SashForm */
public void addExtraView() {
PropsUi props = PropsUi.getInstance();
- extraViewComposite = new Composite(sashForm, SWT.NONE);
- FormLayout extraCompositeFormLayout = new FormLayout();
- extraCompositeFormLayout.marginWidth = 2;
- extraCompositeFormLayout.marginHeight = 2;
- extraViewComposite.setLayout(extraCompositeFormLayout);
-
- // Put a close and max button to the upper right corner...
- //
- closeButton = new Label(extraViewComposite, SWT.NONE);
- closeButton.setImage(GuiResource.getInstance().getImageClosePanel());
- closeButton.setToolTipText(
- BaseMessages.getString(PKG,
"PipelineGraph.ExecutionResultsPanel.CloseButton.Tooltip"));
- FormData fdClose = new FormData();
- fdClose.right = new FormAttachment(100, 0);
- fdClose.top = new FormAttachment(0, 0);
- closeButton.setLayoutData(fdClose);
- closeButton.addMouseListener(
- new MouseAdapter() {
- @Override
- public void mouseDown(MouseEvent e) {
- disposeExtraView();
- }
- });
-
- minMaxButton = new Label(extraViewComposite, SWT.NONE);
- minMaxButton.setImage(GuiResource.getInstance().getImageMaximizePanel());
- minMaxButton.setToolTipText(
- BaseMessages.getString(PKG,
"PipelineGraph.ExecutionResultsPanel.MaxButton.Tooltip"));
- FormData fdMinMax = new FormData();
- fdMinMax.right = new FormAttachment(closeButton, -props.getMargin());
- fdMinMax.top = new FormAttachment(0, 0);
- minMaxButton.setLayoutData(fdMinMax);
- minMaxButton.addMouseListener(
- new MouseAdapter() {
- @Override
- public void mouseDown(MouseEvent e) {
- minMaxExtraView();
- }
- });
-
- // Add a label at the top: Results
- //
- Label wResultsLabel = new Label(extraViewComposite, SWT.LEFT);
- wResultsLabel.setFont(GuiResource.getInstance().getFontLarge());
- wResultsLabel.setBackground(GuiResource.getInstance().getColorWhite());
- wResultsLabel.setText(BaseMessages.getString(PKG,
"PipelineLog.ResultsPanel.NameLabel"));
- FormData fdResultsLabel = new FormData();
- fdResultsLabel.left = new FormAttachment(0, 0);
- fdResultsLabel.right = new FormAttachment(minMaxButton,
-props.getMargin());
- fdResultsLabel.top = new FormAttachment(0, 0);
- wResultsLabel.setLayoutData(fdResultsLabel);
-
// Add a tab folder ...
//
- extraViewTabFolder = new CTabFolder(extraViewComposite, SWT.MULTI);
+ extraViewTabFolder = new CTabFolder(sashForm, SWT.MULTI);
hopGui.getProps().setLook(extraViewTabFolder, Props.WIDGET_STYLE_TAB);
extraViewTabFolder.addMouseListener(
@@ -4056,7 +4001,7 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
@Override
public void mouseDoubleClick(MouseEvent arg0) {
if (sashForm.getMaximizedControl() == null) {
- sashForm.setMaximizedControl(extraViewComposite);
+ sashForm.setMaximizedControl(extraViewTabFolder);
} else {
sashForm.setMaximizedControl(null);
}
@@ -4066,10 +4011,29 @@ public class HopGuiPipelineGraph extends
HopGuiAbstractGraph
FormData fdTabFolder = new FormData();
fdTabFolder.left = new FormAttachment(0, 0);
fdTabFolder.right = new FormAttachment(100, 0);
- fdTabFolder.top = new FormAttachment(wResultsLabel, props.getMargin());
+ fdTabFolder.top = new FormAttachment(0, 0);
fdTabFolder.bottom = new FormAttachment(100, 0);
extraViewTabFolder.setLayoutData(fdTabFolder);
+ // Create toolbar for close and min/max to the upper right corner...
+ //
+ ToolBar extraViewToolBar = new ToolBar(extraViewTabFolder, SWT.FLAT);
+ extraViewTabFolder.setTopRight( extraViewToolBar, SWT.RIGHT );
+ props.setLook(extraViewToolBar);
+
+ minMaxItem = new ToolItem(extraViewToolBar, SWT.PUSH);
+ minMaxItem.setImage(GuiResource.getInstance().getImageMaximizePanel());
+ minMaxItem.setToolTipText(BaseMessages.getString(PKG,
"PipelineGraph.ExecutionResultsPanel.MaxButton.Tooltip"));
+ minMaxItem.addListener(SWT.Selection, e -> minMaxExtraView());
+
+ closeItem = new ToolItem(extraViewToolBar, SWT.PUSH);
+ closeItem.setImage(GuiResource.getInstance().getImageClosePanel());
+ closeItem.setToolTipText(BaseMessages.getString(PKG,
"PipelineGraph.ExecutionResultsPanel.CloseButton.Tooltip"));
+ closeItem.addListener(SWT.Selection, e -> disposeExtraView());
+
+ int height = extraViewToolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+ extraViewTabFolder.setTabHeight(Math.max(height,
extraViewTabFolder.getTabHeight()));
+
sashForm.setWeights(
new int[] {
60, 40,
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
index 0cc10fe..c6d1217 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineGridDelegate.java
@@ -114,7 +114,7 @@ public class HopGuiPipelineGridDelegate {
// First, see if we need to add the extra view...
//
- if (pipelineGraph.extraViewComposite == null ||
pipelineGraph.extraViewComposite.isDisposed()) {
+ if (pipelineGraph.extraViewTabFolder == null ||
pipelineGraph.extraViewTabFolder.isDisposed()) {
pipelineGraph.addExtraView();
} else {
if (pipelineGridTab != null && !pipelineGridTab.isDisposed()) {
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
index 1415850..a6df374 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/pipeline/delegates/HopGuiPipelineLogDelegate.java
@@ -80,7 +80,7 @@ public class HopGuiPipelineLogDelegate {
public void addPipelineLog() {
// First, see if we need to add the extra view...
//
- if (pipelineGraph.extraViewComposite == null ||
pipelineGraph.extraViewComposite.isDisposed()) {
+ if (pipelineGraph.extraViewTabFolder == null ||
pipelineGraph.extraViewTabFolder.isDisposed()) {
pipelineGraph.addExtraView();
} else {
if (pipelineLogTab != null && !pipelineLogTab.isDisposed()) {
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
index 7c3cd56..1c1b7da 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/HopGuiWorkflowGraph.java
@@ -138,7 +138,6 @@ import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.ScrollBar;
@@ -260,11 +259,8 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
protected NotePadMeta ni = null;
- // private Text filenameLabel;
private SashForm sashForm;
- public Composite extraViewComposite;
-
public CTabFolder extraViewTabFolder;
private ToolBar toolBar;
@@ -283,9 +279,8 @@ public class HopGuiWorkflowGraph extends HopGuiAbstractGraph
private Composite mainComposite;
- private Label closeButton;
-
- private Label minMaxButton;
+ private ToolItem closeItem;
+ private ToolItem minMaxItem;
private CheckBoxToolTip helpTip;
@@ -3263,59 +3258,10 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
/** Add an extra view to the main composite SashForm */
public void addExtraView() {
- extraViewComposite = new Composite(sashForm, SWT.NONE);
- FormLayout extraCompositeFormLayout = new FormLayout();
- extraCompositeFormLayout.marginWidth = 2;
- extraCompositeFormLayout.marginHeight = 2;
- extraViewComposite.setLayout(extraCompositeFormLayout);
-
- // Put a close and max button to the upper right corner...
- //
- closeButton = new Label(extraViewComposite, SWT.NONE);
- closeButton.setImage(GuiResource.getInstance().getImageClosePanel());
- closeButton.setToolTipText(
- BaseMessages.getString(PKG,
"WorkflowGraph.ExecutionResultsPanel.CloseButton.Tooltip"));
- FormData fdClose = new FormData();
- fdClose.right = new FormAttachment(100, 0);
- fdClose.top = new FormAttachment(0, 0);
- closeButton.setLayoutData(fdClose);
- closeButton.addMouseListener(
- new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- disposeExtraView();
- }
- });
-
- minMaxButton = new Label(extraViewComposite, SWT.NONE);
- minMaxButton.setImage(GuiResource.getInstance().getImageMaximizePanel());
- minMaxButton.setToolTipText(
- BaseMessages.getString(PKG,
"WorkflowGraph.ExecutionResultsPanel.MaxButton.Tooltip"));
- FormData fdMinMax = new FormData();
- fdMinMax.right = new FormAttachment(closeButton, -props.getMargin());
- fdMinMax.top = new FormAttachment(0, 0);
- minMaxButton.setLayoutData(fdMinMax);
- minMaxButton.addMouseListener(
- new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- minMaxExtraView();
- }
- });
-
- // Add a label at the top: Results
- //
- Label wResultsLabel = new Label(extraViewComposite, SWT.LEFT);
- wResultsLabel.setFont(GuiResource.getInstance().getFontMediumBold());
- wResultsLabel.setBackground(GuiResource.getInstance().getColorWhite());
- wResultsLabel.setText(BaseMessages.getString(PKG,
"WorkflowLog.ResultsPanel.NameLabel"));
- FormData fdResultsLabel = new FormData();
- fdResultsLabel.left = new FormAttachment(0, 0);
- fdResultsLabel.right = new FormAttachment(100, 0);
- fdResultsLabel.top = new FormAttachment(0, 0);
- wResultsLabel.setLayoutData(fdResultsLabel);
// Add a tab folder ...
//
- extraViewTabFolder = new CTabFolder(extraViewComposite, SWT.MULTI);
+ extraViewTabFolder = new CTabFolder(sashForm, SWT.MULTI);
hopGui.getProps().setLook(extraViewTabFolder, Props.WIDGET_STYLE_TAB);
extraViewTabFolder.addMouseListener(
@@ -3324,7 +3270,7 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
@Override
public void mouseDoubleClick(MouseEvent arg0) {
if (sashForm.getMaximizedControl() == null) {
- sashForm.setMaximizedControl(extraViewComposite);
+ sashForm.setMaximizedControl(extraViewTabFolder);
} else {
sashForm.setMaximizedControl(null);
}
@@ -3334,10 +3280,29 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
FormData fdTabFolder = new FormData();
fdTabFolder.left = new FormAttachment(0, 0);
fdTabFolder.right = new FormAttachment(100, 0);
- fdTabFolder.top = new FormAttachment(wResultsLabel, props.getMargin());
- fdTabFolder.bottom = new FormAttachment(100, 0);
+ fdTabFolder.top = new FormAttachment(0, 0);
+ fdTabFolder.bottom = new FormAttachment(100, 0);
extraViewTabFolder.setLayoutData(fdTabFolder);
+ // Create toolbar for close and min/max to the upper right corner...
+ //
+ ToolBar extraViewToolBar = new ToolBar(extraViewTabFolder, SWT.FLAT);
+ extraViewTabFolder.setTopRight( extraViewToolBar, SWT.RIGHT );
+ props.setLook(extraViewToolBar);
+
+ minMaxItem = new ToolItem(extraViewToolBar, SWT.PUSH);
+ minMaxItem.setImage(GuiResource.getInstance().getImageMaximizePanel());
+ minMaxItem.setToolTipText(BaseMessages.getString(PKG,
"WorkflowGraph.ExecutionResultsPanel.MaxButton.Tooltip"));
+ minMaxItem.addListener(SWT.Selection, e -> minMaxExtraView());
+
+ closeItem = new ToolItem(extraViewToolBar, SWT.PUSH);
+ closeItem.setImage(GuiResource.getInstance().getImageClosePanel());
+ closeItem.setToolTipText(BaseMessages.getString(PKG,
"WorkflowGraph.ExecutionResultsPanel.CloseButton.Tooltip"));
+ closeItem.addListener(SWT.Selection, e -> disposeExtraView());
+
+ int height = extraViewToolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+ extraViewTabFolder.setTabHeight(Math.max(height,
extraViewTabFolder.getTabHeight()));
+
sashForm.setWeights(
new int[] {
60, 40,
@@ -3352,7 +3317,7 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
}
private void disposeExtraView() {
- extraViewComposite.dispose();
+ extraViewTabFolder.dispose();
sashForm.layout();
sashForm.setWeights(
new int[] {
@@ -3372,21 +3337,21 @@ public class HopGuiWorkflowGraph extends
HopGuiAbstractGraph
// Minimize
//
sashForm.setMaximizedControl(null);
- minMaxButton.setImage(GuiResource.getInstance().getImageMaximizePanel());
- minMaxButton.setToolTipText(
+ minMaxItem.setImage(GuiResource.getInstance().getImageMaximizePanel());
+ minMaxItem.setToolTipText(
BaseMessages.getString(PKG,
"WorkflowGraph.ExecutionResultsPanel.MaxButton.Tooltip"));
} else {
// Maximize
//
- sashForm.setMaximizedControl(extraViewComposite);
- minMaxButton.setImage(GuiResource.getInstance().getImageMinimizePanel());
- minMaxButton.setToolTipText(
+ sashForm.setMaximizedControl(extraViewTabFolder);
+ minMaxItem.setImage(GuiResource.getInstance().getImageMinimizePanel());
+ minMaxItem.setToolTipText(
BaseMessages.getString(PKG,
"WorkflowGraph.ExecutionResultsPanel.MinButton.Tooltip"));
}
}
public boolean isExecutionResultsPaneVisible() {
- return extraViewComposite != null && !extraViewComposite.isDisposed();
+ return extraViewTabFolder != null && !extraViewTabFolder.isDisposed();
}
@GuiToolbarElement(
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
index fbff9bd..06e75cb 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowGridDelegate.java
@@ -78,7 +78,7 @@ public class HopGuiWorkflowGridDelegate {
// First, see if we need to add the extra view...
//
- if ( workflowGraph.extraViewComposite == null ||
workflowGraph.extraViewComposite.isDisposed() ) {
+ if ( workflowGraph.extraViewTabFolder == null ||
workflowGraph.extraViewTabFolder.isDisposed() ) {
workflowGraph.addExtraView();
} else {
if ( workflowGridTab != null && !workflowGridTab.isDisposed() ) {
diff --git
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
index 696cab1..72c494a 100644
---
a/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
+++
b/ui/src/main/java/org/apache/hop/ui/hopgui/file/workflow/delegates/HopGuiWorkflowLogDelegate.java
@@ -78,7 +78,7 @@ public class HopGuiWorkflowLogDelegate {
public void addWorkflowLog() {
// First, see if we need to add the extra view...
//
- if (workflowGraph.extraViewComposite == null ||
workflowGraph.extraViewComposite.isDisposed()) {
+ if (workflowGraph.extraViewTabFolder == null ||
workflowGraph.extraViewTabFolder.isDisposed()) {
workflowGraph.addExtraView();
} else {
if (workflowLogTab != null && !workflowLogTab.isDisposed()) {
