yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GP-3397 - minor theme fixes

Browse source
This commit is contained in:
dragonmacher 2023-05-09 12:04:37 -04:00
parent b3616a6831
commit b953998f7d
4 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/Base/data/base.theme.properties
View file

@ -35,10 +35,8 @@ color.fg.interpreterconsole.error = color.fg.error
color.bg.markerservice = color.bg color.bg.markerservice = color.bg
color.bg.search.highlight = color.bg.highlight color.bg.search.highlight = color.bg.highlight
color.bg.search.current.line.highlight = color.palette.yellow color.bg.search.highlight.current.line = color.palette.yellow
color.bg.analysis.options.not.default.enablement = color.palette.lightgray
color.bg.analysis.options.not.default.enablement.selected = color.palette.gray
color.fg.analysis.options.prototype = color.palette.crimson color.fg.analysis.options.prototype = color.palette.crimson
color.fg.analysis.options.prototype.selected = color.palette.lightcoral color.fg.analysis.options.prototype.selected = color.palette.lightcoral

23
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AnalysisEnablementTableModel.java
View file

@ -19,8 +19,7 @@ import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.util.List; import java.util.List;
import javax.swing.JComponent; import javax.swing.*;
import javax.swing.JTable;
import docking.widgets.table.*; import docking.widgets.table.*;
import generic.theme.GColor; import generic.theme.GColor;
@ -40,9 +39,6 @@ public class AnalysisEnablementTableModel
//@formatter:off //@formatter:off
private static Color FG_COLOR_PROTOTYPE = new GColor("color.fg.analysis.options.prototype"); private static Color FG_COLOR_PROTOTYPE = new GColor("color.fg.analysis.options.prototype");
private static Color FG_COLOR_PROTOTYPE_SELECTED = new GColor("color.fg.analysis.options.prototype.selected"); private static Color FG_COLOR_PROTOTYPE_SELECTED = new GColor("color.fg.analysis.options.prototype.selected");
private static Color BG_COLOR_NOT_DEFAULT_ENABLEMENT = new GColor("color.bg.analysis.options.not.default.enablement");
private static Color BG_COLOR_NOT_DEFAULT_ENABLEMENT_SELECTED = new GColor("color.bg.analysis.options.not.default.enablement.selected");
//@formatter:on //@formatter:on
private List<AnalyzerEnablementState> analyzerStates; private List<AnalyzerEnablementState> analyzerStates;
@ -179,15 +175,9 @@ public class AnalysisEnablementTableModel
} }
// not the default enablement // not the default enablement
if (isSelected) { JLabel label = (JLabel) component;
component.setBackground(BG_COLOR_NOT_DEFAULT_ENABLEMENT_SELECTED); label.setText("*");
}
else {
component.setBackground(BG_COLOR_NOT_DEFAULT_ENABLEMENT);
}
setToolTip(component, "This option differs from the default"); setToolTip(component, "This option differs from the default");
return component; return component;
} }
@ -222,13 +212,6 @@ public class AnalysisEnablementTableModel
// not the default enablement // not the default enablement
component.setForeground(Palette.BLACK); component.setForeground(Palette.BLACK);
if (data.isSelected()) {
component.setBackground(BG_COLOR_NOT_DEFAULT_ENABLEMENT_SELECTED);
}
else {
component.setBackground(BG_COLOR_NOT_DEFAULT_ENABLEMENT);
}
setToolTip(component, "This option differs from the default"); setToolTip(component, "This option differs from the default");
return component; return component;
} }

2
Ghidra/Features/Decompiler/data/decompiler.theme.properties
View file

@ -18,7 +18,7 @@ color.bg.decompiler.current.variable = color.palette.highlight.transparent.yello
color.bg.decompiler.highlights.default = color.palette.highlight.transparent.yellow color.bg.decompiler.highlights.default = color.palette.highlight.transparent.yellow
color.bg.decompiler.highlights.special = color.palette.crimson color.bg.decompiler.highlights.special = color.palette.crimson
color.bg.decompiler.highlights.search = color.palette.slateblue color.bg.decompiler.highlights.find = color.palette.slateblue
color.bg.decompiler.pcode.dfg.vertex.default = color.palette.red color.bg.decompiler.pcode.dfg.vertex.default = color.palette.red
color.bg.decompiler.pcode.dfg.vertex.selected = color.palette.lightcoral color.bg.decompiler.pcode.dfg.vertex.selected = color.palette.lightcoral

4
Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/DecompileOptions.java
View file

@ -366,9 +366,7 @@ public class DecompileOptions {
private final static GColor HIGHLIGHT_DEFAULT_COLOR = new GColor("color.fg.decompiler"); private final static GColor HIGHLIGHT_DEFAULT_COLOR = new GColor("color.fg.decompiler");
private static final String SEARCH_HIGHLIGHT_MSG = "Display.Color for Highlighting Find Matches"; private static final String SEARCH_HIGHLIGHT_MSG = "Display.Color for Highlighting Find Matches";
private static final GColor SEARCH_HIGHLIGHT_COLOR = new GColor("color.bg.decompiler.highlights.search"); private static final GColor SEARCH_HIGHLIGHT_COLOR = new GColor("color.bg.decompiler.highlights.find");
//@formatter:on //@formatter:on
private static final String BACKGROUND_COLOR_MSG = "Display.Background Color"; private static final String BACKGROUND_COLOR_MSG = "Display.Background Color";