mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-27 18:05:29 +08:00
GP-1981 converting option colors to theme colors and font usages to
theme properties
This commit is contained in:
@@ -12,6 +12,7 @@ icon.bytepatterns.pattern.mining.analyzer = magnifier.png
|
||||
|
||||
icon.bytepatterns.function.bit.patterns.disabled = ledred.png
|
||||
icon.bytepatterns.function.bit.patterns.enabled = ledgreen.png
|
||||
font.bytepatterns.table = monospaced-PLAIN-16
|
||||
|
||||
[Dark Defaults]
|
||||
|
||||
|
||||
+9
-8
@@ -18,15 +18,13 @@
|
||||
*/
|
||||
package ghidra.bitpatterns.gui;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.Component;
|
||||
import java.util.List;
|
||||
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.table.TableModel;
|
||||
|
||||
import docking.widgets.table.AbstractDynamicTableColumn;
|
||||
import docking.widgets.table.TableColumnDescriptor;
|
||||
import docking.widgets.table.threaded.ThreadedTableModelStub;
|
||||
import generic.theme.Gui;
|
||||
import ghidra.bitpatterns.info.ByteSequenceRowObject;
|
||||
import ghidra.docking.settings.Settings;
|
||||
import ghidra.framework.plugintool.ServiceProvider;
|
||||
@@ -38,7 +36,7 @@ import ghidra.util.table.column.GColumnRenderer;
|
||||
import ghidra.util.task.TaskMonitor;
|
||||
|
||||
public class ByteSequenceTableModel extends ThreadedTableModelStub<ByteSequenceRowObject> {
|
||||
private static final int MONOSPACE_FONT_SIZE = 16;
|
||||
private static final String FONT_ID = "font.bytepatterns.table";
|
||||
List<ByteSequenceRowObject> rowObjects;
|
||||
|
||||
public ByteSequenceTableModel(FunctionBitPatternsExplorerPlugin plugin,
|
||||
@@ -51,10 +49,13 @@ public class ByteSequenceTableModel extends ThreadedTableModelStub<ByteSequenceR
|
||||
* Displays the byte sequences in monospace font
|
||||
*/
|
||||
protected GColumnRenderer<String> monospacedRenderer = new AbstractGColumnRenderer<String>() {
|
||||
|
||||
@Override
|
||||
protected void configureFont(JTable table, TableModel model, int column) {
|
||||
Font f = new Font("monospaced", getFixedWidthFont().getStyle(), MONOSPACE_FONT_SIZE);
|
||||
setFont(f);
|
||||
public Component getTableCellRendererComponent(
|
||||
docking.widgets.table.GTableCellRenderingData data) {
|
||||
Component component = super.getTableCellRendererComponent(data);
|
||||
component.setFont(Gui.getFont(FONT_ID));
|
||||
return component;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+12
-12
@@ -15,15 +15,13 @@
|
||||
*/
|
||||
package ghidra.bitpatterns.gui;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.Component;
|
||||
import java.util.List;
|
||||
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.table.TableModel;
|
||||
|
||||
import docking.widgets.table.AbstractDynamicTableColumn;
|
||||
import docking.widgets.table.TableColumnDescriptor;
|
||||
import docking.widgets.table.threaded.ThreadedTableModelStub;
|
||||
import generic.theme.Gui;
|
||||
import ghidra.docking.settings.Settings;
|
||||
import ghidra.framework.plugintool.ServiceProvider;
|
||||
import ghidra.util.datastruct.Accumulator;
|
||||
@@ -42,12 +40,13 @@ public class ClosedPatternTableModel extends ThreadedTableModelStub<ClosedPatter
|
||||
private List<ClosedPatternRowObject> rowObjects;
|
||||
|
||||
private static final String MODEL_NAME = "Closed Patterns";
|
||||
private static final int MONOSPACE_FONT_SIZE = 16;
|
||||
|
||||
protected static final String FONT_ID = "font.bytepatterns.table";
|
||||
|
||||
/**
|
||||
* Creates a table model for closed patterns mined from byte sequences
|
||||
* @param rowObjects
|
||||
* @param serviceProvider
|
||||
* @param rowObjects the row objects
|
||||
* @param serviceProvider the service provider
|
||||
*/
|
||||
public ClosedPatternTableModel(List<ClosedPatternRowObject> rowObjects,
|
||||
ServiceProvider serviceProvider) {
|
||||
@@ -57,11 +56,12 @@ public class ClosedPatternTableModel extends ThreadedTableModelStub<ClosedPatter
|
||||
}
|
||||
|
||||
protected GColumnRenderer<String> monospacedRenderer = new AbstractGColumnRenderer<String>() {
|
||||
@Override
|
||||
protected void configureFont(JTable table, TableModel model, int column) {
|
||||
Font f = new Font("monospaced", getFixedWidthFont().getStyle(), MONOSPACE_FONT_SIZE);
|
||||
setFont(f);
|
||||
}
|
||||
public java.awt.Component getTableCellRendererComponent(
|
||||
docking.widgets.table.GTableCellRenderingData data) {
|
||||
Component component = super.getTableCellRendererComponent(data);
|
||||
component.setFont(Gui.getFont(FONT_ID));
|
||||
return component;
|
||||
};
|
||||
|
||||
@Override
|
||||
public String getFilterString(String t, Settings settings) {
|
||||
|
||||
+8
-9
@@ -15,14 +15,12 @@
|
||||
*/
|
||||
package ghidra.bitpatterns.gui;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.Component;
|
||||
import java.util.List;
|
||||
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.table.TableModel;
|
||||
|
||||
import docking.widgets.table.AbstractDynamicTableColumn;
|
||||
import docking.widgets.table.TableColumnDescriptor;
|
||||
import generic.theme.Gui;
|
||||
import ghidra.bitpatterns.info.PatternEvalRowObject;
|
||||
import ghidra.bitpatterns.info.PatternMatchType;
|
||||
import ghidra.docking.settings.Settings;
|
||||
@@ -37,7 +35,7 @@ import ghidra.util.table.column.GColumnRenderer;
|
||||
import ghidra.util.task.TaskMonitor;
|
||||
|
||||
public class PatternEvalTabelModel extends AddressBasedTableModel<PatternEvalRowObject> {
|
||||
private static final int MONOSPACE_FONT_SIZE = 14;
|
||||
protected static final String FONT_ID = "font.bytepatterns.table";
|
||||
private List<PatternEvalRowObject> rowObjects;
|
||||
|
||||
/**
|
||||
@@ -62,10 +60,11 @@ public class PatternEvalTabelModel extends AddressBasedTableModel<PatternEvalRow
|
||||
protected final GColumnRenderer<String> monospacedRenderer =
|
||||
new AbstractGColumnRenderer<String>() {
|
||||
@Override
|
||||
protected void configureFont(JTable table, TableModel model, int column) {
|
||||
Font f =
|
||||
new Font("monospaced", getFixedWidthFont().getStyle(), MONOSPACE_FONT_SIZE);
|
||||
setFont(f);
|
||||
public java.awt.Component getTableCellRendererComponent(
|
||||
docking.widgets.table.GTableCellRenderingData data) {
|
||||
Component component = super.getTableCellRendererComponent(data);
|
||||
component.setFont(Gui.getFont(FONT_ID));
|
||||
return component;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+8
-9
@@ -15,14 +15,12 @@
|
||||
*/
|
||||
package ghidra.bitpatterns.gui;
|
||||
|
||||
import java.awt.Font;
|
||||
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.table.TableModel;
|
||||
import java.awt.Component;
|
||||
|
||||
import docking.widgets.table.AbstractDynamicTableColumn;
|
||||
import docking.widgets.table.TableColumnDescriptor;
|
||||
import docking.widgets.table.threaded.ThreadedTableModelStub;
|
||||
import generic.theme.Gui;
|
||||
import ghidra.bitpatterns.info.PatternType;
|
||||
import ghidra.docking.settings.Settings;
|
||||
import ghidra.framework.plugintool.ServiceProvider;
|
||||
@@ -42,7 +40,7 @@ public class PatternInfoTableModel extends ThreadedTableModelStub<PatternInfoRow
|
||||
private FunctionBitPatternsExplorerPlugin plugin;
|
||||
private static final int NOTE_COLUMN = 2;
|
||||
private static final int ALIGNMENT_COLUMN = 5;
|
||||
private static final int MONOSPACE_FONT_SIZE = 14;
|
||||
protected static final String FONT_ID = "font.bytepatterns.table";
|
||||
|
||||
public PatternInfoTableModel(FunctionBitPatternsExplorerPlugin plugin) {
|
||||
super(MODEL_NAME, plugin.getTool());
|
||||
@@ -56,10 +54,11 @@ public class PatternInfoTableModel extends ThreadedTableModelStub<PatternInfoRow
|
||||
}
|
||||
|
||||
protected GColumnRenderer<String> monospacedRenderer = new AbstractGColumnRenderer<String>() {
|
||||
@Override
|
||||
protected void configureFont(JTable table, TableModel model, int column) {
|
||||
Font f = new Font("monospaced", getFixedWidthFont().getStyle(), MONOSPACE_FONT_SIZE);
|
||||
setFont(f);
|
||||
public Component getTableCellRendererComponent(
|
||||
docking.widgets.table.GTableCellRenderingData data) {
|
||||
Component component = super.getTableCellRendererComponent(data);
|
||||
component.setFont(Gui.getFont(FONT_ID));
|
||||
return component;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user