Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HOP-4571 Small user interface change #1779

Merged
merged 1 commit into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ui/src/main/java/org/apache/hop/ui/core/gui/GuiResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -455,6 +456,7 @@ private void dispose() {
imageMissing.dispose();
imageVariable.dispose();
imagePipeline.dispose();
imagePlugin.dispose();
imagePartitionSchema.dispose();
imageWorkflow.dispose();
imageUser.dispose();
Expand Down Expand Up @@ -735,6 +737,7 @@ private void loadCommonImages() {
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);
Expand Down Expand Up @@ -1322,6 +1325,9 @@ public Image getImagePipeline() {
imagePipeline, display, ConstUi.SMALL_ICON_SIZE, ConstUi.SMALL_ICON_SIZE);
}

public Image getImagePlugin() {
return imagePlugin;
}
public Image getImageUser() {
return imageUser;
}
Expand Down
6 changes: 3 additions & 3 deletions ui/src/main/java/org/apache/hop/ui/hopgui/HopGui.java
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ public void menuFileCloseAll() {
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')
Expand Down Expand Up @@ -831,7 +831,7 @@ public void menuEditRedo() {
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')
Expand All @@ -844,7 +844,7 @@ public void menuEditSelectAll() {
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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -74,7 +73,7 @@ public void addPluginOptionsTab(CTabFolder wTabFolder) {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
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;
Expand Down
12 changes: 12 additions & 0 deletions ui/src/main/resources/ui/images/select-all.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions ui/src/main/resources/ui/images/shutdown.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions ui/src/main/resources/ui/images/unselect-all.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.