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

GT-2698 refactor JLabel -> GLabel, JComboBox -> GComboBox, renderers.

Browse source
This commit is contained in:
dev747368 2019-04-15 15:29:00 -04:00
parent e0c25b0590
commit 6448f0da8f
280 changed files with 2277 additions and 1531 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerOptionsDialog.java
View file

@ -29,7 +29,7 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import docking.DialogComponentProvider;
import docking.DockingUtils;
import docking.widgets.label.GLabel;
import ghidra.app.plugin.core.format.ByteBlockSelection;
import ghidra.app.plugin.core.format.DataFormatModel;
import ghidra.app.util.AddressInput;
@ -73,7 +73,7 @@ public class ByteViewerOptionsDialog extends DialogComponentProvider
private Component buildSettingsPanel() {
JPanel panel = new JPanel(new PairLayout(5, 5));
panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
panel.add(DockingUtils.createNonHtmlLabel("Alignment Address:"));
panel.add(new GLabel("Alignment Address:"));
if (provider instanceof ProgramByteViewerComponentProvider) {
Program program = ((ProgramByteViewerComponentProvider) provider).getProgram();
@ -87,7 +87,7 @@ public class ByteViewerOptionsDialog extends DialogComponentProvider
}
}
panel.add(DockingUtils.createNonHtmlLabel("Bytes Per Line:"));
panel.add(new GLabel("Bytes Per Line:"));
bytesPerLineField = new FixedBitSizeValueField(8, false, true);
bytesPerLineField.setFormat(10, false);
bytesPerLineField.setMinMax(BigInteger.valueOf(1), BigInteger.valueOf(256));
@ -95,7 +95,7 @@ public class ByteViewerOptionsDialog extends DialogComponentProvider
panel.add(bytesPerLineField);
bytesPerLineField.addChangeListener(this);
panel.add(DockingUtils.createNonHtmlLabel("Group size (Hex View Only):"));
panel.add(new GLabel("Group size (Hex View Only):"));
groupSizeField = new FixedBitSizeValueField(8, false, true);
groupSizeField.setFormat(10, false);
groupSizeField.setMinMax(BigInteger.valueOf(1), BigInteger.valueOf(256));

19
Ghidra/Features/ByteViewer/src/main/java/ghidra/app/plugin/core/byteviewer/ByteViewerPanel.java
View file

@ -25,7 +25,6 @@ import java.util.List;
import javax.swing.*;
import javax.swing.event.*;
import docking.DockingUtils;
import docking.help.Help;
import docking.help.HelpService;
import docking.widgets.fieldpanel.*;
@ -35,6 +34,8 @@ import docking.widgets.fieldpanel.listener.LayoutModelListener;
import docking.widgets.fieldpanel.support.SingleRowLayout;
import docking.widgets.fieldpanel.support.ViewerPosition;
import docking.widgets.indexedscrollpane.*;
import docking.widgets.label.GDLabel;
import docking.widgets.label.GLabel;
import ghidra.app.plugin.core.format.*;
import ghidra.util.HelpLocation;
import ghidra.util.exception.InvalidInputException;
@ -825,21 +826,21 @@ public class ByteViewerPanel extends JPanel implements TableColumnModelListener,
private JPanel createStatusPanel() {
JLabel startLabel = DockingUtils.createNonHtmlLabel("Start:", SwingConstants.RIGHT);
JLabel endLabel = DockingUtils.createNonHtmlLabel("End:", SwingConstants.RIGHT);
JLabel offsetLabel = DockingUtils.createNonHtmlLabel("Offset:", SwingConstants.RIGHT);
JLabel insertionLabel = DockingUtils.createNonHtmlLabel("Insertion:", SwingConstants.RIGHT);
JLabel startLabel = new GLabel("Start:", SwingConstants.RIGHT);
JLabel endLabel = new GLabel("End:", SwingConstants.RIGHT);
JLabel offsetLabel = new GLabel("Offset:", SwingConstants.RIGHT);
JLabel insertionLabel = new GLabel("Insertion:", SwingConstants.RIGHT);
startField = DockingUtils.createNonHtmlLabel("00000000");
startField = new GDLabel("00000000");
startField.setName("Start");
endField = DockingUtils.createNonHtmlLabel("00000000");
endField = new GDLabel("00000000");
endField.setName("End");
offsetField = DockingUtils.createNonHtmlLabel("00000000");
offsetField = new GDLabel("00000000");
offsetField.setName("Offset");
insertionField = DockingUtils.createNonHtmlLabel("00000000");
insertionField = new GDLabel("00000000");
insertionField.setName("Insertion");
Font f = new Font("SansSerif", Font.PLAIN, 11);