diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest index 52fd61aa46..e8b625b23a 100644 --- a/Ghidra/Debug/Debugger/certification.manifest +++ b/Ghidra/Debug/Debugger/certification.manifest @@ -10,7 +10,6 @@ data/debugger.theme.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| src/main/help/help/shared/arrow.gif||GHIDRA||||END| src/main/help/help/shared/close16.gif||GHIDRA||||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0||||END| src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0||||END| src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0||||END| src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0||||END| @@ -39,7 +38,6 @@ src/main/help/help/topics/DebuggerMemoryBytesPlugin/DebuggerMemoryBytesPlugin.ht src/main/help/help/topics/DebuggerMemoryBytesPlugin/images/DebuggerMemoryBytesPlugin.png||GHIDRA||||END| src/main/help/help/topics/DebuggerMemviewPlugin/DebuggerMemviewPlugin.html||GHIDRA||||END| src/main/help/help/topics/DebuggerMemviewPlugin/images/DebuggerMemviewPlugin.png||GHIDRA||||END| -src/main/help/help/topics/DebuggerMemviewPlugin/images/DebuggerMemviewPlugin_old.png||GHIDRA||||END| src/main/help/help/topics/DebuggerModelServicePlugin/DebuggerModelServicePlugin.html||GHIDRA||||END| src/main/help/help/topics/DebuggerModulesPlugin/DebuggerModulesPlugin.html||GHIDRA||||END| src/main/help/help/topics/DebuggerModulesPlugin/images/DebuggerModuleMapProposalDialog.png||GHIDRA||||END| diff --git a/Ghidra/Debug/Debugger/data/debugger.theme.properties b/Ghidra/Debug/Debugger/data/debugger.theme.properties index 1107522053..80bc515fce 100644 --- a/Ghidra/Debug/Debugger/data/debugger.theme.properties +++ b/Ghidra/Debug/Debugger/data/debugger.theme.properties @@ -227,7 +227,7 @@ color.fg.debugger.plugin.objects.target = color.palette.magenta color.fg.debugger.plugin.objects.accessor = lightgray color.fg.debugger.plugin.objects.link = color.palette.green -color.bg.debugger.plugin.resources.stale = color.palette.bg.gray +color.bg.debugger.plugin.resources.stale = #383838 // grayish color.bg.debugger.plugin.resources.error = color.palette.darkred color.fg.debugger.value.stale = gray @@ -235,7 +235,7 @@ color.fg.debugger.value.stale.selected = gray color.fg.debugger.value.changed = color.palette.red color.fg.debugger.value.changed.selected = color.palette.red -color.debugger.plugin.resources.register.marker = color.palette.bg.cyan +color.debugger.plugin.resources.register.marker = #284040 // cyanish color.debugger.plugin.resources.register.stale = color.fg.debugger.value.stale color.debugger.plugin.resources.register.stale.selected = color.fg.debugger.value.stale.selected color.debugger.plugin.resources.register.changed = color.fg.debugger.value.changed @@ -251,7 +251,7 @@ color.debugger.plugin.resources.value.changed.selected = color.fg.debugger.value color.debugger.plugin.resources.pcode.counter = color.debugger.plugin.resources.register.marker -color.debugger.plugin.resources.breakpoint.marker.enabled = color.palette.bg.blue -color.debugger.plugin.resources.breakpoint.marker.disabled = color.palette.bg.blue -color.debugger.plugin.resources.breakpoint.marker.enabled.ineffective = color.palette.bg.gray -color.debugger.plugin.resources.breakpoint.marker.disabled.ineffective = color.palette.bg.gray +color.debugger.plugin.resources.breakpoint.marker.enabled = #282860 // bluish +color.debugger.plugin.resources.breakpoint.marker.disabled = color.debugger.plugin.resources.breakpoint.marker.enabled +color.debugger.plugin.resources.breakpoint.marker.enabled.ineffective = #383838 // grayish +color.debugger.plugin.resources.breakpoint.marker.disabled.ineffective = color.debugger.plugin.resources.breakpoint.marker.enabled.ineffective diff --git a/Ghidra/Features/Base/data/base.listing.theme.properties b/Ghidra/Features/Base/data/base.listing.theme.properties index 5c98d9f3ae..f9fc4a35c4 100644 --- a/Ghidra/Features/Base/data/base.listing.theme.properties +++ b/Ghidra/Features/Base/data/base.listing.theme.properties @@ -22,67 +22,73 @@ color.cursor.focused.listing = color.cursor.focused color.cursor.unfocused.listing = color.cursor.unfocused color.fg.listing.address = color.fg -color.fg.listing.bytes = blue -color.fg.listing.constant = green -color.fg.listing.label.unreferenced = black -color.fg.listing.ext.entrypoint = magenta -color.fg.listing.comment.auto = lightGray -color.fg.listing.comment.eol = blue -color.fg.listing.comment.repeatable = darkOrange -color.fg.listing.comment.ref.repeatable = cornflowerBlue -color.fg.listing.comment.plate = gray -color.fg.listing.comment.post = blue -color.fg.listing.comment.pre = indigo -color.fg.listing.ref.bad = red -color.fg.listing.ext.ref.unresolved = color.fg.listing.ref.bad -color.fg.listing.ext.ref.resolved = teal -color.fg.listing.fieldname = color.fg -color.fg.listing.function.callfixup = fuchsia -color.fg.listing.function.name = blue -color.fg.listing.function.param = black -color.fg.listing.function.tag = mediumVioletRed -color.fg.listing.function.param.auto = gray -color.fg.listing.function.return.type = black -color.fg.listing.function.param.custom = indigo -color.fg.listing.function.param.dynamic = #006666 -color.fg.listing.function.variable = purple -color.fg.listing.function.variable.assigned = purple -color.fg.listing.function.name.thunk = color.fg.listing.function.name +color.fg.listing.bytes = color.palette.blue +color.fg.listing.constant = color.palette.green -color.fg.listing.label.local = green -color.fg.listing.label.non.primary = olive +color.fg.listing.comment.auto = lightGray +color.fg.listing.comment.eol = color.palette.blue +color.fg.listing.comment.repeatable = color.palette.darkorange +color.fg.listing.comment.ref.repeatable = cornflowerBlue +color.fg.listing.comment.plate = color.palette.gray +color.fg.listing.comment.post = color.palette.blue +color.fg.listing.comment.pre = color.palette.indigo +color.fg.listing.ref.bad = color.fg.error +color.fg.listing.ext.entrypoint = color.palette.magenta +color.fg.listing.ext.ref.unresolved = color.fg.listing.ref.bad +color.fg.listing.ext.ref.resolved = color.palette.teal +color.fg.listing.fieldname = color.fg + +color.fg.listing.function.callfixup = fuchsia +color.fg.listing.function.name = color.palette.blue +color.fg.listing.function.name.thunk = color.fg.listing.function.name +color.fg.listing.function.param = color.fg +color.fg.listing.function.param.auto = color.palette.gray +color.fg.listing.function.param.custom = color.palette.indigo +color.fg.listing.function.param.dynamic = #006666 +color.fg.listing.function.purge = color.palette.blue +color.fg.listing.function.return.type = color.fg +color.fg.listing.function.source = color.fg +color.fg.listing.function.tag = mediumVioletRed +color.fg.listing.function.variable = color.palette.purple +color.fg.listing.function.variable.assigned = color.palette.purple + +color.fg.listing.label.local = color.palette.green +color.fg.listing.label.non.primary = color.palette.olive color.fg.listing.label.primary = darkBlue -color.fg.listing.mnemonic.override = deepPink +color.fg.listing.label.unreferenced = color.fg + color.fg.listing.mnemonic = navy +color.fg.listing.mnemonic.override = deepPink color.fg.listing.mnemonic.unimplemented = navy + color.fg.listing.array.values = color.fg -color.fg.listing.bytes.alignment = gray +color.fg.listing.block.start = color.palette.indigo +color.fg.listing.bytes.alignment = color.palette.gray color.fg.listing.bytes.entropy = color.fg color.fg.listing.disassembly.external = color.fg color.fg.listing.file.offset = color.fg -color.fg.listing.function.purge = blue -color.fg.listing.function.source = color.fg -color.fg.listing.mask.bits = navy -color.fg.listing.mask.value = green -color.fg.listing.mask.label = color.fg -color.fg.listing.block.start = indigo -color.fg.listing.instruction.parallel = blue -color.fg.listing.flow.arrow.inactive = lightGray +color.fg.listing.instruction.parallel = color.palette.blue +color.fg.listing.mask.bits = color.palette.navy +color.fg.listing.mask.value = color.palette.green +color.fg.listing.mask.label = color.fg + +color.fg.listing.flow.arrow.inactive = color.palette.lightgray color.fg.listing.flow.arrow.active = color.fg -color.fg.listing.flow.arrow.selected = limeGreen +color.fg.listing.flow.arrow.selected = color.palette.limegreen color.fg.listing.separator = color.fg -color.fg.listing.xref = darkGreen -color.fg.listing.xref.offcut = gray -color.fg.listing.xref.read = blue -color.fg.listing.xref.write = darkOrange + +color.fg.listing.xref = color.palette.darkgreen +color.fg.listing.xref.offcut = color.palette.gray +color.fg.listing.xref.read = color.palette.blue +color.fg.listing.xref.write = color.palette.darkorange color.fg.listing.xref.other = color.fg -color.fg.listing.register = olive -color.fg.listing.underline = cornflowerBlue -color.fg.listing.pcode.label = blue -color.fg.listing.pcode.address.space = blue -color.fg.listing.pcode.varnode = blue -color.fg.listing.pcode.userop = blue +color.fg.listing.register = color.palette.olive +color.fg.listing.underline = color.palette.cornflowerblue +color.fg.listing.pcode.label = color.palette.blue +color.fg.listing.pcode.address.space = color.palette.blue +color.fg.listing.pcode.varnode = color.palette.blue +color.fg.listing.pcode.userop = color.palette.blue color.fg.listing.stack.depth = blue color.fg.listing.taint = color.fg @@ -99,65 +105,16 @@ font.listing.header = SansSerif-PLAIN-11 [Dark Defaults] -color.bg.listing.tabs.selected = #788CBD -color.bg.listing.tabs.unselected = system.color.bg.application -color.bg.listing.tabs.highlighted = #ABC8FF -color.bg.listing.tabs.list = rgb(255, 255, 230) -color.fg.listing.tabs.text.selected = black -color.fg.listing.tabs.text.unselected = color.fg -color.fg.listing.tabs.list = black - - color.bg.listing.header.active.field = rgb(244, 221, 183) color.fg.listing.header.active.field = black - - - -color.fg.listing.address = color.fg -color.fg.listing.bytes = color.palette.blue -color.fg.listing.constant = color.palette.green -color.fg.listing.entrypoint = color.palette.magenta color.fg.listing.comment.auto = color.fg -color.fg.listing.comment.eol = color.palette.blue -color.fg.listing.comment.repeatable = color.palette.orange color.fg.listing.comment.ref.repeatable = color.palette.darkcyan -color.fg.listing.comment.plate = gray -color.fg.listing.comment.post = color.palette.blue -color.fg.listing.comment.pre = color.palette.indigo -color.fg.listing.ref.resolved = color.palette.teal -color.fg.listing.fieldname = color.fg color.fg.listing.function.callfixup = color.palette.magenta -color.fg.listing.function.name = color.palette.blue -color.fg.listing.function.param = color.fg -color.fg.listing.function.tag = color.palette.violetred -color.fg.listing.function.param.auto = gray -color.fg.listing.function.return.type = color.fg -color.fg.listing.function.param.custom = color.palette.indigo color.fg.listing.function.param.dynamic = color.palette.teal -color.fg.listing.function.variable = color.palette.purple -color.fg.listing.function.variable.assigned = color.palette.purple -color.fg.listing.label.local = color.palette.green -color.fg.listing.label.non.primary = color.palette.olive +color.fg.listing.function.tag = color.palette.violetred color.fg.listing.label.primary = color.palette.cyan -color.fg.listing.label.unreferenced = color.fg + color.fg.listing.mnemonic.override = color.palette.pink color.fg.listing.mnemonic = color.palette.cyan color.fg.listing.mnemonic.unimplemented = color.palette.cyan - -color.fg.listing.flow.arrow.inactive = lightGray -color.fg.listing.flow.arrow.active = color.fg -color.fg.listing.flow.arrow.selected = limeGreen -color.fg.listing.separator = color.fg -color.fg.listing.version.tracking = color.palette.purple -color.fg.listing.xref = color.palette.darkgreen -color.fg.listing.xref.offcut = gray -color.fg.listing.xref.read = color.palette.blue -color.fg.listing.xref.write = color.palette.orange -color.fg.listing.xref.other = color.fg -color.fg.listing.register = color.palette.olive -color.fg.listing.underline = cornflowerBlue -color.fg.listing.pcode.label = color.palette.blue -color.fg.listing.pcode.address.space = color.palette.blue -color.fg.listing.pcode.varnode = color.palette.blue -color.fg.listing.pcode.userop = color.palette.blue diff --git a/Ghidra/Features/Base/data/base.theme.properties b/Ghidra/Features/Base/data/base.theme.properties index 4137cb6581..20738c8cdd 100644 --- a/Ghidra/Features/Base/data/base.theme.properties +++ b/Ghidra/Features/Base/data/base.theme.properties @@ -195,14 +195,13 @@ color.fg.table.ghidratable.suggestion = darkGray color.bg.search.highlight = rgb(189,183,107) color.bg.search.current.line.highlight = gold -// TODO: These should probably be "bg" colors -// TODO: I'd be nice if we did have control of the "fg" colors, too -color.fg.listing.highlighter.default = color.palette.bg.blindingyellow -color.fg.listing.highlighter.scoped.read = color.palette.bg.blindingorange -color.fg.listing.highlighter.scoped.write = color.palette.bg.blindinggreen +color.bg.listing.highlighter.default = #ffff00 // blinding yellow +color.bg.listing.highlighter.scoped.read = #ff8000 // blinding orange +color.bg.listing.highlighter.scoped.write = #00ff00 // blinding green -color.bg.analysis.options.not.default.enablement = #D1D19E -color.bg.analysis.options.not.default.enablement.selected = rgb(177, 212, 236) + +color.bg.analysis.options.not.default.enablement = DarkOliveGreen +color.bg.analysis.options.not.default.enablement.selected = olive color.fg.analysis.options.prototype = lightcoral color.bg.plugin.datamgr.edge.default = deepskyblue diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/ListingHighlightProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/ListingHighlightProvider.java index c1f758a93e..1519099b2d 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/ListingHighlightProvider.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/codebrowser/ListingHighlightProvider.java @@ -53,9 +53,9 @@ import ghidra.util.datastruct.Stack; public class ListingHighlightProvider implements ButtonPressedListener, OptionsChangeListener, HighlightProvider { //@formatter:off - private static final GColor DEFAULT_HIGHLIGHT_COLOR = new GColor("color.fg.listing.highlighter.default"); - private static final GColor DEFAULT_SCOPED_READ_COLOR = new GColor("color.fg.listing.highlighter.scoped.read"); - private static final GColor DEFAULT_SCOPED_WRITE_COLOR = new GColor("color.fg.listing.highlighter.scoped.write"); + private static final GColor DEFAULT_HIGHLIGHT_COLOR = new GColor("color.bg.listing.highlighter.default"); + private static final GColor DEFAULT_SCOPED_READ_COLOR = new GColor("color.bg.listing.highlighter.scoped.read"); + private static final GColor DEFAULT_SCOPED_WRITE_COLOR = new GColor("color.bg.listing.highlighter.scoped.write"); private static final String DISPLAY_HIGHLIGHT_NAME = CURSOR_HIGHLIGHT_GROUP + DELIMITER + "Enabled"; private static final String SCOPED_WRITE_HIGHLIGHT_COLOR = CURSOR_HIGHLIGHT_GROUP + DELIMITER + "Scoped Write Highlight Color"; private static final String SCOPED_READ_HIGHLIGHT_COLOR = CURSOR_HIGHLIGHT_GROUP + DELIMITER + "Scoped Read Highlight Color"; @@ -869,8 +869,7 @@ public class ListingHighlightProvider ToolOptions opt = tool.getOptions(CATEGORY_BROWSER_FIELDS); HelpLocation hl = new HelpLocation("CodeBrowserPlugin", "Cursor_Text_Highlight"); - opt.registerThemeColorBinding(HIGHLIGHT_COLOR_NAME, - DEFAULT_HIGHLIGHT_COLOR.getId(), hl, + opt.registerThemeColorBinding(HIGHLIGHT_COLOR_NAME, DEFAULT_HIGHLIGHT_COLOR.getId(), hl, "The color to use to highlight text."); opt.registerThemeColorBinding(SCOPED_WRITE_HIGHLIGHT_COLOR, DEFAULT_SCOPED_WRITE_COLOR.getId(), hl, diff --git a/Ghidra/Framework/Docking/certification.manifest b/Ghidra/Framework/Docking/certification.manifest index 8188824560..1382735c20 100644 --- a/Ghidra/Framework/Docking/certification.manifest +++ b/Ghidra/Framework/Docking/certification.manifest @@ -43,7 +43,6 @@ src/main/resources/images/desktop.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set src/main/resources/images/dialog-warning.png||Oxygen Icons - LGPL 3.0||||END| src/main/resources/images/document-properties.png||Tango Icons - Public Domain|||tango icon set|END| src/main/resources/images/drive.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/resources/images/eatbits.gif||GHIDRA||reviewed||END| src/main/resources/images/eatbits1.png||GHIDRA||reviewed||END| src/main/resources/images/eatbits2.png||GHIDRA||reviewed||END| src/main/resources/images/eatbits3.png||GHIDRA||reviewed||END| @@ -52,13 +51,11 @@ src/main/resources/images/eatbits5.png||GHIDRA||reviewed||END| src/main/resources/images/eatbits6.png||GHIDRA||reviewed||END| src/main/resources/images/eatbits7.png||GHIDRA||reviewed||END| src/main/resources/images/edit-clear.png||Tango Icons - Public Domain|||tango icon set|END| -src/main/resources/images/edit-delete.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/edit-redo.png||Tango Icons - Public Domain|||tango icon set|END| src/main/resources/images/edit-undo.png||Tango Icons - Public Domain|||tango icon set|END| src/main/resources/images/expand.gif||GHIDRA||||END| src/main/resources/images/filter_off.png||GHIDRA||||END| src/main/resources/images/filter_on.png||GHIDRA||||END| -src/main/resources/images/folder-open.png||Tango Icons - Public Domain||||END| src/main/resources/images/folder_add.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/hourglass.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/hourglass24_01.png||GHIDRA||reviewed||END| @@ -72,7 +69,6 @@ src/main/resources/images/hourglass24_08.png||GHIDRA||reviewed||END| src/main/resources/images/hourglass24_09.png||GHIDRA||reviewed||END| src/main/resources/images/hourglass24_10.png||GHIDRA||reviewed||END| src/main/resources/images/hourglass24_11.png||GHIDRA||reviewed||END| -src/main/resources/images/image-missing.png||Oxygen Icons - LGPL 3.0||||END| src/main/resources/images/info_small.png||GHIDRA||||END| src/main/resources/images/info_small_hover.png||GHIDRA||||END| src/main/resources/images/inode-directory.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| @@ -82,11 +78,9 @@ src/main/resources/images/mail-folder-outbox.png||Oxygen Icons - LGPL 3.0|||Oxyg src/main/resources/images/mail-receive.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/media-playback-start.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/menu16.gif||GHIDRA||reviewed||END| -src/main/resources/images/note-red.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/oxygen-edit-redo.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/resources/images/page.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/page_code.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/page_excel.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/page_go.png||FAMFAMFAM Icons - CC 2.5||||END| @@ -104,16 +98,8 @@ src/main/resources/images/trash-empty.png||Oxygen Icons - LGPL 3.0|||Oxygen icon src/main/resources/images/user-home.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/view-filter.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/warning.help.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/resources/images/weather-clear.png||Tango Icons - Public Domain|||tango icon set|END| -src/main/resources/images/weather-few-clouds-reverse.png||Tango Icons - Public Domain||||END| -src/main/resources/images/weather-few-clouds.png||Tango Icons - Public Domain|||tango icon set|END| -src/main/resources/images/weather-overcast.png||Tango Icons - Public Domain|||tango icon set|END| -src/main/resources/images/weather-showers.png||Tango Icons - Public Domain|||tango icon set|END| -src/main/resources/images/window-close.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/www_128.png||Nuvola Icons - LGPL 2.1|||nuvola www.png|END| src/main/resources/images/www_16.png||Nuvola Icons - LGPL 2.1|||nuvola www 16x16|END| -src/main/resources/images/www_32.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| -src/main/resources/images/www_64.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| src/main/resources/images/zoom.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/zoom_in.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/zoom_out.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| diff --git a/Ghidra/Framework/Docking/data/docking.palette.theme.properties b/Ghidra/Framework/Docking/data/docking.palette.theme.properties index 27a02195f5..00a03ef37a 100644 --- a/Ghidra/Framework/Docking/data/docking.palette.theme.properties +++ b/Ghidra/Framework/Docking/data/docking.palette.theme.properties @@ -5,13 +5,14 @@ color.palette.disabled = rgba(255,255,255,0) color.palette.black = black color.palette.blue = blue -color.palate.cornflowerblue = cornflowerblue -color.palate.cornsilk = cornsilk +color.palette.cornflowerblue = cornflowerblue +color.palette.cornsilk = cornsilk color.palette.crimson = crimson color.palette.cyan = cyan color.palette.darkblue = DarkBlue color.palette.darkgray = DarkGray color.palette.darkgreen = darkgreen +color.palette.darkorange = darkorange color.palette.darkkhaki = DarkKhaki color.palette.darkred = DarkRed color.palette.darkslategray = darkslategray @@ -24,7 +25,6 @@ color.palette.greenyellow = greenyellow color.palette.indigo = indigo color.palette.khaki = khaki color.palette.lavender = lavender -color.palette.lime = lime color.palette.lightcoral = lightcoral color.palette.lightgray = rgb(192, 192, 192) color.palette.lightgreen = rgb(127, 255, 127) @@ -32,6 +32,8 @@ color.palette.lightpink = lightpink color.palette.lightred = rgb(255, 127, 127) color.palette.lightskyblue = lightskyblue color.palette.lightsteelblue = lightsteelblue +color.palette.lime = lime +color.palette.limegreen = limegreen color.palette.magenta = magenta color.palette.maroon = maroon color.palette.mistyrose = mistyrose @@ -57,7 +59,6 @@ color.palette.white = white [Dark Defaults] color.palette.black = lightgray - color.palette.blue = #80a0c0 color.palette.indigo = #c070c0 color.palette.green = #70c070 @@ -72,16 +73,7 @@ color.palette.purple = #c080c0 color.palette.yellow = #ffff80 color.palette.olive = #c0c080 color.palette.orange = #ffa070 +color.palette.darkorange = orange color.palette.violetred = #ff7090 -color.palette.bg.yellow = #404028 -color.palette.bg.yellowgreen = #344028 -color.palette.bg.green = #284028 -color.palette.bg.cyan = #284040 -color.palette.bg.blue = #282860 -color.palette.bg.bluegray = #282838 -color.palette.bg.gray = #383838 -color.palette.bg.blindingyellow = #ffff00 -color.palette.bg.blindinggreen = #00ff00 -color.palette.bg.blindingorange = #ff8000 diff --git a/Ghidra/Framework/Docking/data/docking.theme.properties b/Ghidra/Framework/Docking/data/docking.theme.properties index 6df04328ca..6fdd1754d1 100644 --- a/Ghidra/Framework/Docking/data/docking.theme.properties +++ b/Ghidra/Framework/Docking/data/docking.theme.properties @@ -231,10 +231,10 @@ color.bg.textfield.hint.invalid = maroon color.bg.filterfield = color.bg.filtered color.fg.filterfield = darkSlateGray -color.bg.selection = color.palette.bg.green -color.bg.highlight = color.palette.bg.yellow +color.bg.selection = #284028 // greenish +color.bg.highlight = #404028 // yellowish -color.bg.fieldpanel.selection.and.highlight = color.palette.bg.yellowgreen +color.bg.fieldpanel.selection.and.highlight = #344028 // yellow greenish color.bg.table.row.alt = rgb(45,47,65) color.fg.table.uneditable.selected = lemonchiffon