mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-2901-dragonmacher-theme-property-update'

Conflicts:
	Ghidra/Framework/Docking/data/docking.theme.properties
This commit is contained in:
Ryan Kurtz
2022-12-16 14:15:15 -05:00
parent b707c2ea6b 63d6063fa0
commit d7f7bf9a66
31 changed files with 171 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/Project/data/project.theme.properties
View File

@@ -23,8 +23,6 @@ color.fg.pluginpanel.details.developer =mediumVioletRed
color.fg.pluginpanel.details.dependency = green
color.fg.pluginpanel.details.novalue = lightGray
color.border.pluginpanel = darkGray
color.fg.plugin.installer.table.has.dependents = red
color.fg.plugin.installer.table.has.dependents.selected = pink

2
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/logviewer/ui/FVToolBar.java
View File

@@ -78,7 +78,7 @@ public class FVToolBar extends JToolBar {
private class ScrollLockAction extends AbstractAction {
public ScrollLockAction() {
super("FVScrollLockAction", new GIcon("icon.version.control.dialog.add"));
super("FVScrollLockAction", new GIcon("icon.logviewer.toolbar.scroll.lock"));
putValue(SHORT_DESCRIPTION, "Scroll Lock");
}