yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-2910 - Fixed missing theme definitions; removed unused theme

Browse source 
definitions; fixed module theme dependencies
This commit is contained in:
dragonmacher 2022-12-14 17:53:29 -05:00
parent 1a99e2518d
commit 63d6063fa0
31 changed files with 178 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ghidra/Framework/Docking/certification.manifest
View file

@ -9,7 +9,6 @@
##MODULE IP: Tango Icons - Public Domain
Module.manifest||GHIDRA||||END|
data/ExtensionPoint.manifest||GHIDRA||||END|
data/docking.palette.theme.properties||GHIDRA||||END|
data/docking.theme.properties||GHIDRA||||END|
src/main/help/help/TOC_Source.xml||GHIDRA||||END|
src/main/help/help/topics/Misc/Welcome_to_Help.htm||GHIDRA||||END|

80
Ghidra/Framework/Docking/data/docking.palette.theme.properties
View file

@ -1,80 +0,0 @@
[Defaults]
color.palette.nocolor = rgba(255,255,255,0)
color.palette.disabled = rgba(255,255,255,0)
color.palette.black = black
color.palette.blue = blue
color.palette.cornflowerblue = cornflowerblue
color.palette.cornsilk = cornsilk
color.palette.crimson = crimson
color.palette.cyan = cyan
color.palette.darkblue = DarkBlue
color.palette.darkcyan = darkcyan
color.palette.darkgray = DarkGray
color.palette.darkgreen = darkgreen
color.palette.darkorange = darkorange
color.palette.darkkhaki = DarkKhaki
color.palette.darkred = DarkRed
color.palette.darkslategray = darkslategray
color.palette.dodgerblue = DodgerBlue
color.palette.fuchsia = fuchsia
color.palette.gold = gold
color.palette.gray = gray
color.palette.green = green
color.palette.greenyellow = greenyellow
color.palette.indigo = indigo
color.palette.khaki = khaki
color.palette.lavender = lavender
color.palette.lightcoral = lightcoral
color.palette.lightgray = rgb(192, 192, 192)
color.palette.lightgreen = rgb(127, 255, 127)
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
color.palette.navy = navy
color.palette.olive = olive
color.palette.orange = orange
color.palette.palegreen = palegreen
color.palette.palevioletred = PaleVioletRed
color.palette.peachpuff = peachpuff
color.palette.pink = pink
color.palette.purple = purple
color.palette.red = red
color.palette.silver = silver
color.palette.steelblue = steelblue
color.palette.tan = tan
color.palette.teal = teal
color.palette.white = white
color.palette.yellow = yellow
color.palette.yellowgreen = yellowgreen
[Dark Defaults]
color.palette.black = lightgray
color.palette.blue = #80a0c0
color.palette.indigo = #c070c0
color.palette.green = #70c070
color.palette.darkgreen = #70a070
color.palette.magenta = #ff80ff
color.palette.pink = #ff80a0
color.palette.cyan = #80c0c0
color.palette.darkcyan = #406060
color.palette.red = #ff8080
color.palette.teal = #80c0c0
color.palette.purple = #c080c0
color.palette.yellow = #ffff80
color.palette.olive = #c0c080
color.palette.orange = #ffa070
color.palette.darkorange = orange

88
Ghidra/Framework/Docking/data/docking.theme.properties
View file

