You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/11/08 18:12:13 UTC
[hop] branch master updated: HOP-4571 Small user interface change - Change icon for perspective config tab plugin - Change icon for menu file\exit - Change icon for menu edit\select all - Change icon for menu edit\unselect all
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/hop.git
The following commit(s) were added to refs/heads/master by this push:
new ae5f925a54 HOP-4571 Small user interface change - Change icon for perspective config tab plugin - Change icon for menu file\exit - Change icon for menu edit\select all - Change icon for menu edit\unselect all
new 68ac64a862 Merge pull request #1779 from nadment/HOP-4571
ae5f925a54 is described below
commit ae5f925a54edd05510349d75dd1543eadc3ffcb3
Author: Nicolas Adment <39...@users.noreply.github.com>
AuthorDate: Mon Nov 7 22:45:49 2022 +0100
HOP-4571 Small user interface change
- Change icon for perspective config tab plugin
- Change icon for menu file\exit
- Change icon for menu edit\select all
- Change icon for menu edit\unselect all
---
.../main/java/org/apache/hop/ui/core/gui/GuiResource.java | 6 ++++++
ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java | 6 +++---
.../configuration/tabs/ConfigPluginOptionsTab.java | 3 +--
.../perspective/configuration/tabs/ConfigVariablesTab.java | 1 -
ui/src/main/resources/ui/images/select-all.svg | 12 ++++++++++++
ui/src/main/resources/ui/images/shutdown.svg | 10 ++++++++++
ui/src/main/resources/ui/images/unselect-all.svg | 13 +++++++++++++
7 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
index 14bac317f8..8ea30f77ff 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
@@ -228,6 +228,7 @@ public class GuiResource {
private Image imageLabel;
private Image imageFunction;
private Image imageUser;
+ private Image imagePlugin;
private Image imageEditOption;
private Image imageColor;
private Image imageNote;
@@ -455,6 +456,7 @@ public class GuiResource {
imageMissing.dispose();
imageVariable.dispose();
imagePipeline.dispose();
+ imagePlugin.dispose();
imagePartitionSchema.dispose();
imageWorkflow.dispose();
imageUser.dispose();
@@ -735,6 +737,7 @@ public class GuiResource {
loadAsResource(display, "ui/images/minimize-panel.svg", ConstUi.SMALL_ICON_SIZE);
imageNew = loadAsResource(display, "ui/images/new.svg", ConstUi.SMALL_ICON_SIZE);
imageNote = loadAsResource(display, "ui/images/note.svg", ConstUi.SMALL_ICON_SIZE);
+ imagePlugin = loadAsResource(display, "ui/images/plugin.svg", ConstUi.SMALL_ICON_SIZE);
imagePrint = loadAsResource(display, "ui/images/print.svg", ConstUi.SMALL_ICON_SIZE);
imageRefresh = loadAsResource(display, "ui/images/refresh.svg", ConstUi.SMALL_ICON_SIZE);
imageRegEx = loadAsResource(display, "ui/images/regex.svg", ConstUi.SMALL_ICON_SIZE);
@@ -1322,6 +1325,9 @@ public class GuiResource {
imagePipeline, display, ConstUi.SMALL_ICON_SIZE, ConstUi.SMALL_ICON_SIZE);
}
+ public Image getImagePlugin() {
+ return imagePlugin;
+ }
public Image getImageUser() {
return imageUser;
}
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
index ecab8a7879..c19ba8c170 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
@@ -778,7 +778,7 @@ public class HopGui
id = ID_MAIN_MENU_FILE_EXIT,
label = "i18n::HopGui.Menu.File.Quit",
parentId = ID_MAIN_MENU_FILE,
- image = "ui/images/close-panel.svg",
+ image = "ui/images/shutdown.svg",
separator = true)
@GuiKeyboardShortcut(control = true, key = 'q')
@GuiOsxKeyboardShortcut(command = true, key = 'q')
@@ -831,7 +831,7 @@ public class HopGui
id = ID_MAIN_MENU_EDIT_SELECT_ALL,
label = "i18n::HopGui.Menu.Edit.SelectAll",
parentId = ID_MAIN_MENU_EDIT_PARENT_ID,
- image = "ui/images/add_all.svg",
+ image = "ui/images/select-all.svg",
separator = true)
@GuiKeyboardShortcut(control = true, key = 'a')
@GuiOsxKeyboardShortcut(command = true, key = 'a')
@@ -844,7 +844,7 @@ public class HopGui
id = ID_MAIN_MENU_EDIT_UNSELECT_ALL,
label = "i18n::HopGui.Menu.Edit.ClearSelection",
parentId = ID_MAIN_MENU_EDIT_PARENT_ID,
- image = "ui/images/cancel.svg")
+ image = "ui/images/unselect-all.svg")
@GuiKeyboardShortcut(key = SWT.ESC)
@GuiOsxKeyboardShortcut(key = SWT.ESC)
public void menuEditUnselectAll() {
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigPluginOptionsTab.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigPluginOptionsTab.java
index 029ce07c5f..b96fc754fa 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigPluginOptionsTab.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigPluginOptionsTab.java
@@ -19,7 +19,6 @@
package org.apache.hop.ui.hopgui.perspective.configuration.tabs;
import org.apache.hop.core.Const;
-import org.apache.hop.core.config.HopConfig;
import org.apache.hop.core.config.plugin.ConfigPluginType;
import org.apache.hop.core.gui.plugin.GuiPlugin;
import org.apache.hop.core.gui.plugin.tab.GuiTab;
@@ -74,7 +73,7 @@ public class ConfigPluginOptionsTab {
CTabItem wPluginsTab = new CTabItem(wTabFolder, SWT.NONE);
wPluginsTab.setFont(GuiResource.getInstance().getFontDefault());
wPluginsTab.setText("Plugins");
- wPluginsTab.setImage(GuiResource.getInstance().getImageHopUi());
+ wPluginsTab.setImage(GuiResource.getInstance().getImagePlugin());
Composite wPluginsTabComp = new Composite(wTabFolder, SWT.NONE);
PropsUi.setLook(wPluginsTabComp);
diff --git a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigVariablesTab.java b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigVariablesTab.java
index 54dd393225..8ddeebdc7c 100644
--- a/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigVariablesTab.java
+++ b/ui/src/main/java/org/apache/hop/ui/hopgui/perspective/configuration/tabs/ConfigVariablesTab.java
@@ -43,7 +43,6 @@ import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TableItem;
import java.util.ArrayList;
diff --git a/ui/src/main/resources/ui/images/select-all.svg b/ui/src/main/resources/ui/images/select-all.svg
new file mode 100644
index 0000000000..66f81794c6
--- /dev/null
+++ b/ui/src/main/resources/ui/images/select-all.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<path fill="#0E3A5A" d="M48,48h32v32H48 M37.333,90.666h53.333V37.333H37.333 M80,26.667h10.666V16H80 M80,112h10.666v-10.666H80
+ M101.334,90.666H112V80h-10.666 M101.334,48H112V37.333h-10.666 M101.334,112c5.891,0,10.666-4.775,10.666-10.666h-10.666
+ M101.334,69.334H112V58.667h-10.666 M58.667,112h10.667v-10.666H58.667 M48,16H37.333v10.667H48 M16,90.666h10.667V80H16
+ M26.667,112v-10.666H16C16,107.225,20.776,112,26.667,112 M101.334,16v10.667H112C112,20.775,107.225,16,101.334,16 M69.334,16
+ H58.667v10.667h10.667 M16,48h10.667V37.333H16 M37.333,112H48v-10.666H37.333 M16,69.334h10.667V58.667H16 M16,26.667h10.667V16
+ C20.776,16,16,20.775,16,26.667z"/>
+</svg>
diff --git a/ui/src/main/resources/ui/images/shutdown.svg b/ui/src/main/resources/ui/images/shutdown.svg
new file mode 100644
index 0000000000..fe5de6b6b3
--- /dev/null
+++ b/ui/src/main/resources/ui/images/shutdown.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<path fill="#0E3A5A" d="M88.32,29.013l-7.734,7.733C89.813,42.347,96,52.427,96,64c0,17.674-14.326,32-32,32
+ c-17.673,0-32-14.326-32-32c0-11.573,6.187-21.653,15.36-27.307l-7.68-7.68C28.586,36.693,21.333,49.493,21.333,64
+ c0,23.564,19.103,42.666,42.667,42.666c23.564,0,42.666-19.102,42.666-42.666C106.666,49.493,99.414,36.693,88.32,29.013 M69.334,16
+ H58.667v53.334h10.667"/>
+</svg>
diff --git a/ui/src/main/resources/ui/images/unselect-all.svg b/ui/src/main/resources/ui/images/unselect-all.svg
new file mode 100644
index 0000000000..04fc52e481
--- /dev/null
+++ b/ui/src/main/resources/ui/images/unselect-all.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<path fill="#0E3A5A" d="M112,106.666c0,2.934-2.4,5.334-5.334,5.334h-5.332v-10.666H112V106.666 M80,112v-10.666h10.666V112H80
+ M58.667,112v-10.666h10.667V112H58.667 M37.333,112v-10.666H48V112H37.333 M21.333,112C18.4,112,16,109.6,16,106.666v-5.332h10.667
+ V112H21.333 M16,80h10.667v10.666H16V80 M112,80v10.666h-10.666V80H112 M77.813,42.667L64,56.48L50.187,42.667l-7.52,7.52L56.48,64
+ L42.667,77.813l7.52,7.521L64,71.52l13.813,13.814l7.521-7.521L71.52,64l13.814-13.813L77.813,42.667 M16,58.667h10.667v10.667H16
+ V58.667 M112,58.667v10.667h-10.666V58.667H112 M16,37.333h10.667V48H16V37.333 M112,37.333V48h-10.666V37.333H112 M21.333,16h5.333
+ v10.667H16v-5.333C16,18.4,18.4,16,21.333,16 M106.666,16C109.6,16,112,18.4,112,21.333v5.333h-10.666V16H106.666 M80,26.667V16
+ h10.666v10.667H80 M58.667,26.667V16h10.667v10.667H58.667 M37.333,26.667V16H48v10.667H37.333z"/>
+</svg>