Skip to content

Commit 05ac562

Browse files
pabx06pabx06
committed
Function ID and FileChooser color
1 parent b30a932 commit 05ac562

File tree

3 files changed

+109
-0
lines changed

3 files changed

+109
-0
lines changed

Diff for: ‎patch/ActiveFidConfigureDialog.patch

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/ActiveFidConfigureDialog.java b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/ActiveFidConfigureDialog.java
2+
index e9530bb46..1f880e12f 100644
3+
--- a/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/ActiveFidConfigureDialog.java
4+
+++ b/Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/ActiveFidConfigureDialog.java
5+
@@ -89,7 +89,7 @@ public class ActiveFidConfigureDialog extends DialogComponentProvider {
6+
private Component buildCheckBoxPanel() {
7+
JPanel panel = new JPanel(new VerticalLayout(5));
8+
panel.setOpaque(true);
9+
- panel.setBackground(Color.WHITE);
10+
+ //panel.setBackground(Color.WHITE);
11+
panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
12+
for (FidFile fidFile : fidFiles) {
13+
GCheckBox checkbox = new GCheckBox(fidFile.getName(), fidFile.isActive());

Diff for: ‎patch/GhidraFileChooser.patch

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/GhidraFileChooser.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/GhidraFileChooser.java
2+
index 6023e7657..4ef51442d 100644
3+
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/GhidraFileChooser.java
4+
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/GhidraFileChooser.java
5+
@@ -306,7 +306,7 @@ public class GhidraFileChooser extends DialogComponentProvider
6+
myComputerButton.setName("MY_COMPUTER_BUTTON");
7+
myComputerButton.setIcon(ResourceManager.loadImage("images/computer.png"));
8+
myComputerButton.addActionListener(e -> updateMyComputer());
9+
- myComputerButton.setForeground(FOREROUND_COLOR);
10+
+ //myComputerButton.setForeground(FOREROUND_COLOR);
11+
12+
desktopButton = new FileChooserToggleButton("Desktop") {
13+
@Override
14+
@@ -317,7 +317,7 @@ public class GhidraFileChooser extends DialogComponentProvider
15+
desktopButton.setName("DESKTOP_BUTTON");
16+
desktopButton.setIcon(ResourceManager.loadImage("images/desktop.png"));
17+
desktopButton.addActionListener(e -> updateDesktop());
18+
- desktopButton.setForeground(FOREROUND_COLOR);
19+
+ //desktopButton.setForeground(FOREROUND_COLOR);
20+
desktopButton.setEnabled(fileChooserModel.getDesktopDirectory() != null);
21+
22+
homeButton = new FileChooserToggleButton("Home") {
23+
@@ -329,7 +329,7 @@ public class GhidraFileChooser extends DialogComponentProvider
24+
homeButton.setName("HOME_BUTTON");
25+
homeButton.setIcon(ResourceManager.loadImage("images/user-home.png"));
26+
homeButton.addActionListener(e -> updateHome());
27+
- homeButton.setForeground(FOREROUND_COLOR);
28+
+ //homeButton.setForeground(FOREROUND_COLOR);
29+
30+
recentButton = new FileChooserToggleButton("Recent") {
31+
@Override
32+
@@ -345,7 +345,7 @@ public class GhidraFileChooser extends DialogComponentProvider
33+
34+
recentButton.setIcon(multiIcon);
35+
recentButton.addActionListener(e -> updateRecent());
36+
- recentButton.setForeground(FOREROUND_COLOR);
37+
+ //recentButton.setForeground(FOREROUND_COLOR);
38+
39+
shortCutButtonGroup = new UnselectableButtonGroup();
40+
shortCutButtonGroup.add(myComputerButton);
41+
@@ -362,7 +362,7 @@ public class GhidraFileChooser extends DialogComponentProvider
42+
43+
JPanel panel = new JPanel(new BorderLayout());
44+
panel.setBorder(BorderFactory.createLoweredBevelBorder());
45+
- panel.setBackground(BACKGROUND_COLOR.darker());
46+
+ //panel.setBackground(BACKGROUND_COLOR.darker());
47+
panel.add(shortCutPanel, BorderLayout.NORTH);
48+
return panel;
49+
}
50+
@@ -470,7 +470,7 @@ public class GhidraFileChooser extends DialogComponentProvider
51+
private void buildWaitPanel() {
52+
waitPanel = new JPanel(new BorderLayout());
53+
waitPanel.setBorder(BorderFactory.createLoweredBevelBorder());
54+
- waitPanel.setBackground(BACKGROUND_COLOR);
55+
+ //waitPanel.setBackground(BACKGROUND_COLOR);
56+
waitPanel.addMouseListener(new MouseAdapter() {
57+
@Override
58+
public void mouseReleased(MouseEvent e) {
59+
@@ -574,7 +574,7 @@ public class GhidraFileChooser extends DialogComponentProvider
60+
directoryListModel = new DirectoryListModel();
61+
directoryList = new DirectoryList(this, directoryListModel, rootPanel.getFont());
62+
directoryList.setName("LIST");
63+
- directoryList.setBackground(BACKGROUND_COLOR);
64+
+ //directoryList.setBackground(BACKGROUND_COLOR);
65+
66+
directoryList.addFocusListener(new FocusAdapter() {
67+
@Override
68+
@@ -584,7 +584,7 @@ public class GhidraFileChooser extends DialogComponentProvider
69+
});
70+
71+
directoryScroll = new JScrollPane(directoryList);
72+
- directoryScroll.getViewport().setBackground(BACKGROUND_COLOR);
73+
+ //directoryScroll.getViewport().setBackground(BACKGROUND_COLOR);
74+
directoryScroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
75+
directoryScroll.addComponentListener(new ComponentAdapter() {
76+
//if the scroll pane is resized, we need to adjust
77+
@@ -1470,7 +1470,7 @@ public class GhidraFileChooser extends DialogComponentProvider
78+
directoryTableModel = new DirectoryTableModel(this);
79+
directoryTable = new DirectoryTable(this, directoryTableModel);
80+
directoryTable.setName("TABLE");
81+
- directoryTable.setBackground(BACKGROUND_COLOR);
82+
+ //directoryTable.setBackground(BACKGROUND_COLOR);
83+
84+
directoryTable.addFocusListener(new FocusAdapter() {
85+
@Override
86+
@@ -1480,7 +1480,7 @@ public class GhidraFileChooser extends DialogComponentProvider
87+
});
88+
89+
JScrollPane scrollPane = new JScrollPane(directoryTable);
90+
- scrollPane.getViewport().setBackground(BACKGROUND_COLOR);
91+
+ //scrollPane.getViewport().setBackground(BACKGROUND_COLOR);
92+
return scrollPane;
93+
}
94+

Diff for: ‎scripts/patchColors.sh

+2
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ patch ./Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/function/edito
1818

1919
patch ./Ghidra/Framework/Docking/src/main/java/docking/widgets/DropDownTextField.java ../patch/DropDownTextField.patch
2020
patch ./Ghidra/Features/Base/src/main/java/ghidra/framework/main/ConsoleTextPane.java ../patch/ConsoleTextPane.patch
21+
patch ./Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/GhidraFileChooser.java ../patch/GhidraFileChooser.patch
22+
patch ./Ghidra/Features/FunctionID/src/main/java/ghidra/feature/fid/plugin/ActiveFidConfigureDialog.java ../patch/ActiveFidConfigureDialog.patch

0 commit comments

Comments
 (0)