yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

GP-1981 - Theming - Icon Conversions - Software Modeling, Project,

Browse source 
Docking
This commit is contained in:
dragonmacher 2022-09-29 18:57:18 -04:00 • committed by ghidragon
parent d466dbf06b
commit 79b95702ba
150 changed files with 1116 additions and 1001 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerComponentProvider.java
View file

@ -26,6 +26,7 @@ import javax.swing.JComponent;
import docking.action.ToggleDockingAction;
import generic.theme.GColor;
import generic.theme.GIcon;
import ghidra.GhidraOptions;
import ghidra.GhidraOptions.CURSOR_MOUSE_BUTTON_NAMES;
import ghidra.app.plugin.core.format.*;
@ -37,7 +38,6 @@ import ghidra.framework.plugintool.PluginTool;
import ghidra.util.*;
import ghidra.util.classfinder.ClassSearcher;
import ghidra.util.task.SwingUpdateManager;
import resources.ResourceManager;
public abstract class ByteViewerComponentProvider extends ComponentProviderAdapter
implements OptionsChangeListener {
@ -116,7 +116,7 @@ public abstract class ByteViewerComponentProvider extends ComponentProviderAdapt
panel = newByteViewerPanel();
bytesPerLine = DEFAULT_BYTES_PER_LINE;
setIcon(ResourceManager.loadImage("images/binaryData.gif"));
setIcon(new GIcon("icon.plugin.byteviewer.provider"));
setOptions();
createActions();

6
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/OptionsAction.java
View file

@ -15,17 +15,17 @@
*/
package ghidra.app.plugin.core.byteviewer;
import javax.swing.ImageIcon;
import javax.swing.Icon;
import docking.ActionContext;
import docking.action.DockingAction;
import docking.action.ToolBarData;
import generic.theme.GIcon;
import ghidra.framework.plugintool.Plugin;
import ghidra.framework.plugintool.PluginTool;
import resources.ResourceManager;
class OptionsAction extends DockingAction {
public static final ImageIcon OPTIONS_ICON = ResourceManager.loadImage("images/wrench.png");
public static final Icon OPTIONS_ICON = new GIcon("icon.plugin.byteviewer.options");
private final ByteViewerComponentProvider provider;

6
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ProgramByteViewerComponentProvider.java
View file

@ -25,6 +25,7 @@ import javax.swing.*;
import docking.ActionContext;
import docking.action.*;
import docking.widgets.fieldpanel.support.ViewerPosition;
import generic.theme.GIcon;
import ghidra.app.events.*;
import ghidra.app.nav.*;
import ghidra.app.plugin.core.format.*;
@ -43,7 +44,6 @@ import ghidra.util.HelpLocation;
import ghidra.util.classfinder.ClassSearcher;
import ghidra.util.datastruct.WeakDataStructureFactory;
import ghidra.util.datastruct.WeakSet;
import resources.ResourceManager;
public class ProgramByteViewerComponentProvider extends ByteViewerComponentProvider
implements DomainObjectListener, Navigatable {
@ -77,7 +77,7 @@ public class ProgramByteViewerComponentProvider extends ByteViewerComponentProvi
AbstractByteViewerPlugin<?> plugin, String name, boolean isConnected) {
super(tool, plugin, name, ByteViewerActionContext.class);
this.isConnected = isConnected;
setIcon(ResourceManager.loadImage("images/binaryData.gif"));
setIcon(new GIcon("icon.plugin.byteviewer.provider"));
if (!isConnected) {
setTransient();
}
@ -742,7 +742,7 @@ public class ProgramByteViewerComponentProvider extends ByteViewerComponentProvi
public CloneByteViewerAction() {
super("ByteViewer Clone", plugin.getName());
ImageIcon image = ResourceManager.loadImage("images/camera-photo.png");
Icon image = new GIcon("icon.provider.clone");
setToolBarData(new ToolBarData(image, "ZZZ"));
setDescription("Create a snapshot (disconnected) copy of this Bytes window ");

5
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ToggleEditAction.java
View file

@ -20,8 +20,8 @@ import java.awt.event.KeyEvent;
import docking.ActionContext;
import docking.action.*;
import generic.theme.GIcon;
import ghidra.framework.plugintool.Plugin;
import resources.ResourceManager;
class ToggleEditAction extends ToggleDockingAction {
private final ByteViewerComponentProvider provider;
@ -29,8 +29,7 @@ class ToggleEditAction extends ToggleDockingAction {
public ToggleEditAction(ByteViewerComponentProvider provider, Plugin plugin) {
super("Enable/Disable Byteviewer Editing", plugin.getName());
this.provider = provider;
setToolBarData(new ToolBarData(
ResourceManager.loadImage("images/editbytes.gif"), "Byteviewer"));
setToolBarData(new ToolBarData(new GIcon("icon.base.edit.bytes"), "Byteviewer"));
setKeyBindingData(new KeyBindingData(
KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK));

13
Ghidra/Features/ByteViewer/src/test.slow/java/ghidra/framework/plugintool/dialog/SaveToolConfigDialogTest.java
View file

@ -64,9 +64,8 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
private TestEnv env;
private SaveToolConfigDialog saveDialog;
private JTextField toolNameField;
private JList iconList;
private JList<?> iconList;
private JTextField iconNameField;
private PluginTool newtool;
public SaveToolConfigDialogTest() {
super();
@ -161,11 +160,13 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
ToolTemplate template = tc.getToolTemplate("MyTestTool");
tc.remove("MyTestTool");
ImageIcon icon = ResourceManager.getScaledIcon(
ResourceManager.loadImage("defaultTools/images/Caution.png"),
Icon icon = ResourceManager.getScaledIcon(
ResourceManager.loadIcon("defaultTools/images/Caution.png"),
ToolIconURL.LARGE_ICON_SIZE, ToolIconURL.LARGE_ICON_SIZE);
assertEquals(icon.getDescription(), template.getIcon().getDescription());
String expected = ResourceManager.getIconName(icon);
String actual = ResourceManager.getIconName(template.getIcon());
assertEquals(expected, actual);
}
@Test
@ -323,7 +324,7 @@ public class SaveToolConfigDialogTest extends AbstractGhidraHeadedIntegrationTes
assertNotNull(saveDialog);
toolNameField = (JTextField) findComponentByName(saveDialog, "ToolName");
iconList = (JList) findComponentByName(saveDialog, "IconList");
iconList = (JList<?>) findComponentByName(saveDialog, "IconList");
iconNameField = (JTextField) findComponentByName(saveDialog, "IconName");
}