diff --git a/Ghidra/Features/Base/certification.manifest b/Ghidra/Features/Base/certification.manifest index 64a1f11ba3..e9f6a212ad 100644 --- a/Ghidra/Features/Base/certification.manifest +++ b/Ghidra/Features/Base/certification.manifest @@ -707,12 +707,14 @@ src/main/resources/images/LocalVariable.gif||GHIDRA||||END| src/main/resources/images/MarkSelection.png||GHIDRA||||END| src/main/resources/images/Merge.png||GHIDRA||||END| src/main/resources/images/MultiDuplicateData.png||GHIDRA||||END| +src/main/resources/images/Namespace.dark.gif||GHIDRA||||END| src/main/resources/images/Namespace.gif||GHIDRA||||END| src/main/resources/images/NextHighlightBlock16.gif||GHIDRA||||END| src/main/resources/images/NextSelectionBlock16.gif||GHIDRA||||END| src/main/resources/images/Parameter.gif||GHIDRA||||END| src/main/resources/images/PreviousHighlightBlock16.gif||GHIDRA||||END| src/main/resources/images/PreviousSelectionBlock16.gif||GHIDRA||||END| +src/main/resources/images/ThunkFunction.dark.gif||GHIDRA||||END| src/main/resources/images/ThunkFunction.gif||GHIDRA||||END| src/main/resources/images/U.gif||GHIDRA||||END| src/main/resources/images/Unpackage.gif||GHIDRA||||END| @@ -748,6 +750,7 @@ src/main/resources/images/closedFolderGroup.png||Modified Nuvola Icons - LGPL 2. src/main/resources/images/closedFolderInView.png||Modified Nuvola Icons - LGPL 2.1||||END| src/main/resources/images/closedFolderInvalid.png||Modified Nuvola Icons - LGPL 2.1||||END| src/main/resources/images/closedFolderLabels.png||Modified Nuvola Icons - LGPL 2.1||||END| +src/main/resources/images/closedFolderNamespaces.dark.png||GHIDRA||||END| src/main/resources/images/closedFolderNamespaces.png||Modified Nuvola Icons - LGPL 2.1||||END| src/main/resources/images/cloudbar.jpg||GHIDRA||reviewed||END| src/main/resources/images/cloudbarReversed.jpg||GHIDRA||reviewed||END| @@ -853,6 +856,7 @@ src/main/resources/images/openFolderFunctions.png||Modified Nuvola Icons - LGPL src/main/resources/images/openFolderGroup.png||Modified Nuvola Icons - LGPL 2.1||||END| src/main/resources/images/openFolderInView.png||Modified Nuvola Icons - LGPL 2.1||||END| src/main/resources/images/openFolderLabels.png||Modified Nuvola Icons - LGPL 2.1||||END| +src/main/resources/images/openFolderNamespaces.dark.png||GHIDRA||||END| src/main/resources/images/openFolderNamespaces.png||Modified Nuvola Icons - LGPL 2.1||||END| src/main/resources/images/oxygen/16x16/application-pdf.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/oxygen/16x16/application-x-bzip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| diff --git a/Ghidra/Features/Base/data/base.icons.theme.properties b/Ghidra/Features/Base/data/base.icons.theme.properties index 0831ed28d8..19323dd601 100644 --- a/Ghidra/Features/Base/data/base.icons.theme.properties +++ b/Ghidra/Features/Base/data/base.icons.theme.properties @@ -399,3 +399,11 @@ icon.base.util.datatree.version.control.archive.dt.checkout.undo = vcUndoCheckOu [Dark Defaults] + + +icon.plugin.symboltree.node.function.thunk = ThunkFunction.dark.gif +icon.plugin.symboltree.node.namespace = Namespace.dark.gif +icon.plugin.symboltree.node.category.namespace.closed = closedFolderNamespaces.dark.png +icon.plugin.symboltree.node.category.namespace.open = openFolderNamespaces.dark.png + + diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusTableModel.java index 080dd5b998..2045cafd90 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusTableModel.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusTableModel.java @@ -40,7 +40,7 @@ import ghidra.util.table.column.AbstractGColumnRenderer; import ghidra.util.table.column.GColumnRenderer; /** - * Model for {@link BundleStatus} objects. + * Model for {@link BundleStatus} objects. */ public class BundleStatusTableModel extends GDynamicColumnTableModel> { @@ -50,7 +50,7 @@ public class BundleStatusTableModel private static final Color COLOR_BUNDLE_DISABLED = new GColor("color.fg.table.bundle.disabled"); private static final Color COLOR_BUNDLE_BUSY = new GColor("color.fg.table.bundle.busy"); private static final Color COLOR_BUNDLE_INACTIVE = new GColor("color.fg.table.bundle.inactive"); - private static final Color COLOR_BUNDLE_ACTIVE = new GColor("color.fg.table.bundle.active"); + private static final Color COLOR_BUNDLE_ACTIVE = new GColor("color.fg.table.bundle.active"); //@formatter:on private BundleHost bundleHost; @@ -226,7 +226,7 @@ public class BundleStatusTableModel } /** - * return the row objects corresponding an array of model row indices. + * return the row objects corresponding an array of model row indices. * * @param modelRowIndices row indices * @return status objects @@ -240,7 +240,7 @@ public class BundleStatusTableModel } /** - * overridden to avoid generating events when nothing changed + * overridden to avoid generating events when nothing changed */ @Override protected void sort(List data, TableSortingContext sortingContext) { @@ -278,7 +278,7 @@ public class BundleStatusTableModel } } - /** + /** * (re)compute cached mapping from bundleloc to bundlepath * *

only used in testing @@ -560,20 +560,24 @@ public class BundleStatusTableModel GhidraBundle bundle = bundleHost.getGhidraBundle(file); if (bundle == null || bundle instanceof GhidraPlaceholderBundle || !file.exists()) { label.setForeground(COLOR_BUNDLE_ERROR); + return label; + } + + if (data.isSelected()) { + return label; // use default selection colors + } + + if (status.isBusy()) { + label.setForeground(COLOR_BUNDLE_BUSY); + } + else if (!status.isEnabled()) { + label.setForeground(COLOR_BUNDLE_DISABLED); + } + else if (status.isActive()) { + label.setForeground(COLOR_BUNDLE_ACTIVE); } else { - if (status.isBusy()) { - label.setForeground(COLOR_BUNDLE_BUSY); - } - else if (!status.isEnabled()) { - label.setForeground(COLOR_BUNDLE_DISABLED); - } - else if (status.isActive()) { - label.setForeground(COLOR_BUNDLE_ACTIVE); - } - else { - label.setForeground(COLOR_BUNDLE_INACTIVE); - } + label.setForeground(COLOR_BUNDLE_INACTIVE); } return label; diff --git a/Ghidra/Features/Base/src/main/resources/images/FunctionScope.gif b/Ghidra/Features/Base/src/main/resources/images/FunctionScope.gif index 28263f36bf..d422c27577 100644 Binary files a/Ghidra/Features/Base/src/main/resources/images/FunctionScope.gif and b/Ghidra/Features/Base/src/main/resources/images/FunctionScope.gif differ diff --git a/Ghidra/Features/Base/src/main/resources/images/Namespace.dark.gif b/Ghidra/Features/Base/src/main/resources/images/Namespace.dark.gif new file mode 100644 index 0000000000..33e3ee4921 Binary files /dev/null and b/Ghidra/Features/Base/src/main/resources/images/Namespace.dark.gif differ diff --git a/Ghidra/Features/Base/src/main/resources/images/Namespace.gif b/Ghidra/Features/Base/src/main/resources/images/Namespace.gif index 8b354fdcfb..ed92e55973 100644 Binary files a/Ghidra/Features/Base/src/main/resources/images/Namespace.gif and b/Ghidra/Features/Base/src/main/resources/images/Namespace.gif differ diff --git a/Ghidra/Features/Base/src/main/resources/images/ThunkFunction.dark.gif b/Ghidra/Features/Base/src/main/resources/images/ThunkFunction.dark.gif new file mode 100644 index 0000000000..32f8d4db32 Binary files /dev/null and b/Ghidra/Features/Base/src/main/resources/images/ThunkFunction.dark.gif differ diff --git a/Ghidra/Features/Base/src/main/resources/images/ThunkFunction.gif b/Ghidra/Features/Base/src/main/resources/images/ThunkFunction.gif index 4ba1268526..72f00ddaf5 100644 Binary files a/Ghidra/Features/Base/src/main/resources/images/ThunkFunction.gif and b/Ghidra/Features/Base/src/main/resources/images/ThunkFunction.gif differ diff --git a/Ghidra/Features/Base/src/main/resources/images/closedFolderNamespaces.dark.png b/Ghidra/Features/Base/src/main/resources/images/closedFolderNamespaces.dark.png new file mode 100644 index 0000000000..a8c8611784 Binary files /dev/null and b/Ghidra/Features/Base/src/main/resources/images/closedFolderNamespaces.dark.png differ diff --git a/Ghidra/Features/Base/src/main/resources/images/openFolderNamespaces.dark.png b/Ghidra/Features/Base/src/main/resources/images/openFolderNamespaces.dark.png new file mode 100644 index 0000000000..c89b90306d Binary files /dev/null and b/Ghidra/Features/Base/src/main/resources/images/openFolderNamespaces.dark.png differ diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeChooserDialog.java b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeChooserDialog.java index 925fb7eddf..e0a0ec2f21 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeChooserDialog.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeChooserDialog.java @@ -77,6 +77,7 @@ public class ThemeChooserDialog extends DialogComponentProvider { setApplyEnabled(false); } + @Override protected void cancelCallback() { close(); }