@ -1,30 +1,5 @@
[Defaults]
color.bg = white // note: this is the text/widget bg color
color.fg = black
color.fg.error = red
color.bg.error = lightcoral
color.fg.disabled = lightGray
color.bg.uneditable = system.color.bg.application // TODO see if there exists an LaF setting for this
color.bg.filtered = yellow
color.fg.hint = gray
color.fg.messages.hint = color.fg.hint
color.fg.messages.alert = orange
color.fg.messages.error = color.fg.error
color.fg.messages.normal = blue
color.fg.messages.warning = orange
color.bg.help.hint = rgba(100, 100, 255, 100)
color.fg.help.selector.h1 = #000080
color.fg.help.selector.h2 = #984C4C
color.fg.help.selector.h3 = #0000FF
color.fg.help.selector.p.provided.by.plugin = #7F7F7F
color.fg.help.selector.p.related.topic = #800080
color.fg.help.selector.th = #EDF3FE
color.fg.help.selector.code = black
color.fg.help.selector.code.path = #4682B4
color.bg.splashscreen = black
@ -41,27 +16,8 @@ color.fg.dialog.status.warning = color.fg.messages.warning
color.bg.selection = rgb(180, 255, 180) // pale green
color.bg.highlight = rgb(255,255,150) // pale yellow
color.bg.tooltip = rgb(255, 255, 230)
color.bg.currentline = rgb(232,242,254)
color.cursor.focused = red
color.cursor.unfocused = pink
color.bg.table.grid = gray
color.bg.table.row.drag = color.palette.lavender
color.bg.table.row = color.bg
color.bg.table.row.alt = rgb(237,243,254)
color.fg.table.uneditable.selected = yellow
color.fg.table.uneditable.unselected = lightgray
color.fg.table = color.fg
color.fg.table.unselected = white
color.fg.error.table.unselected = color.fg.error
color.fg.error.table.selected = lightpink
color.bg.tableheader.gradient.start = color.bg
color.bg.tableheader.gradient.end = lightGray
color.bg.tableheader.gradient.start.primary = rgb(205, 227, 244)
color.bg.tableheader.gradient.end.primary = rgb(126, 186, 233)
color.bg.textfield.hint.valid = color.bg
color.bg.textfield.hint.invalid = rgb(255,225,225)
@ -73,8 +29,6 @@ color.bg.tree.drag.no.selection = rgb(204, 204, 255)
color.bg.filterfield = color.bg.filtered
color.fg.filterfield = black
color.bg.selection.help = lightsteelblue
// generic component items
color.border.bevel.highlight = lightGray
color.border.bevel.shadow = gray
@ -90,13 +44,10 @@ color.bg.fieldpanel.selection = color.bg.selection
color.bg.fieldpanel.highlight = color.bg.highlight
color.bg.fieldpanel.selection.and.highlight = green
color.bg.tree = [color]Tree.textBackground
color.bg.tree.selected = [color]Tree.selectionBackground
// docking buttons
color.fg.button = black
icon.folder.new = folder_add.png
icon.subtract = list-remove.png
icon.toggle.expand = expand.gif
icon.toggle.collapse = collapse.gif
@ -120,9 +71,6 @@ icon.window = application_xp.png
icon.zoom.in = zoom_in.png
icon.zoom.out = zoom_out.png
icon.theme.import = mail-receive.png
icon.theme.export = mail-folder-outbox.png
icon.docking.application.home = www_16.png
icon.docking.application.16 = www_16.png
icon.docking.application.128 = www_128.png
@ -146,7 +94,6 @@ icon.filter.options.not = bullet_delete.png
icon.widget.imagepanel.reset = tag.png
icon.widget.imagepanel.zoom.in = icon.zoom.in
icon.widget.imagepanel.zoom.out = icon.zoom.out
icon.widget.imagepanel.zoom.reset = zoom.png
icon.widget.filterpanel.filter.off = filter_off.png
icon.widget.filterpanel.filter.on = filter_on.png
@ -190,23 +137,15 @@ font.splash.status = Serif-BOLD-12
font.table.header.number = arial-BOLD-12
font.input.hint = monospaced-PLAIN-10
[Dark Defaults]
color.bg = #1c1d1e
color.fg = lightgray
color.fg.error = indianRed
color.fg.disabled = gray
color.bg.filtered = beige
color.fg.hint = darkgray
color.fg.help.selector.h1 = #66AAF4
color.fg.help.selector.h2 = #9999F9
color.fg.help.selector.h3 = #FF99CC
color.fg.help.selector.p.provided.by.plugin = #CCCCCC
color.fg.help.selector.p.related.topic = #800080
color.fg.help.selector.th = #EDF3FE
color.fg.help.selector.code = gray
color.fg.help.selector.code.path = #5BA5E3
color.bg.splashscreen = black
@ -223,9 +162,6 @@ color.fg.dialog.status.normal = lightBlue
color.bg.currentline = rgb(40,40,56) // dark bluish gray
color.cursor.focused = indianRed
color.cursor.unfocused = darkGray
color.bg.textfield.hint.invalid = maroon
color.bg.filterfield = color.bg.filtered
@ -236,20 +172,10 @@ color.bg.highlight = #404028 // yellowish
color.bg.fieldpanel.selection.and.highlight = #344028 // yellow greenish
color.bg.table.row.alt = rgb(45,47,65)
color.fg.table.uneditable.selected = lemonchiffon
color.fg.table.uneditable.unselected = lightgray
color.bg.tableheader.gradient.start = color.bg
color.bg.tableheader.gradient.end = darkGray
color.bg.tableheader.gradient.start.primary = color.bg
color.bg.tableheader.gradient.end.primary = darkBlue
// docking buttons
color.fg.button = darkGray
color.bg.filechooser.shortcut = system.color.bg.widget
color.bg.tree = color.bg
color.bg.tree.selected = [color]Tree.selectionBackground

2
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/constrainteditor/AbstractColumnConstraintEditor.java
View file

@ -46,7 +46,7 @@ public abstract class AbstractColumnConstraintEditor<T> implements ColumnConstra
/** Color indicating a valid value is defined by the editor widget(s) */
protected static final Color VALID_INPUT_COLOR = Colors.BACKGROUND;
/** Color indicating a invalid value is defined by the editor widget(s) */
protected static final Color INVALID_INPUT_COLOR = new GColor("docking.palette.mistyrose");
protected static final Color INVALID_INPUT_COLOR = new GColor("color.palette.mistyrose");
/**
* Constructor.