diff --git a/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-pipeline-toolbar-icon.png b/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-pipeline-toolbar-icon.png index 74c62763263..536f2c25bde 100644 Binary files a/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-pipeline-toolbar-icon.png and b/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-pipeline-toolbar-icon.png differ diff --git a/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-workflow-toolbar-icon.png b/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-workflow-toolbar-icon.png index 19530c856e2..ab19147cebe 100644 Binary files a/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-workflow-toolbar-icon.png and b/docs/hop-user-manual/modules/ROOT/assets/images/execution-information-perspective-workflow-toolbar-icon.png differ diff --git a/docs/hop-user-manual/modules/ROOT/assets/images/icons/execution.svg b/docs/hop-user-manual/modules/ROOT/assets/images/icons/execution.svg new file mode 100644 index 00000000000..f1fa08c5f42 --- /dev/null +++ b/docs/hop-user-manual/modules/ROOT/assets/images/icons/execution.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/docs/hop-user-manual/modules/ROOT/assets/images/transforms/icons/execinfo.svg b/docs/hop-user-manual/modules/ROOT/assets/images/transforms/icons/execinfo.svg index 9aeb5f0e881..f1fa08c5f42 100644 --- a/docs/hop-user-manual/modules/ROOT/assets/images/transforms/icons/execinfo.svg +++ b/docs/hop-user-manual/modules/ROOT/assets/images/transforms/icons/execinfo.svg @@ -1,18 +1,34 @@ - - - + + + + + + + + + + + + + diff --git a/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspective-execution-information.adoc b/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspective-execution-information.adoc index c05397d4bb9..9499b1fd221 100644 --- a/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspective-execution-information.adoc +++ b/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspective-execution-information.adoc @@ -20,7 +20,7 @@ under the License. = Execution Information Perspective -Icon: image:icons/location.svg[width="24px"] +Icon: image:icons/execution.svg[width="24px"] == Description @@ -33,7 +33,7 @@ The execution information displayed in this perspective is not collected automat == Navigation -You can navigate to it by clicking the image:icons/location.svg[width="24px"] icon from the vertical perspective toolbar in the Hop GUI. +You can navigate to it by clicking the image:icons/execution.svg[width="24px"] icon from the vertical perspective toolbar in the Hop GUI. The Keyboard shortcut to do the same is: `CTRL-Shift-I`. diff --git a/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspectives.adoc b/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspectives.adoc index ca5a5ab96ff..6a05fb7e611 100644 --- a/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspectives.adoc +++ b/docs/hop-user-manual/modules/ROOT/pages/hop-gui/perspectives.adoc @@ -28,7 +28,7 @@ Here are the available perspectives: * image:icons/data_orch.svg[width="24px"] xref:hop-gui/perspective-data-orchestration.adoc[Data Orchestration] -* image:icons/location.svg[width="24px"] xref:hop-gui/perspective-execution-information.adoc[Execution Information] +* image:icons/execution.svg[width="24px"] xref:hop-gui/perspective-execution-information.adoc[Execution Information] * image:icons/gear.svg[width="24px"] xref:hop-gui/perspective-configuration.adoc[Configuration] diff --git a/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoDialog.java b/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoDialog.java index 2af698d43ea..8d3e046c211 100644 --- a/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoDialog.java +++ b/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoDialog.java @@ -131,7 +131,7 @@ public String open() { fdlOperationType.top = new FormAttachment(lastControl, margin); fdlOperationType.right = new FormAttachment(middle, 0); wlOperationType.setLayoutData(fdlOperationType); - wOperationType = new CCombo(shell, SWT.LEFT); + wOperationType = new CCombo(shell, SWT.LEFT | SWT.BORDER); wOperationType.setToolTipText( BaseMessages.getString(PKG, "ExecInfoDialog.OperationType.Tooltip")); PropsUi.setLook(wOperationType); diff --git a/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoMeta.java b/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoMeta.java index df72771c94e..1654b061bb3 100644 --- a/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoMeta.java +++ b/plugins/transforms/execinfo/src/main/java/org/apache/hop/pipeline/transforms/execinfo/ExecInfoMeta.java @@ -36,7 +36,7 @@ @Transform( id = "ExecInfo", - image = "ui/images/location.svg", + image = "ui/images/execution.svg", name = "i18n::ExecInfo.Name", description = "i18n::ExecInfo.Description", categoryDescription = "i18n:org.apache.hop.pipeline.transform:BaseTransform.Category.Utility", 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 0e38652d0b6..a577881e882 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 @@ -5336,7 +5336,7 @@ public List getContextHandlers() { type = GuiActionType.Info, name = "i18n::HopGuiPipelineGraph.ContextualAction.NavigateToExecutionInfo.Text", tooltip = "i18n::HopGuiPipelineGraph.ContextualAction.NavigateToExecutionInfo.Tooltip", - image = "ui/images/location.svg", + image = "ui/images/execution.svg", category = "Basic", categoryOrder = "1") public void navigateToExecutionInfo(HopGuiPipelineContext context) { @@ -5348,7 +5348,7 @@ public void navigateToExecutionInfo(HopGuiPipelineContext context) { id = TOOLBAR_ITEM_TO_EXECUTION_INFO, toolTip = "i18n:org.apache.hop.ui.hopgui:HopGui.Toolbar.ToExecutionInfo", type = GuiToolbarElementType.BUTTON, - image = "ui/images/location.svg") + image = "ui/images/execution.svg") public void navigateToExecutionInfo() { try { // Is there an active IPipeline? @@ -5468,7 +5468,7 @@ public void reload() { type = GuiActionType.Info, name = "i18n::HopGuiPipelineGraph.TransformAction.ViewExecutionInfo.Name", tooltip = "i18n::HopGuiPipelineGraph.TransformAction.ViewExecutionInfo.Tooltip", - image = "ui/images/location.svg", + image = "ui/images/execution.svg", category = "Basic", categoryOrder = "1") public void viewTransformExecutionInfo(HopGuiPipelineTransformContext context) { 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 2594e84c105..40c303e24b3 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 @@ -4075,7 +4075,7 @@ public Thread getWorkflowThread() { type = GuiActionType.Info, name = "i18n::HopGuiWorkflowGraph.ContextualAction.NavigateToExecutionInfo.Text", tooltip = "i18n::HopGuiWorkflowGraph.ContextualAction.NavigateToExecutionInfo.Tooltip", - image = "ui/images/location.svg", + image = "ui/images/execution.svg", category = "i18n::HopGuiWorkflowGraph.ContextualAction.Category.Basic.Text", categoryOrder = "1") public void navigateToExecutionInfo(HopGuiWorkflowContext context) { @@ -4087,7 +4087,7 @@ public void navigateToExecutionInfo(HopGuiWorkflowContext context) { id = TOOLBAR_ITEM_TO_EXECUTION_INFO, toolTip = "i18n:org.apache.hop.ui.hopgui:HopGui.Toolbar.ToExecutionInfo", type = GuiToolbarElementType.BUTTON, - image = "ui/images/location.svg") + image = "ui/images/execution.svg") public void navigateToExecutionInfo() { try { // Is there an active IWorkflow? @@ -4184,7 +4184,7 @@ public void reload() { type = GuiActionType.Info, name = "i18n::HopGuiWorkflowGraph.ActionAction.ViewExecutionInfo.Name", tooltip = "i18n::HopGuiWorkflowGraph.ActionAction.ViewExecutionInfo.Tooltip", - image = "ui/images/location.svg", + image = "ui/images/execution.svg", category = "Basic", categoryOrder = "1") public void viewActionExecutionInfo(HopGuiWorkflowActionContext context) { diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/execution/ExecutionPerspective.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/execution/ExecutionPerspective.java index 8ee4d736e7b..6d8782ee01f 100644 --- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/execution/ExecutionPerspective.java +++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/execution/ExecutionPerspective.java @@ -94,7 +94,7 @@ id = "150-HopExecutionPerspective", name = "i18n::ExecutionPerspective.Name", description = "i18n::ExecutionPerspective.Description", - image = "ui/images/location.svg") + image = "ui/images/execution.svg") @GuiPlugin public class ExecutionPerspective implements IHopPerspective, TabClosable { diff --git a/ui/src/main/resources/ui/images/execution.svg b/ui/src/main/resources/ui/images/execution.svg new file mode 100644 index 00000000000..f1fa08c5f42 --- /dev/null +++ b/ui/src/main/resources/ui/images/execution.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + +