diff --git a/.gitignore b/.gitignore index 5b0452860c..b690996f06 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ gradlew.* # Ignore logs and core dumps *.log core.* +!core.png diff --git a/Ghidra/Debug/Debugger/certification.manifest b/Ghidra/Debug/Debugger/certification.manifest index e8b625b23a..fa575a47f0 100644 --- a/Ghidra/Debug/Debugger/certification.manifest +++ b/Ghidra/Debug/Debugger/certification.manifest @@ -8,11 +8,6 @@ Module.manifest||GHIDRA||||END| data/ExtensionPoint.manifest||GHIDRA||||END| 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.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| src/main/help/help/topics/Debugger/Debugger.html||GHIDRA||||END| src/main/help/help/topics/Debugger/GettingStarted.html||GHIDRA||||END| src/main/help/help/topics/Debugger/Troubleshooting.html||GHIDRA||||END| diff --git a/Ghidra/Debug/Debugger/src/main/help/help/shared/Frontpage.css b/Ghidra/Debug/Debugger/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index ff855bae04..0000000000 --- a/Ghidra/Debug/Debugger/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,67 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } - -.menu { background-color: #EDF3FE; } - diff --git a/Ghidra/Debug/Debugger/src/main/help/help/shared/arrow.gif b/Ghidra/Debug/Debugger/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Debug/Debugger/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Debug/Debugger/src/main/help/help/shared/note.png b/Ghidra/Debug/Debugger/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Debug/Debugger/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Debug/Debugger/src/main/help/help/shared/note.yellow.png b/Ghidra/Debug/Debugger/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Debug/Debugger/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Debug/Debugger/src/main/help/help/shared/tip.png b/Ghidra/Debug/Debugger/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Debug/Debugger/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Debugger.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Debugger.html index fe333d4192..3f1569a122 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Debugger.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Debugger.html @@ -7,7 +7,7 @@ Ghidra Debugger - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/GettingStarted.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/GettingStarted.html index 9509347486..5c21d95efa 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/GettingStarted.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/GettingStarted.html @@ -7,7 +7,7 @@ Debugger: Getting Started - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Troubleshooting.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Troubleshooting.html index d1c4332bf6..d1db65990b 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Troubleshooting.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/Debugger/Troubleshooting.html @@ -7,7 +7,7 @@ Debugger: Troubleshooting - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBots/DebuggerBots.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBots/DebuggerBots.html index c4ef1ef1be..76556d8e89 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBots/DebuggerBots.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBots/DebuggerBots.html @@ -7,7 +7,7 @@ Debugger Bots - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointMarkerPlugin/DebuggerBreakpointMarkerPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointMarkerPlugin/DebuggerBreakpointMarkerPlugin.html index eca15dcc08..4b73f04ca7 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointMarkerPlugin/DebuggerBreakpointMarkerPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointMarkerPlugin/DebuggerBreakpointMarkerPlugin.html @@ -7,7 +7,7 @@ Debugger: Breakpoints in the Listings - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointsPlugin/DebuggerBreakpointsPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointsPlugin/DebuggerBreakpointsPlugin.html index 6c1a7e9efa..3d09ebaa36 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointsPlugin/DebuggerBreakpointsPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerBreakpointsPlugin/DebuggerBreakpointsPlugin.html @@ -7,7 +7,7 @@ Debugger: Breakpoints - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerConsolePlugin/DebuggerConsolePlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerConsolePlugin/DebuggerConsolePlugin.html index 6a3c212002..5466dc68ea 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerConsolePlugin/DebuggerConsolePlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerConsolePlugin/DebuggerConsolePlugin.html @@ -7,7 +7,7 @@ Debugger: Memory Regions - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html index d1f70a09f8..0aa7a7ed5d 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerControlPlugin/DebuggerControlPlugin.html @@ -7,7 +7,7 @@ Debugger: Editing Machine State - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerCopyActionsPlugin/DebuggerCopyActionsPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerCopyActionsPlugin/DebuggerCopyActionsPlugin.html index 759f297caf..49a7fa961f 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerCopyActionsPlugin/DebuggerCopyActionsPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerCopyActionsPlugin/DebuggerCopyActionsPlugin.html @@ -7,7 +7,7 @@ Debugger: Copy Actions - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerDisassemblerPlugin/DebuggerDisassemblerPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerDisassemblerPlugin/DebuggerDisassemblerPlugin.html index 0a4b0f8b4b..6c6006a18d 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerDisassemblerPlugin/DebuggerDisassemblerPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerDisassemblerPlugin/DebuggerDisassemblerPlugin.html @@ -7,7 +7,7 @@ Debugger Disassembler - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerEmulationServicePlugin/DebuggerEmulationServicePlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerEmulationServicePlugin/DebuggerEmulationServicePlugin.html index cd9f81ad9b..fd318bf8d5 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerEmulationServicePlugin/DebuggerEmulationServicePlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerEmulationServicePlugin/DebuggerEmulationServicePlugin.html @@ -7,7 +7,7 @@ Debugger: Model Service - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerInterpreterPlugin/DebuggerInterpreterPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerInterpreterPlugin/DebuggerInterpreterPlugin.html index 6b77c09cbd..25805ceb04 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerInterpreterPlugin/DebuggerInterpreterPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerInterpreterPlugin/DebuggerInterpreterPlugin.html @@ -7,7 +7,7 @@ Debugger: Interpreters - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerListingPlugin/DebuggerListingPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerListingPlugin/DebuggerListingPlugin.html index 91e5ca6265..0001e848c2 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerListingPlugin/DebuggerListingPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerListingPlugin/DebuggerListingPlugin.html @@ -7,7 +7,7 @@ Debugger: Dynamic Listing - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemoryBytesPlugin/DebuggerMemoryBytesPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemoryBytesPlugin/DebuggerMemoryBytesPlugin.html index 1021f472cc..078934cb04 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemoryBytesPlugin/DebuggerMemoryBytesPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemoryBytesPlugin/DebuggerMemoryBytesPlugin.html @@ -7,7 +7,7 @@ Debugger: Memory (Dynamic Bytes) - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemviewPlugin/DebuggerMemviewPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemviewPlugin/DebuggerMemviewPlugin.html index 4cfdc445b1..90bd80ccd8 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemviewPlugin/DebuggerMemviewPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerMemviewPlugin/DebuggerMemviewPlugin.html @@ -7,7 +7,7 @@ Debugger: Memory View - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModelServicePlugin/DebuggerModelServicePlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModelServicePlugin/DebuggerModelServicePlugin.html index 50fab05e66..b57f9fe05c 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModelServicePlugin/DebuggerModelServicePlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModelServicePlugin/DebuggerModelServicePlugin.html @@ -7,7 +7,7 @@ Debugger: Model Service - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModulesPlugin/DebuggerModulesPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModulesPlugin/DebuggerModulesPlugin.html index 256c43690e..3aaa071222 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModulesPlugin/DebuggerModulesPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerModulesPlugin/DebuggerModulesPlugin.html @@ -7,7 +7,7 @@ Debugger: Modules and Sections - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerObjectsPlugin/DebuggerObjectsPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerObjectsPlugin/DebuggerObjectsPlugin.html index 17ce19b2e0..6f30b4ba0b 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerObjectsPlugin/DebuggerObjectsPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerObjectsPlugin/DebuggerObjectsPlugin.html @@ -7,7 +7,7 @@ Debugger: Commands and Objects - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPcodeStepperPlugin/DebuggerPcodeStepperPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPcodeStepperPlugin/DebuggerPcodeStepperPlugin.html index 5fb693744e..d4c0aae718 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPcodeStepperPlugin/DebuggerPcodeStepperPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPcodeStepperPlugin/DebuggerPcodeStepperPlugin.html @@ -7,7 +7,7 @@ Debugger: P-code Stepper - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPlatformPlugin/DebuggerPlatformPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPlatformPlugin/DebuggerPlatformPlugin.html index 23ac62c62a..c6bcf7432c 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPlatformPlugin/DebuggerPlatformPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerPlatformPlugin/DebuggerPlatformPlugin.html @@ -7,7 +7,7 @@ Debugger: Platform Selection - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegionsPlugin/DebuggerRegionsPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegionsPlugin/DebuggerRegionsPlugin.html index d12b4e2d4f..24ebe105e7 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegionsPlugin/DebuggerRegionsPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegionsPlugin/DebuggerRegionsPlugin.html @@ -7,7 +7,7 @@ Debugger: Memory Regions - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegistersPlugin/DebuggerRegistersPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegistersPlugin/DebuggerRegistersPlugin.html index 2d86a9a2d6..9cb24ebb86 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegistersPlugin/DebuggerRegistersPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerRegistersPlugin/DebuggerRegistersPlugin.html @@ -7,7 +7,7 @@ Debugger: Registers - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStackPlugin/DebuggerStackPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStackPlugin/DebuggerStackPlugin.html index a6a24a147d..72dbd235a7 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStackPlugin/DebuggerStackPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStackPlugin/DebuggerStackPlugin.html @@ -7,7 +7,7 @@ Debugger: Stack - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStaticMappingPlugin/DebuggerStaticMappingPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStaticMappingPlugin/DebuggerStaticMappingPlugin.html index cb7711c878..b1247497ff 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStaticMappingPlugin/DebuggerStaticMappingPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerStaticMappingPlugin/DebuggerStaticMappingPlugin.html @@ -7,7 +7,7 @@ Debugger: Static Mappings - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTargetsPlugin/DebuggerTargetsPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTargetsPlugin/DebuggerTargetsPlugin.html index 8d4059bc1f..4dc01a1fd1 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTargetsPlugin/DebuggerTargetsPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTargetsPlugin/DebuggerTargetsPlugin.html @@ -7,7 +7,7 @@ Debugger: Targets - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html index 26809e2a0b..1f6d17c630 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerThreadsPlugin/DebuggerThreadsPlugin.html @@ -7,7 +7,7 @@ Debugger: Threads and Traces - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTimePlugin/DebuggerTimePlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTimePlugin/DebuggerTimePlugin.html index a871f1ef1b..fea1e5b359 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTimePlugin/DebuggerTimePlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTimePlugin/DebuggerTimePlugin.html @@ -7,7 +7,7 @@ Debugger: Time - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceManagerServicePlugin/DebuggerTraceManagerServicePlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceManagerServicePlugin/DebuggerTraceManagerServicePlugin.html index 14c36cb3e2..8d82b70eca 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceManagerServicePlugin/DebuggerTraceManagerServicePlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceManagerServicePlugin/DebuggerTraceManagerServicePlugin.html @@ -7,7 +7,7 @@ Debugger: Trace Service - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceViewDiffPlugin/DebuggerTraceViewDiffPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceViewDiffPlugin/DebuggerTraceViewDiffPlugin.html index 0221bc8c13..4afee181b0 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceViewDiffPlugin/DebuggerTraceViewDiffPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerTraceViewDiffPlugin/DebuggerTraceViewDiffPlugin.html @@ -7,7 +7,7 @@ Debugger: Comparing Times - + diff --git a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerWatchesPlugin/DebuggerWatchesPlugin.html b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerWatchesPlugin/DebuggerWatchesPlugin.html index 9f89fd5bcc..fe19e146a1 100644 --- a/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerWatchesPlugin/DebuggerWatchesPlugin.html +++ b/Ghidra/Debug/Debugger/src/main/help/help/topics/DebuggerWatchesPlugin/DebuggerWatchesPlugin.html @@ -7,7 +7,7 @@ Debugger: Watches - + diff --git a/Ghidra/Extensions/MachineLearning/src/main/help/help/shared/Frontpage.css b/Ghidra/Extensions/MachineLearning/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index b8471669f4..0000000000 --- a/Ghidra/Extensions/MachineLearning/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; `font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Extensions/MachineLearning/src/main/help/help/topics/RandomForestFunctionFinderPlugin/RandomForestFunctionFinderPlugin.htm b/Ghidra/Extensions/MachineLearning/src/main/help/help/topics/RandomForestFunctionFinderPlugin/RandomForestFunctionFinderPlugin.htm index ae449f5f1c..d99f9b8772 100644 --- a/Ghidra/Extensions/MachineLearning/src/main/help/help/topics/RandomForestFunctionFinderPlugin/RandomForestFunctionFinderPlugin.htm +++ b/Ghidra/Extensions/MachineLearning/src/main/help/help/topics/RandomForestFunctionFinderPlugin/RandomForestFunctionFinderPlugin.htm @@ -6,7 +6,7 @@ Random Forest Function Finder Plugin - + diff --git a/Ghidra/Extensions/SampleTablePlugin/certification.manifest b/Ghidra/Extensions/SampleTablePlugin/certification.manifest index dc315f04e3..2e5c198cc0 100644 --- a/Ghidra/Extensions/SampleTablePlugin/certification.manifest +++ b/Ghidra/Extensions/SampleTablePlugin/certification.manifest @@ -6,16 +6,4 @@ data/ExtensionPoint.manifest||GHIDRA||||END| data/sampletableplugin.theme.properties||GHIDRA||||END| extension.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/menu16.gif||GHIDRA||reviewed||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/redo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0||||END| -src/main/help/help/shared/undo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0||||END| -src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm||GHIDRA||reviewed||END| -src/main/resources/images/erase16.png||GHIDRA||reviewed||END| -src/main/resources/images/information.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm||GHIDRA||||END| diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/Frontpage.css b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/arrow.gif b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/close16.gif b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/note.png b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/note.yellow.png b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/tip.png b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm index 76cfe95a3a..1c36413ab6 100644 --- a/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm +++ b/Ghidra/Extensions/SampleTablePlugin/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm @@ -10,7 +10,7 @@ Sample Help File for a Plugin - + diff --git a/Ghidra/Extensions/sample/certification.manifest b/Ghidra/Extensions/sample/certification.manifest index 0f1a49b26c..7790314feb 100644 --- a/Ghidra/Extensions/sample/certification.manifest +++ b/Ghidra/Extensions/sample/certification.manifest @@ -6,17 +6,4 @@ data/README.txt||GHIDRA||||END| data/sample.theme.properties||GHIDRA||||END| extension.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/menu16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0||||END| -src/main/help/help/shared/redo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/shared/undo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm||GHIDRA||||END| -src/main/resources/images/applications-development.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/resources/images/erase16.png||GHIDRA||reviewed||END| -src/main/resources/images/information.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| diff --git a/Ghidra/Extensions/sample/src/main/help/help/shared/Frontpage.css b/Ghidra/Extensions/sample/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Extensions/sample/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Extensions/sample/src/main/help/help/shared/arrow.gif b/Ghidra/Extensions/sample/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Extensions/sample/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Extensions/sample/src/main/help/help/shared/close16.gif b/Ghidra/Extensions/sample/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Extensions/sample/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Extensions/sample/src/main/help/help/shared/note.png b/Ghidra/Extensions/sample/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Extensions/sample/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Extensions/sample/src/main/help/help/shared/note.yellow.png b/Ghidra/Extensions/sample/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Extensions/sample/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Extensions/sample/src/main/help/help/shared/tip.png b/Ghidra/Extensions/sample/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Extensions/sample/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Extensions/sample/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm b/Ghidra/Extensions/sample/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm index 890fe59cf9..34e139427c 100644 --- a/Ghidra/Extensions/sample/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm +++ b/Ghidra/Extensions/sample/src/main/help/help/topics/SampleHelpTopic/SampleHelpFile.htm @@ -10,7 +10,7 @@ Sample Help File for a Plugin - + @@ -65,9 +65,9 @@ -

This is a note

+

This is a note

-

This is a tip

+

This is a tip

Related Topics: add links to related pages

diff --git a/Ghidra/Features/Base/build.gradle b/Ghidra/Features/Base/build.gradle index a6076a0cd7..b649a3cc12 100644 --- a/Ghidra/Features/Base/build.gradle +++ b/Ghidra/Features/Base/build.gradle @@ -155,7 +155,7 @@ def createTipsHelpFile(input, output) { Ghidra Tips - +

Ghidra Tips of the Day

diff --git a/Ghidra/Features/Base/certification.manifest b/Ghidra/Features/Base/certification.manifest index 3315cb02d8..6fbeea6a06 100644 --- a/Ghidra/Features/Base/certification.manifest +++ b/Ghidra/Features/Base/certification.manifest @@ -95,11 +95,6 @@ data/x86_linux_syscall_numbers||GHIDRA||||END| ghidra_scripts/AskScript.properties||GHIDRA||||END| ghidra_scripts/world.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|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.png||Oxygen Icons - LGPL 3.0|||renamed from flag-green.png|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||renamed from flag-yellow.png|END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0) Renamed version of help-hint.png|END| src/main/help/help/topics/About/About_Ghidra.htm||GHIDRA||||END| src/main/help/help/topics/About/About_Program_File.htm||GHIDRA||||END| src/main/help/help/topics/About/images/About_Program.png||GHIDRA||||END| @@ -214,7 +209,7 @@ src/main/help/help/topics/DataTypePreviewPlugin/images/Data_Type_Preview.png||GH src/main/help/help/topics/DataWindowPlugin/data_window.htm||GHIDRA||||END| src/main/help/help/topics/DataWindowPlugin/images/DataWindow.png||GHIDRA||||END| src/main/help/help/topics/DataWindowPlugin/images/DataWindowFilter.png||GHIDRA||||END| -src/main/help/help/topics/DbViewerPlugin/DbViewer.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/DbViewerPlugin/DbViewer.htm||GHIDRA||||END| src/main/help/help/topics/DbViewerPlugin/images/DatabaseViewer.png||GHIDRA||||END| src/main/help/help/topics/DisassembledViewPlugin/DisassembledViewPlugin.htm||GHIDRA||||END| src/main/help/help/topics/DisassembledViewPlugin/images/DisassembledViewPluginMain.png||GHIDRA||||END| @@ -229,7 +224,6 @@ src/main/help/help/topics/DockingWindows/images/leftArrow.png||GHIDRA||||END| src/main/help/help/topics/DockingWindows/images/resize.png||GHIDRA||||END| src/main/help/help/topics/DockingWindows/images/rightArrow.png||GHIDRA||||END| src/main/help/help/topics/DockingWindows/images/upArrow.png||GHIDRA||||END| -src/main/help/help/topics/DockingWindows/images/window.png||GHIDRA||||END| src/main/help/help/topics/EclipseIntegration/EclipseIntegration.htm||GHIDRA||||END| src/main/help/help/topics/EquatePlugin/Equates.htm||GHIDRA||||END| src/main/help/help/topics/EquatePlugin/images/AfterApplyEnum.png||GHIDRA||||END| @@ -249,9 +243,9 @@ src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm||GHIDRA|||| src/main/help/help/topics/FallThroughPlugin/images/SetFallThrough.png||GHIDRA||||END| src/main/help/help/topics/FileSystemBrowserPlugin/FileSystemBrowserPlugin.html||GHIDRA||||END| src/main/help/help/topics/FlowSelection/Selection_By_Flow.html||GHIDRA||||END| -src/main/help/help/topics/FrontEndPlugin/Archive_Project.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/FrontEndPlugin/Archive_Project.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Close_Project.htm||GHIDRA||||END| -src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Creating_a_Project.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Deleting_a_Ghidra_Project.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Edit_Plugin_Path.htm||GHIDRA||||END| @@ -260,10 +254,10 @@ src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end_Menus.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Opening_a_Ghidra_Project.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Project_Info.htm||GHIDRA||||END| -src/main/help/help/topics/FrontEndPlugin/Re-opening_a_Project.htm||GHIDRA||reviewed||END| -src/main/help/help/topics/FrontEndPlugin/Restore_Project.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/FrontEndPlugin/Re-opening_a_Project.htm||GHIDRA||||END| +src/main/help/help/topics/FrontEndPlugin/Restore_Project.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/Saving_a_Ghidra_Project.htm||GHIDRA||||END| -src/main/help/help/topics/FrontEndPlugin/ShowMemoryUsage.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/FrontEndPlugin/ShowMemoryUsage.htm||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/images/ArchiveFileExists.png||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/images/ArchiveProject.png||GHIDRA||||END| src/main/help/help/topics/FrontEndPlugin/images/ChangeAccessList.png||GHIDRA||||END| @@ -354,7 +348,7 @@ src/main/help/help/topics/ImporterPlugin/images/ImporterDialog.png||GHIDRA||||EN src/main/help/help/topics/ImporterPlugin/images/LanguagePickerDialog.png||GHIDRA||||END| src/main/help/help/topics/ImporterPlugin/images/SearchPathsDialog.png||GHIDRA||||END| src/main/help/help/topics/ImporterPlugin/importer.htm||GHIDRA||||END| -src/main/help/help/topics/Intro/GhidraFunctionality.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/Intro/GhidraFunctionality.htm||GHIDRA||||END| src/main/help/help/topics/Intro/GhidraSupport.htm||GHIDRA||||END| src/main/help/help/topics/Intro/Intro.htm||GHIDRA||||END| src/main/help/help/topics/Intro/images/Empty_ghidra.png||GHIDRA||||END| @@ -386,7 +380,7 @@ src/main/help/help/topics/MemoryMapPlugin/images/MemoryMap.png||GHIDRA||||END| src/main/help/help/topics/MemoryMapPlugin/images/MoveMemory.png||GHIDRA||||END| src/main/help/help/topics/MemoryMapPlugin/images/SetImageBaseDialog.png||GHIDRA||||END| src/main/help/help/topics/MemoryMapPlugin/images/SplitMemoryBlock.png||GHIDRA||||END| -src/main/help/help/topics/Misc/Appendix.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/Misc/Appendix.htm||GHIDRA||||END| src/main/help/help/topics/Misc/Tips.htm||NONE||||END| src/main/help/help/topics/Misc/Welcome_to_Ghidra_Help.htm||GHIDRA||||END| src/main/help/help/topics/Navigation/Navigation.htm||GHIDRA||||END| @@ -403,10 +397,10 @@ src/main/help/help/topics/OverviewPlugin/images/OverviewPanel.png||GHIDRA||||END src/main/help/help/topics/PrintingPlugin/Printing.htm||GHIDRA||||END| src/main/help/help/topics/PrintingPlugin/images/PrintOptions.png||GHIDRA||||END| src/main/help/help/topics/Program/Ghidra_Programs.htm||GHIDRA||||END| -src/main/help/help/topics/ProgramManagerPlugin/Closing_Program_Files.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/ProgramManagerPlugin/Closing_Program_Files.htm||GHIDRA||||END| src/main/help/help/topics/ProgramManagerPlugin/Navigating_Program_Files.htm||GHIDRA||||END| src/main/help/help/topics/ProgramManagerPlugin/Opening_Program_Files.htm||GHIDRA|||'Open Program' graphic contains 'wcbiema'|END| -src/main/help/help/topics/ProgramManagerPlugin/Program_Annotation.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/ProgramManagerPlugin/Program_Annotation.htm||GHIDRA||||END| src/main/help/help/topics/ProgramManagerPlugin/Program_Options_Dialog.htm||GHIDRA||||END| src/main/help/help/topics/ProgramManagerPlugin/Saving_Program_Files.htm||GHIDRA||||END| src/main/help/help/topics/ProgramManagerPlugin/images/ClosedTab.png||GHIDRA||||END| @@ -565,8 +559,8 @@ src/main/help/help/topics/Tables/images/MultipleColumnSortDialog.png||GHIDRA|||| src/main/help/help/topics/Tables/images/SelectColumnsDialog.png||GHIDRA||||END| src/main/help/help/topics/Tool/Configure_Tool.htm||GHIDRA||||END| src/main/help/help/topics/Tool/Ghidra_Tool_Administration.htm||GHIDRA||||END| -src/main/help/help/topics/Tool/ShowLog.htm||GHIDRA||reviewed|References wcbiema in screen snapshot|END| -src/main/help/help/topics/Tool/Tip_Of_The_Day.htm||GHIDRA||reviewed||END| +src/main/help/help/topics/Tool/ShowLog.htm||GHIDRA|||References wcbiema in screen snapshot|END| +src/main/help/help/topics/Tool/Tip_Of_The_Day.htm||GHIDRA||||END| src/main/help/help/topics/Tool/ToolOptions_Dialog.htm||GHIDRA||||END| src/main/help/help/topics/Tool/Undo_Redo.htm||GHIDRA||||END| src/main/help/help/topics/Tool/images/ConfigTool.png||GHIDRA||||END| diff --git a/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java b/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java index 6a106efc91..5841fe98fc 100644 --- a/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java +++ b/Ghidra/Features/Base/ghidra_scripts/CreateHelpTemplateScript.java @@ -66,7 +66,7 @@ public class CreateHelpTemplateScript extends GhidraScript { printWriter.println(""); printWriter.println("\t" + "" + plugin.getName() + ""); printWriter.println("\t" + - ""); + ""); printWriter.println(""); printWriter.println(""); printWriter.println(""); diff --git a/Ghidra/Features/Base/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/Base/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/Base/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/Base/src/main/help/help/shared/arrow.gif b/Ghidra/Features/Base/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/Base/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/Base/src/main/help/help/shared/close16.gif b/Ghidra/Features/Base/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/Base/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/Base/src/main/help/help/shared/note.png b/Ghidra/Features/Base/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/Base/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/Base/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/Base/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/Base/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/Base/src/main/help/help/shared/tip.png b/Ghidra/Features/Base/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/Base/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/Base/src/main/help/help/topics/About/About_Ghidra.htm b/Ghidra/Features/Base/src/main/help/help/topics/About/About_Ghidra.htm index d08f5d5350..dcf7677752 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/About/About_Ghidra.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/About/About_Ghidra.htm @@ -7,7 +7,7 @@ About Ghidra - + @@ -20,12 +20,12 @@

To view information about Ghidra

-

  This option is also available from the +

  This option is also available from the Ghidra Project Window 

@@ -69,7 +69,7 @@ assorted variants which may be implemented for each processor.

-

  This option is also available from the +

  This option is also available from the Ghidra Project Window 

@@ -77,7 +77,7 @@

To view the Installed Processors list

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/About/About_Program_File.htm b/Ghidra/Features/Base/src/main/help/help/topics/About/About_Program_File.htm index dbacf29c31..d5e5b12677 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/About/About_Program_File.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/About/About_Program_File.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> About Program File - + @@ -20,7 +20,7 @@
  1. From the menu-bar of the tool that has the program open, select Help About Program ...
    2. + "help/shared/arrow.gif" alt="" border="0"> About Program ...

To view information about any program in the project window
@@ -39,7 +39,7 @@

Figure 1 - About Program

-

Notes:  +

Notes:  When viewing the "About" information on a non-open program, you may get a very abbreviated version of the program's information if the program was created with a version of Ghidra before version 4.2.  Once a program has been saved with version 4.2 or later, the full diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Annotations/Annotations.html b/Ghidra/Features/Base/src/main/help/help/topics/Annotations/Annotations.html index acb36fbbd4..ff77f941dd 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Annotations/Annotations.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/Annotations/Annotations.html @@ -8,7 +8,7 @@ Annotations - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/AssemblerPlugin/Assembler.htm b/Ghidra/Features/Base/src/main/help/help/topics/AssemblerPlugin/Assembler.htm index 17f0f8e132..782ecf4628 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/AssemblerPlugin/Assembler.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/AssemblerPlugin/Assembler.htm @@ -8,7 +8,7 @@ Assembler - + @@ -24,7 +24,7 @@ coloring can be performed from a script, which allows you to color disassembly during automated processing.

-

Unlike program selections and +

Unlike program selections and highlights, the background colors you set will be saved with the program.

Changing Colors

@@ -47,7 +47,7 @@ the Colors pull-right. This action will clear all colors applied to the entire program. exists.

-

Any of these actions can be undone +

Any of these actions can be undone using the undo action.

@@ -120,19 +120,19 @@

Next Color Range - Available from the menu bar at Navigation -> Next Color Range This action will + "help/shared/arrow.gif" border="0" alt="->"> Next Color Range This action will navigate to the next color range at an address larger than the current address. Depending upon the range navigation options, either the bottom of the current range, or the top of next range will be chosen.

Previous Color Range - Available from the menu bar at Navigation ->Previous Color Range This action will + "help/shared/arrow.gif" border="0" alt="->">Previous Color Range This action will navigate to the next color range at an address larger than the current address. Depending upon the range navigation options, either the bottom of the previous range, or the top of the previous range will be chosen.

-

You can change range navigation - behavior by editing the Navigation +You can change range navigation + behavior by editing the Navigation ->Range Navigation tool options.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/SelectionTable.htm b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/SelectionTable.htm index 84419a7d68..ca7c5ba4cc 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/SelectionTable.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/CodeBrowserPlugin/SelectionTable.htm @@ -8,7 +8,7 @@ Selection Table - + @@ -27,7 +27,7 @@

To create a table from the current selection within the Listing, press Select Create Table From Selection from the tool's menu bar.

+ "help/shared/arrow.gif">Create Table From Selection from the tool's menu bar.

Provided by: Code Browser plugin

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CommentWindowPlugin/comment_window.htm b/Ghidra/Features/Base/src/main/help/help/topics/CommentWindowPlugin/comment_window.htm index 3c853d1933..08004e2a07 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/CommentWindowPlugin/comment_window.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/CommentWindowPlugin/comment_window.htm @@ -7,7 +7,7 @@ Comment Window - + @@ -15,7 +15,7 @@

The Comment Window provides a list of comments defined in the currently open program. To display the Comment Window, select the WindowComments from the tool menu.

+ "help/shared/arrow.gif">Comments from the tool menu.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/CommentsPlugin/Comments.htm b/Ghidra/Features/Base/src/main/help/help/topics/CommentsPlugin/Comments.htm index dabc8a6987..8c9dba9a83 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/CommentsPlugin/Comments.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/CommentsPlugin/Comments.htm @@ -7,7 +7,7 @@ Comments - + @@ -81,7 +81,7 @@
  1. From the right-mouse pop-up menu over the Code Browser window, select the - Comments-> Set menu + Comments-> Set menu option.
  2. Choose the appropriate tab for the type of comment that is to be added or edited.
    3. @@ -137,7 +137,7 @@
    1. Right-click on the comment to be deleted.
      2. -
    2. Choose Comments-> Delete +
    3. Choose Comments-> Delete <comment type> Comment from the popup-menu.
    @@ -180,12 +180,12 @@
  3. Right-click on the comment that you would like to view the history.
  4. - Choose Comments-> Show History + Choose Comments-> Show History for <comment type>....
    • If you are not over a specific comment, right mouse click and choose - Comments-> Show + Comments-> Show History....
    5. @@ -203,7 +203,7 @@
-

Only comments that are placed at the start +

Only comments that are placed at the start address of data or instructions are displayed.  Comments on addresses other than the start (interior) address will remain hidden until the data or instructions are cleared.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ComputeChecksumsPlugin/Generate_Checksum_Help.html b/Ghidra/Features/Base/src/main/help/help/topics/ComputeChecksumsPlugin/Generate_Checksum_Help.html index 818df01098..48819b2220 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ComputeChecksumsPlugin/Generate_Checksum_Help.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/ComputeChecksumsPlugin/Generate_Checksum_Help.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Generate Checksum Help - + @@ -48,7 +48,7 @@ -

+

All of the preceding checksums may be modified using the XOR and Carry toggle buttons.

@@ -106,7 +106,7 @@ -

+

All of the preceding checksums may be modified using the 1's Complement and 2's Complement toggle buttons.

@@ -183,7 +183,7 @@
-

It is now possible to write a custom checksum +

It is now possible to write a custom checksum algorithm and add it to the table using a script. Contact the Ghidra Team for more detail.

@@ -194,8 +194,8 @@

Using the Checksum Generator

To display the Generate Checksum dialog, select ToolsGenerate Checksum... or select WindowChecksum Generator.  The results of the thirteen types + "help/shared/arrow.gif">Generate Checksum... or select WindowChecksum Generator.  The results of the thirteen types of checksums can be viewed in decimal or hex format. There is also an option to have the applicable results displayed in 1's or 2's complement.


@@ -253,7 +253,7 @@ -

Once the results are posted in the table, +

Once the results are posted in the table, choosing another checksum option will automatically update the results, without your having to regenerate the results.

diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ConsolePlugin/console.html b/Ghidra/Features/Base/src/main/help/help/topics/ConsolePlugin/console.html index 7480eb9e09..8f9f58291b 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ConsolePlugin/console.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/ConsolePlugin/console.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Console - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DWARFExternalDebugFilesPlugin/DWARFExternalDebugFilesPlugin.html b/Ghidra/Features/Base/src/main/help/help/topics/DWARFExternalDebugFilesPlugin/DWARFExternalDebugFilesPlugin.html index c7ab424498..51d216ba01 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DWARFExternalDebugFilesPlugin/DWARFExternalDebugFilesPlugin.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/DWARFExternalDebugFilesPlugin/DWARFExternalDebugFilesPlugin.html @@ -4,7 +4,7 @@ DWARF External Debug Files - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm index 4319372e67..02cb433571 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataPlugin/Data.htm @@ -9,7 +9,7 @@ Data - + @@ -32,7 +32,7 @@ (structure, array, typedef, etc) and supports dynamic data types whose structure depends on the underlying data.

-

It is important to note that the size of many of the primitive built-in types is +

It is important to note that the size of many of the primitive built-in types is determined by the language and compiler specification (e.g., the size of an integer can vary).

@@ -580,7 +580,7 @@ was created is displayed in the tool's status area.

-

 Regardless of how a data type is applied, data is +

 Regardless of how a data type is applied, data is only created if the data type will fit within the available undefined bytes.  

Drag from Data Type Manager

@@ -594,7 +594,7 @@

  1. Open the Data Type Manager (select - Window Data Type Manager)

    + Window Data Type Manager)

  2. @@ -630,23 +630,23 @@
- + - + - +
b Byte Word DoubleWord QuadWord - ByteByte Word DoubleWord QuadWord + Byte
' (single quote) Ascii String Unicode AsciiAscii String Unicode Ascii
f Float Double FloatFloat Double Float
@@ -697,7 +697,7 @@
  • In the Data popup, select the favorite data type to be applied
    • -

      To quickly assign a key binding to a favorite, +

      To quickly assign a key binding to a favorite, use the Key Bindings Shortcut.  Key Bindings allow you to assign "hot keys" to any menu item.

    @@ -726,7 +726,7 @@ bytes from the popup menu -

    Deleting data types from the Data Type Manager window is a quick way to clear every instance of a data type in a program.

    @@ -750,7 +750,7 @@
  • Press mouse-right to bring up the popup menu
    • -
  • Select Data Settings... to bring up the +
  • Select Data Settings... to bring up the settings dialog
    • @@ -790,7 +790,7 @@
  • Press mouse-right to bring up the popup menu
    • -
  • Select Data Default Settings... to bring up +
  • Select Data Default Settings... to bring up the default settings dialog
    • @@ -816,13 +816,13 @@ list of valid choices for that setting.  Choose a value from this list of choices and press OK.

    -

    +

    Default settings on components within a structure apply to that structure only. For example, if Struct_1 has a byte component with its format set as Octal, then only other instances of Struct_1 will be affected. Settings on other occurrences of byte are not affected.

    -

    A typedef has the same set of settings as its underlying +

    A typedef has the same set of settings as its underlying data type.  For example, when you create a typedef on a byte, the default settings on the typedef will be the same as the original default settings of the byte. Changing the default settings for either the typedef or its underlying data type doesn't affect the @@ -838,7 +838,7 @@

  • Press mouse-right to bring up the popup menu
    • -
  • Select Data Settings... to bring up the +
  • Select Data Settings... to bring up the settings dialog
    • @@ -889,7 +889,7 @@
    1. Select a set of contiguous defined or undefined Data
      2. -
    2. Use the right-mouse popup Data Create +
    3. Use the right-mouse popup Data Create Structure
    4. The Data items within the selection are used to define the structure
      5. @@ -918,7 +918,7 @@ a default name.  The bottom part shows a list of matching structures.  You can select from this list to use that structure instead of creating a new one.

      -

      The method for finding matching structures is either +

      The method for finding matching structures is either by an exact match or by a match on structure size. You can change the type of matching used by clicking the Exact or Size radio buttons under the Matching: heading.

      @@ -944,7 +944,7 @@

      To use an existing, matching structure, find and select the structure in the Use Exising Structure table and press OK.

      -

      You can create nested structures by following the +

      You can create nested structures by following the instructions above.  The only difference is in Step (1), select contiguous bytes within an existing structure.

      @@ -956,7 +956,7 @@
    5. Place the cursor on the first line of the structure
    6. Press mouse-right over the structure and choose Data Edit Data Type...
      7. + "help/shared/arrow.gif"> Edit Data Type...
    7. Change the name in the Structure Editor
      8. @@ -972,14 +972,14 @@
      1. Right mouse click on the field name of a structure member in the Code Browser
        2. -
      2. Choose the Data Rename Field +
      3. Choose the Data Rename Field option
      4. Enter a new name in the Rename Data Field dialog
      -

      The  "Field Name" field must be added to the +

      The  "Field Name" field must be added to the "Open Data" tab in the Code Browser header in order for the data structure field names to show up in the Code Browser.

      @@ -991,13 +991,13 @@
    8. Place the cursor on the first line of the structure
    9. Press mouse-right over the structure and choose Data Edit Data Type...
      10. + "help/shared/arrow.gif"> Edit Data Type...
    10. Edit the field name for the structure member
    -

    You cannot set the field name of undefined +

    You cannot set the field name of undefined member

    @@ -1124,7 +1124,7 @@ key-binding actions.

    -

    To create a pointer of a specific size apply either +

    To create a pointer of a specific size apply either pointer8, pointer16, pointer32, or pointer64 to create a pointer sizes of 1, 2, 4, 8, respectively.

    @@ -1147,7 +1147,7 @@
  • Press the '[' Quick-Key,
     - or -
    - Press mouse-right on the data item and choose Data + Press mouse-right on the data item and choose Data Create Array
  • A dialog will prompt you for the number of elements in the array.  It will be @@ -1167,7 +1167,7 @@
  • Press the '[' Quick-Key,
     - or -
    - Press mouse-right on the array and choose Data + Press mouse-right on the array and choose Data Create Array
  • Enter the number of elements for the next dimension, and press OK
    • diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/DataTypeSelectionDialog.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/DataTypeSelectionDialog.htm index 083029e4fd..ae170f8d16 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/DataTypeSelectionDialog.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/DataTypeSelectionDialog.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Data Type Chooser Dialog - + @@ -31,7 +31,7 @@ escape.

    -

    Usage Note: If you would like to +

    Usage Note: If you would like to type the name of a data type to be chosen and would not like to use the selected value in the drop-down list, then you must first press the Escape key to close the drop-down list, if it is open. To state this point differently, pressing diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/EnumEditor.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/EnumEditor.htm index e6490270c0..43b9ae3d4b 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/EnumEditor.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/EnumEditor.htm @@ -2,7 +2,7 @@ Enum Editor - +

    @@ -59,7 +59,7 @@

    -

    +

    While editing, you can use the Tab key to navigate the editing to the next cell, the Shift-Tab key to navigate backwards, the Up key to move editing to the cell above, and the Down to move editing to the cell below the currently edited cell. @@ -67,7 +67,7 @@

    -

    +

    Names and values must be unique.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm index c95b7b9d58..34124a1903 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeEditors/StructureEditor.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Data Structure Editor - + @@ -60,7 +60,7 @@ structure or array component changing it into its component parts.
    -
  • Pull Down Menu: The icon at the top +
  • Pull Down Menu: The icon at the top of the editor provides additional editor actions. These are: show the category path of a component's data type, edit a component's data type, edit the fields of a component, apply a cycle group or favorite.
    @@ -96,7 +96,7 @@ the changes from the editor back to the program or archive.

    -

    If editor changes to a structure or union are +

    If editor changes to a structure or union are applied and it is assigned to data in the program, all data items with the structure or union as the data type now have the new data type. In other words, the size or composition of those data items in the program will have changed due to the apply.

    @@ -115,7 +115,7 @@

    Closing the Editor

    -

    Select the Close dockable component icon in +

    Select the Close dockable component icon in the toolbar to exit from the editor. If you have unsaved changes to your data type, a dialog will ask if you want to save the changes.

    @@ -261,7 +261,7 @@
    • -

    Note: The equivalent of having no C/C++ code aligned/alignas +

    Note: The equivalent of having no C/C++ code aligned/alignas attribute on the structure or union is to choose default. The equivalent for the C code aligned attribute without a value is to choose machine alignment. The equivalent of aligned(4) or alignas(4) is to specify an explicit alignment value of 4.

    @@ -298,10 +298,10 @@ of the pack setting. The align setting will not influence interior component placement as does the pack setting.

    -

    Note: The placement of bitfields may be influenced +

    Note: The placement of bitfields may be influenced based upon the specified pack value based upon the compiler specification.

    -

    Note: The equivalent of having no C #pragma +

    Note: The equivalent of having no C #pragma pack attribute on the structure or union is to choose default. The equivalent for a C code attribute of #pragma pack() without a value is to specify a pack value of 1. The equivalent of # pragma pack(4) is to specify a pack value @@ -375,12 +375,12 @@

    -

    Note:While packing of bitfields within packed +

    Note:While packing of bitfields within packed structures is controlled by the compiler specification (e.g., data organization), bit-packing order is currently fixed based upon endianess. Little-endian packs starting with bit-0 (lsb) while big-endian packs starting with bit-7 (msb).

    -

    Note:The use of bitfield components is not +

    Note:The use of bitfield components is not currently reflected in decompiler results or assembly markup.

    Zero-Element / Flexible Array Components

    @@ -395,7 +395,7 @@ equal to the length of the structure. When packing is enabled such a component may influence the overall alignment of the structure and its length. -

    Note:The use of flexible array components is not +

    Note:The use of flexible array components is not currently reflected in decompiler results or listing reference markup. Its primary purpose if to reflect the C/C++ source definition of a structure with correct alignment and structure sizing.

    @@ -539,7 +539,7 @@ will be equal to the length of the component being cleared. -

    Clearing a component will also erase its Field +

    Clearing a component will also erase its Field Name and Comment.

    @@ -574,7 +574,7 @@
    -

    In a structure, an array can be created from a +

    In a structure, an array can be created from a selection of multiple components. The data type of the first component in the selection will be used for the data type in the array.

    @@ -657,7 +657,7 @@ menu action (right mouse-click) Add Bitfield may be selected to launch the Bitfield Editor for a new bitfield.

    -

    Note: A direct text entry of a bitfield +

    Note: A direct text entry of a bitfield datatype may be specified within the table datatype column (e.g., char:1), although it will always be placed at a default offset.

    @@ -700,7 +700,7 @@ except on undefined components.

    -

    To rearrange the order of the component +

    To rearrange the order of the component fields position the cursor over the header for the table column. Left mouse click and drag the column left or right to its new position.


    @@ -781,7 +781,7 @@ which allows you to easily enter a data type or select/modify an existing one from one of the open datatype managers. It can also be Undefined, a pointer to a datatype, or an array.

    -

    Note: Certain restrictions may apply when specifying +

    Note: Certain restrictions may apply when specifying or modifying a component's datatype which could cause a modification to fail. Some common restrictions include but are not limited to:

    @@ -909,7 +909,7 @@ is associated with the Byte cycle group. This group is Byte, Word, DWord, and QWord.

    -

    A single row of the component table must be +

    A single row of the component table must be selected to cycle a data type.

    @@ -931,7 +931,7 @@
    -

    Cycle groups can also be applied +

    Cycle groups can also be applied from the component table's popup menu under Cycle.

    @@ -946,7 +946,7 @@
    -

    When the current component data +

    When the current component data type is not in the cycle group of the desired data type, pressing the cycle group key of the desired data type will change the component to the first data type in the desired cycle group. The data type can then be cycled to any other data type in the group.

    @@ -978,7 +978,7 @@ currently work on a Mac. On a Mac try using the Alt key to insert rather than the Ctrl key. The "+" should then appear at the drop site.

    -

    When a data type is dropped on a pointer +

    When a data type is dropped on a pointer component, the component becomes a pointer of that data type instead of simply being replaced by that data type. For example, dropping a Byte on a Pointer results in a Byte*, which is a pointer to a Byte. Drag and Drop is discussed further in -

    When a favorite data type is applied to a pointer +

    When a favorite data type is applied to a pointer component, the component becomes a pointer of that data type instead of simply being replaced by that data type.

    -

    If you right mouse click on a component +

    If you right mouse click on a component where there is no selection, the selection becomes a single component selection containing that component and the popup menu will appear.

    @@ -1036,7 +1036,7 @@ click the OK button.

    -

    For information about drag and drop with +

    For information about drag and drop with pointers, see Drag and Drop Basics.

    Favorites

    @@ -1044,7 +1044,7 @@

    Right mouse click on the empty row at the end of the table and pull right to see the Favorites. Select the favorite from the popup and it is added as the last component.

    -

    For information about Pointers as a Favorite, +

    For information about Pointers as a Favorite, see Favorites Basics.

    @@ -1072,7 +1072,7 @@ -

    For information about drag and drop with +

    For information about drag and drop with pointers, see Drag and Drop Basics.

    @@ -1113,7 +1113,7 @@ selection are created to replace the selection. In a non-packed structure any left over bytes in the selection will become undefined components.

    -

    For information about drag and drop with +

    For information about drag and drop with pointers, see Drag and Drop Basics.

    @@ -1122,7 +1122,7 @@

    Single Component Selected

    -

    If you right mouse click on a +

    If you right mouse click on a component where there is no selection, the selection becomes a single component selection containing that component and the popup menu will appear.

    @@ -1144,7 +1144,7 @@ doesn't matter. The selection becomes as many of the data type as will fit and left over bytes become undefined components for a non-packed structure.

    -

    For information about Pointers as a Favorite, +

    For information about Pointers as a Favorite, see Favorites Basics.

    @@ -1212,7 +1212,7 @@ whether the numbers are displayed in hexadecimal or decimal. Changing this only affects the current editor where it is changed.

    -

    The Union Editor does not display offsets since +

    The Union Editor does not display offsets since they are always zero.

    To switch between decimal and hexadecimal display of numeric values in the current @@ -1241,7 +1241,7 @@ settings:

      -
    • From the tool's menu select Edit ->From the tool's menu select Edit -> Tool Options... which displays the Tool Options Dialog.
      • @@ -1339,7 +1339,7 @@
      -

      Tip: A component zoom feature is provided which can +

      Tip: A component zoom feature is provided which can allow the user to increase the visual bit size allowing for component labels to be shown as size permits. While with the mouse cursor is over a component, use mouse wheel while the Shift key is depressed.

      @@ -1377,11 +1377,11 @@

      Comment - (optional) specifies the structure component comment to be assigned to the bitfield. This entry utilizes a simple text entry field.

      -

      Tip: The bitfield offset and size may be fully +

      Tip: The bitfield offset and size may be fully specified by using the mouse. Clicking and dragging over the visual bit-range where the bitfield should reside will adjust these settings.

      -

      Note: Within the Bitfield Editor the bit +

      Note: Within the Bitfield Editor the bit size may not exceed the size of the Base Datatype based upon the structure's associated compiler convention (i.e., data organization). Since archives use default @@ -1393,7 +1393,7 @@ components, structure component sizing may change when moving between a datatype archive and a target program.

      -

      Note: It is important to note that the retained bitfield +

      Note: It is important to note that the retained bitfield storage specification (byte offset, component byte size, bit offset) will utilize the smallest possible values while preserving bitfield positioning within the structure. The allocation unit offset and size conveyed by the editor are for editor use only.

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_archives.html b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_archives.html index 83827c1139..3f14ebe017 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_archives.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_archives.html @@ -7,7 +7,7 @@ Data Type Archives - + @@ -371,7 +371,7 @@

      To refresh sync indicators for datatypes associated with a particular source archive, right-click on the node that contains the datatypes and select - Refresh Sync Indicators For + Refresh Sync Indicators For <Source Archive Name>.

      @@ -400,7 +400,7 @@ either the up or down arrows to move the path up or down in the list respectively.

      -

      +

      Ghidra currently accepts two special strings in the Edit Data Type Archive Paths dialog:

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm index 291f25f32e..c571ebe828 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_description.htm @@ -7,7 +7,7 @@ Data Type Manager - + @@ -109,7 +109,7 @@ path.

      -

      In the unlikely event that new data type class files +

      In the unlikely event that new data type class files or jar files are added while Ghidra is running, there is a refresh action which will find and add the new data types to the "built-in" archive.

      @@ -145,7 +145,7 @@

      Besides being stored in archives, data types are also stored inside programs.

      -

      Any data type used in a program must be stored in +

      Any data type used in a program must be stored in that program even if it originally came from an archive.

      Because of this, the "same" data types can live in more than one archive or program and @@ -226,7 +226,7 @@ from the actual archive and the change time on a data type, Ghidra can determine if data types are out-of-sync with their corresponding data type in a program or other archive.

      -

      +

      The data type tree will indicate data types that have a source archive association by displaying the name of the source archive in parenthesis after the data type name.

      @@ -359,7 +359,7 @@

      Opening a File Data Type Archive

      -

      From the local menu , select Open +

      From the local menu , select Open File Archive.... A file chooser will appear. Use the file chooser to find and select the data type archive to open. A new node will appear in the tree for the newly opened archive. Also, the directory containing the newly opened archive will be added to the @@ -369,7 +369,7 @@

      Opening a Project Data Type Archive

      -

      From the local menu , select Open +

      From the local menu , select Open Project Archive.... A Ghidra project data type archive chooser will appear. This chooser will show all the project archives in the current project. Use the chooser to find and select the project data type archive to open. A new node will appear in the tree for @@ -380,7 +380,7 @@

      Creating a New File Data Type Archive

      -

      From the local menu , select New +

      From the local menu , select New File Archive.... A file chooser will appear. Use the file chooser to select a directory and enter a name for the new archive. If an archive already exists with that name, a dialog will appear asking if the existing archive should be over-written. A new @@ -392,14 +392,14 @@ Archive

    -

    From the local menu , select New +

    From the local menu , select New Project Archive.... A Ghidra project data type archive chooser will appear. Use the chooser to select a folder and enter a name for the new archive. A new node will appear in the tree for the newly created archive.

    -

    You can also create a new Project Data Type +

    You can also create a new Project Data Type Archive by dragging a File Data Type Archive (.gdt) file onto the Ghidra Project Window. This will create a new Project Data Type Archive populated with the same data types as the dragged File Data Type @@ -501,12 +501,12 @@

    To update the datatypes, right-click on the node that needs updating and select Update Datatypes From <Source Archive + "help/shared/arrow.gif" alt=""> <Source Archive Name>. The Update Data Types dialog will be shown allowing you to select the datatypes to update.

    -

    Ghidra uses time stamps and flags to +

    Ghidra uses time stamps and flags to determine if an archive is out-of-sync. This can result in Ghidra indicating the archive needs updating when actually it does not. For example, if a data type is changed and then changed back, it will cause Ghidra to think the data type was changed. @@ -527,18 +527,18 @@

    To commit the datatypes, right-click on the node that contains the changed datatypes and select Commit Datatypes To <Source Archive + "help/shared/arrow.gif" alt=""> <Source Archive Name>. The Commit Data Types dialog will be shown allowing you to select the datatypes to commit.

    -

    Ghidra uses time stamps and flags to determine +

    Ghidra uses time stamps and flags to determine if an archive is out-of-sync. This can result in Ghidra indicating the archive needs committing when actually it does not. For example, if a data type is changed and then changed back, it will cause Ghidra to think the data type was changed. In this case, invoking the commit action will cause Ghidra to search for commits, but when it finds none, a message dialog will appear indicating that no changes were detected.

    -

    +

    The source archive must be editable in order to commit File archives must be open for editing and project archives that are under version control must be checked-out.

    @@ -555,7 +555,7 @@

    To revert the datatypes, right-click on the node that contains the changed datatypes and select Revert Datatypes To <Source Archive + "help/shared/arrow.gif" alt=""> <Source Archive Name>. The Revert Data Types dialog will be shown allowing you to select the datatypes to revert.

    @@ -571,7 +571,7 @@

    To disassociate datatypes, right-click on the node that contains the datatypes and select Disassociate Datatypes From <Source + src="help/shared/arrow.gif" alt=""> <Source Archive Name>. The Revert Data Types dialog will be shown allowing you to select the datatypes to revert.

    @@ -589,7 +589,7 @@

    To refresh sync indicators for datatypes associated with a particular source archive, right-click on the node that contains the datatypes and select Refresh Sync Indicators For <Source Archive + "help/shared/arrow.gif" alt=""> <Source Archive Name>. <

    @@ -619,7 +619,7 @@

    Right-click on the category where the new category is to be created. Select the - New Category action and a new + New Category action and a new category named "New Category" will be created.

    @@ -716,7 +716,7 @@ types and so on, until finally they are built on the primitive types (the built-in data types.)

    -

    Built-in types have several restrictions. They +

    Built-in types have several restrictions. They always live in the root category of an archive and they can't be renamed.

    Applying Data Types to a Program

    @@ -756,7 +756,7 @@ -

    Applying a data type from an archive will +

    Applying a data type from an archive will automatically add that data type to the program's archive. Also, the archive will become associated with the program and automatically be opened whenever the program is opened.

    @@ -774,10 +774,10 @@

    Structures, unions, enums, and function definitions can be created by right-clicking on the category where the new type should be located, and then choosing either the - New Structure, New Union, New Enum or New Function Definition action respectively. Each of + New Structure, New Union, New Enum or New Function Definition action respectively. Each of these actions will bring up an appropriate editor (structure editor for structures and unions, the

    Creating a Typedef

    Creating a new typedef is even easier. Right-click on the data type to be - typedef'ed and select the New Typedef on + typedef'ed and select the New Typedef on XYZ action. A new typedef will be created on the XYZ data type in the same category as the original data type.

    -

    Alternatively, you can click New +

    Alternatively, you can click New Typedef..., which will show a dialog that allows you to choose a typedef name and the data type from which the typedef will be created.* This action can also be executed from any folder instead of directly on another data type. @@ -812,11 +812,11 @@

    Creating a Pointer

    -

    To create a pointer, you can click NewTo create a pointer, you can click New Pointer to XYZ. A new pointer will be created to the XYZ data type in the same category as the original data type.*

    -

    *If you create a typedef or +

    *If you create a typedef or pointer to a data type in the Built-in Data Type Manager, the newly created type will be placed in program's data type manager at the root category.

    @@ -1058,11 +1058,11 @@
    -

    The favorites are identified by +

    The favorites are identified by name and must be unique, so you cannot have data type "fred" in one "categoryA" marked as a favorite and "fred" in "categoryB" also marked as a favorite.

    -

    Any data type from any archive +

    Any data type from any archive type (Program, BuildInTypes, or archive) can be marked as a favorite and used as such, however, only those marked in the BuiltInTypes category will be saved as part of your tool's state when you close the Project or exit Ghidra. Your list of @@ -1102,12 +1102,12 @@ the absolute address that the pointer refers to. -

    All Typedef Settings must be established on +

    All Typedef Settings must be established on a Typedef before such a type is applied to Data or referenced by other types. This is highly recommended since the side-affects of using such a modified typedef will not be updated to reflect subsequent changes.

    -

    Full support for the above Pointer-Typedef +

    Full support for the above Pointer-Typedef Settings within analysis and decompilation will evolve over time. We also hope to improve naming concerns for such typedefs and to replace the use of custom BuiltIn data types which would be better modeled as a Pointer.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html index d277751c06..6c57b766da 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypeManagerPlugin/data_type_manager_window.html @@ -7,7 +7,7 @@ Data Type Manager Window - + @@ -22,7 +22,7 @@

    The Data Type Manager window shows the data types and their categories using a tree structure. To bring up the window, click on the icon in the tool bar, or select the Window Data Types... menu option in the + src="help/shared/arrow.gif" alt="" border="0"> Data Types... menu option in the tool.

    @@ -272,7 +272,7 @@ -

    Opening a program also causes file data +

    Opening a program also causes file data type archives that have been associated with that program to be opened. As of Ghidra version 4.3, whenever a data type is applied from an archive to a program, that archive will become associated with the program.

    @@ -679,7 +679,7 @@

    You can find data types with names that match a string. A separate window is displayed to show the results. Multiple search results are shown as tabs in the results window. To find data types, select the Find Data Types by Name... action from the - local menu . The following dialog is + local menu . The following dialog is displayed.

    @@ -748,7 +748,7 @@

    - Not only will the selected data types be + Not only will the selected data types be exported, but so too will be any dependencies for the selected types. For example, if you select a structure to be exported, all of the types within that structure will be exported as well. diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataTypePreviewPlugin/DataTypePreviewPlugin.html b/Ghidra/Features/Base/src/main/help/help/topics/DataTypePreviewPlugin/DataTypePreviewPlugin.html index c6045e84de..093ac97804 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataTypePreviewPlugin/DataTypePreviewPlugin.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataTypePreviewPlugin/DataTypePreviewPlugin.html @@ -8,7 +8,7 @@ Data Preview - + @@ -39,7 +39,7 @@ and dropped into the Data Type Preview table. If you add a structure or union, then a row will be added for member of the structure or union.

    -

    The data type preview does +

    The data type preview does not support dynamic data types. However, keep in mind that not all variable-length data types are dynamic. Specifically, you can use data types that implement Dynamic as long as they do not also extend from @@ -52,7 +52,7 @@

    Select the row(s) to delete and click on the to remove data types from the table.

    -

    If you remove a structure +

    If you remove a structure member, then entire structure will be removed from the preview table

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DataWindowPlugin/data_window.htm b/Ghidra/Features/Base/src/main/help/help/topics/DataWindowPlugin/data_window.htm index 7a6a210932..b7c8b27066 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DataWindowPlugin/data_window.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DataWindowPlugin/data_window.htm @@ -7,7 +7,7 @@ Data Window - + @@ -15,7 +15,7 @@

    The Data Window provides a list of data defined in the currently open program. To display the Data Window, select the WindowDefined Data from the tool menu.

    + "help/shared/arrow.gif">Defined Data from the tool menu.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DbViewerPlugin/DbViewer.htm b/Ghidra/Features/Base/src/main/help/help/topics/DbViewerPlugin/DbViewer.htm index e5a8859f3b..fc8031298c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DbViewerPlugin/DbViewer.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DbViewerPlugin/DbViewer.htm @@ -7,7 +7,7 @@ Comments - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DisassembledViewPlugin/DisassembledViewPlugin.htm b/Ghidra/Features/Base/src/main/help/help/topics/DisassembledViewPlugin/DisassembledViewPlugin.htm index 85dda7f51f..262f2a79e7 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DisassembledViewPlugin/DisassembledViewPlugin.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DisassembledViewPlugin/DisassembledViewPlugin.htm @@ -8,7 +8,7 @@ Disassembled View Plugin - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DisassemblerPlugin/Disassembly.htm b/Ghidra/Features/Base/src/main/help/help/topics/DisassemblerPlugin/Disassembly.htm index dac7109337..b89d479763 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DisassemblerPlugin/Disassembly.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DisassemblerPlugin/Disassembly.htm @@ -7,7 +7,7 @@ Disassembly - + @@ -53,14 +53,14 @@ provides a "Cancel" button.  Press the "Cancel" button to stop the disassembly process.  Note: this will not undo any disassembly that has already occurred.

    -

    Press the 'D' key to Disassemble starting at the +

    Press the 'D' key to Disassemble starting at the current cursor location.

    -

    Selecting Selecting Undo will return the disassembled instructions to undefined bytes.

    -

    Be aware that some processors may allow for +

    Be aware that some processors may allow for disassembly in different modes (eg: ARM vs. THUMB). Specific commands may be provided for these and are not discussed here.

    @@ -90,7 +90,7 @@

    The above Options may be changed via the program Options dialog which allows various program properties to be examined or modified. This dialog may be accessed via the menu action EditOptions for ... for the currently active program. These + src="help/shared/arrow.gif">Options for ... for the currently active program. These options are program specific and stored within the program database. The above program properties can be accessed by clicking the Disassembler node within the Properties tree. Any changes to these options will be stored when the OK or @@ -126,7 +126,7 @@

    -

    Selecting Selecting Undo will return the disassembled instruction to undefined bytes.

    @@ -152,7 +152,7 @@ provides a "Cancel" button.  Press the "Cancel" button to stop the disassembly process.  Note: this will not undo any disassembly that has already occurred.

    -

    Selecting Selecting Undo will return the disassembled instruction to undefined bytes.

    @@ -191,10 +191,10 @@ provides a "Cancel" button.  Press the "Cancel" button to stop the disassembly process.  Note: this will not undo any disassembly that has already occurred.

    -

    Press the 'F11' key to Disassemble in ARM +

    Press the 'F11' key to Disassemble in ARM mode and press the "F12" key to disassemble in Thumb mode.

    -

    Selecting Selecting Undo will return the disassembled instruction to undefined bytes.

    @@ -225,7 +225,7 @@ behavior.
  • Click OK in the dialog
    • -

    An instruction whose flow has been +

    An instruction whose flow has been modified will have its' mnemonic color modified.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DockingWindows/Docking_Windows.htm b/Ghidra/Features/Base/src/main/help/help/topics/DockingWindows/Docking_Windows.htm index 4202b1d274..0d8c005927 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/DockingWindows/Docking_Windows.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/DockingWindows/Docking_Windows.htm @@ -7,7 +7,7 @@ Docking Windows - + @@ -53,7 +53,7 @@ -

    Menu Icon

    +

    Menu Icon

    The menu icon will appear if the dockable component has a local menu.  As with the @@ -61,10 +61,10 @@ show the menu.

    -

    Close Icon

    +

    Close Icon

    -

    Select to hide the dockable component. +

    Select to hide the dockable component. The component will be removed until you select the component's name from the tool's Window menu. Some components, such as search results, are transient and are permanently removed when you close @@ -123,7 +123,7 @@ in a new window.

    -

    To get the arrow cursors to appear, move the +

    To get the arrow cursors to appear, move the mouse near the inside edge of another component.  To get the stack cursor, move the mouse over the middle area of another component.  To get the new window cursor, move the mouse over the desktop.  The Invalid location cursor will appear when the mouse is over diff --git a/Ghidra/Features/Base/src/main/help/help/topics/DockingWindows/images/window.png b/Ghidra/Features/Base/src/main/help/help/topics/DockingWindows/images/window.png deleted file mode 100644 index 5d615b47c7..0000000000 Binary files a/Ghidra/Features/Base/src/main/help/help/topics/DockingWindows/images/window.png and /dev/null differ diff --git a/Ghidra/Features/Base/src/main/help/help/topics/EclipseIntegration/EclipseIntegration.htm b/Ghidra/Features/Base/src/main/help/help/topics/EclipseIntegration/EclipseIntegration.htm index 54cb0cd63d..d7fb178149 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/EclipseIntegration/EclipseIntegration.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/EclipseIntegration/EclipseIntegration.htm @@ -7,7 +7,7 @@ Ghidra Script Manager - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/EquatePlugin/Equates.htm b/Ghidra/Features/Base/src/main/help/help/topics/EquatePlugin/Equates.htm index a3dbeb780d..06663f5430 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/EquatePlugin/Equates.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/EquatePlugin/Equates.htm @@ -7,7 +7,7 @@ Equates - + @@ -42,7 +42,7 @@ contain spaces and special characters. Duplicate equate names are not allowed.

    -

    NoteIt should be noted that for the purposes of this document, "scalars" refers to scalar values +

    NoteIt should be noted that for the purposes of this document, "scalars" refers to scalar values contained in code units. A code unit is an instruction operand or other data element.

    @@ -136,7 +136,7 @@

    Note The list of strings shown in the Set + "help/shared/note.png"> The list of strings shown in the Set Equate dialog are generated from two sources. The first source is all the currently assigned equates to the given value. The other source is all the Enum datatypes that exist in all the open datatype archives. If an @@ -145,13 +145,13 @@

    NoteThe open data type archives + "help/shared/note.png">The open data type archives contain valid enums and "fake" enums. The fake enums are created from #define values (parsed from .h files), specifically so that they will be available in the Set Equate dialog.

    Note Each entry in the dialog is color-coded based upon how it is being used + "help/shared/note.png"> Each entry in the dialog is color-coded based upon how it is being used as an equate.

      @@ -256,7 +256,7 @@
        -
      1. Select the Code Browser menu option WindowSelect the Code Browser menu option WindowEquates Table to bring up the Equates Table window.
      2. Right-mouse-click on the Equate to be deleted and select Delete.
        3. @@ -354,7 +354,7 @@

        To view the Equates Table select the Code Browser menu option WindowEquates Table to bring up the Equates Table + "help/shared/arrow.gif" border="0">Equates Table to bring up the Equates Table window.

        You can re-order the columns in the Equates table by dragging the header to another @@ -369,7 +369,7 @@

        Note Each equate is color-coded based upon how it is being used.
        + "help/shared/note.png"> Each equate is color-coded based upon how it is being used.

        1. @@ -460,16 +460,16 @@ operands.

          -

          The convert actions also work on an +

          The convert actions also work on an instruction selection. Just make a selection then choose an operand scalar value to convert. All matching instruction scalar values in the selection will be converted.

          -

          Based upon how an instruction +

          Based upon how an instruction is implemented by its' associated language module, a hexadecimal operand which appears to be negative may in fact be a positive scalar with negative sign '-' character prepended. In such cases, the convert action may not produce the expected result.

          -

          The presence of a primary reference +

          The presence of a primary reference on an operand may prevent rendering of the converted scalar value since reference markup takes precedence over equates and data formatting.

        diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm index 78f8e89da5..fd5950f946 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ExporterPlugin/exporter.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Exporting Files - + @@ -69,7 +69,7 @@
      3. Make sure the program to export is the currently open program in the CodeBrowser tool.
        4. -
      4. Invoke the action from the FileExport +
      5. Invoke the action from the FileExport File... menu item.
      6. Use the Exporter Dialog that appears to configure the @@ -234,7 +234,7 @@

        The text-fields in this panel specify the width, in number of characters, to use when displaying program elements in the output file.

        -

        Setting a width to zero (0) +

        Setting a width to zero (0) effectively excludes it from the output file.

    @@ -294,7 +294,7 @@ fields to be color-matched to those in the Code Browser. The hyper-linking allows navigation similar to that supported in the Code Browser.

    -

    The HTML Options are identical +

    The HTML Options are identical the ASCII Options.

    @@ -346,18 +346,18 @@ the primary (first) file source will saved to the specified destination file. -

    This exporter is only +

    This exporter is only operational when the program has at least one file-backed byte source. This will be reflected in the Memory Map's Byte Source column, which entries that begin with File:

    -

    Writing back a modified Memory +

    Writing back a modified Memory Map is not supported.

    -

    Relocation bytes are always +

    Relocation bytes are always restored to their original values, even if the user modifies them.

    -

    Programs written to disk with +

    Programs written to disk with this exporter may be runnable on your native platform. Use caution when exporting potentially malicious programs.

    @@ -371,7 +371,7 @@ Importer     and there is only one memory block, then this exporter allows recreation of the original file.

    -

    Only initialized memory blocks +

    Only initialized memory blocks are included in the output file.

    @@ -382,7 +382,7 @@ re-import files in this format using the XML Importer.

    -

    The +

    The XML Options are identical the XML Importer Options.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm b/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm index 532431db8b..b6e3b3149f 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FallThroughPlugin/Override_Fallthrough.htm @@ -3,7 +3,7 @@ Override Fallthrough Addresses - + @@ -51,7 +51,7 @@
  • Position the cursor on an instruction.
  • Right mouse click and select FallthroughSet... to display the dialog.
    • + "help/shared/arrow.gif">Set... to display the dialog.
  • Select the User radio button.
    • @@ -67,7 +67,7 @@ instructions that are skipped over via setting the fallthrough address are not included in the selection. 

    -

    +

    Just below the overridden address will be a comment indicating the override, containing the text Fallthrough Override, along with the updated fallthrough address.

    @@ -93,10 +93,10 @@ or position the cursor at an instruction.
  • Right mouse click and select FallthroughAuto override
    • + "help/shared/arrow.gif">Auto override -

    The Auto Override option is disabled +

    The Auto Override option is disabled for a single instruction if the instruction's fallthrough was already overridden.

    @@ -112,10 +112,10 @@ or position the cursor at an instruction whose fallthrough address was overridden.
  • Right mouse click and select FallthroughClear Overrides
    • + "help/shared/arrow.gif">Clear Overrides -

    The Clear Overrides option is disabled +

    The Clear Overrides option is disabled for a single instruction if the instruction's fallthrough address was not overridden.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FileSystemBrowserPlugin/FileSystemBrowserPlugin.html b/Ghidra/Features/Base/src/main/help/help/topics/FileSystemBrowserPlugin/FileSystemBrowserPlugin.html index 5dff6533e5..c38bce26b3 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FileSystemBrowserPlugin/FileSystemBrowserPlugin.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/FileSystemBrowserPlugin/FileSystemBrowserPlugin.html @@ -4,7 +4,7 @@ - + FileSystem Browser diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FlowSelection/Selection_By_Flow.html b/Ghidra/Features/Base/src/main/help/help/topics/FlowSelection/Selection_By_Flow.html index dea48ac82f..f5d6010163 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FlowSelection/Selection_By_Flow.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/FlowSelection/Selection_By_Flow.html @@ -7,7 +7,7 @@ Selecting - + @@ -39,10 +39,10 @@ selections, use one of the following two actions, respectively:
      -
    • From the menu bar choose Select - Scoped FlowForward Scoped Flow
      • -
    • From the menu bar choose Select - Scoped FlowReverse Scoped Flow
      • +
    • From the menu bar choose Select + Scoped FlowForward Scoped Flow
      • +
    • From the menu bar choose Select + Scoped FlowReverse Scoped Flow

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Archive_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Archive_Project.htm index 1dc150b05e..2173064ccc 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Archive_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Archive_Project.htm @@ -4,7 +4,7 @@ Archive Project - + @@ -44,7 +44,7 @@ tools.)
  • From the Ghidra Project Window, select FileArchive Current + src="help/shared/arrow.gif" border="0">Archive Current Project...
  • From the Archive Current Project dialog, specify the Archive File where the @@ -54,7 +54,7 @@

    -

    The file +

    The file name must end with a '.gar' extension.

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Close_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Close_Project.htm index e3f75d34bf..7cca447455 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Close_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Close_Project.htm @@ -4,7 +4,7 @@ Close Project - + @@ -18,7 +18,7 @@

      To close a project:

        -
      1. Select FileClose Project from the +
      2. Select FileClose Project from the menu.
      3. If there are unsaved changes, Ghidra will display the  Save Modified Files diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm index ca15eb9e72..189c9db0ea 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Connecting_Tools.htm @@ -4,7 +4,7 @@ Connecting Tools - + @@ -56,7 +56,7 @@ move the cursor in Tool A, the location change is reflected in Tool B. Conversely, if you move the cursor in Tool B, the location change is reflected in Tool A.

        -

        Drag and drop tool +

        Drag and drop tool icons is the quickest way to connect two tools.

        @@ -67,7 +67,7 @@

        You manually connect tools by selecting the ToolsConnect + border="0" src="help/shared/arrow.gif">Connect Tools... option from the Ghidra Project Window.

        @@ -113,13 +113,13 @@
      4. Select the check box for the event of interest in the Event Names list.
      -

      When you select a +

      When you select a check box for an event, the connection is established immediately. The OK button - dismisses the dialog, as does selecting the + dismisses the dialog, as does selecting the button. There is no "cancel" associated with connecting tools. 

      -

      The manual connection +

      The manual connection is useful only if you want to control specific events between the tools. From the Connect Tools dialog, the easiest way to connect all tools for all events is to click on the Connect All button. This action will connect tools in both directions, @@ -127,7 +127,7 @@ "#AutomaticToolConnection">automatic connection.  Conversely, disconnect all tools for all events by clicking on the Disconnect All button.

      -

      Some Notes on +

      Some Notes on Connecting Tools:

        @@ -186,7 +186,7 @@
        -

        When you deselect a +

        When you deselect a check box for an event, the connection is terminated immediately.

        diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Creating_a_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Creating_a_Project.htm index b5da143772..b70124e9a1 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Creating_a_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Creating_a_Project.htm @@ -4,7 +4,7 @@ Creating a Project - + @@ -23,7 +23,7 @@

        To create a new non-shared project:

          -
        1. Select the FileNew +
        2. Select the FileNew Project... menu option from the Ghidra Project Window.
        3. The first panel of the New Project wizard is @@ -61,7 +61,7 @@

          Creating a Shared Project

          -

          The discussion for this +

          The discussion for this section assumes the following:

            @@ -82,7 +82,7 @@

            To create a shared project, 

              -
            1. Select the FileNew +
            2. Select the FileNew Project... menu option from the Ghidra Project Window; the first panel of the New Project wizard is displayed.
              3. @@ -110,7 +110,7 @@
            -

            Refer to the Refer to the Troubleshooting page if you fail to connect to the Ghidra Server.

            @@ -184,12 +184,12 @@ out. 
          -

          If you are creating a +

          If you are creating a project against an existing repository, then you will not see the Project Access panel as part of the New Project wizard.  After you have opened the shared project, and if you are an administrator in the existing repository, then you can display and modify user privileges by choosing the ProjectEdit Project Access List... option. 

          diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Deleting_a_Ghidra_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Deleting_a_Ghidra_Project.htm index 9eb4060c3a..ce998dc20f 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Deleting_a_Ghidra_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Deleting_a_Ghidra_Project.htm @@ -4,7 +4,7 @@ Deleting a Ghidra Project - + @@ -16,13 +16,13 @@ should be exercised when using this function. You may want to archive the project first, close it, and then delete it.

          -

          You can delete a project if the project is not +

          You can delete a project if the project is not your current project.

          To delete a project,

            -
          1. Select FileDelete +
          2. Select FileDelete Project from the menu. The Delete a Ghidra Project dialog will appear.
          diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Edit_Plugin_Path.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Edit_Plugin_Path.htm index 783fdb5648..7cc8d0105b 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Edit_Plugin_Path.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Edit_Plugin_Path.htm @@ -4,7 +4,7 @@ Edit Plugin Path - + @@ -20,7 +20,7 @@

          - + All plugins discovered by Ghidra can be displayed in the Configure dialog for all tools. All known data types are shown in the -

          After you make a change +

          After you make a change to the plugin path, you must restart Ghidra to see the effects.

          @@ -68,7 +68,7 @@

          To add a Plugin Path,

            -
          1. From the Ghidra Project Window, select EditFrom the Ghidra Project Window, select Edit Plugin Path...
          2. @@ -112,7 +112,7 @@ to move the path down in the list. 
          -

          The search order is +

          The search order is important when you have different versions of a plugin in different jar files. The first class that is loaded is the one that you will be using when you run Ghidra. 

          @@ -125,7 +125,7 @@
            -
          1. From the Ghidra Project Window,  select EditFrom the Ghidra Project Window,  select Edit Plugin Path...
          2. Select a User Plugin Path.
            3. @@ -155,7 +155,7 @@
          -

          When you click on the +

          When you click on the Apply or OK button, your preferences file in your <home>/.ghidra/.ghidra-<version> @@ -167,7 +167,7 @@

          -

          If you have a tool that +

          If you have a tool that was built with Plugins that came from the paths that you removed, you will get an error message listing each Plugin that could not be found when you re-open the project or when you launch that tool.

          diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Extensions.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Extensions.htm index 3ef0ad739c..72b5cfd911 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Extensions.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Extensions.htm @@ -3,7 +3,7 @@ Extension Installation - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm index 2a1d32f400..99da150e3c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end.htm @@ -4,7 +4,7 @@ Ghidra Front End - + @@ -28,7 +28,7 @@ "Restore_Project.htm">restoring an archived project          . These plugins may be added to other tools. 

          -

          The options for archiving +

          The options for archiving and restoring a project will show up only in the Ghidra Project window, even though the plugins providing these options can be added to other tools.

          @@ -133,7 +133,7 @@ editing.
        -

        You cannot create +

        You cannot create a sub-folder of a folder that you do not own.

        @@ -146,7 +146,7 @@
      1. Select a file or folder; you may also select multiple folders and files. -

        If you select a +

        If you select a folder, then any selections that are descendants of this folder are ignored.

        2. @@ -169,7 +169,7 @@
      2. Select a file or folder; you may also select multiple folders and files. -

        If you select a +

        If you select a folder, then any selections that are descendants of this folder are ignored.

        3. @@ -181,7 +181,7 @@
      3. Right mouse click and choose the Paste option. 
      -

      You cannot move a +

      You cannot move a file that is in use.

      @@ -198,10 +198,10 @@
    1. Drop the object on a folder.
    -

    You will not get a +

    You will not get a valid drop target for folders that you do not own.

    -

    If you release the +

    If you release the Ctrl key during the drag, the operation changes to a move if you are dragging from a folder that you own. Dragging files from another user always results in a copy, regardless of whether you hold down the Ctrl key.

    @@ -219,7 +219,7 @@ -

    If a folder or file +

    If a folder or file already exists in the destination folder, Ghidra will append a ".copy" to the name to make it unique.

    Expand/Collapse

    @@ -276,14 +276,14 @@
  • Select the folder or file or select multiple folders and files. -

    If you select a +

    If you select a folder, then any selections that are descendants of this folder are ignored.

  • Right mouse click and choose the Delete option.
    • -

    The Delete option +

    The Delete option is disabled for a file that is in use.

    @@ -302,10 +302,10 @@

    Duplicate names are not allowed within the same folder.

    -

    You cannot rename a +

    You cannot rename a file that is in use. 

    -

    You cannot rename +

    You cannot rename your project folder.

    @@ -336,10 +336,10 @@

    The icon for the file is updated to indicate the read only state. When you right mouse click, a check mark shows up in the Read-Only option.

    -

    A read-only +

    A read-only Program must be saved to a new name if you make changes to it.

    -

    You cannot change +

    You cannot change the read-only state of a file while it is in use.

    @@ -372,7 +372,7 @@
    1. Select the file.
      2. -
    2. Right mouse click and choose Open WithRight mouse click and choose Open With<tool name>.
    @@ -558,7 +558,7 @@

    To view the data from another project:

      -
    1. Select Project +
    2. Select Project View Project...
    3. A file chooser is displayed; the default location is the projects folder in the @@ -591,7 +591,7 @@

      You can copy and paste folders (via menus or drag and drop) and files from the other view to your folders. 

      -

      You do not have to +

      You do not have to hold the Ctrl key down when you drag from the other view since this cannot be a move operation, as this view is always read-only.

      @@ -613,7 +613,7 @@

      To view the data from a server-based repository:

        -
      1. Select Project +
      2. Select Project View Repository...
      3. A repository chooser is displayed; allowing you to specify a Ghidra Server @@ -646,8 +646,8 @@

        To view a recently opened project or repository,

          -
        1. Select Project - View Recent +
        2. Select Project + View Recent <project path or repository URL>
        3. @@ -667,8 +667,8 @@

          To close a view, select ProjectClose View + "help/shared/arrow.gif" border="0">Close View <project path/repository URL>, OR click on the small 'X' on the specific view tab, OR right mouse click on the corresponding view tab and choose the Close @@ -681,9 +681,9 @@

          To close all read-only views at once, select Project + "4">Project Close ViewClose All Read-Only Views.

          The tabbed pane for read-only Project data is removed from the Project Window.

          @@ -704,7 +704,7 @@
        4. Right mouse click on the selected tree node and choose the Copy option.
        5. Select a destination folder in the active project tree.
        6. Right mouse click on the folder and choose the Paste as Link option. -

          Currently, linked-file types are +

          Currently, linked-file types are currently limited to Program and Data Type Archive files only. The Past as Link menu item will be disabled for unsupported file content types or for other unsupported situations such as internal @@ -720,10 +720,10 @@ connection password when accessing a linked folder or file.

          Within a project file chooser dialog a linked-folder may be expanded in a similar fashion to local folders provided any neccessary repository connection can be completed.

          -

          Add to Version Control... is supported +

          Add to Version Control... is supported for repository folder and file links only and will be disabled for links to a local project.

          -

          Currently, linked-files only provide access +

          Currently, linked-files only provide access to the latest file version and do not facilitate access to older file versions.

          The project window below shows a Program file-link "Program1" which is linked to the same file in the viewed project. Hovering the mouse over a linked-file will show the URL @@ -763,8 +763,8 @@

            -
          1. Select Project - WorkspaceAdd...
            2. +
          2. Select Project + WorkspaceAdd...
          3. A dialog is displayed; enter a new workspace name. Duplicate workspace names are not allowed.
            4. @@ -773,7 +773,7 @@ Click on the OK button; the newly created workspace becomes the current workspace; the name is added to the list of workspaces in the combo box. -

            If you leave +

            If you leave "Workspace" as the new workspace name in the dialog and click on OK, a one-up number is appended to the name to make it unique.

            @@ -787,8 +787,8 @@
            1. Select ProjectWorkspaceRename...
              2. + "help/shared/arrow.gif" border="0">WorkspaceRename...
            2. A dialog is displayed.
              3. @@ -804,8 +804,8 @@
              1. Select ProjectWorkspaceDelete...
                2. + "help/shared/arrow.gif" border="0">WorkspaceDelete...
              2. A dialog is displayed to confirm your delete request.
                3. @@ -834,8 +834,8 @@
                1. Select ProjectWorkspaceSwitch...
                  2. + "help/shared/arrow.gif" border="0">WorkspaceSwitch...
                2. Switches sequentially through the list of workspaces (in creation order), wrapping back to the first after the last has been reached.
                  3. @@ -859,7 +859,7 @@ drag one icon onto another icon. Those tools are connected for all tool events.

                  -

                  Tools running in +

                  Tools running in different workspaces may be connected.

            @@ -879,7 +879,7 @@ your project repository is associated with a Ghidra Server but it is not connected to it. 

            -

            If your project is not +

            If your project is not associated with a Ghidra Server, then this status panel is empty.

          @@ -892,7 +892,7 @@ list. This list controls what users have access to the project and what privileges the users have. If you have administrative privilege in the project, the option for ProjectEdit Project Access List will + "help/shared/arrow.gif" border="0">Edit Project Access List will be enabled. The dialog displayed when you select this option shows a panel that is the same as the one you see in the New Project Wizard when you set up the user list for new project. As in the New Project Wizard, this @@ -900,7 +900,7 @@

          -

          In order for a user to +

          In order for a user to show up in the Known Users list, the server administrator must add a new user to the Ghidra Server.   This is accomplished from a command shell on the server system using the server/svrREADME.html file in the installation directory for use of this administration command.

          -

          If the user does not have administrative privilege in the project, the user will not be able to view +

          If the user does not have administrative privilege in the project, the user will not be able to view this full dialog and make edits. Instead, the option for ProjectView Project Access List will be enabled, which will display + "help/shared/arrow.gif" border="0">View Project Access List will be enabled, which will display the following dialog and allow the user to view the project users and their current access privileges only.

          @@ -921,7 +921,7 @@

          If your project is associated with a Ghidra Server that is using Ghidra password - authentication, then the menu item, ProjectProjectChange Password... will be present. Use this option when you want to change your password. A dialog is displayed to confirm your request, as shown below.

          @@ -933,7 +933,7 @@

          -

          When you initially +

          When you initially connect to the Ghidra Server using password authentication, your default password is "changeme".  The default password expires after 24 hours so you must change your password as soon as possible. If your diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end_Menus.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end_Menus.htm index e37c770105..5536640baf 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end_Menus.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Ghidra_Front_end_Menus.htm @@ -4,7 +4,7 @@ Ghidra Front end Menus - + @@ -23,7 +23,7 @@ active project. These "special" Plugins can also be added to any tool; however, the archive and restore options show up only in the Ghidra Project Window even though the plugins providing these options can be added to other tools. To bring up the Configure Tool - Plugins  dialog, select the File + Plugins  dialog, select the File Configure... option.

          @@ -49,10 +49,10 @@
          -

          Adding or removing +

          Adding or removing Plugins may cause menu options to change.

          -

          The configuration for +

          The configuration for your Project Window is saved when you save your Project.

          @@ -86,7 +86,7 @@ dialog.

          To bring up the Options dialog, select EditOptions...

          + "help/shared/arrow.gif" border="0">Options...

          Related Topics: 

          @@ -111,7 +111,7 @@ associated with this server.

          To configure, choose EditSet PKI Certificate.... A + "help/shared/arrow.gif" border="0">Set PKI Certificate.... A file chooser is displayed; select your PKI certificate file and select the Set Certificate button. You must restart Ghidra in order for the setting to take effect. When you connect to the server the next time you run Ghidra, you will be prompted for the @@ -120,7 +120,7 @@

          -

          If the Ghidra Server +

          If the Ghidra Server is not using PKI Certificates for user authentication, you can ignore this menu option.

          7. @@ -131,7 +131,7 @@

          To exit Ghidra,

            -
          • Select File +
          • Select File Exit Ghidra option on the Project Window, OR
          @@ -140,14 +140,14 @@
            -
          • Select File +
          • Select File Exit Ghidra option from a running tool.
          -

          If you have made +

          If you have made changes to read-only files, then the Read-Only Files dialog will appear. It will indicate that you must do a Save As to save these files to a new name. You can choose to Cancel and go perform the diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Opening_a_Ghidra_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Opening_a_Ghidra_Project.htm index 0382e5688d..c948bada67 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Opening_a_Ghidra_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Opening_a_Ghidra_Project.htm @@ -4,7 +4,7 @@ Opening a Ghidra Project - + @@ -21,7 +21,7 @@ workspace. Other viewed projects are restored.

          -

          Projects that were +

          Projects that were created using a release of Ghidra prior to 3.0 can be viewed only. You can drag the data from the old project to your current project.

          @@ -34,7 +34,7 @@

          To open a project:

            -
          1. From the Ghidra Project Window, select FileFrom the Ghidra Project Window, select FileOpen Project.... The Open a Ghidra Project dialog appears.
          @@ -47,7 +47,7 @@
        -

        The project name can be +

        The project name can be of any length.  The name of the project has the same restrictions that the operating system imposes on file names.  A Ghidra Project name must have the .gpr extension.

        diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Project_Info.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Project_Info.htm index 0c4fd4ea26..de1cdfdec4 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Project_Info.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Project_Info.htm @@ -4,7 +4,7 @@ Project Info - + @@ -73,7 +73,7 @@

        To access Project Information, select ProjectView Project Info... from the View Project Info... from the Ghidra Project Window. The image below shows information and functionality for a shared project:

        @@ -96,7 +96,7 @@ Access Level indicates your privileges in the project (Administrator, Read Only, or Read/Write). The User Access Level is only displayed while in a connected state.

        -

        As +

        As of version 5.5 Ghidra utilizes an Indexed Filesystem for storage of project files, however, projects created prior to version 5.5 utilize a Mangled Filesystem. The Mangled Filesystem uses a name mangling scheme for files @@ -151,7 +151,7 @@

        Press the Next >> button to connect to the specified server and port.

        -

        If you +

        If you are changing the Ghidra Server name or port number and you fail to connect, refer to the Troubleshooting @@ -203,12 +203,12 @@

      -

      If you are +

      If you are associating your project with an existing repository, then you will not see the Project Access panel as part of the Change Shared Project Information wizard.  If you are an administrator in the existing repository, then you can display and modify user privileges by choosing the ProjectEdit Project Access List... option. 

      @@ -222,7 +222,7 @@
      -

      +

      If one or more checked-out files do not match-up properly with the new repository you will be prompted to allow these checkouts to be terminated and converted to private .keep files. Such file conversion will prevent such files from ever being checked-in and @@ -245,7 +245,7 @@ any files that you have opened. Closing all of your active tools (e.g., CodeBrowser) may be the simplest way to accomplish this.

      -

      You will lose all +

      You will lose all version history for files under local version control after you convert your project.

      @@ -263,10 +263,10 @@ on versioned files. From the warning dialog, click on the Convert button to complete the conversion process. 

      -

      The conversion +

      The conversion process cannot be undone.

      -

      After you have +

      After you have converted your project, all of your files (including the ones that were under version control) become private files. You may end up with hijacked files if files of the same diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Re-opening_a_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Re-opening_a_Project.htm index 90b3c65116..2ab8f5a2b0 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Re-opening_a_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Re-opening_a_Project.htm @@ -4,7 +4,7 @@ Re-opening a Project - + @@ -23,8 +23,8 @@

      To reopen a project:

        -
      • Select File - Reopendirectory +
      • Select File + Reopendirectory path/project_name where directory_path/project_name indicates the project from the list that you wish to reopen.
      @@ -32,7 +32,7 @@

      Ghidra will close any active project. It then opens project_name and restores all of the project's configurations. 

      -

      If the project that you +

      If the project that you are re-opening is shared, then an attempt is made to connect to the Ghidra Server. If the connection was not successful, you can still diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Restore_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Restore_Project.htm index bd8e2d7b56..6a7a053a3f 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Restore_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Restore_Project.htm @@ -4,7 +4,7 @@ Restore Project - + @@ -13,17 +13,17 @@

      The Restore Project operation will create a new project from an Archived project file. Restoring a project makes it the active project.

      -

      You must close your +

      You must close your project before you can restore an archived project.

      To restore an archived project,

        -
      1. If a project is open, close it by selecting FileIf a project is open, close it by selecting FileClose Project from the Ghidra Project Window menu.
        2. -
      2. Select FileRestore +
      3. Select FileRestore Project....
      @@ -39,7 +39,7 @@ restored. Use the browse button (". . .") to locate the archive (*.gar) file.
      4. -
    4. The Restore +
    5. The Restore Directory and Project Name fields are automatically filled in when you use the browse button (". . .") to the right of the Archive File field to select the archive file.
      6. diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Saving_a_Ghidra_Project.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Saving_a_Ghidra_Project.htm index 602d6f93bb..c7fd379f43 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Saving_a_Ghidra_Project.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/Saving_a_Ghidra_Project.htm @@ -4,7 +4,7 @@ Saving a Ghidra Project - + @@ -36,12 +36,12 @@
      • From the Ghidra Project Window menu, select FileSave Project.
        • + "help/shared/arrow.gif">Save Project        .

       

      -

      You can also save your project as you You can also save your project as you exit Ghidra.

       

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/ShowMemoryUsage.htm b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/ShowMemoryUsage.htm index 03f079ebd2..fe3557a7dd 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/ShowMemoryUsage.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FrontEndPlugin/ShowMemoryUsage.htm @@ -4,7 +4,7 @@ Memory Usage - + @@ -17,7 +17,7 @@

      To display the memory usage dialog:

        -
      1. From the Project Window, Select HelpShow VM Memory from the +
      2. From the Project Window, Select HelpShow VM Memory from the menu.
      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FunctionComparison/FunctionComparison.htm b/Ghidra/Features/Base/src/main/help/help/topics/FunctionComparison/FunctionComparison.htm index 0d06c447db..40b4294fce 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FunctionComparison/FunctionComparison.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FunctionComparison/FunctionComparison.htm @@ -4,7 +4,7 @@ Function Comparison - + @@ -44,7 +44,7 @@ the gray difference code units indicates individual bytes and parts of instructions that differ between a code unit in one function and its matching code unit in the other function using the current difference settings.

      -

      The user can change these colors from the +

      The user can change these colors from the Properties action in the popup menu of the Listing View or from the Listing Code Comparison entry in the Tool Options.

      @@ -444,7 +444,7 @@ will result in a GoTo event being generated. This allows other panels (eg: the listing) to update their views accordingly.

      -

      The Remove and Go To actions described +

      The Remove and Go To actions described above will operate on the comparison panel that has focus, identified by the pink border.

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FunctionPlugin/Functions.htm b/Ghidra/Features/Base/src/main/help/help/topics/FunctionPlugin/Functions.htm index 633cfaeedd..1dfbcf0a7e 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FunctionPlugin/Functions.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FunctionPlugin/Functions.htm @@ -8,7 +8,7 @@ Functions - + @@ -98,14 +98,14 @@
    -

    As part of creating a function, function parameters +

    As part of creating a function, function parameters and local variables may also be created. See Variables for the operations on variables.

    -

    Functions may be automatically created via Functions may be automatically created via Auto Analysis.

    -

    If a function starts with an unconditional jump +

    If a function starts with an unconditional jump instruction, the function will be created as a Thunk Function if possible.

    @@ -119,9 +119,9 @@ determine the function body. The resulting code may not be contiguous.

    -

    To see the body of the function that has been +

    To see the body of the function that has been defined, place the cursor on the first instruction within the function and choose - Select Functions from the Code Browser's + Select Functions from the Code Browser's main menu.

    @@ -144,7 +144,7 @@ variables. See Stack References on how to add stack variables.

    -

    Select Subroutines will display the scope +

    Select Subroutines will display the scope of a subroutine from any address within the scope of the subroutine. It is helpful to use the Subroutines option to determine what the potential scope of a function would be if you create it.
    @@ -173,7 +173,7 @@ The cursor can be on any field at the entry point of the function.

  • Right-mouse-click, select the FunctionRe-create Function popup menu item
    • + "help/shared/arrow.gif">Re-create Function popup menu item

    To Re Create a Function, with a forced new body

    @@ -184,11 +184,11 @@ The cursor can be on any field at the entry point of the function.
  • Right-mouse-click, select the FunctionRe-create Function popup menu item
    • + "help/shared/arrow.gif">Re-create Function popup menu item
    -

    Recreating a function will kick off auto-analysis +

    Recreating a function will kick off auto-analysis on the function if there are any changes to the function's body. New parameters or locals may be created since more code may now be part of the function's body. See Variables for the operations on variables.

    @@ -211,7 +211,7 @@ Renaming the thunk allows the thunk to have a name which differs from the thunked-function. Local variables are not supported for thunk functions. -

    Within the Code Browser, double-clicking on a thunk +

    Within the Code Browser, double-clicking on a thunk function name will navigate to the associated thunked function, while thunked functions will display back-references (i.e., XREFs) to the associated thunk functions with a Ref-Type of 'T'.

    @@ -238,7 +238,7 @@ function.
    The cursor can be on any field at the entry point of the function. -
  • Right-mouse-click, select the FunctionSet +
  • Right-mouse-click, select the FunctionSet Thunked Function... popup menu item
  • The user will be prompted to specify the thunked function by label or address. The @@ -252,7 +252,7 @@ function.
    The cursor can be on any field at the entry point of the function.
    • -
  • Right-mouse-click, select the FunctionRevert +
  • Right-mouse-click, select the FunctionRevert Thunk Function... popup menu item
  • The user will be prompted to confirm the action.
    • @@ -282,7 +282,7 @@

    From either the Symbol Table or Symbol Tree, an existing External Function may be modified using the FunctionEdit + "help/shared/arrow.gif">Edit Function... popup action on the selected function node.

    Creating an External Reference @@ -327,7 +327,7 @@

    1. Right-mouse-click on the function header in the Code Browser
      2. -
    2. Select the FunctionRename Function +
    3. Select the FunctionRename Function popup menu item
    4. Enter the new function name and/or namespace, click OK. The name may also be entered @@ -356,7 +356,7 @@
      1. Right mouse-click on the function header
        2. -
      2. Select the FunctionDelete Function +
      3. Select the FunctionDelete Function popup menu item
      @@ -392,7 +392,7 @@
    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FunctionTagPlugin/function_tag_window.htm b/Ghidra/Features/Base/src/main/help/help/topics/FunctionTagPlugin/function_tag_window.htm index a8a6d01654..e931e136ee 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FunctionTagPlugin/function_tag_window.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FunctionTagPlugin/function_tag_window.htm @@ -7,7 +7,7 @@ Function Tag Window - + @@ -17,7 +17,7 @@ program. It will also show which tags are assigned to the currently-selected function. Tags may be created by the user, or loaded from a predefined set (see section on loading tags below).

    To display the Function Tag window, select the WindowFunction Tags option on the tool menu. Optionally, the + src="help/shared/arrow.gif">Function Tags option on the tool menu. Optionally, the dialog may be activated by right-clicking on a function header in the listing and selecting the Edit Function Tags option.

    @@ -77,7 +77,7 @@ multiple tag names delimited by a comma. All newly-created tags will be displayed in the Available Tags List but are NOT yet assigned to any function.

    -

    Each tag may have an associated comment that +

    Each tag may have an associated comment that is visible as a tooltip. This can be assigned after the tag has been created (see edit section below).

    @@ -108,7 +108,7 @@

    -

    An italicized tag name +

    An italicized tag name indicates that the tag was loaded from an external source and has not yet been added to the program, making it immutable. As soon as the tag is assigned to a function it becomes editable. If you delete the tag using the -

    Be aware that any external tags that have +

    Be aware that any external tags that have removed/edited will reappear with Ghidra is restarted, as these are always loaded from this file.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/FunctionWindowPlugin/function_window.htm b/Ghidra/Features/Base/src/main/help/help/topics/FunctionWindowPlugin/function_window.htm index 1876141aa5..8062da9017 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/FunctionWindowPlugin/function_window.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/FunctionWindowPlugin/function_window.htm @@ -3,7 +3,7 @@ Function Window - + @@ -13,7 +13,7 @@ Function Window

    The Functions window provides a list of functions defined in the currently open program. -To display the Function Window, select the WindowFunctions +To display the Function Window, select the WindowFunctions option on the tool menu.

    @@ -45,7 +45,7 @@ on the tool bar to make a selection in the Code Browser. To make a selection,

    The Functions window has an icon ( which contains a star ) on the tool bar that allows users to compare the functions currently selected in the table.

    -

    Note that selecting this +

    Note that selecting this will always create a new comparison. If you have an existing comparison and wish to add functions to it, you must initiate that directly from the existing comparison window itself.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/GhidraScriptMgrPlugin.htm b/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/GhidraScriptMgrPlugin.htm index fc9c19aea1..f45d72aef7 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/GhidraScriptMgrPlugin.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/GhidraScriptMgrPlugin.htm @@ -7,7 +7,7 @@ Ghidra Script Manager - + @@ -200,13 +200,13 @@

    Edits the selected script in Eclipse using the GhidraDev plugin.

    -

    Before a script can be edited in +

    Before a script can be edited in Eclipse, an Eclipse installation and workspace directory must be defined in the Tool's Eclipse Integration options.

    -

    For more information on developing +

    For more information on developing Ghidra scripts in Eclipse, see Extensions/Eclipse/GhidraDev/GhidraDev_README.html.

    @@ -229,7 +229,7 @@
    -

    The script key bindings +

    The script key bindings are stored in the Tool's Key Binding options.

    @@ -247,7 +247,7 @@

    -

    This is a This is a permanent operation.

    You cannot delete scripts in the system diff --git a/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/ScriptDevelopment.htm b/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/ScriptDevelopment.htm index 253d719d27..dd2c4a5750 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/ScriptDevelopment.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/GhidraScriptMgrPlugin/ScriptDevelopment.htm @@ -7,7 +7,7 @@ Script Development - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/GhidraServer/GhidraServer.htm b/Ghidra/Features/Base/src/main/help/help/topics/GhidraServer/GhidraServer.htm index 2c25f32c3f..de8f644b30 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/GhidraServer/GhidraServer.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/GhidraServer/GhidraServer.htm @@ -8,7 +8,7 @@ Ghidra Server - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Glossary/glossary.htm b/Ghidra/Features/Base/src/main/help/help/topics/Glossary/glossary.htm index 0e488d20e4..2711af8c57 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Glossary/glossary.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Glossary/glossary.htm @@ -8,7 +8,7 @@ xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC- Glossary - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphIntro.html b/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphIntro.html index 21530cd2f8..f68f6b0242 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphIntro.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphIntro.html @@ -4,7 +4,7 @@ Graphing - + @@ -21,4 +21,4 @@

    - \ No newline at end of file + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphServicesIntro.html b/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphServicesIntro.html index 201f64dc74..0d6dd26589 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphServicesIntro.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/Graph/GraphServicesIntro.html @@ -4,7 +4,7 @@ Graph Services - + @@ -22,4 +22,4 @@
    - \ No newline at end of file + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/HeadlessAnalyzer/HeadlessAnalyzer.htm b/Ghidra/Features/Base/src/main/help/help/topics/HeadlessAnalyzer/HeadlessAnalyzer.htm index 61a4380d8b..a85bf40cfc 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/HeadlessAnalyzer/HeadlessAnalyzer.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/HeadlessAnalyzer/HeadlessAnalyzer.htm @@ -7,7 +7,7 @@ Headless Analyzer - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm index 85bebfc22d..b54c4b83e6 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/importer.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Importer Plugin - + @@ -74,7 +74,7 @@

    Steps:

      -
    • Invoke the action from the FileImport +
    • Invoke the action from the FileImport File... menu item.
    • Select the file to import using the filechooser that appears.
      • @@ -100,7 +100,7 @@

      Steps:

        -
      • Invoke the action from the FileBatch +
      • Invoke the action from the FileBatch Import... menu item.
      • Use the filechooser dialog that appears to select a root directory for searching for @@ -126,7 +126,7 @@

        Steps:

          -
        • Invoke the action from the FileOpen File System... menu item.
          • +
        • Invoke the action from the FileOpen File System... menu item.
        • Use the dialog that appears to browse the contents of the container file and import files as desired. @@ -143,7 +143,7 @@

          Steps:

            -
          • Invoke the action from the FileAdd to +
          • Invoke the action from the FileAdd to Program... menu item.
          • Use the filechooser dialog that appears to select a root directory for searching for @@ -233,7 +233,7 @@

          - If this dialog appears as a result of the + If this dialog appears as a result of the Add To Program action, then the Language, Destination Folder, and Filename fields will be disabled since these values are already determined by the existing program.

          @@ -458,7 +458,7 @@ process, the information will be cached locally to the user's .ghidra/ directory to speed up future imports.

          -

          When running Ghidra with symbol files +

          When running Ghidra with symbol files created from an older operating system, you may receive the following warning message:

          @@ -674,7 +674,7 @@
          -

          The search order is important when you +

          The search order is important when you have different versions of a libraries in different directories. The first directory in the search path that contains a required library is the one that Ghidra will use.

          @@ -693,7 +693,7 @@
          -

          The newly added path will be placed at +

          The newly added path will be placed at the top of the list.

          @@ -720,7 +720,7 @@
          -

          +

          This option will remove any paths added manually.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraFunctionality.htm b/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraFunctionality.htm index 6164e8022b..b2284fd006 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraFunctionality.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraFunctionality.htm @@ -8,7 +8,7 @@ Ghidra Functionality - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraSupport.htm b/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraSupport.htm index 588ad13f05..37e39256e8 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraSupport.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Intro/GhidraSupport.htm @@ -8,7 +8,7 @@ Ghidra Support - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Intro/Intro.htm b/Ghidra/Features/Base/src/main/help/help/topics/Intro/Intro.htm index 81a76594f4..28a4e93d45 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Intro/Intro.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Intro/Intro.htm @@ -8,7 +8,7 @@ Introduction - + @@ -151,7 +151,7 @@

    Run the ghidraRun.bat file located in the Ghidra installation directory.

    -

    One way to run this file is to use +

    One way to run this file is to use the Windows file explorer to locate the ghidra.bat file and then simply double click on the file.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/FieldNames.htm b/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/FieldNames.htm index 091fbe61f7..01d4f6cb47 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/FieldNames.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/FieldNames.htm @@ -7,7 +7,7 @@ + href="help/shared/DefaultStyle.css"> diff --git a/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/Labels.htm b/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/Labels.htm index 80c32aa884..a619434162 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/Labels.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/LabelMgrPlugin/Labels.htm @@ -7,7 +7,7 @@ Labels - + @@ -39,7 +39,7 @@
  • Length Limit of 2000 - the name length may not exceed 2000 characters/bytes
    • -

    Note: In addition to the above restrictions, the +

    Note: In addition to the above restrictions, the use of '::' within a label name may cause problems with certain name edit dialogs which may use this as a namespace separator.

    @@ -127,7 +127,7 @@


    -

    Note: If you add a label where there is a function +

    Note: If you add a label where there is a function with a default label name, the label you add will become the function's new name. 

    @@ -175,7 +175,7 @@
    -

    Note:This field is disabled, if there is a +

    Note:This field is disabled, if there is a function with a default name at this address. The namespace will stay set to the parent namespace of the function and the label name you enter will become the new function name.
    @@ -267,7 +267,7 @@

    -

    Note:Adding a label to an address where there is a +

    Note:Adding a label to an address where there is a function with a default name results in the function name becoming the new label name.

    @@ -286,7 +286,7 @@
  • Press the OK button.
    • -

    Note:If the label appearing in an operand corresponds +

    Note:If the label appearing in an operand corresponds to an external location the Edit Label action will be replaced by Edit External Location. @@ -334,7 +334,7 @@ option. -

    Ghidra gives no confirmation +

    Ghidra gives no confirmation on Remove Label. A status message is displayed if you try to remove a default function label.

    @@ -361,7 +361,7 @@ -

    Any use of a class-namespace requires that it first be +

    Any use of a class-namespace requires that it first be created prior to associating a label or other namespace with that class-namespace. This is most easily accomplished via the Symbol Tree

    @@ -435,7 +435,7 @@ result of disassembly are not recorded in the history; however, if you rename a default label, you will see an entry in the table, as shown below.

    -

    A column for "Address" shows up in the +

    A column for "Address" shows up in the table if you are viewing the history of changes on labels at all addresses.

    @@ -456,7 +456,7 @@
  • Choose the Show Label History option.
    • -

    You can sort the label history by any of the +

    You can sort the label history by any of the columns and in ascending or descending order. By default, the history is sorted by ascending modification date (i.e., oldest date first). You can also reorder the columns by dragging the header to another column position.

    @@ -466,7 +466,7 @@

      -
    1. Select SearchSelect SearchLabel History...
    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm b/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm index ebe1ecf4a4..d7bd2eaa54 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/LanguageProviderPlugin/Languages.htm @@ -4,7 +4,7 @@ - + Processor Languages @@ -42,7 +42,7 @@ Any stored register values will be transferred if there is a register with the same name in the new language.  If a matching register can't be found those values will be removed.

    -

    +

    If your program has been added to version control in a shared project, you must first have an

    -

    +

    Once the operation completes successfully the only way to revert to the previous language (aside from attempting another Set Language) is to undo your checkout if it is versioned.  Otherwise, you must rely on a backup copy which you hopefully made prior to the operation.

    -

      +

      Set Language will fail if any old address space can not be mapped to the same size or larger address spaces within the new language.  This allows migration to larger diff --git a/Ghidra/Features/Base/src/main/help/help/topics/LocationReferencesPlugin/Location_References.html b/Ghidra/Features/Base/src/main/help/help/topics/LocationReferencesPlugin/Location_References.html index ac6b9e7006..1f884bb209 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/LocationReferencesPlugin/Location_References.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/LocationReferencesPlugin/Location_References.html @@ -7,7 +7,7 @@ Location References Dialog - + @@ -58,7 +58,7 @@ references to the address 0040767d.

    -

    You can also show +

    You can also show references to data types from the Data Type Manager. In this case, all locations where the selected data type is applied will be highlighted.

    @@ -73,11 +73,11 @@
  • Select whichever of the following is available from the popup menu:
      -
    • Select References Show References to +
    • Select References Show References to from the popup menu.
      • -
    • Select References Find References to +
    • Select References Find References to from the popup menu.
      • -
    • Select References Find Uses of +
    • Select References Find Uses of from the popup menu.
    @@ -134,12 +134,12 @@

    - + To instead make a Program Selection Highlight, use the select button mentioned above. Then, click from the menu bar Select - -> + -> Program Highlight - -> + -> Entire Selection

    @@ -167,7 +167,7 @@ the decompiled function will be shown.

    -

    You can make a +

    You can make a selection in the Code Browser from the entries in the table:

      @@ -201,7 +201,7 @@

      - When searching for references to a field of + When searching for references to a field of a composite data type via the popup menu in the Data Type Manager, you can search by name or by offset within the parent data type. This is useful when the field you seek does not have a name. @@ -210,14 +210,14 @@

      - + By default, finding uses of data types will search not only for applied data types, but also will perform dynamic discovery of data types using the Data Type Reference Finder service. This causes the search to be slower, but also reports many more type uses. To disable the dynamic searching, use the - Search-> + Search-> Dynamic Data Type Discovery tool option.

      @@ -231,7 +231,7 @@
      1. Right-mouse anywhere on the code unit*
        2. -
      2. Select References Show References to +
      3. Select References Show References to Address from the popup menu.
      @@ -250,7 +250,7 @@

      - This action will show only direct + This action will show only direct references to the current code unit. No other special reference finding will take place.

      @@ -260,7 +260,7 @@

      - see see Docking Windows - Renaming Windows

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/MemoryMapPlugin/Memory_Map.htm b/Ghidra/Features/Base/src/main/help/help/topics/MemoryMapPlugin/Memory_Map.htm index 4b68fc957e..76f53a365f 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/MemoryMapPlugin/Memory_Map.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/MemoryMapPlugin/Memory_Map.htm @@ -9,7 +9,7 @@ Memory Map - + @@ -21,7 +21,7 @@ structure of the current program.  The component provides actions for adding, renaming, moving, splitting, extending, joining, and deleting memory blocks.

      -

      When working with a versioned program within a +

      When working with a versioned program within a shared project an exclusive checkout of the program project file is required to perform any modifications to the memory map.

      @@ -56,7 +56,7 @@ mapping ratio (e.g., 2:4).
    -

    File Bytes are currently only created +

    File Bytes are currently only created by importers. At this point in time there is no capability provided by the Memory Map provider to create a new File Bytes instance.

    @@ -69,7 +69,7 @@ do not relocate with image base changes and have significant limitations in conjunction with decompilation and analysis.

    -

    To view the Memory Map, select Window +

    To view the Memory Map, select Window Memory Map from the main tool menu, or click on the    icon in the tool bar.  Note that the current Image Base Address is specified within the title bar.
    @@ -250,7 +250,7 @@

  • Uninitialized - An unitialized block will be created.
  • File Bytes - Select from a list of imported files and enter a starting offset for that file. Those bytes will be the initial value for the block.
    • -

    You can use the "Add To Program" +

    You can use the "Add To Program" using "Binary Import" to create new FileBytes that you can use here.

  • Bit Mapped - This is a block that allows bit addressing of a section @@ -347,7 +347,7 @@

    New End Address -  Enter the NEW ending address for the block. The NEW starting address will be computed.

    -

    You cannot move a block under the +

    You cannot move a block under the following conditions:

      @@ -421,7 +421,7 @@

      Block Length - Length of new split block

    • -

    Overlay type blocks cannot +

    Overlay type blocks cannot be split. 

    @@ -461,7 +461,7 @@

    Block Length - Displays the length of the block.  A new value can be entered here which will cause a corresponding change in the start address.

    -

    Overlay type +

    Overlay type blocks cannot be expanded. 

    @@ -502,7 +502,7 @@

    Block Length - Displays the length of the block.  A new value can be entered here which will cause a corresponding change in the end address.

    -

    Overlay type +

    Overlay type blocks cannot be expanded. 

    @@ -515,15 +515,15 @@ attempts to merge all selected blocks into one block.  Any "gaps" will be "filled in" with 0s. 

    -

    Caution should be used because a VERY +

    Caution should be used because a VERY large memory block can be created if the memory blocks being merged are far apart in the address space.  Ghidra will display a warning if a really large block is about to be created.  Disregarding the warning may cause Ghidra to fail with an "out of memory" error.

    -

    Only adjacent Default blocks of the same +

    Only adjacent Default blocks of the same initialization state can be merged.

    -

    Overlay type blocks cannot be merged.

    +

    Overlay type blocks cannot be merged.

    @@ -536,7 +536,7 @@ a confirmation dialog is displayed; select "yes" on the dialog to delete the block. A progress dialog is displayed while the block is being deleted. 

    -

    For large blocks that may contain many +

    For large blocks that may contain many symbols, references, instructions, etc., the delete operation may take a while to complete. You can cancel the delete operation at any time.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Misc/Appendix.htm b/Ghidra/Features/Base/src/main/help/help/topics/Misc/Appendix.htm index fc7aaa0037..6d9b575614 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Misc/Appendix.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Misc/Appendix.htm @@ -3,7 +3,7 @@ Ghidra Appendix - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Misc/Welcome_to_Ghidra_Help.htm b/Ghidra/Features/Base/src/main/help/help/topics/Misc/Welcome_to_Ghidra_Help.htm index 815f26553c..3eddb24f9c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Misc/Welcome_to_Ghidra_Help.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Misc/Welcome_to_Ghidra_Help.htm @@ -7,7 +7,7 @@ - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm b/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm index a2e4f4d0d6..739b731d61 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Navigation/Navigation.htm @@ -3,7 +3,7 @@ Navigation - + @@ -34,7 +34,7 @@

    To Perform a Go To: 

      -
    1. In the menu-bar of a tool, select Navigation In the menu-bar of a tool, select Navigation Go To...
    2. The Go To dialog will be displayed, as shown below:
      3. @@ -74,7 +74,7 @@

      Enter an address into the text area of the dialog. The value entered will be assumed to be in hexadecimal. That is, "0x1000" and "1000" are the same value.

      -

      When the program has multiple address +

      When the program has multiple address spaces and the destination address is ambiguous (based on the current location), a query results dialog will be displayed.

      @@ -195,7 +195,7 @@ sensitive option.  If more than one match is found, they are displayed in a Query Results dialog.

      -

      Even if the case sensitive option is off, +

      Even if the case sensitive option is off, if a label has an exact match, no other labels will be found.

      @@ -209,7 +209,7 @@ stored, but are generated on the fly because of a reference to that location.) If this option is off, only defined labels are searched. -

      Turning off this option can result in +

      Turning off this option can result in significantly faster results in larger programs.


      @@ -226,11 +226,11 @@ assumed to be in decimal unless it is preceeded by 0x. That is, "file(0x1000)" and "file(1000)" are different values.

      -

      Ghidra does not support storing source +

      Ghidra does not support storing source file bytes for all file formats. Searching for a file offset in these programs will always yield no results.

      -

      When the program has multiple file byte +

      When the program has multiple file byte sources and the destination address is ambiguous, a query results dialog will be displayed.

      @@ -415,7 +415,7 @@ current cursor location and proceeds either forward (next) or backwards (previous).

      -

      When searching for Instructions, Data or +

      When searching for Instructions, Data or Undefined items, Ghidra will skip all contiguous items of the same type. For example, if the cursor is on an address with an Instruction, and you go to the next Instruction, then all Instructions immediately following the current one will be skipped until a non-Instruction is @@ -645,7 +645,7 @@ href="help/topics/Search/Search_Program_Text.htm">Program Text, etc) -

      The +

      The button is only enabled after performing a

      @@ -661,7 +661,7 @@

      - The behavior of the previous action will + The behavior of the previous action will vary slightly depending upon what component is focused. It is possible for a non-Listing view to be showing a function that is not the current function in the Listing. In this case, if the Listing has focus, then the previously visited function @@ -676,7 +676,7 @@

      To clear the navigation history stack, select Navigation Clear History

      + "help/shared/arrow.gif" border="0"> Clear History

      After clearing the history, the  and buttons are disabled

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm b/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm index d0c3f3e306..fe99903c45 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/OverviewPlugin/Overview.htm @@ -7,7 +7,7 @@ Overview - + @@ -37,7 +37,7 @@
    3. Right-clicking on the margin bar will bring up a popup-menu which will at least include an option for displaying a legend for that particular overview. -

      Overview margin bars can be turned on or off using the control button +

      Overview margin bars can be turned on or off using the control button on the Listing's toolbar.

      4. @@ -68,7 +68,7 @@
    4. Uninitialized - None of the above. The address falls in an uninitialized memory block (no byte values)
    -

    Note that the overview panel only provides an +

    Note that the overview panel only provides an approximation of the contents of a program. Although the level of detail can be increased by selected a more restricted view, there may still be imprecise summaries. For instance, if a region of memory contains mostly defined data, but the particular address that is rendered in the overview @@ -83,7 +83,7 @@

    The legend indicates the colors that correspond to each type of program element shown in the overview display. The colors are specified as options and can be changed from the default values. To change the colors, click on the color, or edit the options through the Edit - Options... dialog. You can choose the color from a + Options... dialog. You can choose the color from a color chooser dialog.

    @@ -107,7 +107,7 @@
  • Uninitialized Color - color for memory that is not initialized
    • -

    To view the options, select Edit Options... on +

    To view the options, select Edit Options... on the tool, then choose the Overview node in the options tree. To change a color, double click on the color bar in the Overview Options panel. Choose the color from the color chooser dialog.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/PrintingPlugin/Printing.htm b/Ghidra/Features/Base/src/main/help/help/topics/PrintingPlugin/Printing.htm index 215c6aa6ba..3d530370ff 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/PrintingPlugin/Printing.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/PrintingPlugin/Printing.htm @@ -6,7 +6,7 @@ - +

    Printing

    @@ -23,9 +23,9 @@ spacing as code on the screen.

    1. You can optionally specify page settings (paper size, orientation, - margins, etc.). To do this, select File + margins, etc.). To do this, select File Page Setup... from the code browser tool.
      2. -
    2. To print, select File +
    3. To print, select File Print...
    4. Select the content to print as well as other printing options in the dialog that appears. Click "OK" when finished.
      5. diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Program/Ghidra_Programs.htm b/Ghidra/Features/Base/src/main/help/help/topics/Program/Ghidra_Programs.htm index cfdb874deb..52f29da846 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Program/Ghidra_Programs.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Program/Ghidra_Programs.htm @@ -3,7 +3,7 @@ Ghidra Programs - +

      Ghidra Programs

      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Closing_Program_Files.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Closing_Program_Files.htm index 2988989933..2b2388549d 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Closing_Program_Files.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Closing_Program_Files.htm @@ -7,7 +7,7 @@ Closing Program Files - + @@ -27,7 +27,7 @@

      To Close a Program File

        -
      1. From the Tool menu, select File +
      2. From the Tool menu, select File Close
      3. If changes were made to the program and they haven't been saved yet, the Save @@ -51,7 +51,7 @@ -

            If the listing +

            If the listing window is open and multiple programs are open, the program names are displayed on tabs across the top of the listing window.  Programs can be closed by selecting the appropriate tab and pressing the corresponding "x" button.

        @@ -62,7 +62,7 @@
          -
        1. From the Tool menu, select File Close +
        2. From the Tool menu, select File Close All
        3. For each program that was changed, the Save Program? dialog appears.
          4. @@ -75,7 +75,7 @@
            -
          1. From the Tool menu, select File Close +
          2. From the Tool menu, select File Close Others
          3. For each of the other programs that was changed, the Save Program? dialog appears.
            4. diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Navigating_Program_Files.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Navigating_Program_Files.htm index 96861554c4..5d6b0943f4 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Navigating_Program_Files.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Navigating_Program_Files.htm @@ -7,7 +7,7 @@ Navigating Program Files - + @@ -103,7 +103,7 @@

            Go To Program Popup Window

            To execute this action, from the Tool menu, select NavigationGo To Program....

            + "help/shared/arrow.gif" border="0">Go To Program...            .

        @@ -116,7 +116,7 @@ have a previously active program.

        To execute this action, from the Tool menu, select NavigationGo To Last Active Program.

        + "help/shared/arrow.gif" border="0">Go To Last Active Program        .

        diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Opening_Program_Files.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Opening_Program_Files.htm index 608d12ffb5..83323e5f2d 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Opening_Program_Files.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Opening_Program_Files.htm @@ -7,7 +7,7 @@ Opening Program Files - + @@ -31,7 +31,7 @@
        1. To open a program file in the currently displayed tool, select File Open... from the Ghidra Tool's menu.
          2. + "help/shared/arrow.gif" border="0"> Open... from the Ghidra Tool's menu.
        2. The Open Program dialog is displayed.
        @@ -119,7 +119,7 @@


        -      +      The icon in the Tool Chest indicates the CodeBrowser tool. 

        diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Annotation.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Annotation.htm index 7e940aeac7..203b687a58 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Annotation.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Annotation.htm @@ -7,7 +7,7 @@ Program Annotation - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Options_Dialog.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Options_Dialog.htm index 34f75f90b8..65d65f1982 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Options_Dialog.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Program_Options_Dialog.htm @@ -10,7 +10,7 @@ Program Options Dialog - + @@ -38,7 +38,7 @@
        1. -

          Select Edit Program +

          Select Edit Program Options....

          2. diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Saving_Program_Files.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Saving_Program_Files.htm index b1826c65bf..f6c2c1ca10 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Saving_Program_Files.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramManagerPlugin/Saving_Program_Files.htm @@ -7,7 +7,7 @@ Saving Program Files - + @@ -26,7 +26,7 @@
            -
          1. From the Ghidra Tool's menu, select File Save.
            2. +
          2. From the Ghidra Tool's menu, select File Save.
          @@ -47,7 +47,7 @@
            -
          1. From the Ghidra Tool's menu, select File Save As....
            2. +
          2. From the Ghidra Tool's menu, select File Save As....
          3. The Save As... dialog appears.
          @@ -77,7 +77,7 @@
            -
          1. From the Ghidra Tool's menu, select File Save All.
            2. +
          2. From the Ghidra Tool's menu, select File Save All.
          diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/Program_Organizations.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/Program_Organizations.htm index e3154fb931..6c58fc9c70 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/Program_Organizations.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/Program_Organizations.htm @@ -7,7 +7,7 @@ Program Organizations - + @@ -55,8 +55,8 @@

          To organize a folder or fragment by modularization and block model, right mouse click on a folder or fragment in the Program Tree and choose Modularize BySubroutineModularize BySubroutine<block model name>.

          Provided by: ModularizeAlgorithmPlugin

          diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/program_tree.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/program_tree.htm index 067409b412..c8294e3f7c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/program_tree.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/program_tree.htm @@ -8,7 +8,7 @@ Program Tree - + @@ -84,7 +84,7 @@
        -

        After you are done editing the name, the icon for the +

        After you are done editing the name, the icon for the fragment indicates that it is empty (). You can drag code units from the Code Browser and drop them onto the empty node. The icon changes to indicate that the fragment is not empty.

        @@ -101,7 +101,7 @@
      -

      The default name of the fragment is the name of the +

      The default name of the fragment is the name of the first address in the set of code units that you dragged. This operation actually moves the code units to this fragment. If the first code unit in the set that you are dragging has a label, then the name of the fragment defaults to this label @@ -149,7 +149,7 @@

    5. The cell editor for the tree is displayed. Enter a new name.
    -

    Duplicate folder or fragment names are not allowed, +

    Duplicate folder or fragment names are not allowed, regardless of where they are in the hierarchy. If you enter a name that already exists, an error message is displayed; the name reverts back to its original name. Hit the <Esc> key to cancel editing at any time.

    @@ -197,7 +197,7 @@

    The code units are moved from the source fragment to the destination Fragment.

    -

    Drag and drop the +

    Drag and drop the selection on a folder to create a new fragment.

    @@ -220,7 +220,7 @@
  • Select a folder in the Program Tree.
  • Right mouse click and choose the Sortby Address option.
    • + "help/shared/arrow.gif">by Address option.
    @@ -234,7 +234,7 @@
  • Select a folder in the Program Tree.
  • Right mouse click and choose the Sortby Name option.
    • + "help/shared/arrow.gif">by Name option.
    @@ -288,7 +288,7 @@ -

    This option is available for a multiple selection of +

    This option is available for a multiple selection of fragments and/or folders.

    Provided By: ProgramTreeSelectionPlugin

    @@ -358,7 +358,7 @@ option. -

    The Go To in View option is always enabled +

    The Go To in View option is always enabled regardless of whether the folder or fragment is in the view or not. 

    @@ -405,7 +405,7 @@
    -

    The program tree can be configured, via tool +

    The program tree can be configured, via tool options, such that a double-click performs a simple navigation, or the Replace View action. The default behavior for a double-click is to perform the Replace View action.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/view_manager.htm b/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/view_manager.htm index 62d6e24979..84bb329c27 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/view_manager.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ProgramTreePlugin/view_manager.htm @@ -7,7 +7,7 @@ Program Tree View Management - + @@ -97,7 +97,7 @@

    Re-open the program tree by selecting it from the list of views described above.

    -

    You cannot close the +

    You cannot close the last program tree..

    @@ -120,7 +120,7 @@ tool. The list of existing views will show the new name.

    -

    If you move focus out +

    If you move focus out of the edit window, the edit window is removed, and no change is made to the name.

    Click the button to @@ -138,7 +138,7 @@

  • Choose the "Delete" option. 
    • -

    You cannot delete the +

    You cannot delete the last program tree. You must first create a new default tree, then delete your other tree.

    Click the button to diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Project/Ghidra_Projects.htm b/Ghidra/Features/Base/src/main/help/help/topics/Project/Ghidra_Projects.htm index 6e6457a753..6cbf48fd7e 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Project/Ghidra_Projects.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Project/Ghidra_Projects.htm @@ -3,7 +3,7 @@ Ghidra Projects - +

    Ghidra Projects

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/PropertyManagerPlugin/Property_Viewer.htm b/Ghidra/Features/Base/src/main/help/help/topics/PropertyManagerPlugin/Property_Viewer.htm index 4bc2f4afe1..e659c1399e 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/PropertyManagerPlugin/Property_Viewer.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/PropertyManagerPlugin/Property_Viewer.htm @@ -10,7 +10,7 @@ Property Viewer - + @@ -44,7 +44,7 @@

     

    To display the Property Viewer window, select WindowManage Properties... from the tool menu.

    + "help/shared/arrow.gif">Manage Properties...     from the tool menu.

    In this example, a plugin has placed several source related properties on code units. Select the row for "Source File" to see all the locations in the Code Browser where a "Source File" diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/CreateOffsetReferencesTable.htm b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/CreateOffsetReferencesTable.htm index 8dd887d992..0b57f92378 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/CreateOffsetReferencesTable.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/CreateOffsetReferencesTable.htm @@ -10,7 +10,7 @@ Create Offset References Table - + @@ -39,11 +39,11 @@ the selection should not contain instructions.

  • - Right mouse click and choose the References + Right mouse click and choose the References Create Offset Reference option.
    -

    If the selection contains +

    If the selection contains instructions, then a warning message is displayed in the tool status area.

    • @@ -85,7 +85,7 @@
    -

    If the value of the data type being used +

    If the value of the data type being used as the offset does not result in a valid address for the reference, then a message is displayed in the status area of the tool. The data type will have been created, but not the reference.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References.htm b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References.htm index 2e2d32e75a..5601edf0ab 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> References - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm index f834bb6945..2d722752dd 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/References_from.htm @@ -6,7 +6,7 @@ c "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Forward References - + @@ -61,14 +61,14 @@ c within the program when you double click on an operand field within the Listing.

    -

    When a reference is placed on an operand, it +

    When a reference is placed on an operand, it will only change the rendering of that operand within the program listing if the reference is marked as 'primary'.

    -

    If a reference is placed on an instruction +

    If a reference is placed on an instruction mnemonic within the Listing, the instruction mnemonic will be underlined.

    -

    If a non-primary reference exists for an operand +

    If a non-primary reference exists for an operand (i.e., not reflected in the instruction markup), the corresponding instruction operand within the Listing will be underlined.

    @@ -92,10 +92,10 @@ c
  • Register Reference
    • -

    Ghidra does not permit mixing "types of +

    Ghidra does not permit mixing "types of references" for a given mnemonic or operand.

    -

    With the exception of Memory References, only a +

    With the exception of Memory References, only a single reference may be placed on a given mnemonic/operand.

    @@ -170,11 +170,11 @@ c in use.

    -

    Stack References should be placed on all stack +

    Stack References should be placed on all stack parameter/variable data access operands.

    -

    Stack References may only be specified for +

    Stack References may only be specified for source code units contained within a function.

    @@ -189,11 +189,11 @@ c used.

    -

    Register References should be placed only on +

    Register References should be placed only on register variable data assignment operands.

    -

    Register References may only be specified for +

    Register References may only be specified for source code units contained within a function.

    Reference Destination Symbols

    @@ -811,7 +811,7 @@ c mnemonic/operand current references) -

      Default key-bindings for actions are +

      Default key-bindings for actions are indicated with {}'s.

    @@ -820,7 +820,7 @@ c

    While there is a separate action for creating a default reference on an operand (see Creating a Default Reference below), an arbitrary reference may be also be added directly to a mnemonic or operand by using the popup menu action - References Add Reference from... . + References Add Reference from... .  This will cause the Add Reference Dialog to be displayed, allowing the user to specify any of the permitted reference types.

    @@ -829,7 +829,7 @@ c

    While the current cursor location is on the operand of an instruction or data code unit within the CodeBrowser Listing, the popup menu item References Create Default Reference* may be selected to create + "help/shared/arrow.gif" alt=""> Create Default Reference* may be selected to create the default primary reference for an operand.  This action will be disabled if the current location does not correspond to an operand field or a default reference can not be determined.  
    @@ -850,7 +850,7 @@ c is deleted, any explicit bindings to that variable will be cleared.

    -

    *The popup menu item name Create Default +

    *The popup menu item name Create Default Reference may differ based upon the type of reference which will get created:  Create Memory Reference, Create Stack Reference, Create Register Reference.

    @@ -859,13 +859,13 @@ c

    While the current cursor location is on the mnemonic/operand of an instruction or data code unit within the CodeBrowser Listing, the popup menu item References Delete References* may be selected to delete all + "help/shared/arrow.gif" alt=""> Delete References* may be selected to delete all references on the current mnemonic/operand.  This action will be disabled if the current location does not correspond to a mnemonic/operand field or references do not exist on the current mnemonic/operand. 

    -

    *The popup menu item name Delete References may +

    *The popup menu item name Delete References may differ based upon the existing reference(s):  Delete Memory References, Delete Stack Reference, Delete Register Reference, Delete External Reference.

    @@ -877,7 +877,7 @@ c

    All references "from" a data or instruction code unit can be edited and/or viewed by clicking on the code unit (or a specific operand) within the Listing and activating the Add/Edit... action via the popup menu item References Add/Edit... {'R'}.   Each time this action is + "help/shared/arrow.gif" alt=""> Add/Edit... {'R'}.   Each time this action is invoked a new instance of the References Editor panel will be displayed.  Once the panel is displayed, the  toggle button may be pushed-in to have the source location follow the current location within the  "#dragNDrop">Adding Memory References from a Selection).

    -

    +

    The table entries that match the selected source element will be gray in color.

    @@ -957,11 +957,11 @@ c -

    *With the exception of External references, +

    *With the exception of External references, both the Ref-Type and Primary? choices may be changed directly within this table.

    -

    References and symbol names corresponding to +

    References and symbol names corresponding to memory references outside of the program's defined memory blocks will be displayed in red (e.g., DAT_00000000).   These red references frequently correspond to well-known memory locations, although they could point out a bad @@ -1039,24 +1039,24 @@ c clicking on it, as well as the Type of Reference.  The available choices for Type of Reference may be constrained based upon the choosen operand.

    -

    In general, only flow references should be set +

    In general, only flow references should be set on an instruction mnemonic, unless of course the instruction has no operands.  References from data code units (e.g., addr/pointer) should always specify the scalar operand as the source, not the mnemonic (i.e., data-type).

    -

    Stack and register references may only be +

    Stack and register references may only be specified for source code units contained within a function.  Register references may only be set on operands containing a single register and in general should correspond to a WRITE Ref-Type.  

    -

    With the exception of memory references, only a +

    With the exception of memory references, only a single reference may be set for a given operand or mnemonic.

    -

    An External reference +

    An External reference may not be set on a mnemonic.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/external_program_names.htm b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/external_program_names.htm index 901705e633..fc5647cfe3 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/external_program_names.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ReferencesPlugin/external_program_names.htm @@ -7,7 +7,7 @@ External Program Names - + @@ -108,7 +108,7 @@

    Adding a New External Program Name

      -
    1. Select Window External Programs +
    2. Select Window External Programs from the main Code Browser menu.
    3. Press the Add button.
      4. @@ -118,7 +118,7 @@
    4. <> -

      If the table is sorted by Name, then +

      If the table is sorted by Name, then the name you enter will be placed at the correct position in the table to maintain the sort order. The sort icon or indicates the order and what column is @@ -133,7 +133,7 @@

      1. Select Window External Programs from the main Code Browser + "help/shared/arrow.gif" border="0"> External Programs from the main Code Browser menu.
      2. Click on the external program name that is be associated with a Ghidra program @@ -152,7 +152,7 @@
        1. Select Window External Programs from the main Code Browser + "help/shared/arrow.gif" border="0"> External Programs from the main Code Browser menu.
        2. Click on the external program name that has an association to be cleared.
          3. @@ -164,7 +164,7 @@
          1. Select Window External Programs from the main Code Browser + "help/shared/arrow.gif" border="0"> External Programs from the main Code Browser menu.
          2. Click on the external program name to be removed.
            diff --git a/Ghidra/Features/Base/src/main/help/help/topics/RegisterPlugin/Registers.htm b/Ghidra/Features/Base/src/main/help/help/topics/RegisterPlugin/Registers.htm index cd1c6cc5d5..365d8cbc20 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/RegisterPlugin/Registers.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/RegisterPlugin/Registers.htm @@ -7,7 +7,7 @@ Register Values Plugin - + @@ -150,7 +150,7 @@ changed using the adjacent drop-down menu.

            -

            If the browser cursor is on a register when +

            If the browser cursor is on a register when this dialog is invoked, then the register combo will be set to that register.


            diff --git a/Ghidra/Features/Base/src/main/help/help/topics/RelocationTablePlugin/relocation_table.htm b/Ghidra/Features/Base/src/main/help/help/topics/RelocationTablePlugin/relocation_table.htm index 379fe0f876..8a3d82af85 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/RelocationTablePlugin/relocation_table.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/RelocationTablePlugin/relocation_table.htm @@ -8,7 +8,7 @@ Relocation Table - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Repository/Merge_Program_Files.htm b/Ghidra/Features/Base/src/main/help/help/topics/Repository/Merge_Program_Files.htm index 872aaf2e93..ffb09d9b2d 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Repository/Merge_Program_Files.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Repository/Merge_Program_Files.htm @@ -9,7 +9,7 @@ Merge Program Files - + @@ -82,7 +82,7 @@

          -

          +

          If a new version of a file has been added since the user checked out the file, a merge is required at check in. This is the only time a merge is required.

          @@ -848,19 +848,19 @@
          -

          renamed Foo -> My_Foo
          - moved /MISC -> /Category1
          +

          renamed Foo -> My_Foo
          + moved /MISC -> /Category1
          changed undefined -> char

          + "help/shared/arrow.gif"> char

          In the latest version:

          -

          moved /MISC -> +

          moved /MISC -> /Category1/Category2/Category3
          changed undefined -> byte
          + "help/shared/arrow.gif"> byte

          The conflict arises because in both versions the file was moved and also because @@ -892,7 +892,7 @@

          Select a radio button to resolve the conflict.

          -

          Note:In the Merge Tool window above, the title +

          Note:In the Merge Tool window above, the title indicates the project, program and new version number that will result from the merge. Version 5 of  "helloProgram" in the "SampleProject" will be created by the merge. The source archive is indicated for each data tpe in the conflict window. The "Foo" data type @@ -909,12 +909,12 @@

          The image below shows the scenario where you:

          -

          moved /MISC /Category1/MISC

          +

          moved /MISC /Category1/MISC

          In the latest version:

          -

          moved /MISC moved /MISC /Category1/Cateogry2/Category3/MISC

    @@ -1011,7 +1011,7 @@
    -

    The scrolled listings allow you to +

    The scrolled listings allow you to see the code units in the different program versions, which may help determine the correct register value to choose. The layout of the Merge Program Context window is very similar to the Merge Listing window.

    @@ -1176,7 +1176,7 @@ in the other version.
    -

    If an instruction change conflicts with a +

    If an instruction change conflicts with a reference change, the references can be viewed by right clicking on an instruction in one of the four listings (Result, Latest, Checked Out, Original) and choosing the View Instruction Details... action. This will pop up a dialog indicating any @@ -1918,14 +1918,14 @@

    -

    changed 01 -> +

    changed 01 -> PEAR

    In the latest version:

    -

    changed 01 -> +

    changed 01 -> ORANGE

    @@ -2044,7 +2044,7 @@ longer be prompted to resolve conflicts for that property type.

    -

    Selecting the Use the selected option for +

    Selecting the Use the selected option for resolving all ... checkbox for the Space property would not affect the resolving of conflicts for any other named property. However, the user can select the checkbox for each different named property with conflicts.
    @@ -2149,7 +2149,7 @@ -

    Note: The first operand of an +

    Note: The first operand of an instruction is numbered as operand 0.

    @@ -2319,7 +2319,7 @@
  • your version removes a non-Note bookmark of a specific category and the latest version changes the description for that bookmark type and category or vice versa.
    - You cannot directly change the description + You cannot directly change the description on a non-Note bookmark through regular bookmark editing in Ghidra, but a plugin could change it programmatically.
    • @@ -2361,7 +2361,7 @@ the value in the Original version that you checked out -

    border= Notice that the above bookmarks +

    border= Notice that the above bookmarks conflict even though they are not in the same category. This is because only one Note bookmark is allowed at an address regardless of its category.

    @@ -2439,7 +2439,7 @@
    -

    If you choose to keep both comments by +

    If you choose to keep both comments by placing checkmarks in both boxes, your comment is appended to the latest comment with a new line separating them. If one of the comments is contained within the other comment, then the longer comment is kept instead of combining them with a new line @@ -2524,7 +2524,7 @@

    Select the radio button for the desired result and then select the Apply button to proceed with the merge.

    -

    When you remove an external program name that is +

    When you remove an external program name that is in conflict, it will get added back later as a result of choosing a reference that refers to that external program name.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ResourceActionsPlugin/ResourceActions.html b/Ghidra/Features/Base/src/main/help/help/topics/ResourceActionsPlugin/ResourceActions.html index f4f71b3c9a..256dca0092 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ResourceActionsPlugin/ResourceActions.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/ResourceActionsPlugin/ResourceActions.html @@ -4,7 +4,7 @@ - + Saving an Image diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ScalarSearchPlugin/The_Scalar_Table.htm b/Ghidra/Features/Base/src/main/help/help/topics/ScalarSearchPlugin/The_Scalar_Table.htm index fba6d72e6f..f97fc03004 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ScalarSearchPlugin/The_Scalar_Table.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ScalarSearchPlugin/The_Scalar_Table.htm @@ -7,7 +7,7 @@ Search for Scalars - + @@ -21,7 +21,7 @@
      -
    1. From the Tool, select Search For +
    2. From the Tool, select Search For Scalars...
    3. Select "Scalars in Range:" or "Specific Scalar:".
      4. @@ -33,7 +33,7 @@
    -

    Once a value is entered in a +

    Once a value is entered in a text field, Ctrl+M toggles the value display between the decimal and hex representation of the value in that field.

    @@ -90,7 +90,7 @@ program. Any new code units containing scalars added to the program will automatically appear in the table.

    -

    To bring up the Scalar Table, choose WindowTo bring up the Scalar Table, choose WindowScalar Table from the tool's menu. This table can be docked in the tool if desired.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm index 5eee8cdbbb..6d2872436c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Query_Results_Dialog.htm @@ -4,7 +4,7 @@ Search Results Window - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Regular_Expressions.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Regular_Expressions.htm index 5b7cf0b420..34cbbacdbf 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Regular_Expressions.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Regular_Expressions.htm @@ -7,7 +7,7 @@ Regular Expressions - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Instruction_Patterns.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Instruction_Patterns.htm index 15ff858771..f3529298f9 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Instruction_Patterns.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Instruction_Patterns.htm @@ -7,7 +7,7 @@ Search Instruction Patterns - + @@ -37,7 +37,7 @@ the selection range will have an entry in the table, even non-instructions. Users may click on an item in the table to mask it from the final search string.

    -

    Color-coding is used to indicate the code +

    Color-coding is used to indicate the code unit type. Instructions are displayed in blue, data items are tan.

    @@ -183,7 +183,7 @@

     

    -

    It should be noted that the search will look +

    It should be noted that the search will look for exact byte pattern matches, not simply the mnemonic and/or operand text. eg: If you load a program and select a RET instruction, you can't expect to use that same search pattern to find a RET instruction in a different program. Unless they represent the same @@ -198,7 +198,7 @@

    1. Select a range of instructions in the code listing.
      2. -
    2. From the Tool, select Search For +
    3. From the Tool, select Search For Instruction Patterns.
      The dialog will launch and be populated with the instruction set.
      4. diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm index 862728f466..5e53b35fc7 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Memory.htm @@ -7,7 +7,7 @@ Search Memory - + @@ -23,7 +23,7 @@
        -
      1. From the Tool, select Search +
      2. From the Tool, select Search Memory
      3. Enter a Hex String in the Value field
        @@ -138,7 +138,7 @@ -

        +

        As a convenience, if a user enters a single wildcard value within the search text, then the search string will be interpreted as if 2 consecutive wildcard characters were entered, meaning to match any byte value. @@ -329,7 +329,7 @@

      4. Next / Previous - Finds the next/previous occurrence of the byte pattern from the current cursor location; if you mouse click in the Code Browser to move focus there, you can choose Search Repeat Memory Search to go to the next/previous match + "help/shared/arrow.gif"> Repeat Memory Search to go to the next/previous match found.
      5. Search All - Finds all occurrences of the byte pattern in a
        -

        For very large Programs that may take a +

        For very large Programs that may take a while to search, you can cancel the search at any time. For these situations, a progress bar is displayed, along with a Cancel button. Click on the Cancel button to stop the search. 

        -

        Dismissing the search dialog +

        Dismissing the search dialog automatically cancels the search operation.

        @@ -353,7 +353,7 @@

        You can specify that the bytes found in the search be highlighted in the Code Browser by selecting the Highlight Search Results checkbox on the Search Options panel. To view - the Search Options, select Edit + the Search Options, select Edit Tool Options... from the tool menu, then select the Search node in the Options tree in the Options dialog. You can also change the highlight color. Click on the color bar next to Highlight Color to bring up a color chooser. Choose the new color, click on @@ -361,7 +361,7 @@ on the Options dialog. 

        -

        Highlights are displayed for the last +

        Highlights are displayed for the last search that you did. For example, if you bring up the Search Program Text dialog and search for text, that string now becomes the new highlight string. Similarly, if you invoke cursor text @@ -451,7 +451,7 @@

        -

        NoteThe previous operations can only work on a +

        NoteThe previous operations can only work on a single selected region. If multiple regions are selected, the following error dialog will be shown and the operation will be cancelled.

        diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm index 9b0b24f509..f91253bf16 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_Program_Text.htm @@ -7,7 +7,7 @@ Search Program Text - + @@ -24,7 +24,7 @@ to your current selection in the Code Browser.

        To bring up the Search Program Text dialog, as shown below, select SearchProgram Text... from the + src="help/shared/arrow.gif" border="0">Program Text... from the tool menu.



        @@ -108,7 +108,7 @@

        By default, the Program Database Search Type type is selected.

        -

        If you select the +

        If you select the All Fields button, the Listing Display Search Type button automatically becomes selected, as the Search All Fields does not apply to the Program Database. The Selected Fields option applies to either the Program Database or the Listing Display @@ -123,7 +123,7 @@

        To search for text strings incrementally,

          -
        1. Select the SearchSelect the SearchProgram Text from the Code Browser tool menu.
          2. @@ -133,11 +133,11 @@ character. 
            -
          • This field does +
          • This field does not support regular expressions.
            • -
          • If you need to +
          • If you need to search for one of the wildcard characters, then escape the character with a backslash. For example, to search for any occurrence of an asterisk, you would enter \* as the search string.
            • @@ -146,7 +146,7 @@ strings that you previously entered.
          • - If you have selected text within + If you have selected text within a single field, then if you invoke the dialog, it will automatically load that text into the Search for text box for your convenience.
            • @@ -176,7 +176,7 @@
          • - The Program Database + The Program Database Search Type does not include components of  Structures or Unions. Use the @@ -188,7 +188,7 @@
          • - If you have made a selection and it + If you have made a selection and it has been loaded into the Search for text box then the dialog will automatically select the field that the text was found in as your choice of Field to search. You have the option to add more or remove this selection @@ -225,20 +225,20 @@ dialog.
          • If you mouse click in the Code Browser to move focus - there, you can choose SearchRepeat Text Search to go to the next match found.
            • + there, you can choose SearchRepeat Text Search to go to the next match found.
        -

        Search operations do not +

        Search operations do not "wrap" once the you have reached the maximum address in memory or within a selection. Select the Backward direction check box to search backwards from your current location.

        -

        For very large Programs +

        For very large Programs that may take a while to search, you can cancel your search at any time. For these situations, an indicator for "search in progress" is displayed with a Cancel button. Click on the Cancel button to stop the search

        -

        Dismissing the search +

        Dismissing the search dialog automatically cancels the search operation. For search all, partial results are ignored if the search dialog was dismissed while the search was still in progress, therefore, the "View Results" question dialog will not be displayed.

        @@ -267,7 +267,7 @@
    -

    When performing a "Search All" on large Programs, +

    When performing a "Search All" on large Programs, the results table will appear before the search is completed. At the bottom of this window, there will be a cancel button that you can use to stop the search.

    @@ -301,7 +301,7 @@

    You can specify that the string found in the search be highlighted by selecting the Highlight Search Results checkbox on the Search Options panel. To view the Search - Options, select EditTool Options... from the tool menu, then select the Search node in the Options + Options, select EditTool Options... from the tool menu, then select the Search node in the Options tree in the Options dialog. You can also change the highlight color. Click on the color bar next to Highlight Color to bring up a color chooser. Choose the new color, click on the OK button.  The option for Highlight Color for Current Match indicates @@ -313,7 +313,7 @@

    The highlight options also apply to searching memory.

    -

    Other notes of interest +

    Other notes of interest on highlighting:

    @@ -392,7 +392,7 @@

    The Query Results display will show the search results in this default search order.

    -

    If your If your Listing fields are organized in a different order from the search order (e.g., Plate Comment is after the End of Line Comment), then as you search incrementally, your cursor potentially would move back and diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm index d46f8f3bf8..f56a1213b7 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_AddressTables.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Search for Address Tables - + @@ -36,7 +36,7 @@

    To search for address tables,

      -
    1. Select the SearchFor Address Tables... option
      2. +
    2. Select the SearchFor Address Tables... option
    3. Select the Search button; the results of the search are displayed in the table.
    @@ -62,7 +62,7 @@
    -

    For very large Programs +

    For very large Programs that may take a while to search, you can cancel the search at any time by hitting the cancel () button. A progress bar is displayed as needed.

    @@ -123,7 +123,7 @@
    -

    A warning dialog is +

    A warning dialog is displayed if address tables could not be created due to a collision with existing data at either the start of end of possible address tables. If the auto label option is selected, you can determine from the label column those address tables that were not created.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_DirectReferences.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_DirectReferences.htm index e137c0cd34..64a7d7454d 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_DirectReferences.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_DirectReferences.htm @@ -7,7 +7,7 @@ Search for Direct References - + @@ -64,7 +64,7 @@
  • Click on the address in the Code Browser.
    • -
  • Select Search for Direct +
  • Select Search for Direct References...
  • If the search will take a while, an "in progress" dialog pops up so that you can see the @@ -83,7 +83,7 @@ has no references to it.

    -

    To search for all possible +

    To search for all possible references within the current program's memory space, press Ctrl+A to select the entire program before performing the search

    @@ -97,11 +97,11 @@ -

    If you use this search multiple times on +

    If you use this search multiple times on different addresses without closing the window, one window will show all the results. Each result for an address is displayed when you click on the tab at the bottom of the window.

    -

    This plugin works with 16-bit, 16-bit +

    This plugin works with 16-bit, 16-bit segmented, and 32-bit programs.

    @@ -111,7 +111,7 @@

    If your search results came from searching on a selection, you can restore the program's selection that was used for the search. To do this, click the menu button in the Search Results button bar and select + "images/menu16.gif" alt=""> menu button in the Search Results button bar and select Restore Search Results. This will set the program selection back to what it was when you initially performed the search.

    @@ -122,7 +122,7 @@

    Once you have search results you can filter them based on the address alignment of the - From Location. To do this, click the menu + From Location. To do this, click the menu button in the Search Results button bar, pull right on Alignment, and select the desired alignment (1, 2, 4, or 8). This will limit the displayed results to those where the From Location is an address that matches the selected byte diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_Strings.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_Strings.htm index d0ef535896..35c8fc4a8e 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_Strings.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Search_for_Strings.htm @@ -7,7 +7,7 @@ Search for Strings - + @@ -22,7 +22,7 @@

    To search for strings, select Search For Strings... This will bring up the String Search Dialog + "help/shared/arrow.gif"> For Strings... This will bring up the String Search Dialog where you can configure the search criteria before initiating the search.

    @@ -191,7 +191,7 @@ Otherwise, no string will be created if a conflict exists.
    • -

    The "Make Strings" panel can be +

    The "Make Strings" panel can be hidden/shown using the / toggle button at the end of the text filter.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm b/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm index d87fa69b23..09bc57e039 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Search/Searching.htm @@ -7,7 +7,7 @@ Searching - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/SelectBlockPlugin/Select_Block_Help.html b/Ghidra/Features/Base/src/main/help/help/topics/SelectBlockPlugin/Select_Block_Help.html index 8c99b2dc6e..ecf9289d9c 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/SelectBlockPlugin/Select_Block_Help.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/SelectBlockPlugin/Select_Block_Help.html @@ -4,7 +4,7 @@ Select Bytes - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Selection/Selecting.htm b/Ghidra/Features/Base/src/main/help/help/topics/Selection/Selecting.htm index 28596c0c13..f5c755d6bd 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Selection/Selecting.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Selection/Selecting.htm @@ -7,7 +7,7 @@ Selecting - + @@ -26,7 +26,7 @@

    To create a selection using one of the predefined methods via the menu item SelectSelectionType. + "help/shared/arrow.gif">SelectionType.

    The SelectionTypes and their descriptions are as follows:

    @@ -248,9 +248,9 @@ transient, change it to a highlight.

    -

    At any time you can +

    At any time you can restore the previous selection for the current program by pressing the SelectRestore Selection.

    + "help/shared/arrow.gif">Restore Selection.

    Selection by Flow Tool Options

    @@ -260,7 +260,7 @@
    • From the tool's menu select EditTool Options...
      • + "help/shared/arrow.gif">      Tool Options...
    • Click on the Selection by Flow tree node
    @@ -371,7 +371,7 @@

    From the menu-bar of the Code Browser, select Navigation Next Selected Range

    + "help/shared/arrow.gif"> Next Selected Range

    OR

    @@ -383,7 +383,7 @@
    -

    When the Code Browser is on or after the +

    When the Code Browser is on or after the last address range in the selection, the "Next Selected Range" menu-bar and tool-bar options will be disabled.

    @@ -394,7 +394,7 @@

    From the menu-bar of the Code Browser, select NavigationPrevious Selected Range

    + "help/shared/arrow.gif">    Previous Selected Range

    OR

    @@ -404,7 +404,7 @@ () button

    -

    When the Code Browser is on or before the first +

    When the Code Browser is on or before the first address range in the selection, the "Previous Selected Range" menu-bar and tool-bar options will be disabled.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/SetHighlightPlugin/Highlighting.htm b/Ghidra/Features/Base/src/main/help/help/topics/SetHighlightPlugin/Highlighting.htm index 38e9b4db30..2e1357235f 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/SetHighlightPlugin/Highlighting.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/SetHighlightPlugin/Highlighting.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Highlighting - + @@ -15,8 +15,8 @@

    A highlight is a more permanent variation of a selection. As you may recall, a selection can be cleared simply by clicking in the Code Browser. In order to clear a highlight, you must - explicitly select the Select Highlight-> option.

    + explicitly select the Select Highlight-> option.

    You would commonly use a highlight when you do not want to lose a selection. For example, you just used Search Memory to search for @@ -36,15 +36,15 @@

  • Create a selection in the Code Browser
  • - From the menu-bar of the Code Browser, select Select -> Highlight Select -> Highlight -> Selection

    OR

    From the right mouse popup menu of the Code Browser, select Highlight - -> Entire + -> Entire Selection
    • @@ -54,15 +54,15 @@
    1. - From the menu-bar of the Code Browser, select Select -> Highlight Select -> Highlight -> Clear

      OR

      From the right mouse popup menu of the Code Browser, select Highlight - -> Clear
      + -> Clear
    @@ -71,15 +71,15 @@
    1. - From the menu-bar of the Code Browser, select Select -> Highlight Select -> Highlight -> Add Selection

      OR

      From the right mouse popup menu of the Code Browser, select Highlight - ->  Add + ->  Add Selection
    @@ -89,15 +89,15 @@
    1. - From the menu-bar of the Code Browser, select Select -> Highlight Select -> Highlight -> Subtract Selection

      OR

      From the right mouse popup menu of the Code Browser, select Highlight - ->  Subtract + ->  Subtract Selection
    @@ -109,14 +109,14 @@
  • Create a highlight in the Code Browser
  • - From the menu-bar of the Code Browser, select Select Select -> From Highlight

    OR

    From the right mouse popup menu of the Code Browser, select Select - -> Entire + -> Entire Highlight
    • @@ -145,8 +145,8 @@

    From the menu-bar of the Code Browser, select either Navigation Previous Highlighted Range or Navigation Next Highlighted Range.

    + "help/shared/arrow.gif" border="0"> Previous Highlighted Range     or Navigation Next Highlighted Range.

    OR

    @@ -164,7 +164,7 @@
    -

    When the Code Browser is on or before the +

    When the Code Browser is on or before the first address range in the highlight, the "Previous Highlight Range" menu-bar and tool-bar options will be disabled. Similarly, when the Code Browser is on or after the last address range in the highlight, the "Next Highlight Range" menu and toolbar options will be diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ShowInstructionInfoPlugin/ShowInstructionInfo.htm b/Ghidra/Features/Base/src/main/help/help/topics/ShowInstructionInfoPlugin/ShowInstructionInfo.htm index 9e12ee18d9..df002a6ff5 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ShowInstructionInfoPlugin/ShowInstructionInfo.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ShowInstructionInfoPlugin/ShowInstructionInfo.htm @@ -7,7 +7,7 @@ Show Instruction Info - + @@ -49,7 +49,7 @@

  • right-mouse-click, select Processor Manual
    • -

    Not all Ghidra language +

    Not all Ghidra language modules support this functionality.

    Implementation Note:
    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html b/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html index 55a8da90b1..377072cd56 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/Snapshots/Snapshots.html @@ -5,7 +5,7 @@ Snapshot Views - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/StackEditor/StackEditor.html b/Ghidra/Features/Base/src/main/help/help/topics/StackEditor/StackEditor.html index fd307d996c..039df8e949 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/StackEditor/StackEditor.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/StackEditor/StackEditor.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Stack Frame Editor - + @@ -35,7 +35,7 @@ to an array.
    -

  • Pull Down Menu: The icon at the top of +
  • Pull Down Menu: The icon at the top of the editor provides additional editor actions. These are: show the category path of a component's data type, edit a component's data type, edit the fields of a component, and apply a cycle group or favorite.
    @@ -72,7 +72,7 @@

    Closing the Editor

    -

    Select the Close dockable component icon in the +

    Select the Close dockable component icon in the toolbar to exit from the editor. If you have unsaved changes to your stack frame, a dialog will ask if you want to save the changes.

    @@ -313,7 +313,7 @@

    For example, Float*[5] is an array with five elements where each element is a pointer to a Float.

    -

    Pointers to arrays are not allowed. In other +

    Pointers to arrays are not allowed. In other words it is not legal for the * to be to the right of the array dimensions.

    If the data type can be various sizes, like a Pointer or CString, then the user is @@ -363,7 +363,7 @@ with the Byte cycle group. This group is Byte, Word, DWord, and QWord.

    -

    A single row of the component table must be +

    A single row of the component table must be selected to cycle a data type.

    @@ -393,7 +393,7 @@ cycling the data type to a larger sized data type. Likewise, cycling to a smaller data type will add Undefined bytes after the component being cycled.

    -

    Cycle groups can also be applied from +

    Cycle groups can also be applied from the component table's popup menu under Cycle.

    • @@ -407,7 +407,7 @@ the drop is occurring.

    -

    When a data type is dropped on a pointer +

    When a data type is dropped on a pointer component, the component becomes a pointer of that data type instead of simply being replaced by that data type. For example, dropping a Byte on a Pointer results in a Byte*, which is a pointer to a Byte. Drag and Drop is discussed further in Creating a @@ -424,11 +424,11 @@ Therefore, individual favorites are only enabled when they can be applied (i.e. they fit at the selection and the selection is a single table row).

    -

    When a favorite data type is applied to a pointer +

    When a favorite data type is applied to a pointer component, the component becomes a pointer of that data type instead of simply being replaced by that data type.

    -

    If you right mouse click on a component +

    If you right mouse click on a component where there is no selection, the selection becomes a single component selection containing that component and the popup menu will appear.

    @@ -454,7 +454,7 @@ offset on the stack.

    -

    For information about drag and drop with +

    For information about drag and drop with pointers, see Drag and Drop Basics.

    Favorites

    @@ -462,7 +462,7 @@

    Right mouse click on the empty row at the end of the table and pull right to see the Favorites. Select the favorite from the popup and it is added as the last component.

    -

    For information about Pointers as a Favorite, see +

    For information about Pointers as a Favorite, see Favorites Basics.

    @@ -485,7 +485,7 @@ of Changing a Component's Size)

    -

    For information about drag and drop with +

    For information about drag and drop with pointers, see Drag and Drop Basics.

    @@ -494,7 +494,7 @@

    Single Component Selected

    -

    If you right mouse click on a +

    If you right mouse click on a component where there is no selection, the selection becomes a single component selection containing that component and the popup menu will appear.

    @@ -503,7 +503,7 @@ component will be enabled. (see Affect of Changing a Component's Size)

    -

    For information about Pointers as a Favorite, +

    For information about Pointers as a Favorite, see Favorites Basics.

    @@ -582,7 +582,7 @@ settings:

    -

    This dialog is displayed when the last +

    This dialog is displayed when the last tool is closed that has this Program opened. So if you have two tools running with the same Program opened and you close one tool, the dialog will not be displayed until you close the second tool.

    -

    You cannot close a tool while a background +

    You cannot close a tool while a background process is running, e.g., Disassembly or Clear. You must first stop the operation, then close the tool.

    @@ -492,8 +492,8 @@
    • From the Ghidra Project Window, Select the Tools Delete Tool <tool name> + "help/shared/arrow.gif"> Delete Tool <tool name> OR,
    • Right mouse click on the icon in the Tool Chest and select the A dialog to confirm your delete request is displayed; choose the Delete button to remove the tool from your Tool Chest.

      -

      You can always get your default tools back into +

      You can always get your default tools back into your Tool Chest by selecting the Import Default Tools to Tool Chestoption. However, deleting your own custom tool from your diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Tool/ShowLog.htm b/Ghidra/Features/Base/src/main/help/help/topics/Tool/ShowLog.htm index 95190facf5..9f8cba3f1d 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Tool/ShowLog.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Tool/ShowLog.htm @@ -7,7 +7,7 @@ Show Log - + diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Tool/Tip_Of_The_Day.htm b/Ghidra/Features/Base/src/main/help/help/topics/Tool/Tip_Of_The_Day.htm index 01b0ffe5ff..b7592c0a0f 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Tool/Tip_Of_The_Day.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Tool/Tip_Of_The_Day.htm @@ -7,7 +7,7 @@ Tip of the Day - + @@ -17,7 +17,7 @@ The Tip of the Day action brings up a dialog that displays various tips for using Ghidra.

       

      -


      +


      diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Tool/ToolOptions_Dialog.htm b/Ghidra/Features/Base/src/main/help/help/topics/Tool/ToolOptions_Dialog.htm index 4719feaa67..e65a69aed7 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Tool/ToolOptions_Dialog.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Tool/ToolOptions_Dialog.htm @@ -7,7 +7,7 @@ Tool Options Dialog - + @@ -23,7 +23,7 @@

      -

      The Tool Options dialog has a filter text field +

      The Tool Options dialog has a filter text field that can be used to quickly find options relating to a keyword. Any options names or descriptions that contain the keyword text will be displayed.

      @@ -31,7 +31,7 @@

      To display the Options dialog, select EditTool Options... from the tool menu.

      + "help/shared/arrow.gif">Tool Options...       from the tool menu.

      Restoring Default Settings

      @@ -61,7 +61,7 @@ using the keyboard. Below we describe the Key Bindings options editor.

      -

      Not all key bindings are changeable +

      Not all key bindings are changeable via the tool options. For example, the following keys cannot be changed:

      • @@ -79,7 +79,7 @@
        -

        You can also change key bindings +

        You can also change key bindings from within Ghidra by pressing F4 while the mouse is over any toolbar icon or menu item. Click here for more info.

        @@ -117,7 +117,7 @@
        1. Select Edit Tool Options... from the main + "help/shared/arrow.gif"> Tool Options... from the main menu.
        2. Select the Key Bindings node in the options tree.
          3. @@ -139,7 +139,7 @@
      -

      When a key is mapped to multiple +

      When a key is mapped to multiple actions, and more than one of these actions is valid in the current context (i.e., the action is enabled), then a dialog is displayed for you to choose what action you want to perform.

      @@ -155,7 +155,7 @@
      1. Select Edit Tool Options... from the main + "help/shared/arrow.gif"> Tool Options... from the main menu.
      2. Select the Key Bindings node in the options tree.
        3. @@ -178,7 +178,7 @@
        1. Select Edit Tool Options... from the main + "help/shared/arrow.gif"> Tool Options... from the main menu.
        2. Select the Key Bindings node in the options tree.
          3. @@ -194,14 +194,14 @@
        3. Press OK to import the key bindings.
        -

        Importing key bindings will override +

        Importing key bindings will override your current key bindings settings. It is suggested that you export your key bindings before you import so that you may revert to your previous settings if necessary.

        -

        After importing you must save your +

        After importing you must save your tool (File Save Tool) if you want you changes + "help/shared/arrow.gif"> Save Tool) if you want you changes to persist between tool invocations.

      @@ -212,11 +212,11 @@

      File Close

      + alt="" border="0" src="help/shared/arrow.gif"> Close

      Data Cycle Cycle: Float, + alt="" border="0" src="help/shared/arrow.gif"> Cycle Cycle: Float, Double

      @@ -230,7 +230,7 @@ on the toolbar.
      • -

      This menu item or icon will be +

      This menu item or icon will be associated with the Key Binding. When the Key Binding key is used, this menu item or action associated with the icon will be applied.

      @@ -259,7 +259,7 @@
      1. Select Edit Options... from the Tool + "help/shared/arrow.gif"> Options... from the Tool menu.
      2. Select the Key Bindings node in the options tree.
        3. @@ -368,7 +368,7 @@

        To change Tool Options,

          -
        1. From the tool, select Edit +
        2. From the tool, select Edit Tool Options...
        3. Select the Tool node in the options tree.
          4. @@ -437,7 +437,7 @@ less visually straining.

          -

          As a prototype +

          As a prototype feature, this feature has many known issues, including:

            diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Tool/Undo_Redo.htm b/Ghidra/Features/Base/src/main/help/help/topics/Tool/Undo_Redo.htm index f00a5b7777..58bf49d20e 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Tool/Undo_Redo.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/Tool/Undo_Redo.htm @@ -7,7 +7,7 @@ Undo/Redo - + @@ -23,15 +23,15 @@
            • To undo an edit operation, select EditUndo from the main menu or press the + "help/shared/arrow.gif">Undo from the main menu or press the button on the tool bar.
            • To redo an edit operation, select EditRedo from the main menu or press the + "help/shared/arrow.gif">Redo from the main menu or press the button on the tool bar.
            -

            Hovering the mouse over the +

            Hovering the mouse over the button will display the name of the edit operation that would be "undone".  Similarly, hovering the mouse over the button will display the name of the edit operation that would be "redone".

            diff --git a/Ghidra/Features/Base/src/main/help/help/topics/TranslateStringsPlugin/TranslateStringsPlugin.htm b/Ghidra/Features/Base/src/main/help/help/topics/TranslateStringsPlugin/TranslateStringsPlugin.htm index 35bd22a438..ff66b501f9 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/TranslateStringsPlugin/TranslateStringsPlugin.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/TranslateStringsPlugin/TranslateStringsPlugin.htm @@ -7,7 +7,7 @@ Translate Strings - + @@ -19,7 +19,7 @@

            This plugin doesn't perform any natural language translation by itself. The user must install string translation services that do the actual translation. Extensions to Ghidra are installed via the File - -> Install Extensions... + -> Install Extensions... menu.

            When a string has been translated, the translated value will be shown in place of @@ -29,11 +29,11 @@

            Translate Menu

            -

            The Data -> +

            The Data -> Translate menu will appear in the popup menu of the Listing window when a string or string-like datatype is selected, and in the Defined Strings table (found under Window - -> Defined Strings). + -> Defined Strings).

            @@ -43,12 +43,12 @@

            Allows the user to specify a translated string value manually, by typing a value in a pop-up dialog.

            Select an existing string instance in the Listing window and right click - and select Data -> - Translate -> + and select Data -> + Translate -> Manual to enter a manual translation.

            In the Defined Strings table select a row or a range of rows and right click and select Translate - -> Manual.

            + -> Manual            .

          Clear translated values

          @@ -57,12 +57,12 @@

          The selected string instances will default back to their true value.

          Select an existing string instance in the Listing window and right click and select Data - -> Translate - -> Clear translated values + -> Translate + -> Clear translated values to clear the translated value.

          In the Defined Strings table select a row or a range of rows and right click and select Translate - -> Clear translated values.

          + -> Clear translated values.

    Toggle show translated values

    @@ -70,12 +70,12 @@

    Toggles the display of the translated string with the original value.

    Select an existing string instance in the Listing window and right click and select Data - -> Translate - -> Toggle show translated values + -> Translate + -> Toggle show translated values to toggle the display of the translated value of each of the strings.

    In the Defined Strings table select a row or a range of rows and right click and select Translate - -> Toggle show translated values.

    + -> Toggle show translated values.

    @@ -85,9 +85,9 @@ can be installed that will allow the user to translate strings.

    Once installed, the translation service plugins, like all plugins, can be - found in the File -> + found in the File -> Configure... window and must be enabled before they will - appear in the Data -> + appear in the Data -> Translate menu.

    Each string translation services will operate in a different way, please consult diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Trees/GhidraTreeFilter.html b/Ghidra/Features/Base/src/main/help/help/topics/Trees/GhidraTreeFilter.html index 8a69d02136..d5d0114271 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/Trees/GhidraTreeFilter.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/Trees/GhidraTreeFilter.html @@ -7,7 +7,7 @@ Ghidra Tree Filters - + @@ -35,7 +35,7 @@ exited Ghidra.

    -

    Some trees use more than the node's name for +

    Some trees use more than the node's name for filter purposes. So, it may appear that the filter is matching more than it should, when actually it is also using some other related text for the match, such as a node description.

    @@ -100,7 +100,7 @@

    - Multiple words in the text field + Multiple words in the text field are treated as separate patterns and ALL patterns must match for the node or row to be accepted. For example, if the text field contained "foo bar", then the table will match if at least one column contains a "foo" and at least one column @@ -181,7 +181,7 @@ evaluated. If the text is split, the Filter Strategy and associated options -- case sensitivity, globbing, and inversion -- are applied to each term.

    -

    When 'Regular Expression' is selected as the +

    When 'Regular Expression' is selected as the filter strategy, these options are disabled. Regular expressions are flexible enough to match multiple terms and may contain many of the characters otherwise used for convenient text splitting.

    @@ -229,7 +229,7 @@ overall acceptance by the filter.

    -

    Using delimiters that otherwise have a +

    Using delimiters that otherwise have a logical definition -- '+', or '|', for example -- have no semantic value in this application; they are simply tokens for input string processing.

    @@ -277,7 +277,7 @@
    -

    +

    Some columns in tables are not filterable via the filter text field below the table. For example, many numeric columns are ignored by the text filter because they can be slow to calculate and they are better filtered by using a range filter, as is available diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ValidateProgram/ValidateProgram.html b/Ghidra/Features/Base/src/main/help/help/topics/ValidateProgram/ValidateProgram.html index 877e6d052f..18a27e904f 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ValidateProgram/ValidateProgram.html +++ b/Ghidra/Features/Base/src/main/help/help/topics/ValidateProgram/ValidateProgram.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Validate Program - + @@ -27,7 +27,7 @@

    You can launch the Validate Program window by using the Analysis-> Validate {Current Program} menu item.

    + "help/shared/arrow.gif" alt="->"> Validate {Current Program}     menu item.

    diff --git a/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm b/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm index 4458e8aad3..d3e5d0c5dd 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/VersionControl/project_repository.htm @@ -10,7 +10,7 @@ Project Repository - + @@ -55,7 +55,7 @@ checked out "disappear" from the Ghidra Project Window, as they are unavailable. Private files remain intact and are not affected by the server connection.

    -

    You are authenticated only once per +

    You are authenticated only once per Ghidra session; so if you open other project repositories managed by the same Ghidra Server, you will be prompted only once for a password, as required. 

    @@ -133,7 +133,7 @@ has not been added to version control (note the plain icon and no version information). It is considered to be a "private" file. Private files are never visible to other users.

    -

    A normal checkout is indicated by a +

    A normal checkout is indicated by a checkmark with a green background, while an exclusive checkout is is indicated by checkmark with a blue background. A checkmark with a red background

    -

    The exclusive lock is implied for a +

    The exclusive lock is implied for a non-shared project repository.

    @@ -185,7 +185,7 @@ either click on the check in icon on the tool bar, or right mouse click and select the Check In... option. 

    -

    The The icon is also available from the tool where you have the file opened. 

    @@ -240,7 +240,7 @@

    If the checkbox on the dialog is selected, then a private file is created with a ".keep" extension on the filename. The checkbox is selected by default. 

    -

    If you have the file +

    If you have the file open in the Code Browser when you attempt to undo the check out, you will get an error dialog indicating that the file is in use. You must close the file first, then undo check out.

    @@ -276,11 +276,11 @@ option is only enabled when the latest version number on the server is greater than the version that you checked out.  

    -

      The   The icon is also available from the tool where you have the file opened.

    -

    The update action is not applicable +

    The update action is not applicable in a non-shared project repository.

    @@ -336,14 +336,14 @@

    To view any version in the history, select the version, right mouse click and choose the - Open With<tool> where + Open With<tool> where <tool> denotes a menu item for each tool in your tool chest. The version is read only and is opened in the selected tool. The filename shown in the title of the tool indicates the version number, e.g., "SharedProgram.exe@10 [Read Only]" indicates you are viewing version 10 of SharedProgram.exe.  You can make changes to the file, but you must save it to a new name.

    -

      Other ways to open a specific +

      Other ways to open a specific version in a tool are:

      @@ -354,7 +354,7 @@ "help/topics/Tool/Ghidra_Tool_Administration.htm#Set_Tool_Associations">default tool specified, double click on the version that you want to open. -
    • Choose the FileChoose the FileOpen... option; the Open Program dialog is displayed; from this dialog you can select a version to diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm b/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm index 6cdd458b57..cf10906e2a 100644 --- a/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm +++ b/Ghidra/Features/Base/src/main/help/help/topics/ViewStringsPlugin/ViewStringsPlugin.htm @@ -7,7 +7,7 @@ View Defined Strings - + @@ -36,7 +36,7 @@ String Settings for formatting settings) or the translated value of the string. Double click in this column to change the string's representation into a value of your choice. This is the - same as using the Translate -> + same as using the Translate -> Manual menu item.
    • Data Type - mnemonic or data type for the string type.
    • Is Ascii - boolean flag that indicates the string has non-ASCII characters.
      • @@ -72,7 +72,7 @@
    • Select the button on the tool bar.
    -

    The refresh icon on the toolbar will +

    The refresh icon on the toolbar will appear grayed-out by default. If potential changes to string data are detected, the icon will become green in color. The toolbar button can be pressed in either state for a full table reload. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingCodeComparisonOptions.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingCodeComparisonOptions.java index b86f766876..ad0aa22cad 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingCodeComparisonOptions.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/listingpanel/ListingCodeComparisonOptions.java @@ -104,19 +104,23 @@ public class ListingCodeComparisonOptions { HelpLocation help = new HelpLocation(HELP_TOPIC, "Options"); options.setOptionsHelpLocation(help); - options.registerOption(BYTE_DIFFS_COLOR_KEY, DEFAULT_BYTE_DIFFS_COLOR, help, - DEFAULT_BYTE_DIFFS_BACKGROUND_COLOR_DESCRIPTION); + options.registerThemeColorBinding(BYTE_DIFFS_COLOR_KEY, "color.bg.listing.comparison.bytes", + help, DEFAULT_BYTE_DIFFS_BACKGROUND_COLOR_DESCRIPTION); - options.registerOption(MNEMONIC_DIFFS_COLOR_KEY, DEFAULT_MNEMONIC_DIFFS_COLOR, help, - DEFAULT_MNEMONIC_DIFFS_BACKGROUND_COLOR_DESCRIPTION); + options.registerThemeColorBinding(MNEMONIC_DIFFS_COLOR_KEY, + "color.bg.listing.comparison.mnemonic", + help, DEFAULT_MNEMONIC_DIFFS_BACKGROUND_COLOR_DESCRIPTION); - options.registerOption(OPERAND_DIFFS_COLOR_KEY, DEFAULT_OPERAND_DIFFS_COLOR, help, + options.registerThemeColorBinding(OPERAND_DIFFS_COLOR_KEY, + "color.bg.listing.comparison.operand", help, DEFAULT_OPERAND_DIFFS_BACKGROUND_COLOR_DESCRIPTION); - options.registerOption(DIFF_CODE_UNITS_COLOR_KEY, DEFAULT_DIFF_CODE_UNITS_COLOR, help, + options.registerThemeColorBinding(DIFF_CODE_UNITS_COLOR_KEY, + "color.bg.listing.comparison.code.units.diff", help, DEFAULT_DIFF_CODE_UNITS_BACKGROUND_COLOR_DESCRIPTION); - options.registerOption(UNMATCHED_CODE_UNITS_COLOR_KEY, DEFAULT_UNMATCHED_CODE_UNITS_COLOR, + options.registerThemeColorBinding(UNMATCHED_CODE_UNITS_COLOR_KEY, + "color.bg.listing.comparison.code.units.unmatched", help, DEFAULT_UNMATCHED_CODE_UNITS_BACKGROUND_COLOR_DESCRIPTION); } diff --git a/Ghidra/Features/BytePatterns/certification.manifest b/Ghidra/Features/BytePatterns/certification.manifest index 5d7f4c0f6d..99ac789f9e 100644 --- a/Ghidra/Features/BytePatterns/certification.manifest +++ b/Ghidra/Features/BytePatterns/certification.manifest @@ -6,16 +6,6 @@ data/test/FileBitPatternInfoReaderTestFile1.xml||GHIDRA||||END| data/test/FileBitPatternInfoReaderTestFile2.xml||GHIDRA||||END| ghidra_scripts/DumpFunctionPatternInfoScript.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/menu16.gif||GHIDRA||||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/redo.png||GHIDRA||||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/undo.png||GHIDRA||||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm||GHIDRA||||END| src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/images/DataGatheringParams.png||GHIDRA||||END| src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/images/TabbedView.png||GHIDRA||||END| diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/BytePatterns/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/BytePatterns/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/shared/arrow.gif b/Ghidra/Features/BytePatterns/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/BytePatterns/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/shared/close16.gif b/Ghidra/Features/BytePatterns/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/BytePatterns/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/shared/note.png b/Ghidra/Features/BytePatterns/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/BytePatterns/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/BytePatterns/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/BytePatterns/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/shared/tip.png b/Ghidra/Features/BytePatterns/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/BytePatterns/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm b/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm index 776b5f8328..4611186cd2 100644 --- a/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm +++ b/Ghidra/Features/BytePatterns/src/main/help/help/topics/FunctionBitPatternsExplorerPlugin/FunctionBitPatternsExplorerPlugin.htm @@ -10,7 +10,7 @@ Function Bit Patterns Explorer Plugin - + @@ -110,7 +110,7 @@

    -

    NoteRecommended Parameters:

    +

    NoteRecommended Parameters:

    Reasonable starting values for the parameters controlling the number of instructions to be gathered are 3, 4, and 5. When setting the number of bytes to gather, it's reasonable to choose a value that can hold most of the corresponding instruction sequences. For diff --git a/Ghidra/Features/ByteViewer/certification.manifest b/Ghidra/Features/ByteViewer/certification.manifest index 636a55f1ae..108fc10ebf 100644 --- a/Ghidra/Features/ByteViewer/certification.manifest +++ b/Ghidra/Features/ByteViewer/certification.manifest @@ -5,11 +5,6 @@ Module.manifest||GHIDRA||||END| data/ExtensionPoint.manifest||GHIDRA||reviewed||END| data/byteviewer.theme.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||reviewed||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0). Renamed from flag-green.png.|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0). Renamed from flag-yellow.png.|END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0). Renamed from help-hint.png.|END| src/main/help/help/topics/ByteViewerPlugin/ByteViewerOptions.htm||GHIDRA||||END| src/main/help/help/topics/ByteViewerPlugin/The_Byte_Viewer.htm||GHIDRA||||END| src/main/help/help/topics/ByteViewerPlugin/images/ByteViewer.png||GHIDRA||||END| diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/ByteViewer/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/ByteViewer/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/shared/arrow.gif b/Ghidra/Features/ByteViewer/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/ByteViewer/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/shared/close16.gif b/Ghidra/Features/ByteViewer/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/ByteViewer/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/shared/note.png b/Ghidra/Features/ByteViewer/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/ByteViewer/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/ByteViewer/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/ByteViewer/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/shared/tip.png b/Ghidra/Features/ByteViewer/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/ByteViewer/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/ByteViewerOptions.htm b/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/ByteViewerOptions.htm index f37444ca9a..94913e4636 100644 --- a/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/ByteViewerOptions.htm +++ b/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/ByteViewerOptions.htm @@ -3,7 +3,7 @@ Configuration Options for the Byte Viewer - + @@ -13,7 +13,7 @@ tool has configurable items for colors and font. The Byte Viewer options determines the colors, font, and header configuration. To view the options, select - EditTool Options + EditTool Options and then select the Byte Viewer node in the Options tree.

    Colors and Font

    @@ -74,7 +74,7 @@
    1. From the Byte Viewer menu select Edit + src="help/shared/arrow.gif" width="18" height="14"> Tool Options.
    2. Select the Byte Viewer node; the panel of options appears to the right of the tree.
      3. @@ -92,7 +92,7 @@
      1. From the Byte Viewer menu select Edit Options.
        2. + src="help/shared/arrow.gif" width="18" height="14"> Options.
      2. Select the Byte Viewer node; the panel of options appears to the right of the tree.
      3. Click on the Font button.
        4. diff --git a/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/The_Byte_Viewer.htm b/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/The_Byte_Viewer.htm index 7967dec696..84a7a19bbf 100644 --- a/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/The_Byte_Viewer.htm +++ b/Ghidra/Features/ByteViewer/src/main/help/help/topics/ByteViewerPlugin/The_Byte_Viewer.htm @@ -3,7 +3,7 @@ The Byte Viewer - + @@ -20,7 +20,7 @@

        To show the Byte Viewer, select the icon, , on the Code Browser toolbar, OR, choose the WindowBytes: ... menu.

        + src="help/shared/arrow.gif" border="0" >Bytes: ... menu.

        The following paragraphs describe the Byte Viewer.

        Data Formats

        @@ -186,7 +186,7 @@ Edit toolbar button so that it no longer appears pushed-in.

        -

        If +

        If you have two Byte Viewers running, you can connect the two tools for the "Byte Block Edit" event so that when you make @@ -233,7 +233,7 @@ The offset is affected by both the alignment address and the bytes per line. The offset is displayed as a label below the scroll pane containing the views.

        -

        Sometimes +

        Sometimes you might see a byte pattern such that you want all the bytes to line up in the first column of the display. Consider the cursor position in the image below. If you want to see the fourth column of @@ -254,7 +254,7 @@

        The bytes per line indicates how many bytes are displayed in one line in a view. The default value is 16.

        -

        +

        All formats shown must be able to support the new value. For example,  since the HexInteger and Integer  formats show bytes in groups of four, the bytes per line must be a multiple of four. diff --git a/Ghidra/Features/Decompiler/certification.manifest b/Ghidra/Features/Decompiler/certification.manifest index 5a59a8eaea..da903893ec 100644 --- a/Ghidra/Features/Decompiler/certification.manifest +++ b/Ghidra/Features/Decompiler/certification.manifest @@ -71,16 +71,6 @@ src/main/doc/sleigh_common.xsl||GHIDRA||||END| src/main/doc/sleigh_html.xsl||GHIDRA||||END| src/main/doc/sleigh_pdf.xsl||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||||END| -src/main/help/help/shared/menu16.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/redo.png||GHIDRA||||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0||||END| -src/main/help/help/shared/undo.png||GHIDRA||||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0||||END| src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html||GHIDRA||||END| src/main/help/help/topics/DecompilePlugin/DecompilerConcepts.html||GHIDRA||||END| src/main/help/help/topics/DecompilePlugin/DecompilerIntro.html||GHIDRA||||END| @@ -91,11 +81,4 @@ src/main/help/help/topics/DecompilePlugin/images/Defuse.png||GHIDRA||||END| src/main/help/help/topics/DecompilePlugin/images/EditFunctionSignature.png||GHIDRA||||END| src/main/help/help/topics/DecompilePlugin/images/ForwardSlice.png||GHIDRA||||END| src/main/help/help/topics/DecompilePlugin/images/Undefined.png||GHIDRA||||END| -src/main/help/help/topics/DecompilePlugin/images/camera-photo.png||Tango Icons - Public Domain|||Tango|END| -src/main/help/help/topics/DecompilePlugin/images/decompileFunction.gif||GHIDRA||reviewed||END| -src/main/help/help/topics/DecompilePlugin/images/document-properties.png||Tango Icons - Public Domain|||tango|END| -src/main/help/help/topics/DecompilePlugin/images/openFolder.png||Modified Nuvola Icons - LGPL 2.1||||END| -src/main/help/help/topics/DecompilePlugin/images/page_edit.png||FAMFAMFAM Icons - CC 2.5||||END| -src/main/help/help/topics/DecompilePlugin/images/page_white_copy.png||FAMFAMFAM Icons - CC 2.5||||END| -src/main/help/help/topics/DecompilePlugin/images/reload3.png||Crystal Clear Icons - LGPL 2.1||||END| src/main/resources/images/decompileFunction.gif||GHIDRA||reviewed||END| diff --git a/Ghidra/Features/Decompiler/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/Decompiler/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/Decompiler/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/Decompiler/src/main/help/help/shared/arrow.gif b/Ghidra/Features/Decompiler/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/Decompiler/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/Decompiler/src/main/help/help/shared/close16.gif b/Ghidra/Features/Decompiler/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/Decompiler/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/Decompiler/src/main/help/help/shared/note.png b/Ghidra/Features/Decompiler/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/Decompiler/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/Decompiler/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/Decompiler/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/Decompiler/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/Decompiler/src/main/help/help/shared/tip.png b/Ghidra/Features/Decompiler/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/Decompiler/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html index ab1eb92658..1211eb4cb9 100644 --- a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html +++ b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerAnnotations.html @@ -2,8 +2,8 @@ Program Annotations Affecting the Decompiler - - + + @@ -89,7 +89,7 @@

        - +
        [Warning][Warning]
        @@ -260,7 +260,7 @@

        - +
        [Warning][Warning]
        @@ -889,7 +889,7 @@

        - +
        [Warning][Warning]
        @@ -943,7 +943,7 @@

        - +
        [Note][Note]
        @@ -1267,7 +1267,7 @@

        - +
        [Warning][Warning]
        @@ -1499,7 +1499,7 @@

        - +
        [Tip][Tip]
        diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerConcepts.html b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerConcepts.html index d1dae701b8..3887f5a74f 100644 --- a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerConcepts.html +++ b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerConcepts.html @@ -2,8 +2,8 @@ Decompiler Concepts - - + + @@ -182,7 +182,7 @@

        -

        Table . P-code Operations

        +

        Table�.�P-code Operations

        @@ -1312,7 +1312,7 @@

        - +
        [Warning][Warning]
        diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerIntro.html b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerIntro.html index d3ce6937f5..21c950fdbd 100644 --- a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerIntro.html +++ b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerIntro.html @@ -2,8 +2,8 @@ Decompiler - - + + @@ -64,7 +64,7 @@
      4. Press the -  icon + �icon in the tool bar, or
      5. @@ -85,7 +85,7 @@

        - +
        [Tip][Tip]
        diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerOptions.html b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerOptions.html index c8fb1f1e28..4a93dfe117 100644 --- a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerOptions.html +++ b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerOptions.html @@ -2,8 +2,8 @@ Decompiler Options - - + + @@ -40,12 +40,12 @@
      6.   -  Analysis - lists Analysis Options that affect the Decompiler's transformation process. + �Analysis - lists Analysis Options that affect the Decompiler's transformation process.
      7.   -  Display - lists Display Options that affect the final presentation of Decompiler output. + �Display - lists Display Options that affect the final presentation of Decompiler output.
        8. diff --git a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html index 40eec57c0f..280d78476b 100644 --- a/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html +++ b/Ghidra/Features/Decompiler/src/main/help/help/topics/DecompilePlugin/DecompilerWindow.html @@ -2,8 +2,8 @@ Decompiler Window - - + + @@ -18,7 +18,7 @@ function in the Code Browser, then select the -  icon from the tool bar, or the + �icon from the tool bar, or the Decompile option from the Window menu in the tool.

        @@ -91,7 +91,7 @@ Initially pressing -  or selecting + �or selecting Decompile from the Window menu in the tool brings up the main window. The main window always displays the function at the current address within the Code Browser and follows as the user navigates @@ -131,7 +131,7 @@

        - +
        [Warning][Warning]
        @@ -153,7 +153,7 @@ Pressing the -  icon + �icon in any Decompiler window's toolbar causes a Snapshot window to be created, which shows decompilation of the same function. Unlike the main window however, the Snapshot window @@ -240,7 +240,7 @@

        -  - button + �- button

        Exports the decompiled result of the current function to a file. A file chooser @@ -265,7 +265,7 @@

        -  - button + �- button

        Creates a new Snapshot window. The Snapshot window @@ -282,7 +282,7 @@

        -  - button + �- button

        Triggers a re-decompilation of the current function displayed in the window. @@ -290,7 +290,7 @@

        - +
        [Tip][Tip]
        @@ -310,7 +310,7 @@

        -  - button + �- button

        Copies the currently selected text in the Decompiler window to the clipboard. @@ -569,7 +569,7 @@

        - + @@ -460,7 +460,7 @@ Don't Know @@ -476,7 +476,7 @@ Conflict @@ -491,7 +491,7 @@ Reject @@ -506,7 +506,7 @@ Failed @@ -555,7 +555,7 @@ Apply (Use Options; Force If Necessary) - + - + - + @@ -274,49 +274,49 @@

        The Accept Match - + action marks a match (and all matches that have the same association) as being accepted. All competing matches will become blocked. - There are options to auto-apply + There are options to auto-apply function names and create implied matches when accepting a match.

        The Apply Blocked Match - + action will clear conflicting matches and then apply the match, which had been blocked by those conflicts, and its markup items according to the apply settings.

        The Apply Markup - + action will attempt to apply all the markup items for the match according to the apply settings. If the match is not already accepted, it will first be marked as accepted.

        The Reject Match - + action will mark the match as rejected.

        The Choose Match Tag - + action allows the user to set a user-defined tag that has been created via the Edit Tag action.

        The Remove Match Tag - + action removes any tag associated with the selected match(es)

        The Edit Tag - + action allows the user to manage (create and delete) custom tags that can be applied to matches.

        -

        The Clear Match +

        The Clear Match action will reset the match to unaccepted and undo any applied markup.

        -

        The Remove Match +

        The Remove Match action will remove a manually created match from the matches table.

        The Make Selections @@ -324,7 +324,7 @@

        The Table Selection Mode - allows you to change the behavior + allows you to change the behavior of the match table with regard to how it tracks table selections as you apply matches.

        @@ -334,7 +334,7 @@ As you make changes to a match, the table will update. Sometimes as the table updates the changed match will disappear from the table (for example, if your filter settings are setup to hide applied matches and you have just applied a match). The - default behavior () is to keep + default behavior () is to keep the table selection on the same row, regardless of whether the match changes its position in the table or is removed from the table altogether.

        @@ -351,7 +351,7 @@
        - + - + - +
        [Note][Note]
        diff --git a/Ghidra/Features/FileFormats/certification.manifest b/Ghidra/Features/FileFormats/certification.manifest index ea2d4e851b..ecc99fcb57 100644 --- a/Ghidra/Features/FileFormats/certification.manifest +++ b/Ghidra/Features/FileFormats/certification.manifest @@ -14,7 +14,6 @@ data/android/eclipse-classpath||GHIDRA||reviewed||END| data/android/eclipse-project||GHIDRA||reviewed||END| data/crypto/README.txt||GHIDRA||||END| data/languages/apport.opinion||GHIDRA||||END| -data/languages/dumpfile.opinion||GHIDRA||||END| data/languages/minidump.opinion||GHIDRA||||END| data/languages/pagedump.opinion||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| diff --git a/Ghidra/Features/FileFormats/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/FileFormats/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/FileFormats/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/FileFormats/src/main/help/help/topics/FileFormatsPlugin/FileFormats.html b/Ghidra/Features/FileFormats/src/main/help/help/topics/FileFormatsPlugin/FileFormats.html index 7eaa0e664d..cb581dd1c2 100644 --- a/Ghidra/Features/FileFormats/src/main/help/help/topics/FileFormatsPlugin/FileFormats.html +++ b/Ghidra/Features/FileFormats/src/main/help/help/topics/FileFormatsPlugin/FileFormats.html @@ -4,7 +4,7 @@ - + File Formats diff --git a/Ghidra/Features/FunctionGraph/certification.manifest b/Ghidra/Features/FunctionGraph/certification.manifest index 05bca5ea1c..ebddfd6db5 100644 --- a/Ghidra/Features/FunctionGraph/certification.manifest +++ b/Ghidra/Features/FunctionGraph/certification.manifest @@ -7,16 +7,6 @@ Module.manifest||GHIDRA||||END| data/ExtensionPoint.manifest||GHIDRA||||END| data/functiongraph.theme.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/menu16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0|||renamed from flag-red.png|END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||renamed from flag-green.png|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||renamed from flag-yellow.png|END| -src/main/help/help/shared/redo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||renamed oxygen file ktip.png|END| -src/main/help/help/shared/undo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0||||END| src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html||GHIDRA|||contains screenshots of various icons with IP and listing windows|END| src/main/help/help/topics/FunctionGraphPlugin/Function_Graph_Layouts.html||GHIDRA||||END| src/main/help/help/topics/FunctionGraphPlugin/images/FunctionGraphWindow.png||GHIDRA||||END| @@ -42,20 +32,7 @@ src/main/help/help/topics/FunctionGraphPlugin/images/FunctionGraph_Vertex_Action src/main/help/help/topics/FunctionGraphPlugin/images/FunctionGraph_Vertex_Action_XRefs.png||GHIDRA|||screenshot of silk|END| src/main/help/help/topics/FunctionGraphPlugin/images/FunctionGraph_Vertex_Drop_Shadow.png||GHIDRA||||END| src/main/help/help/topics/FunctionGraphPlugin/images/FunctionGraph_Vertex_Header.png||GHIDRA||reviewed||END| -src/main/help/help/topics/FunctionGraphPlugin/images/camera-photo.png||Tango Icons - Public Domain|||tango|END| -src/main/help/help/topics/FunctionGraphPlugin/images/edit-redo.png||Tango Icons - Public Domain|||tango|END| -src/main/help/help/topics/FunctionGraphPlugin/images/field.header.png||GHIDRA||reviewed|Custom icon|END| -src/main/help/help/topics/FunctionGraphPlugin/images/fullscreen_view.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/help/help/topics/FunctionGraphPlugin/images/get-hot-new-stuff.png||Oxygen Icons - LGPL 3.0|||oxygen|END| -src/main/help/help/topics/FunctionGraphPlugin/images/house.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/help/help/topics/FunctionGraphPlugin/images/network-wireless.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/topics/FunctionGraphPlugin/images/page_paste.png||FAMFAMFAM Icons - CC 2.5|||famfam|END| -src/main/help/help/topics/FunctionGraphPlugin/images/page_white_copy.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/help/help/topics/FunctionGraphPlugin/images/shape_handles.png||FAMFAMFAM Icons - CC 2.5|||famfam|END| -src/main/help/help/topics/FunctionGraphPlugin/images/shape_square_add.png||FAMFAMFAM Icons - CC 2.5|||famfam|END| -src/main/help/help/topics/FunctionGraphPlugin/images/shape_ungroup.png||FAMFAMFAM Icons - CC 2.5|||famfam|END| src/main/resources/images/brick_link.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/resources/images/edit-redo.png||Tango Icons - Public Domain|||tango|END| src/main/resources/images/fgblock.png||GHIDRA||reviewed||END| src/main/resources/images/fgin.png||GHIDRA||reviewed||END| src/main/resources/images/fginout.png||GHIDRA||reviewed||END| @@ -67,9 +44,7 @@ src/main/resources/images/fgrevblock.png||GHIDRA||reviewed||END| src/main/resources/images/field.header.png||GHIDRA||reviewed|Custom icon|END| src/main/resources/images/fullscreen_view.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/graph_view.png||FAMFAMFAM Icons - CC 2.5||||END| -src/main/resources/images/house.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/id.png||FAMFAMFAM Icons - CC 2.5||||END| -src/main/resources/images/listing_format.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/paintbrush.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/palette.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/shape_handles.png||FAMFAMFAM Icons - CC 2.5|||famfam|END| diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/FunctionGraph/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/arrow.gif b/Ghidra/Features/FunctionGraph/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/close16.gif b/Ghidra/Features/FunctionGraph/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/note.png b/Ghidra/Features/FunctionGraph/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/FunctionGraph/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/tip.png b/Ghidra/Features/FunctionGraph/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/FunctionGraph/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html b/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html index 97a6c2207a..ce4dc14231 100644 --- a/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html +++ b/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html @@ -7,7 +7,7 @@ Function Graph Plugin - + @@ -102,7 +102,7 @@ deselecting the Display Satellite View toggle button from the popup menu.

        -

        If the Primary View is painting +

        If the Primary View is painting sluggishly, then hiding the Satellite View cause the Primary View to be more responsive.

        @@ -123,7 +123,7 @@
        -

        To reshow the Satellite View if it is +

        To reshow the Satellite View if it is hidden, whether docked or undocked, you can press the button. This button is in the lower-right hand corner of the graph and is only visible if the Satellite View is hidden or @@ -215,7 +215,7 @@ choose a new color to set.

        -

        Note By default, colors +

        Note By default, colors applied to a vertex are also applied to the primary disassembly Listing.


        @@ -249,7 +249,7 @@ function.

        -

        Note This action will also +

        Note This action will also appear in the vertex containing the function entry point, for convenience.



        @@ -271,7 +271,7 @@
        -

        Note This section describes vertex +

        Note This section describes vertex grouping, which is covered later in this document.

        @@ -308,7 +308,7 @@ take on that color.

        -

        Note Via the options you can +

        Note Via the options you can disable this feature.



        @@ -347,7 +347,7 @@ all members of a given group back into a single grouped vertex.

        -

        Note To remove an uncollapsed vertex +

        Note To remove an uncollapsed vertex from group membership, right-click on that vertex and select Ungroup Selected Vertices.


        @@ -462,7 +462,7 @@ vertex.

        -

        Note You can select a single vertex +

        Note You can select a single vertex to group. This allows you to annotate a given vertex with text, without editing the label at the vertex address, which is the default behavior of the edit label action. In addition to setting the text for the @@ -495,10 +495,10 @@ title.

        -

        Note Grouped vertices may contain other +

        Note Grouped vertices may contain other grouped vertices.

        -

        Note As you group vertices, the +

        Note As you group vertices, the graph may perform a relayout of the vertices, depending upon the Function Graph Options, as described below.

        @@ -515,7 +515,7 @@ Never.

        -

        Note You can access the Function +

        Note You can access the Function Graph Options by right-clicking in an empty area of the graph and clicking the Properties menu item.

        @@ -525,7 +525,7 @@ this will ungroup all groups, which is an operation that cannot be undone.

        -

        Note Ungrouped vertices can be +

        Note Ungrouped vertices can be regrouped by executing the regroup action. This action is executed from an individual vertex, but will apply to all vertices in its group.

        @@ -575,7 +575,7 @@ clicking on the drop-down arrow will allow you to choose a new layout.

        -

        Note This action allows you to +

        Note This action allows you to perform a graph relayout without losing grouping information



        @@ -822,7 +822,7 @@

        You may create Program Selections from the current path - highlights by clicking Program Selection by clicking Program Selection From Hovered Edges and From Focused Edges from the popup menu of a block. If not paths are highlighted, then these actions will be disabled.

        @@ -831,7 +831,7 @@

        You may select all Code Units in a Code Block by - clicking Program Selection Select All + clicking Program Selection Select All Code Units from the popup menu (or by using the default keybinding, Ctrl-A). This action will select all Code Units in all selected Code Blocks in the graph. If no Code Blocks are selected, then a Program Selection will be created for all Code Units in all Code @@ -842,7 +842,7 @@

        You may clear the current Program Selection by clicking Program Selection Clear Selection from the popup menu.

        + "help/shared/arrow.gif" border="0" alt=""> Clear Selection         from the popup menu.

        @@ -916,11 +916,11 @@ the window level (zoomed out far enough to fit the entire graph in the window). These actions are Zoom to Vertex and Zoom to Window, respectively.

        -

        Note To have the scroll wheel zoom +

        Note To have the scroll wheel zoom without holding the Control key, you can disable the Scroll Wheel Pans option.

        -

        Note To zoom the graph incrementally +

        Note To zoom the graph incrementally using the keyboard you can use the Zoom In and Zoom Out actions. These actions have default keybindings of Control-Minus and Control-Equals.

        @@ -978,7 +978,7 @@ painted with the current background color of the block.

        -

        Note Zooming past the painting +

        Note Zooming past the painting threshold will improve the rendering speed of the Primary View.

        @@ -994,7 +994,7 @@

        -

        NoteChanges made to +

        NoteChanges made to Snapshots will not be saved. This is done to avoid conflict between changes made to the connected view and any of the snapshots

        diff --git a/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph_Layouts.html b/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph_Layouts.html index 6e71260598..fde3c94abd 100644 --- a/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph_Layouts.html +++ b/Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph_Layouts.html @@ -7,7 +7,7 @@ Function Graph Plugin - + @@ -63,4 +63,4 @@

        Provided by: Function Graph Plugin


        - \ No newline at end of file + diff --git a/Ghidra/Features/FunctionID/certification.manifest b/Ghidra/Features/FunctionID/certification.manifest index 27bef5a3f4..ee188e43c0 100644 --- a/Ghidra/Features/FunctionID/certification.manifest +++ b/Ghidra/Features/FunctionID/certification.manifest @@ -9,7 +9,6 @@ src/main/doc/fid_common.xsl||GHIDRA||||END| src/main/doc/fid_html.xsl||GHIDRA||||END| src/main/doc/fid_pdf.xsl||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| src/main/help/help/topics/FunctionID/FunctionID.html||GHIDRA||||END| src/main/help/help/topics/FunctionID/FunctionIDDebug.html||GHIDRA||||END| src/main/help/help/topics/FunctionID/FunctionIDPlugin.html||GHIDRA||||END| @@ -18,4 +17,3 @@ src/main/help/help/topics/FunctionID/images/DetachAttachedFidDb.png||GHIDRA||||E src/main/help/help/topics/FunctionID/images/FIDSearch.png||GHIDRA||||END| src/main/help/help/topics/FunctionID/images/FIDmatch.png||GHIDRA||||END| src/main/help/help/topics/FunctionID/images/PopulateFidDbFromPrograms1.png||GHIDRA|||Directory name includes sid|END| -src/main/resources/images/vcard.png||Nuvola Icons - LGPL 2.1||||END| diff --git a/Ghidra/Features/FunctionID/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/FunctionID/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/FunctionID/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/FunctionID/src/main/help/help/shared/arrow.gif b/Ghidra/Features/FunctionID/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/FunctionID/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionID.html b/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionID.html index 353450c658..954c497d34 100644 --- a/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionID.html +++ b/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionID.html @@ -2,8 +2,8 @@ Function ID - - + + diff --git a/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDDebug.html b/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDDebug.html index 3db890432f..0837cdaba0 100644 --- a/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDDebug.html +++ b/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDDebug.html @@ -2,8 +2,8 @@ Function ID Debug Plug-in - - + + diff --git a/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDPlugin.html b/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDPlugin.html index b1052c6538..c66624390e 100644 --- a/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDPlugin.html +++ b/Ghidra/Features/FunctionID/src/main/help/help/topics/FunctionID/FunctionIDPlugin.html @@ -2,8 +2,8 @@ Function ID Plug-in - - + + diff --git a/Ghidra/Features/GraphFunctionCalls/certification.manifest b/Ghidra/Features/GraphFunctionCalls/certification.manifest index 90d6cbdf19..cd6895cd38 100644 --- a/Ghidra/Features/GraphFunctionCalls/certification.manifest +++ b/Ghidra/Features/GraphFunctionCalls/certification.manifest @@ -3,16 +3,6 @@ Module.manifest||GHIDRA||||END| data/functioncallgraph.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/menu16.gif||GHIDRA||||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/redo.png||GHIDRA||||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/undo.png||GHIDRA||||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/help/help/topics/FunctionCallGraphPlugin/Function_Call_Graph.html||GHIDRA||||END| src/main/help/help/topics/FunctionCallGraphPlugin/images/FunctionCallGraphProvider.png||GHIDRA||||END| src/main/help/help/topics/FunctionCallGraphPlugin/images/TooManyReferences.png||GHIDRA||reviewed||END| diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/arrow.gif b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/close16.gif b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/note.png b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/tip.png b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/topics/FunctionCallGraphPlugin/Function_Call_Graph.html b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/topics/FunctionCallGraphPlugin/Function_Call_Graph.html index 8697cf287d..65f61c7826 100644 --- a/Ghidra/Features/GraphFunctionCalls/src/main/help/help/topics/FunctionCallGraphPlugin/Function_Call_Graph.html +++ b/Ghidra/Features/GraphFunctionCalls/src/main/help/help/topics/FunctionCallGraphPlugin/Function_Call_Graph.html @@ -4,7 +4,7 @@ Function Call Graph Plugin - + @@ -32,7 +32,7 @@

        To show the Function Call Graph provider window, - select the Window + select the Window Function Call Graph option on the tool menu.

        @@ -44,7 +44,7 @@

        - The graph updates itself as you navigate within + The graph updates itself as you navigate within the tool. To prevent losing graph state (e.g., expanded functions, node locations, etc), a small number of graphs will be cached. For example, if you navigate away from a function and then immediately return, the graph will be restored to @@ -133,7 +133,7 @@

        - As new vertices are added to the + As new vertices are added to the graph, any indirect edges will be added to the graph.

        @@ -144,7 +144,7 @@

        - It is important to understand + It is important to understand that the graph is only a subset of the entire program graph. This graph does not represent all functions and function calls in the program. @@ -152,7 +152,7 @@

        - Sometimes a function + Sometimes a function may have too many references to display in the graph. When this happens, the function node will be a gray color, with the expand icon replaced with a warning icon, as so:
        diff --git a/Ghidra/Features/GraphServices/certification.manifest b/Ghidra/Features/GraphServices/certification.manifest index 60b91eadd8..8640954b5a 100644 --- a/Ghidra/Features/GraphServices/certification.manifest +++ b/Ghidra/Features/GraphServices/certification.manifest @@ -10,18 +10,8 @@ Module.manifest||GHIDRA||||END| data/ExtensionPoint.manifest||GHIDRA||||END| data/graphservices.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/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/help/help/topics/GraphServices/GraphDisplay.htm||GHIDRA||||END| src/main/help/help/topics/GraphServices/GraphExport.htm||GHIDRA||||END| src/main/help/help/topics/GraphServices/images/DefaultGraphDisplay.png||GHIDRA||||END| src/main/help/help/topics/GraphServices/images/ExportDialog.png||GHIDRA||||END| -src/main/resources/images/Lasso.png||GHIDRA||||END| -src/main/resources/images/magnifier.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/resources/images/project-open.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/resources/images/redspheregraph.png||GHIDRA||||END| -src/main/resources/images/sat2.png||GHIDRA||||END| -src/main/resources/images/tree.png||GHIDRA||||END| -src/main/resources/images/view-fullscreen.png||Tango Icons - Public Domain|||tango icon set|END| src/main/resources/jungrapht.properties||GHIDRA||||END| diff --git a/Ghidra/Features/GraphServices/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/GraphServices/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 452bf6e6b5..0000000000 --- a/Ghidra/Features/GraphServices/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,58 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -code { color: black; font-family: courier new; font-size: 14pt; } diff --git a/Ghidra/Features/GraphServices/src/main/help/help/shared/arrow.gif b/Ghidra/Features/GraphServices/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/GraphServices/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/GraphServices/src/main/help/help/shared/note.png b/Ghidra/Features/GraphServices/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/GraphServices/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/GraphServices/src/main/help/help/shared/tip.png b/Ghidra/Features/GraphServices/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/GraphServices/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphDisplay.htm b/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphDisplay.htm index c752ad90a6..e0fb14d101 100644 --- a/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphDisplay.htm +++ b/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphDisplay.htm @@ -7,7 +7,7 @@ Graph Display - + diff --git a/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphExport.htm b/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphExport.htm index e0e6a5d3b3..96f4af1846 100644 --- a/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphExport.htm +++ b/Ghidra/Features/GraphServices/src/main/help/help/topics/GraphServices/GraphExport.htm @@ -7,7 +7,7 @@ Graph Export - + @@ -64,4 +64,4 @@
        - \ No newline at end of file + diff --git a/Ghidra/Features/PDB/certification.manifest b/Ghidra/Features/PDB/certification.manifest index 8ae04a48be..c52a7cc7ae 100644 --- a/Ghidra/Features/PDB/certification.manifest +++ b/Ghidra/Features/PDB/certification.manifest @@ -6,30 +6,14 @@ Module.manifest||GHIDRA||||END| src/global/docs/README_PDB.html||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/menu16.gif||GHIDRA||||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/redo.png||GHIDRA||||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| -src/main/help/help/shared/undo.png||GHIDRA||||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/help/help/topics/Pdb/LoadPDB.html||GHIDRA||||END| src/main/help/help/topics/Pdb/PDB.htm||GHIDRA||||END| src/main/help/help/topics/Pdb/images/LoadPdb_Advanced_NeedsConfig.png||GHIDRA||||END| src/main/help/help/topics/Pdb/images/LoadPdb_Advanced_Screenshot.png||GHIDRA||||END| src/main/help/help/topics/Pdb/images/LoadPdb_Initial_Screenshot.png||GHIDRA||||END| -src/main/help/help/topics/Pdb/images/Plus2.png||GHIDRA||||END| src/main/help/help/topics/Pdb/images/SymbolServerConfig_AddButtonMenu.png||GHIDRA||||END| src/main/help/help/topics/Pdb/images/SymbolServerConfig_Configured.png||GHIDRA||||END| src/main/help/help/topics/Pdb/images/SymbolServerConfig_Screenshot.png||GHIDRA||||END| -src/main/help/help/topics/Pdb/images/disk.png||FAMFAMFAM Icons - CC 2.5||||END| -src/main/help/help/topics/Pdb/images/down.png||GHIDRA||||END| -src/main/help/help/topics/Pdb/images/error.png||Nuvola Icons - LGPL 2.1||||END| -src/main/help/help/topics/Pdb/images/reload3.png||Crystal Clear Icons - LGPL 2.1||||END| -src/main/help/help/topics/Pdb/images/up.png||GHIDRA||||END| src/pdb/README.txt||GHIDRA||||END| src/pdb/pdb.sln||GHIDRA||||END| src/pdb/pdb.vcxproj||GHIDRA||||END| diff --git a/Ghidra/Features/PDB/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/PDB/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/PDB/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/PDB/src/main/help/help/shared/arrow.gif b/Ghidra/Features/PDB/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/PDB/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/PDB/src/main/help/help/shared/close16.gif b/Ghidra/Features/PDB/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/PDB/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/PDB/src/main/help/help/shared/note.png b/Ghidra/Features/PDB/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/PDB/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/PDB/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/PDB/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/PDB/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/PDB/src/main/help/help/shared/tip.png b/Ghidra/Features/PDB/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/PDB/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDB.html b/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDB.html index 5d63a9cb10..7345faf58d 100644 --- a/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDB.html +++ b/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDB.html @@ -4,7 +4,7 @@ Load PDB - + diff --git a/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/PDB.htm b/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/PDB.htm index 278e99af73..4e4a0166f4 100644 --- a/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/PDB.htm +++ b/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/PDB.htm @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Microsoft Program Databases (PDB) - + @@ -115,7 +115,7 @@ applications could, for example, report stack trace-back information and analyze performance data.

        -

        If you are attempting to load a PDB on a +

        If you are attempting to load a PDB on a Windows machine and see an error message such as "Unable to locate the DIA SDK," you will need to add and register one or more files on your computer. Refer to the README_PDB document for detailed instructions. diff --git a/Ghidra/Features/ProgramDiff/certification.manifest b/Ghidra/Features/ProgramDiff/certification.manifest index d351c3e3bd..b8f3d7eecd 100644 --- a/Ghidra/Features/ProgramDiff/certification.manifest +++ b/Ghidra/Features/ProgramDiff/certification.manifest @@ -8,41 +8,17 @@ Module.manifest||GHIDRA||||END| data/programdiff.theme.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/menu16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0) Renamed version of flag-red.png|END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0) Renamed version of flag-green.png|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0) Renamed version of flag-yellow.png|END| -src/main/help/help/shared/redo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0) Renamed version of help-hint.png|END| -src/main/help/help/shared/undo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0) Renamed version of security-medium.png|END| src/main/help/help/topics/Diff/Diff.htm||GHIDRA||||END| src/main/help/help/topics/Diff/images/DetermineDiffs.png||GHIDRA||||END| src/main/help/help/topics/Diff/images/Diff.png||GHIDRA||||END| -src/main/help/help/topics/Diff/images/Diff16.png||GHIDRA||reviewed||END| src/main/help/help/topics/Diff/images/DiffApplySettings.png||GHIDRA||||END| src/main/help/help/topics/Diff/images/DiffApplySettingsPopup.png||GHIDRA||reviewed||END| src/main/help/help/topics/Diff/images/DiffDetails.png||GHIDRA||||END| -src/main/help/help/topics/Diff/images/DiffSelect16.png||GHIDRA||reviewed||END| src/main/help/help/topics/Diff/images/SelectOpenProgram.png||GHIDRA||||END| src/main/help/help/topics/Diff/images/SelectOtherProgram.png||GHIDRA||||END| src/main/help/help/topics/Diff/images/SelectOtherVersionedProgram.png||GHIDRA||||END| -src/main/help/help/topics/Diff/images/disk.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/help/help/topics/Diff/images/down.png||GHIDRA||reviewed||END| -src/main/help/help/topics/Diff/images/eraser_arrow16.png||GHIDRA||||END| -src/main/help/help/topics/Diff/images/pencil16.png||GHIDRA||reviewed||END| -src/main/help/help/topics/Diff/images/pencil_arrow16.png||GHIDRA||reviewed||END| -src/main/help/help/topics/Diff/images/settings16.gif||GHIDRA||reviewed||END| -src/main/help/help/topics/Diff/images/table_relationship.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/help/help/topics/Diff/images/up.png||GHIDRA||reviewed||END| -src/main/help/help/topics/Diff/images/xmag.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| src/main/resources/images/Diff16.png||GHIDRA||reviewed||END| src/main/resources/images/DiffSelect16.png||GHIDRA||reviewed||END| -src/main/resources/images/erase16.png||GHIDRA||reviewed||END| src/main/resources/images/eraser_arrow16.png||GHIDRA||||END| -src/main/resources/images/pencil16.png||GHIDRA||reviewed||END| src/main/resources/images/pencil_arrow16.png||GHIDRA||reviewed||END| -src/main/resources/images/settings16.gif||GHIDRA||reviewed||END| src/main/resources/images/xmag.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/ProgramDiff/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/arrow.gif b/Ghidra/Features/ProgramDiff/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/close16.gif b/Ghidra/Features/ProgramDiff/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/note.png b/Ghidra/Features/ProgramDiff/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/ProgramDiff/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/tip.png b/Ghidra/Features/ProgramDiff/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/ProgramDiff/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm b/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm index 69db26583d..d990289d7c 100644 --- a/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm +++ b/Ghidra/Features/ProgramDiff/src/main/help/help/topics/Diff/Diff.htm @@ -3,7 +3,7 @@ The Diff Tool - +

        @@ -31,7 +31,7 @@ a second program in the Code Browser Diff panel. This is one of two ways to open the Diff tool. The other is the menu action, Tools - -> + -> Program Differences... which is described later under Viewing Program Differences. @@ -67,7 +67,7 @@

        A Diff can be opened from the menu action, Tools - -> + -> Program Differences... . This is one of two ways to open the Diff tool. The other is the Open/Close Diff View icon @@ -82,7 +82,7 @@

      8. From the Code Browser, select Tools - -> + -> Program Differences... . @@ -95,18 +95,20 @@
        1. From the Select Other Program dialog select the second program to be viewed and compared with the tool's program.
          - + The second program must have the same address spaces defined. In other words, they should be the same type of program (i.e. based on the same program language).
          - + + If you wish to Diff against a specific version of a - versioned program, a specific version may be seleected from the + versioned program, a specific version may be selected from the Version History table. The project file history panel is displayed when the History>> button is clicked. Select the versioned program from the tree. Next select the desired version of the program from the Version History table on the right side of the dialog.
          +

          @@ -147,7 +149,7 @@ highlighted.
        -

        +

        The selected program is displayed as the second program in the browser. Only the portion of the second program that matches the address set of the current view is displayed. Highlighted code units in @@ -169,11 +171,11 @@ both programs is still controlled by the program tree for the tool's program. In other words, the second program's view will only show addresses that match those viewed for the tool's program.
        - + Notice that the difference highlights are light orange above. The selected difference is green. These are only the default colors. They can be changed from the tool's Options dialog (Edit - -> + -> Options..., open the Listing Fields folder, and select Selection Colors, double click on the Difference color).
        @@ -344,7 +346,7 @@ Pressing the Cancel button will remove the Determine Program Differences dialog without performing the Program Diff.

        -

        +

        If the two programs being compared are large, determining program differences can be time consuming. If you are not interested in all of the differences in the program, you can reduce the amount of @@ -415,7 +417,7 @@

        9. Program Context - detect any code units where the values of the program context registers differ.
        - + If the two programs contexts don't have the same registers defined, the program context is disabled and can't be compared between the programs. @@ -507,7 +509,7 @@ will bring the tab containing the Diff to the front. 
        If you attempt to start a Diff using Tools - Program Differences... + Program Differences... in the tool menu and a Diff is already being performed, the status bar will indicate the name of the program that currently has a Diff.

        @@ -519,19 +521,19 @@ Listing toolbar when the Program Diff is actively being displayed.
      9. Selecting the Close Window icon  - from the + from the Listing toolbar when the Program Diff is actively being displayed. (Normally this will close the current program, but when Diff is active this closes the Diff.)
      10. Closing the Diff's program via the Tool's menu, File - Close, + Close, when the Diff is actively displayed. (In this case the Diff is closed along with the current program.)
      11. Exiting the Tool or Ghidra will also terminate an active Diff.
        12. -

        +

        Hovering the mouse over the Diff View icon provides a tooltip indicating whether the current action is Open Diff View, Close Diff View, or Bring Diff View to Front. @@ -613,7 +615,7 @@ Program Differences icon , the current Diff Apply Settings will not be affected by the defaults.
        - + The Default Diff Apply Settings can also be set by changing the Diff Default Apply Settings tool options @@ -622,7 +624,7 @@

        The Diff Apply Settings toolbar menu - also has actions for changing + also has actions for changing all the apply settings at once. They are:

        @@ -711,7 +713,7 @@ uncheck the Limit to Selection box. It switches between the addresses in common between the two programs and those in the selection.

        -

        +

        Once you press the OK button on the Program Difference Settings dialog, the Program Diff is performed against the indicated address ranges (address set). You can make a selection in @@ -768,7 +770,7 @@

        -

        +

        Some of the difference markers may overlap in the right margin. Therefore, it is best to use the markers for navigation to a region where there are differences and then use the @@ -819,7 +821,7 @@ be used to extend the selection. -

        +

        When differences are applied from the second program to the tool's program, only selected code units in the current view will be applied. @@ -971,7 +973,7 @@

        The selected code units will be ignored. This means they will no longer be highlighted as a difference. The Diff will then navigate to the next difference and select it.

        -

        Once a code unit is +

        Once a code unit is ignored, it will no longer be marked in the browser with a change bar and will no longer be highlighted. If you Determine Program Differences, any previously ignored items where @@ -1015,7 +1017,7 @@

         

        - + When the Automatically Update Details check box is selected, the Diff Details will update automatically to show the differences at the current location whenever the current address @@ -1024,7 +1026,7 @@ by the CodeBrowser.

        - + When the Only Show Expected Difference Types check box is selected, the Diff Details will only show Diff Details for the types of Differences that you chose to look for when you determined your differences. @@ -1033,7 +1035,7 @@ seeking.

        - + If you modify the program at the current location after the Diff Details are displayed, press the Refresh button @@ -1084,7 +1086,7 @@

        -

        To graph the entire program, press "<ctrl> a" to +

        To graph the entire program, press "<ctrl> a" to select all before creating the graph.

        @@ -98,12 +98,12 @@ the new current selection within Ghidra.

        -

        See the documentation for the specific graph display for +

        See the documentation for the specific graph display for descriptions of how to to make selections and navigate the graph.

        -

        A selection in one graph can be used to create a follow +

        A selection in one graph can be used to create a follow on graph. When a graph is created, only blocks of code that fall within the current selection will be part of the graph. For example, a single subroutine could be selected in a Call Graph. From that selection, a Block Flow graph can be created @@ -124,7 +124,7 @@ is not part of any node within the graph, the red arrow will not be visible.

        When the option Graph Show Location is turned on, the graph will re-orient + src="help/shared/arrow.gif"> Show Location is turned on, the graph will re-orient itself to insure that the red location arrow is always visible.

        Clicking on a node in the graph display causes the @@ -278,9 +278,9 @@ (this will pop the graph window to the front)

      12. Create a graph using:
        - Select Graph Block Flow, Graph Calls, or any of the Graph Calls Using Model items
        13. + Select Graph Block Flow, Graph Calls, or any of the Graph Calls Using Model items
        @@ -302,12 +302,12 @@ (this will pop the graph window to the front).
      13. Create a graph using:
        - Select Graph Block Flow, Graph Calls, or any of the Graph Calls Using Model menu items
        14. + Select Graph Block Flow, Graph Calls, or any of the Graph Calls Using Model menu items -

        The Reuse Graph option must be enabled for the +

        The Reuse Graph option must be enabled for the Append Graph option to be considered. Toggling on the Append Graph option will automatically turn on the Reuse Graph option. Append Graph without Reuse Graph will display new graphs in a new graph window, essentially having no effect.

        @@ -354,14 +354,14 @@

        -

        If there is a current selection, the nodes and edges +

        If there is a current selection, the nodes and edges will be restricted to blocks of code that fall within the selection.

        To Graph Block Flow Using the default model,

          -
        1. Select Graph Block Flow
          2. +
        2. Select Graph Block Flow
        3. A new graph window is created
        @@ -391,20 +391,20 @@

        Graph Calls

        A graph of the call instruction flow from one subroutine to another can be created with - Graph Calls. The graph is created using the default + Graph Calls. The graph is created using the default Call Model. Several Subroutine Models are available. Each model provides a slightly different perspective on what constitutes a subroutine.

        -

        If there is a current selection, the nodes and edges +

        If there is a current selection, the nodes and edges will be restricted to blocks of code that fall within the selection.

        To Graph Calls Using the default model,

          -
        1. Select Graph Calls
          2. +
        2. Select Graph Calls
        3. A new graph window is created
        @@ -412,8 +412,8 @@

        To Graph Calls Using a specific model*,

          -
        1. Select Graph Calls Using Model <a Call Model>
          2. +
        2. Select Graph Calls Using Model <a Call Model>
        3. Select one of @@ -433,7 +433,7 @@
        -

        *For a more thorough description of each Call Block +

        *For a more thorough description of each Call Block Model (i.e., Subroutine Model), see Block Models. The specific list of models presented to the user may vary depending upon the set of block models configured into the tool.

        @@ -441,16 +441,16 @@

        Graph Data References

        -

        A graph of data references can be created with Graph +

        A graph of data references can be created with Graph Data then selecting To References, From References or To/From References. Only the selected references will be included. By default only a single layer of references will - be graphed, this can be adjusted using the Edit - Tool Options Graph + be graphed, this can be adjusted using the Edit + Tool Options Graph Max Reference Depth

        -

        Unlike flow graphs, where only the selection is +

        Unlike flow graphs, where only the selection is included in the graph, the selection and its references are included.

        @@ -458,8 +458,8 @@
        1. Select the data to start from in the listing -
        2. Select Graph Data
          3. +
        3. Select Graph Data
        4. Select one of diff --git a/Ghidra/Features/Python/certification.manifest b/Ghidra/Features/Python/certification.manifest index 412c40104c..716354906c 100644 --- a/Ghidra/Features/Python/certification.manifest +++ b/Ghidra/Features/Python/certification.manifest @@ -4,6 +4,5 @@ Module.manifest||GHIDRA||||END| data/python.theme.properties||GHIDRA||||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/topics/Python/images/erase16.png||GHIDRA||||END| src/main/help/help/topics/Python/interpreter.html||GHIDRA||||END| src/main/resources/images/python.png||GHIDRA||||END| diff --git a/Ghidra/Features/Python/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/Python/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/Python/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/Python/src/main/help/help/topics/Python/interpreter.html b/Ghidra/Features/Python/src/main/help/help/topics/Python/interpreter.html index ddc272d65e..ed62387a43 100644 --- a/Ghidra/Features/Python/src/main/help/help/topics/Python/interpreter.html +++ b/Ghidra/Features/Python/src/main/help/help/topics/Python/interpreter.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Python Interpreter - + diff --git a/Ghidra/Features/SourceCodeLookup/certification.manifest b/Ghidra/Features/SourceCodeLookup/certification.manifest index f9dc882491..913b81f759 100644 --- a/Ghidra/Features/SourceCodeLookup/certification.manifest +++ b/Ghidra/Features/SourceCodeLookup/certification.manifest @@ -2,14 +2,4 @@ ##MODULE IP: Oxygen Icons - LGPL 3.0 Module.manifest||GHIDRA||reviewed||END| src/main/help/help/TOC_Source.xml||GHIDRA||||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/menu16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/note-red.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/shared/redo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| -src/main/help/help/shared/undo.png||GHIDRA||reviewed||END| -src/main/help/help/shared/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen|END| src/main/help/help/topics/SourceCodeLookupPlugin/Source_Code_Lookup.html||GHIDRA||||END| diff --git a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/arrow.gif b/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/close16.gif b/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/note.png b/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/tip.png b/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/SourceCodeLookup/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/SourceCodeLookup/src/main/help/help/topics/SourceCodeLookupPlugin/Source_Code_Lookup.html b/Ghidra/Features/SourceCodeLookup/src/main/help/help/topics/SourceCodeLookupPlugin/Source_Code_Lookup.html index 0f7755b4de..3e0dc964d7 100644 --- a/Ghidra/Features/SourceCodeLookup/src/main/help/help/topics/SourceCodeLookupPlugin/Source_Code_Lookup.html +++ b/Ghidra/Features/SourceCodeLookup/src/main/help/help/topics/SourceCodeLookupPlugin/Source_Code_Lookup.html @@ -8,7 +8,7 @@ Source Code Lookup Plugin - + @@ -19,7 +19,7 @@

          Source Code Lookup attempts to look up a symbol contained within a Ghidra program, in the source of a C/C++ Eclipse project.

          -

          This plugin requires that Eclipse, +

          This plugin requires that Eclipse, the Eclipse GhidraDev plugin, and the Eclipse CDT plugin are installed on your system.

          Setting up Eclipse

          diff --git a/Ghidra/Features/VersionTracking/certification.manifest b/Ghidra/Features/VersionTracking/certification.manifest index 5d9d2f0f88..3cc0271000 100644 --- a/Ghidra/Features/VersionTracking/certification.manifest +++ b/Ghidra/Features/VersionTracking/certification.manifest @@ -9,17 +9,12 @@ data/version.tracking.theme.properties||GHIDRA||||END| src/main/docs/VTClasses.png||GHIDRA||reviewed||END| src/main/docs/VTGuiImpl.png||GHIDRA||reviewed||END| src/main/help/help/TOC_Source.xml||GHIDRA||reviewed||END| -src/main/help/help/shared/arrow.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/close16.gif||GHIDRA||reviewed||END| -src/main/help/help/shared/note.png||Oxygen Icons - LGPL 3.0|||oxygen|END| -src/main/help/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||oxygen|END| -src/main/help/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||oxygen|END| src/main/help/help/topics/VersionTrackingPlugin/VT_Correlators.html||GHIDRA||||END| -src/main/help/help/topics/VersionTrackingPlugin/VT_Preconditions.html||GHIDRA||reviewed||END| +src/main/help/help/topics/VersionTrackingPlugin/VT_Preconditions.html||GHIDRA||||END| src/main/help/help/topics/VersionTrackingPlugin/VT_Tool.html||GHIDRA||||END| -src/main/help/help/topics/VersionTrackingPlugin/VT_Wizard.html||GHIDRA||reviewed||END| -src/main/help/help/topics/VersionTrackingPlugin/VT_Workflow.html||GHIDRA||reviewed||END| -src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html||GHIDRA||reviewed||END| +src/main/help/help/topics/VersionTrackingPlugin/VT_Wizard.html||GHIDRA||||END| +src/main/help/help/topics/VersionTrackingPlugin/VT_Workflow.html||GHIDRA||||END| +src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html||GHIDRA||||END| src/main/help/help/topics/VersionTrackingPlugin/images/ActionsMenu_DropDown.png||GHIDRA||reviewed||END| src/main/help/help/topics/VersionTrackingPlugin/images/ApplyAdd.png||GHIDRA|||Captured on Mac using Grab.|END| src/main/help/help/topics/VersionTrackingPlugin/images/ApplyReplace.png||GHIDRA|||Captured on Mac using Grab.|END| diff --git a/Ghidra/Features/VersionTracking/data/version.tracking.theme.properties b/Ghidra/Features/VersionTracking/data/version.tracking.theme.properties index 86ca1541f4..2583530b49 100644 --- a/Ghidra/Features/VersionTracking/data/version.tracking.theme.properties +++ b/Ghidra/Features/VersionTracking/data/version.tracking.theme.properties @@ -1,7 +1,7 @@ [Defaults] color.fg.version.tracking.tooltip = gray - + color.bg.version.tracking.dual.listing.highlight.markup.applied = rgb(150, 220, 150) // green color.bg.version.tracking.dual.listing.highlight.markup.unapplied = rgb(255, 170, 85) // orange color.bg.version.tracking.dual.listing.highlight.markup.ignored = gainsboro // gray @@ -51,6 +51,10 @@ icon.version.tracking.substract = list-remove.png icon.version.tracking.replace = sync_enabled.png icon.version.tracking.auto = wizard.png + +icon.version.tracking.action.match.apply.blocked = icon.lock{icon.checkmark.green[size(12,12)][move(4,0)]} +icon.version.tracking.action.function.filter.not.accepted = icon.flag{dialog-cancel.png[size(10,10)][move(6,6)]} + icon.version.tracking.action.clear.match = undo-apply.png icon.version.tracking.action.create.implied.match = flag.png icon.version.tracking.action.create.manual.match = Plus.png diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/shared/Frontpage.css b/Ghidra/Features/VersionTracking/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Features/VersionTracking/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/shared/arrow.gif b/Ghidra/Features/VersionTracking/src/main/help/help/shared/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Features/VersionTracking/src/main/help/help/shared/arrow.gif and /dev/null differ diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/shared/close16.gif b/Ghidra/Features/VersionTracking/src/main/help/help/shared/close16.gif deleted file mode 100644 index f523864639..0000000000 Binary files a/Ghidra/Features/VersionTracking/src/main/help/help/shared/close16.gif and /dev/null differ diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/shared/note.png b/Ghidra/Features/VersionTracking/src/main/help/help/shared/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Features/VersionTracking/src/main/help/help/shared/note.png and /dev/null differ diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/shared/note.yellow.png b/Ghidra/Features/VersionTracking/src/main/help/help/shared/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Features/VersionTracking/src/main/help/help/shared/note.yellow.png and /dev/null differ diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/shared/tip.png b/Ghidra/Features/VersionTracking/src/main/help/help/shared/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Features/VersionTracking/src/main/help/help/shared/tip.png and /dev/null differ diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Correlators.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Correlators.html index 17209b1a1d..27d94971a2 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Correlators.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Correlators.html @@ -7,7 +7,7 @@ Version Tracking Program Correlators - + @@ -117,7 +117,7 @@

          Function Match Correlators

          -

          Note that functions MUST be defined in the +

          Note that functions MUST be defined in the destination program for these correlators to find matches.

          Exact Function Bytes Match

          @@ -202,7 +202,7 @@ destination address -

          NOTE: this format is provided for users who +

          NOTE: this format is provided for users who have existing results that absolutely positively can't see any way to get them into Version Tracking another way. It is legacy, deprecated, and will likely be replaced in the future with a new import format (most likely a legacy format -> new data import format conversion @@ -394,7 +394,7 @@

          -

          NOTE: If no matches are returned, make sure there are existing ACCEPTED matches +

          NOTE: If no matches are returned, make sure there are existing ACCEPTED matches (). This means you will need to run other correlators first, such as

          • Exact Data Match
            • diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Preconditions.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Preconditions.html index a42802db0b..f248e81641 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Preconditions.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Preconditions.html @@ -7,7 +7,7 @@ Version Tracking Preconditions - + diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Tool.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Tool.html index 065441c98f..a1b33a9003 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Tool.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Tool.html @@ -7,7 +7,7 @@ Version Tracking Tool - + @@ -139,7 +139,7 @@
          • Combined Function and Data Reference Correlator
          -

          NOTE: It is unlikely that all matches in the entire program will be made and there is no guarantee that no mistakes will be made. This +

          NOTE: It is unlikely that all matches in the entire program will be made and there is no guarantee that no mistakes will be made. This action was designed to try to save as much time as possible while also taking a conservative approach to the automation.

          diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Wizard.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Wizard.html index 1ec9c3a59a..a4debe9092 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Wizard.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Wizard.html @@ -7,7 +7,7 @@ Version Tracking Wizard - + @@ -182,7 +182,7 @@ run.

          -

          +

          NOTE: This option will be disabled when the correlator does not support limiting search scope.

          @@ -236,7 +236,7 @@ defined in the source program when determining match results.

          -

          +

          NOTE: This is the default option which you normally get if you don't check the Limit source and destination address sets box on the previous panel for Address Set Options. @@ -252,7 +252,7 @@ want to limit the addresses using a selection.

          -

          +

          NOTE: This option will be disabled if there wasn't a selection in the version tracking Source Tool when the Add To Session version tracking wizard was started. @@ -290,7 +290,7 @@ address ranges from the Address Ranges list that are currently selected.

          -

          +

          NOTE: This button will be disabled if the Specify My Own Address Ranges option isn't selected or if there isn't an address range selected in the list.

          @@ -317,7 +317,7 @@ defined in the destination program when determining match results.

          -

          +

          NOTE: This is the default option which you normally get if you don't check the Limit source and destination address sets box on the previous panel for Address Set Options. @@ -333,7 +333,7 @@ want to limit the addresses using a selection.

          -

          +

          NOTE: This option will be disabled if there wasn't a selection in the version tracking Destination Tool when the Add To Session version tracking wizard was started. @@ -371,7 +371,7 @@ address ranges from the Address Ranges list that are currently selected.

          -

          +

          NOTE: This button will be disabled if the Specify My Own Address Ranges option isn't selected or if there isn't an address range selected in the list.

          diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Workflow.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Workflow.html index c14d0f93fc..9d356d4b3f 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Workflow.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/VT_Workflow.html @@ -7,7 +7,7 @@ Version Tracking Workflow - + @@ -133,7 +133,7 @@ correlators can ignore them and not waste time or memory trying to identify them.

          -

          +

          NOTE: It is also a good idea to check for wildly differing lengths between matches in case there is the case where a wrapper function in one program has the same name as the actual function in the other program. You can either take care of length @@ -239,7 +239,7 @@

          - + NOTE: For any of the following runs, there is an option to Exclude Accepted Matches so that the correlator being run will not report matches that are already made. It is up to personal preference whether to use this option. In large binaries it will speed @@ -387,7 +387,7 @@

          -

          NOTE: This is only one sample workflow +

          NOTE: This is only one sample workflow for matching all possible functions. In general, the exact, one-to-one correlators should be run first and the rest can be used in any order. Users will come up with their own preferences for workflow as they get used to the tool.

          diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html index b905e5d738..cc83b2b43f 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/Version_Tracking_Intro.html @@ -7,7 +7,7 @@ Version Tracking Introduction - + diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Apply_Options.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Apply_Options.html index b018d183ad..c200601658 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Apply_Options.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Apply_Options.html @@ -7,7 +7,7 @@ Version Tracking Apply Options - + @@ -19,7 +19,7 @@ The actions taken when accepting match or applying its markup are defined as options, which can be changed by the user. The sections below describe the various options available and list the default values. To access the options you can click the - icon on the + icon on the Matches Table.

          diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Functions_Table.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Functions_Table.html index 7637b86497..b2d3066412 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Functions_Table.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Functions_Table.html @@ -7,7 +7,7 @@ Version Tracking Functions Table - + @@ -91,7 +91,7 @@

          Create Manual Match

          - The Create Manual Match action () allows the user to create a match for the + The Create Manual Match action () allows the user to create a match for the selected function in source table to the selected function in the destination table. The action will be disabled if you do not have a single function selected in both tables. @@ -101,7 +101,7 @@

          Create And Accept Manual Match

          - The Create And Accept Manual Match action () allows the user to create a match for the + The Create And Accept Manual Match action () allows the user to create a match for the selected function in source table to the selected function in the destination table and then automatically accept it. The action will be disabled if you do not have a single function selected in both tables. @@ -112,7 +112,7 @@

          Create And Apply Manual Match

          - The Create And Apply Manual Match action () allows the user to create a match for the + The Create And Apply Manual Match action () allows the user to create a match for the selected function in source table to the selected function in the destination table and then accept it and then automatically apply any appropriate markup items from the source to the destination program. The action will be disabled if you do not have a single function selected in both @@ -148,12 +148,12 @@

          • - Show All Functions () - + Show All Functions () - Shows all functions found in the source and destination programs.
          • - Show Only Unmatched Functions () - + Show Only Unmatched Functions () - Shows only functions in the source and destination programs that are not part of any match. This is useful for showing functions that were not matched by any of the @@ -161,7 +161,8 @@
          • - Show Only Unaccepted Match Functions () - + Show Only Unaccepted Match Functions + () - Shows only functions in the source and destination programs that are not part of an accepted match. This means that the functions visible in the tables will either be part of no match or part of a @@ -176,7 +177,7 @@

            The Toggle Visibility of Dual Comparison Views action - () will + () will toggle whether or not a function comparison panel is displayed below the source and destination function tables. As you select a function in the source or destination table, it is displayed in the function comparison panel so you can visually compare diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Implied_Matches_Table.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Implied_Matches_Table.html index 1c6697819f..c8d57239ca 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Implied_Matches_Table.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Implied_Matches_Table.html @@ -7,7 +7,7 @@ Version Tracking Implied Matches Table - + @@ -155,20 +155,20 @@

            Navigate References When this action toggled on, selecting a row in the + "images/locationOut.gif" border="0"> When this action toggled on, selecting a row in the implied matches table will cause the sub-tools to navigate to the From Address of the references used to create the selected implied match.

            Navigate Match When this action toggled on, selecting a row in the + "images/locationIn.gif" border="0"> When this action toggled on, selecting a row in the implied matches table will cause the sub-tools to navigate to the source and destination addresses of the selected implied match.

            The Accept Implied Match action creates a match in the Matches Table if one + src="images/flag.png" border="0"> action creates a match in the Matches Table if one does not already exist, and then sets its status as 'Accepted'. Note, the Implied Matches shown in the table are not saved unless this action is applied.

            diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Markup_Table.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Markup_Table.html index 2ef9974123..d6a0e6e640 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Markup_Table.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Markup_Table.html @@ -7,7 +7,7 @@ Version Tracking Markup Items Table - + @@ -445,7 +445,7 @@ Don't Care
        		- +
        		- +
        		- +
        		- +
        		- +
        		- + This action applies the selected markup items using the current apply @@ -572,7 +572,7 @@ Apply (Add As Primary) - + This action applies the source value for each selected markup item @@ -586,7 +586,7 @@ Apply (Add) - + This action applies the source value for each selected markup item by adding it @@ -599,7 +599,7 @@ Apply (Replace Default Only) - + This action applies the source value for each selected markup item by @@ -613,7 +613,7 @@ Apply (Replace First Only) - + This action applies the source value for each selected markup item by @@ -629,7 +629,7 @@ Apply (Replace) - + This action applies the source value for each selected markup item by @@ -652,7 +652,7 @@ Don't Care - + This action sets the status of this markup item to Don't Care. This indicates that @@ -666,7 +666,7 @@ Don't Know - + This action sets the status of this markup item to Don't Know. This indicates that @@ -680,7 +680,7 @@ Reject - + This action sets the status of this markup item to rejected. Once a markup item is @@ -693,7 +693,7 @@ Edit Destination Address - + This action provides an edit address dialog that allows you to specify a destination @@ -709,7 +709,7 @@ Reset - + This action resets the markup item back to its original unapplied state and @@ -734,12 +734,12 @@

        - The button to the right of the + The button to the right of the primary text filter will show the ancillary filters that are available. You can apply an ancillary filter by removing the check mark from its box and pressing the Apply or OK button. Once an ancillary filter is applied the ancillary filters icon will change to - . Further, + . Further, the icon may occasionally flash as a reminder that there is a filter applied. The following image shows the available ancillary filters.

        @@ -805,7 +805,7 @@

        - The window title above the Markup Items table displays an + The window title above the Markup Items table displays an indicator that a filter is set on the markup items table and not all items are shown. For example, the title might contain "2 markup items (of 8)" indicating 6 items are hidden or filtered out. @@ -870,7 +870,7 @@

        - The Toggle Dual Listing Visibility toolbar + The Toggle Dual Listing Visibility toolbar action allows you to control whether or not the dual listing is displayed. When it is toggled on (appearing pressed in) the dual listings are shown below the Markup Items table.
        @@ -892,7 +892,7 @@

        - From the toolbar menu + From the toolbar menu there are selectable options that apply to the dual listing.

          @@ -992,7 +992,7 @@ item's status should change in the table.

          - Some markup item's can only be applied at a + Some markup item's can only be applied at a particular spot. For example, a function's name or signature can only be applied to the function. Therefore the destination function's entry point is the expected destination address. In this case, the destination diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html index ee9a30a72c..9e944764ab 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Matches_Table.html @@ -7,7 +7,7 @@ Version Tracking Matches Table - + @@ -76,14 +76,14 @@

        REJECTED The match has been rejected by the user.
        BLOCKED The match can't be accepted because a conflicting match has been accepted. @@ -96,7 +96,7 @@
        ACCEPTED The match has been accepted.
        Track Selected Index Causes the match table to maintain the selection for the selected row. So, for example, if you change a match, and that @@ -361,7 +361,7 @@
        Track Selected Match Causes the match table to maintain the selection for the selected match. So, for example, if you change a match, @@ -371,7 +371,7 @@
        No Selection Tracking In this state the table will not restore selections. If changes are made to matches, the selection will be lost. @@ -385,7 +385,7 @@ -

        The Settings +

        The Settings action will bring up the version tracking accept and apply options.

        @@ -411,9 +411,9 @@

        -

        Finally, the will show the ancillary filters +

        Finally, the will show the ancillary filters available. The table below lists and describes the available filters. When an ancillary - filter is applied, the icon will change to . + filter is applied, the icon will change to . Further, the icon may occasionally flash as a reminder that there is a filter applied.


        diff --git a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Related_Associations_Table.html b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Related_Associations_Table.html index 4c46eac2e5..8993671b89 100644 --- a/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Related_Associations_Table.html +++ b/Ghidra/Features/VersionTracking/src/main/help/help/topics/VersionTrackingPlugin/providers/VT_Related_Associations_Table.html @@ -7,7 +7,7 @@ Version Tracking Related Matches Table - + @@ -70,7 +70,7 @@ accepted match per function.

        -

        Selecting a row in the Related +

        Selecting a row in the Related Match Table causes the Destination Tool to navigate to that selected destination address.

        @@ -102,7 +102,7 @@ arrived at by different correlation algorithms.

        -

        Selecting a row in this table +

        Selecting a row in this table causes the Source Tool to navigate to that selected source address.

        diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ApplyBlockedMatchAction.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ApplyBlockedMatchAction.java index 14c44af73d..19602931fa 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ApplyBlockedMatchAction.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/actions/ApplyBlockedMatchAction.java @@ -17,10 +17,13 @@ package ghidra.feature.vt.gui.actions; import java.util.*; +import javax.swing.Icon; + import docking.ActionContext; import docking.action.DockingAction; import docking.action.MenuData; import docking.widgets.OptionDialog; +import generic.theme.GIcon; import ghidra.feature.vt.api.main.*; import ghidra.feature.vt.gui.plugin.VTController; import ghidra.feature.vt.gui.plugin.VTPlugin; @@ -28,7 +31,6 @@ import ghidra.feature.vt.gui.provider.matchtable.VTMatchContext; import ghidra.feature.vt.gui.task.ApplyBlockedMatchTask; import ghidra.util.HTMLUtilities; import ghidra.util.HelpLocation; -import resources.Icons; /** * The ApplyBlockedMatchAction allows the user to apply a match that is currently blocked. @@ -37,6 +39,9 @@ import resources.Icons; */ public class ApplyBlockedMatchAction extends DockingAction { + public static final Icon APPLY_BLOCKED_MATCH_ICON = + new GIcon("icon.version.tracking.action.match.apply.blocked"); + public static String NAME = "Apply Blocked Match"; private static final String MENU_GROUP = VTPlugin.EDIT_MENU_GROUP; @@ -47,7 +52,7 @@ public class ApplyBlockedMatchAction extends DockingAction { this.controller = controller; setPopupMenuData(new MenuData(new String[] { "Apply Blocked Match" }, - Icons.APPLY_BLOCKED_MATCH_ICON, MENU_GROUP)); + APPLY_BLOCKED_MATCH_ICON, MENU_GROUP)); setEnabled(false); setHelpLocation(new HelpLocation("VersionTrackingPlugin", "Apply_Blocked_Match")); diff --git a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/functionassociation/VTFunctionAssociationProvider.java b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/functionassociation/VTFunctionAssociationProvider.java index 535fc4160c..27adf9bb22 100644 --- a/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/functionassociation/VTFunctionAssociationProvider.java +++ b/Ghidra/Features/VersionTracking/src/main/java/ghidra/feature/vt/gui/provider/functionassociation/VTFunctionAssociationProvider.java @@ -61,7 +61,6 @@ import ghidra.program.util.*; import ghidra.util.HelpLocation; import ghidra.util.SystemUtilities; import ghidra.util.table.*; -import resources.Icons; /** * Provider for the version tracking function association table. @@ -77,6 +76,8 @@ public class VTFunctionAssociationProvider extends ComponentProviderAdapter private static final String NO_SESSION = "None"; private static final Icon SHOW_LISTINGS_ICON = new GIcon("icon.version.tracking.action.show.listings"); + public static final Icon FILTER_NOT_ACCEPTED_ICON = + new GIcon("icon.version.tracking.action.function.filter.not.accepted"); private static final String SHOW_COMPARE_ACTION_GROUP = "A9_ShowCompare"; // "A9_" forces to right of other dual view actions in toolbar. private static final Color FG_ERROR = new GColor("color.fg.error"); @@ -171,7 +172,7 @@ public class VTFunctionAssociationProvider extends ComponentProviderAdapter ActionState unacceptedOnlyActionState = new ActionState<>("Show Only Unaccepted Match Functions", - Icons.FILTER_NOT_ACCEPTED_ICON, SHOW_UNACCEPTED); + FILTER_NOT_ACCEPTED_ICON, SHOW_UNACCEPTED); unacceptedOnlyActionState.setHelpLocation( new HelpLocation("VersionTrackingPlugin", "Show_Unaccepted_Functions")); @@ -218,7 +219,7 @@ public class VTFunctionAssociationProvider extends ComponentProviderAdapter } @Override - public List getPopupActions(Tool tool, ActionContext context) { + public List getPopupActions(Tool t, ActionContext context) { if (context.getComponentProvider() == this) { ListingCodeComparisonPanel dualListingPanel = functionComparisonPanel.getDualListingPanel(); diff --git a/Ghidra/Framework/Docking/certification.manifest b/Ghidra/Framework/Docking/certification.manifest index 1382735c20..80037480e3 100644 --- a/Ghidra/Framework/Docking/certification.manifest +++ b/Ghidra/Framework/Docking/certification.manifest @@ -32,7 +32,6 @@ src/main/resources/images/StackFrame_Red.png||GHIDRA||reviewed||END| src/main/resources/images/accessories-text-editor.png||Tango Icons - Public Domain||||END| src/main/resources/images/application-vnd.oasis.opendocument.spreadsheet-template.png||Oxygen Icons - LGPL 3.0|||oxygen|END| src/main/resources/images/application_xp.png||FAMFAMFAM Icons - CC 2.5|||fam fam|END| -src/main/resources/images/arrow.gif||GHIDRA||||END| src/main/resources/images/bullet_delete.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/check.png||GHIDRA||||END| src/main/resources/images/close16.gif||GHIDRA||reviewed||END| @@ -78,8 +77,6 @@ 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.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_code.png||FAMFAMFAM Icons - CC 2.5||||END| src/main/resources/images/page_excel.png||FAMFAMFAM Icons - CC 2.5||||END| @@ -93,7 +90,6 @@ src/main/resources/images/table_relationship.png||FAMFAMFAM Icons - CC 2.5|||fam src/main/resources/images/tag.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/text_lowercase.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/textfield_rename.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| -src/main/resources/images/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/trash-empty.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| 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| diff --git a/Ghidra/Framework/Docking/src/main/help/help/shared/Frontpage.css b/Ghidra/Framework/Docking/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Framework/Docking/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Misc/Welcome_to_Help.htm b/Ghidra/Framework/Docking/src/main/help/help/topics/Misc/Welcome_to_Help.htm index 4291313572..2be204c481 100644 --- a/Ghidra/Framework/Docking/src/main/help/help/topics/Misc/Welcome_to_Help.htm +++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Misc/Welcome_to_Help.htm @@ -7,7 +7,7 @@ - + diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingDeveloperDocs.html b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingDeveloperDocs.html index 086394618e..ff9ab1c82f 100644 --- a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingDeveloperDocs.html +++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingDeveloperDocs.html @@ -4,7 +4,7 @@ - + Developer's Guide diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html index 6a72228954..33ea671d36 100644 --- a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html +++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingInternals.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Theming Architecture - + diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingOverview.html b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingOverview.html index d446609d85..c0018e699c 100644 --- a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingOverview.html +++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingOverview.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> General Overivew - + diff --git a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html index eb9ff2d102..97ad5be37f 100644 --- a/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html +++ b/Ghidra/Framework/Docking/src/main/help/help/topics/Theming/ThemingUserDocs.html @@ -6,7 +6,7 @@ "HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net"> Theming User Documentation - + @@ -109,7 +109,7 @@

        To change the current theme, first bring up the Theme Dialog. The Theme Dialog can be invoked from the main application menu using the - EditTheme menu. From the Theme + EditTheme menu. From the Theme Dialog you can select a theme from the combo box at the top.

        Modifying Theme Values

        @@ -117,7 +117,7 @@

        All the colors, fonts, and icons that have been registered with the theme API can be modified using the Theme Dialog. The Theme Dialog can be invoked from the main application menu using the - EditTheme menu. Choose the + EditTheme menu. Choose the tab for the appropriate type and double-click on the ID column or Current Value column of the item you want to change. An editor for that type will appear.

        @@ -125,7 +125,7 @@

        To reset an individual value back to its original theme value, from the main application menu invoke the Theme Dialog using the Edit Theme Dialog using the Edit Theme menu. Choose the tab for the appropriate type and right-click on the row of the value you want to reset, then choose the Restore Value menu item.

        @@ -134,8 +134,8 @@

        To reset all values back to the original values established by the current theme, from the main application menu invoke - the EditTheme Actions Reset Theme Values menu.

        + the EditTheme Actions Reset Theme Values menu.

        Saving Themes

        @@ -149,8 +149,8 @@

        To delete a custom saved theme, from the main application menu invoke the EditTheme Actions Delete Theme... menu. This will bring up a dialog + "help/shared/arrow.gif" border="0">Theme Actions Delete Theme... menu. This will bring up a dialog with a list of themes that can be deleted. Select the theme to delete and press the Ok button.

        @@ -158,8 +158,8 @@

        To export a theme so that it can be shared with others, from the main application menu invoke the Edit Theme Actions Export Theme... menu. You will first be asked if + src="help/shared/arrow.gif" border="0">Theme Actions Export Theme... menu. You will first be asked if you want to export as a regular theme file or as a Zip file. The Zip file option is useful if the current theme has icon values that are not included with standard application. In that case, the Zip file will include those non-standard icon files.

        @@ -167,8 +167,8 @@

        Importing Themes

        To import a theme, from the main application menu - invoke the Edit Theme Actions Import + invoke the Edit Theme Actions Import Theme... menu. A file chooser dialog will appear allowing the user to choose a theme file to import. The selected file can be either a standard theme file or a Zip file containing the theme file and any non-standard icon files defined by that theme.

        diff --git a/Ghidra/Framework/Docking/src/main/resources/images/arrow.gif b/Ghidra/Framework/Docking/src/main/resources/images/arrow.gif deleted file mode 100644 index bcb3db7057..0000000000 Binary files a/Ghidra/Framework/Docking/src/main/resources/images/arrow.gif and /dev/null differ diff --git a/Ghidra/Framework/Docking/src/main/resources/images/note.png b/Ghidra/Framework/Docking/src/main/resources/images/note.png deleted file mode 100644 index 51e1c8f8c1..0000000000 Binary files a/Ghidra/Framework/Docking/src/main/resources/images/note.png and /dev/null differ diff --git a/Ghidra/Framework/Docking/src/main/resources/images/note.yellow.png b/Ghidra/Framework/Docking/src/main/resources/images/note.yellow.png deleted file mode 100644 index f8ab6489f2..0000000000 Binary files a/Ghidra/Framework/Docking/src/main/resources/images/note.yellow.png and /dev/null differ diff --git a/Ghidra/Framework/Docking/src/main/resources/images/tip.png b/Ghidra/Framework/Docking/src/main/resources/images/tip.png deleted file mode 100644 index 209f1d28c8..0000000000 Binary files a/Ghidra/Framework/Docking/src/main/resources/images/tip.png and /dev/null differ diff --git a/Ghidra/Framework/Gui/certification.manifest b/Ghidra/Framework/Gui/certification.manifest index efd2ca259d..555f8f58b3 100644 --- a/Ghidra/Framework/Gui/certification.manifest +++ b/Ghidra/Framework/Gui/certification.manifest @@ -6,5 +6,59 @@ ##MODULE IP: Tango Icons - Public Domain .classpath||GHIDRA||||END| Module.manifest||GHIDRA||||END| +data/gui.theme.properties||GHIDRA||||END| src/main/java/ghidra/framework/options/package.html||GHIDRA||||END| src/main/java/ghidra/util/layout/package.html||GHIDRA||||END| +src/main/resources/images/EmptyIcon.gif||GHIDRA||||END| +src/main/resources/images/EmptyIcon16.gif||GHIDRA||||END| +src/main/resources/images/GhidraIcon128.png||GHIDRA||||END| +src/main/resources/images/GhidraIcon16.png||GHIDRA||||END| +src/main/resources/images/GhidraIcon24.png||GHIDRA||||END| +src/main/resources/images/GhidraIcon256.png||GHIDRA||||END| +src/main/resources/images/GhidraIcon32.png||GHIDRA||||END| +src/main/resources/images/GhidraIcon40.png||GHIDRA||||END| +src/main/resources/images/GhidraIcon48.png||GHIDRA||||END| +src/main/resources/images/GhidraIcon64.png||GHIDRA||||END| +src/main/resources/images/Plus2.png||GHIDRA||||END| +src/main/resources/images/checkmark_green.gif||GHIDRA||||END| +src/main/resources/images/closedSmallFolder.png||Modified Nuvola Icons - LGPL 2.1||||END| +src/main/resources/images/collapse_all.png||GHIDRA||||END| +src/main/resources/images/core.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| +src/main/resources/images/core24.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| +src/main/resources/images/dialog-cancel.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| +src/main/resources/images/disk.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/resources/images/disk_save_as.png||FAMFAMFAM Icons - CC 2.5||||END| +src/main/resources/images/down.png||GHIDRA||||END| +src/main/resources/images/edit-cut.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/emblem-important.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| +src/main/resources/images/erase16.png||GHIDRA||||END| +src/main/resources/images/error.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| +src/main/resources/images/exec.png||Crystal Clear Icons - LGPL 2.1||||END| +src/main/resources/images/expand_all.png||GHIDRA||||END| +src/main/resources/images/flag.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| +src/main/resources/images/go-home.png||Tango Icons - Public Domain|||tango icon set|END| +src/main/resources/images/help-browser.png||Tango Icons - Public Domain|||tango icon set|END| +src/main/resources/images/information.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/resources/images/kgpg.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| +src/main/resources/images/left.alternate.png||GHIDRA||||END| +src/main/resources/images/left.png||GHIDRA||||END| +src/main/resources/images/locationIn.gif||GHIDRA||||END| +src/main/resources/images/locationOut.gif||GHIDRA||||END| +src/main/resources/images/openFolder.png||Modified Nuvola Icons - LGPL 2.1||||END| +src/main/resources/images/openSmallFolder.png||Modified Nuvola Icons - LGPL 2.1||||END| +src/main/resources/images/page_paste.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/resources/images/page_white_copy.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/resources/images/process-stop.png||Tango Icons - Public Domain|||tango icon set|END| +src/main/resources/images/program_obj.png||GHIDRA||||END| +src/main/resources/images/reload3.png||Crystal Clear Icons - LGPL 2.1||||END| +src/main/resources/images/right.alternate.png||GHIDRA||||END| +src/main/resources/images/right.png||GHIDRA||||END| +src/main/resources/images/software-update-urgent.png||Tango Icons - Public Domain|||tango icon set|END| +src/main/resources/images/sortascending.png||GHIDRA||||END| +src/main/resources/images/sortdescending.png||GHIDRA||||END| +src/main/resources/images/text_align_justify.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| +src/main/resources/images/up.png||GHIDRA||||END| +src/main/resources/images/video-x-generic16.png||Tango Icons - Public Domain|||tango icon set|END| +src/main/resources/images/viewmagfit.png||Nuvola Icons - LGPL 2.1|||Nuvola icon set|END| +src/main/resources/images/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| diff --git a/Ghidra/Framework/Generic/data/generic.theme.properties b/Ghidra/Framework/Gui/data/gui.theme.properties similarity index 90% rename from Ghidra/Framework/Generic/data/generic.theme.properties rename to Ghidra/Framework/Gui/data/gui.theme.properties index 8db3c102fb..bf24e7d5be 100644 --- a/Ghidra/Framework/Generic/data/generic.theme.properties +++ b/Ghidra/Framework/Gui/data/gui.theme.properties @@ -63,8 +63,6 @@ icon.make.selection = text_align_justify.png icon.arrow.down.right = viewmagfit.png[rotate(90)] icon.arrow.up.left = viewmagfit.png[rotate(275)] -icon.filter.not.accepted = icon.flag{dialog-cancel.png[size(10,10)][move(6,6)]} -icon.blocked.match = icon.lock{icon.checkmark.green[size(12,12)][move(4,0)]} diff --git a/Ghidra/Framework/Gui/src/main/java/ghidra/util/HelpLocation.java b/Ghidra/Framework/Gui/src/main/java/ghidra/util/HelpLocation.java index 20000ebd7e..867bf7451a 100644 --- a/Ghidra/Framework/Gui/src/main/java/ghidra/util/HelpLocation.java +++ b/Ghidra/Framework/Gui/src/main/java/ghidra/util/HelpLocation.java @@ -38,7 +38,7 @@ public class HelpLocation { * to locate the given resource. This is meant to be used with shared help resources, such * as images. */ - public static final String HELP_SHARED = "help/shared"; + public static final String HELP_SHARED = "help/shared/"; private String id; private URL url; @@ -189,6 +189,7 @@ public class HelpLocation { /** * Returns the topic name/path if known, otherwise null. + * @return the topic name/path if known, otherwise null. */ public String getTopic() { return topic; @@ -196,6 +197,7 @@ public class HelpLocation { /** * Returns the topic anchor name if known, otherwise null. + * @return the topic anchor name if known, otherwise null. */ public String getAnchor() { return anchor; diff --git a/Ghidra/Framework/Gui/src/main/java/resources/Icons.java b/Ghidra/Framework/Gui/src/main/java/resources/Icons.java index d4708f1232..f7485fb8b2 100644 --- a/Ghidra/Framework/Gui/src/main/java/resources/Icons.java +++ b/Ghidra/Framework/Gui/src/main/java/resources/Icons.java @@ -80,13 +80,8 @@ public class Icons { public static final Icon MAKE_SELECTION_ICON = new GIcon("icon.make.selection"); - // Not necessarily re-usable, but this is needed for the help system; these should - // probably be moved to the client that uses them, while updating the - // help system to use them there. public static final Icon ARROW_DOWN_RIGHT_ICON = new GIcon("icon.arrow.down.right"); public static final Icon ARROW_UP_LEFT_ICON = new GIcon("icon.arrow.up.left"); - public static final Icon FILTER_NOT_ACCEPTED_ICON = new GIcon("icon.filter.not.accepted"); - public static final Icon APPLY_BLOCKED_MATCH_ICON = new GIcon("icon.blocked.match"); /** * Returns true if the given string is a Java code snippet that references this class diff --git a/Ghidra/Framework/Gui/src/main/java/resources/ResourceManager.java b/Ghidra/Framework/Gui/src/main/java/resources/ResourceManager.java index 7a9a9e3157..c59046825f 100644 --- a/Ghidra/Framework/Gui/src/main/java/resources/ResourceManager.java +++ b/Ghidra/Framework/Gui/src/main/java/resources/ResourceManager.java @@ -521,10 +521,12 @@ public class ResourceManager { ImageIcon icon = iconMap.get(iconPath); if (icon == null) { icon = doLoadIcon(iconPath); - iconMap.put(iconPath, icon == null ? DEFAULT_ICON : icon); + if (icon != null) { + iconMap.put(iconPath, icon); + } } - return icon == DEFAULT_ICON ? null : icon; + return icon; } /** @@ -538,7 +540,9 @@ public class ResourceManager { ImageIcon icon = iconMap.get(iconPath); if (icon == null) { icon = doLoadIcon(iconPath); - iconMap.put(iconPath, icon == null ? DEFAULT_ICON : icon); + if (icon != null) { + iconMap.put(iconPath, icon); + } } return icon == null ? new UnresolvedIcon(iconPath, DEFAULT_ICON) : icon; } diff --git a/Ghidra/Framework/Generic/src/main/resources/images/EmptyIcon.gif b/Ghidra/Framework/Gui/src/main/resources/images/EmptyIcon.gif similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/EmptyIcon.gif rename to Ghidra/Framework/Gui/src/main/resources/images/EmptyIcon.gif diff --git a/Ghidra/Framework/Generic/src/main/resources/images/EmptyIcon16.gif b/Ghidra/Framework/Gui/src/main/resources/images/EmptyIcon16.gif similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/EmptyIcon16.gif rename to Ghidra/Framework/Gui/src/main/resources/images/EmptyIcon16.gif diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon128.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon128.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon128.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon128.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon16.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon16.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon16.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon16.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon24.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon24.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon24.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon24.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon256.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon256.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon256.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon256.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon32.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon32.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon32.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon32.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon40.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon40.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon40.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon40.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon48.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon48.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon48.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon48.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon64.png b/Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon64.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/GhidraIcon64.png rename to Ghidra/Framework/Gui/src/main/resources/images/GhidraIcon64.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/Plus2.png b/Ghidra/Framework/Gui/src/main/resources/images/Plus2.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/Plus2.png rename to Ghidra/Framework/Gui/src/main/resources/images/Plus2.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/checkmark_green.gif b/Ghidra/Framework/Gui/src/main/resources/images/checkmark_green.gif similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/checkmark_green.gif rename to Ghidra/Framework/Gui/src/main/resources/images/checkmark_green.gif diff --git a/Ghidra/Framework/Generic/src/main/resources/images/closedSmallFolder.png b/Ghidra/Framework/Gui/src/main/resources/images/closedSmallFolder.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/closedSmallFolder.png rename to Ghidra/Framework/Gui/src/main/resources/images/closedSmallFolder.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/collapse_all.png b/Ghidra/Framework/Gui/src/main/resources/images/collapse_all.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/collapse_all.png rename to Ghidra/Framework/Gui/src/main/resources/images/collapse_all.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/core.png b/Ghidra/Framework/Gui/src/main/resources/images/core.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/core.png rename to Ghidra/Framework/Gui/src/main/resources/images/core.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/core24.png b/Ghidra/Framework/Gui/src/main/resources/images/core24.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/core24.png rename to Ghidra/Framework/Gui/src/main/resources/images/core24.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/dialog-cancel.png b/Ghidra/Framework/Gui/src/main/resources/images/dialog-cancel.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/dialog-cancel.png rename to Ghidra/Framework/Gui/src/main/resources/images/dialog-cancel.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/disk.png b/Ghidra/Framework/Gui/src/main/resources/images/disk.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/disk.png rename to Ghidra/Framework/Gui/src/main/resources/images/disk.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/disk_save_as.png b/Ghidra/Framework/Gui/src/main/resources/images/disk_save_as.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/disk_save_as.png rename to Ghidra/Framework/Gui/src/main/resources/images/disk_save_as.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/down.png b/Ghidra/Framework/Gui/src/main/resources/images/down.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/down.png rename to Ghidra/Framework/Gui/src/main/resources/images/down.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/edit-cut.png b/Ghidra/Framework/Gui/src/main/resources/images/edit-cut.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/edit-cut.png rename to Ghidra/Framework/Gui/src/main/resources/images/edit-cut.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/edit-delete.png b/Ghidra/Framework/Gui/src/main/resources/images/edit-delete.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/edit-delete.png rename to Ghidra/Framework/Gui/src/main/resources/images/edit-delete.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/emblem-important.png b/Ghidra/Framework/Gui/src/main/resources/images/emblem-important.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/emblem-important.png rename to Ghidra/Framework/Gui/src/main/resources/images/emblem-important.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/erase16.png b/Ghidra/Framework/Gui/src/main/resources/images/erase16.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/erase16.png rename to Ghidra/Framework/Gui/src/main/resources/images/erase16.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/error.png b/Ghidra/Framework/Gui/src/main/resources/images/error.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/error.png rename to Ghidra/Framework/Gui/src/main/resources/images/error.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/exec.png b/Ghidra/Framework/Gui/src/main/resources/images/exec.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/exec.png rename to Ghidra/Framework/Gui/src/main/resources/images/exec.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/expand_all.png b/Ghidra/Framework/Gui/src/main/resources/images/expand_all.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/expand_all.png rename to Ghidra/Framework/Gui/src/main/resources/images/expand_all.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/flag.png b/Ghidra/Framework/Gui/src/main/resources/images/flag.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/flag.png rename to Ghidra/Framework/Gui/src/main/resources/images/flag.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/go-home.png b/Ghidra/Framework/Gui/src/main/resources/images/go-home.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/go-home.png rename to Ghidra/Framework/Gui/src/main/resources/images/go-home.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/help-browser.png b/Ghidra/Framework/Gui/src/main/resources/images/help-browser.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/help-browser.png rename to Ghidra/Framework/Gui/src/main/resources/images/help-browser.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/information.png b/Ghidra/Framework/Gui/src/main/resources/images/information.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/information.png rename to Ghidra/Framework/Gui/src/main/resources/images/information.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/kgpg.png b/Ghidra/Framework/Gui/src/main/resources/images/kgpg.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/kgpg.png rename to Ghidra/Framework/Gui/src/main/resources/images/kgpg.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/left.alternate.png b/Ghidra/Framework/Gui/src/main/resources/images/left.alternate.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/left.alternate.png rename to Ghidra/Framework/Gui/src/main/resources/images/left.alternate.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/left.png b/Ghidra/Framework/Gui/src/main/resources/images/left.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/left.png rename to Ghidra/Framework/Gui/src/main/resources/images/left.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/locationIn.gif b/Ghidra/Framework/Gui/src/main/resources/images/locationIn.gif similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/locationIn.gif rename to Ghidra/Framework/Gui/src/main/resources/images/locationIn.gif diff --git a/Ghidra/Framework/Generic/src/main/resources/images/locationOut.gif b/Ghidra/Framework/Gui/src/main/resources/images/locationOut.gif similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/locationOut.gif rename to Ghidra/Framework/Gui/src/main/resources/images/locationOut.gif diff --git a/Ghidra/Framework/Generic/src/main/resources/images/openFolder.png b/Ghidra/Framework/Gui/src/main/resources/images/openFolder.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/openFolder.png rename to Ghidra/Framework/Gui/src/main/resources/images/openFolder.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/openSmallFolder.png b/Ghidra/Framework/Gui/src/main/resources/images/openSmallFolder.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/openSmallFolder.png rename to Ghidra/Framework/Gui/src/main/resources/images/openSmallFolder.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/page_paste.png b/Ghidra/Framework/Gui/src/main/resources/images/page_paste.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/page_paste.png rename to Ghidra/Framework/Gui/src/main/resources/images/page_paste.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/page_white_copy.png b/Ghidra/Framework/Gui/src/main/resources/images/page_white_copy.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/page_white_copy.png rename to Ghidra/Framework/Gui/src/main/resources/images/page_white_copy.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/process-stop.png b/Ghidra/Framework/Gui/src/main/resources/images/process-stop.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/process-stop.png rename to Ghidra/Framework/Gui/src/main/resources/images/process-stop.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/program_obj.png b/Ghidra/Framework/Gui/src/main/resources/images/program_obj.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/program_obj.png rename to Ghidra/Framework/Gui/src/main/resources/images/program_obj.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/reload3.png b/Ghidra/Framework/Gui/src/main/resources/images/reload3.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/reload3.png rename to Ghidra/Framework/Gui/src/main/resources/images/reload3.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/right.alternate.png b/Ghidra/Framework/Gui/src/main/resources/images/right.alternate.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/right.alternate.png rename to Ghidra/Framework/Gui/src/main/resources/images/right.alternate.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/right.png b/Ghidra/Framework/Gui/src/main/resources/images/right.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/right.png rename to Ghidra/Framework/Gui/src/main/resources/images/right.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/software-update-urgent.png b/Ghidra/Framework/Gui/src/main/resources/images/software-update-urgent.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/software-update-urgent.png rename to Ghidra/Framework/Gui/src/main/resources/images/software-update-urgent.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/sortascending.png b/Ghidra/Framework/Gui/src/main/resources/images/sortascending.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/sortascending.png rename to Ghidra/Framework/Gui/src/main/resources/images/sortascending.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/sortdescending.png b/Ghidra/Framework/Gui/src/main/resources/images/sortdescending.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/sortdescending.png rename to Ghidra/Framework/Gui/src/main/resources/images/sortdescending.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/text_align_justify.png b/Ghidra/Framework/Gui/src/main/resources/images/text_align_justify.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/text_align_justify.png rename to Ghidra/Framework/Gui/src/main/resources/images/text_align_justify.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/up.png b/Ghidra/Framework/Gui/src/main/resources/images/up.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/up.png rename to Ghidra/Framework/Gui/src/main/resources/images/up.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/video-x-generic16.png b/Ghidra/Framework/Gui/src/main/resources/images/video-x-generic16.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/video-x-generic16.png rename to Ghidra/Framework/Gui/src/main/resources/images/video-x-generic16.png diff --git a/Ghidra/Framework/Generic/src/main/resources/images/viewmagfit.png b/Ghidra/Framework/Gui/src/main/resources/images/viewmagfit.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/viewmagfit.png rename to Ghidra/Framework/Gui/src/main/resources/images/viewmagfit.png diff --git a/Ghidra/Framework/Gui/src/main/resources/images/warning.png b/Ghidra/Framework/Gui/src/main/resources/images/warning.png new file mode 100644 index 0000000000..628cf2dae3 Binary files /dev/null and b/Ghidra/Framework/Gui/src/main/resources/images/warning.png differ diff --git a/Ghidra/Framework/Help/certification.manifest b/Ghidra/Framework/Help/certification.manifest index b189a7b238..aa0e9a25b3 100644 --- a/Ghidra/Framework/Help/certification.manifest +++ b/Ghidra/Framework/Help/certification.manifest @@ -5,6 +5,8 @@ Module.manifest||GHIDRA||||END| build.files/buildLocalHelp.xml||GHIDRA||||END| src/main/resources/help/shared/arrow.gif||GHIDRA||||END| +src/main/resources/help/shared/close16.gif||GHIDRA||||END| src/main/resources/help/shared/note.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/help/shared/note.yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/help/shared/tip.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| +src/main/resources/help/shared/warning.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| diff --git a/Ghidra/Framework/Help/src/main/java/help/GHelpHTMLEditorKit.java b/Ghidra/Framework/Help/src/main/java/help/GHelpHTMLEditorKit.java index ecd5ea65f1..982b4543ac 100644 --- a/Ghidra/Framework/Help/src/main/java/help/GHelpHTMLEditorKit.java +++ b/Ghidra/Framework/Help/src/main/java/help/GHelpHTMLEditorKit.java @@ -53,7 +53,7 @@ import utilities.util.FileUtilities; */ public class GHelpHTMLEditorKit extends HTMLEditorKit { - private static final String G_HELP_STYLE_SHEET = "Frontpage.css"; + private static final String G_HELP_STYLE_SHEET = "DefaultStyle.css"; private static final String DARK_G_HELP_STYLE_SHEET = "DarkStyle.css"; private static final Pattern EXTERNAL_URL_PATTERN = Pattern.compile("https?://.*"); diff --git a/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java b/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java index 883b72e8b0..5542b298f5 100644 --- a/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java +++ b/Ghidra/Framework/Help/src/main/java/help/HelpBuildUtils.java @@ -18,14 +18,16 @@ package help; import java.io.*; import java.net.*; import java.nio.file.*; -import java.text.MessageFormat; import java.util.Collection; import java.util.Collections; import java.util.regex.Matcher; import java.util.regex.Pattern; +import generic.jar.ResourceFile; import generic.theme.GIcon; import generic.theme.Gui; +import ghidra.framework.Application; +import ghidra.util.HelpLocation; import help.validator.location.*; import resources.IconProvider; import resources.Icons; @@ -34,26 +36,25 @@ public class HelpBuildUtils { private static final String HELP_TOPICS_ROOT_PATH = "help/topics"; - // Great. You've just summoned Cthulu. private static final Pattern HREF_PATTERN = Pattern.compile("\"(\\.\\./[^/.]+/[^/.]+\\.html*(#[^\"]+)*)\"", Pattern.CASE_INSENSITIVE); - private static final Pattern STYLE_SHEET_PATTERN = Pattern.compile( - "", Pattern.CASE_INSENSITIVE); - private static final Pattern STYLE_CLASS_PATTERN = Pattern.compile("class\\s*=\\s*\"(\\w+)\"", Pattern.CASE_INSENSITIVE); - private static final String STYLE_SHEET_FORMAT_STRING = - ""; - private static final String SHARED_DIRECTORY = "shared/"; - public static boolean debug = true; private HelpBuildUtils() { // utils class; can't create } + public static Path getSharedHelpDirectory() { + ResourceFile appRootDir = Application.getApplicationRootDirectory(); + ResourceFile sharedHelpDir = + new ResourceFile(appRootDir, "Framework/Help/src/main/resources/help/shared/"); + return Paths.get(sharedHelpDir.getAbsolutePath()); + } + public static HelpModuleLocation toLocation(File file) { if (file.isDirectory()) { return new DirectoryHelpModuleLocation(file); @@ -94,6 +95,14 @@ public class HelpBuildUtils { return null; } + /** + * Returns a path object using the given source file path as the source of the given relative + * path. The returned path represents a local file on the file system. + * + * @param srcFile the source file path + * @param relativePath the relative path + * @return a path or null if the resolved path is not a local file + */ public static Path getFile(Path srcFile, String relativePath) { if (relativePath == null || relativePath.isEmpty()) { return null; @@ -111,6 +120,13 @@ public class HelpBuildUtils { return null; // not sure why this is here } + if (relativePath.startsWith(HelpLocation.HELP_SHARED)) { + // special syntax that tells the help system to look in the shared directory + String updatedRelativePath = relativePath.substring(HelpLocation.HELP_SHARED.length()); + Path sharedDir = getSharedHelpDirectory(); + return sharedDir.resolve(updatedRelativePath); + } + Path parent = srcFile.getParent(); return parent.resolve(relativePath); } @@ -160,15 +176,6 @@ public class HelpBuildUtils { fileContents = newContents; } - String styleSheetFixupContents = fixStyleSheetLinkInFile(helpFile, fileContents); - if (styleSheetFixupContents != null) { - // a fixup has taken place - newContents = styleSheetFixupContents; - - // replace the input to future processing so we don't lose changes - fileContents = newContents; - } - String styleSheetClassFixupContents = fixStyleSheetClassNames(helpFile, fileContents); if (styleSheetClassFixupContents != null) { newContents = styleSheetClassFixupContents; @@ -181,56 +188,6 @@ public class HelpBuildUtils { writeFileContents(helpFile, newContents); } - private static String fixStyleSheetLinkInFile(Path helpFile, String fileContents) { - - int currentPosition = 0; - StringBuffer newContents = new StringBuffer(); - Matcher matcher = STYLE_SHEET_PATTERN.matcher(fileContents); - - boolean hasMatches = matcher.find(); - if (!hasMatches) { - return null; // no work to do - } - - // only care about the first hit, if there are multiple matches - // Groups: - // 0 - full match - // 1 - href text with relative notation "../.." - // 2 - href text without relative prefix - - int matchStart = matcher.start(); - String fullMatch = matcher.group(0); - - String beforeMatchString = fileContents.substring(currentPosition, matchStart); - newContents.append(beforeMatchString); - currentPosition = matchStart + fullMatch.length(); - - String fullHREFText = matcher.group(1); - if (fullHREFText.indexOf(SHARED_DIRECTORY) != -1) { - return null; // already fixed; nothing to do - } - - debug("Found stylesheet reference text: " + fullHREFText + " in file: " + - helpFile.getFileName()); - - // pull off the relative path structure - String filenameOnlyHREFText = matcher.group(2); - int filenameStart = fullHREFText.indexOf(filenameOnlyHREFText); - String reltativePrefix = fullHREFText.substring(0, filenameStart); - - String updatedStyleSheetTag = MessageFormat.format(STYLE_SHEET_FORMAT_STRING, - reltativePrefix, SHARED_DIRECTORY, filenameOnlyHREFText); - debug("\tnew link tag: " + updatedStyleSheetTag); - newContents.append(updatedStyleSheetTag); - - // grab the remaining content - if (currentPosition < fileContents.length()) { - newContents.append(fileContents.substring(currentPosition)); - } - - return newContents.toString(); - } - private static String fixStyleSheetClassNames(Path helpFile, String fileContents) { int currentPosition = 0; diff --git a/Ghidra/Framework/Help/src/main/java/help/validator/JavaHelpValidator.java b/Ghidra/Framework/Help/src/main/java/help/validator/JavaHelpValidator.java index f01bcba840..ff738de814 100644 --- a/Ghidra/Framework/Help/src/main/java/help/validator/JavaHelpValidator.java +++ b/Ghidra/Framework/Help/src/main/java/help/validator/JavaHelpValidator.java @@ -22,6 +22,7 @@ import java.util.Map.Entry; import generic.jar.ResourceFile; import ghidra.framework.Application; +import ghidra.util.HelpLocation; import help.HelpBuildUtils; import help.validator.links.*; import help.validator.location.HelpModuleCollection; @@ -176,40 +177,13 @@ public class JavaHelpValidator { private Path findPathInModules(IMG img) { String src = img.getSrcAttribute(); - - // TODO upcoming 'shared' unification -// if (src.startsWith(HelpLocation.HELP_IMAGES)) { - if (src.startsWith("../../shared/")) { + if (src.startsWith(HelpLocation.HELP_SHARED)) { // this prefix is a signal to look for images in a special directory inside of the // modules instead of help - String imagePath = "help/" + src.substring("../../".length()); - ResourceFile myModule = Application.getMyModuleRootDirectory(); ResourceFile resourceDir = new ResourceFile(myModule, "src/main/resources"); - Path toCheck = makePath(resourceDir, imagePath); - if (toCheck != null) { - return toCheck; - } - - // now try removing the 'shared' portion altogether - imagePath = "images/" + src.substring("../../shared/".length()); - Path path = doFindPathInModules(imagePath); - if (path != null) { - return path; - } - - // TODO upcoming 'shared' unification -// Path path = doFindPathInModules(imagePath); -// if (path != null) { -// return path; -// } - } - - // TODO upcoming 'shared' unification - fix the few of these that are left-over in the html - if (src.startsWith("../images/")) { - String imagePath = src.substring("../".length()); - Path toCheck = doFindPathInModules(imagePath); + Path toCheck = makePath(resourceDir, src); if (toCheck != null) { return toCheck; } diff --git a/Ghidra/Framework/Help/src/main/java/help/validator/ReferenceTagProcessor.java b/Ghidra/Framework/Help/src/main/java/help/validator/ReferenceTagProcessor.java index 36ff433e87..3770b57c6d 100644 --- a/Ghidra/Framework/Help/src/main/java/help/validator/ReferenceTagProcessor.java +++ b/Ghidra/Framework/Help/src/main/java/help/validator/ReferenceTagProcessor.java @@ -17,7 +17,8 @@ package help.validator; import java.io.IOException; import java.net.URISyntaxException; -import java.nio.file.*; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.*; import ghidra.util.exception.AssertException; @@ -29,8 +30,7 @@ import help.validator.model.IMG; public class ReferenceTagProcessor extends TagProcessor { private static final String EOL = System.getProperty("line.separator"); - private static final String STYLESHEET_FILENAME = "Frontpage.css"; - private static final String STYLESHEET_PATHNAME = "shared/" + STYLESHEET_FILENAME; + private static final String STYLESHEET_FILENAME = "DefaultStyle.css"; private Path htmlFile; private Set styleSheets = new HashSet<>(); @@ -47,17 +47,10 @@ public class ReferenceTagProcessor extends TagProcessor { this.help = help; this.anchorManager = anchorManager; - // - // Note: currently all help being built has the required stylesheet living under - // /shared/ - // - // If we ever need a more robust styling mechanism, then this code would need to be - // updated to know how to search for the referenced stylesheet - Path helpPath = help.getHelpLocation(); - FileSystem fs = helpPath.getFileSystem(); - Path relativeSSPath = fs.getPath(STYLESHEET_PATHNAME); - defaultStyleSheet = helpPath.resolve(relativeSSPath); - if (Files.notExists(helpPath)) { + Path sharedHelpDir = HelpBuildUtils.getSharedHelpDirectory(); + defaultStyleSheet = sharedHelpDir.resolve(Path.of(STYLESHEET_FILENAME)); + + if (Files.notExists(defaultStyleSheet)) { throw new AssertException("Cannot find expected stylesheet: " + defaultStyleSheet); } } diff --git a/Ghidra/Framework/Help/src/main/resources/help/shared/Frontpage.css b/Ghidra/Framework/Help/src/main/resources/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/Ghidra/Framework/Help/src/main/resources/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/Ghidra/Debug/Debugger/src/main/help/help/shared/close16.gif b/Ghidra/Framework/Help/src/main/resources/help/shared/close16.gif similarity index 100% rename from Ghidra/Debug/Debugger/src/main/help/help/shared/close16.gif rename to Ghidra/Framework/Help/src/main/resources/help/shared/close16.gif diff --git a/Ghidra/Framework/Generic/src/main/resources/images/warning.png b/Ghidra/Framework/Help/src/main/resources/help/shared/warning.png similarity index 100% rename from Ghidra/Framework/Generic/src/main/resources/images/warning.png rename to Ghidra/Framework/Help/src/main/resources/help/shared/warning.png diff --git a/Ghidra/Framework/Help/src/test/java/help/AbstractHelpTest.java b/Ghidra/Framework/Help/src/test/java/help/AbstractHelpTest.java index 8d8a3cdd73..d763369d38 100644 --- a/Ghidra/Framework/Help/src/test/java/help/AbstractHelpTest.java +++ b/Ghidra/Framework/Help/src/test/java/help/AbstractHelpTest.java @@ -15,7 +15,7 @@ */ package help; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.*; import java.io.IOException; import java.nio.file.*; @@ -75,16 +75,13 @@ public abstract class AbstractHelpTest extends AbstractGenericTest { // HelpFile wants to read one of these, so put one there createEmpty_TOC_Source_File(helpDir); - createSharedDir(helpDir); + createImageDir(helpDir); } - protected Path createSharedDir(Path helpDir) throws IOException { - Path sharedDir = helpDir.resolve("shared"); + protected Path createImageDir(Path helpDir) throws IOException { + Path sharedDir = helpDir.resolve("images"); Files.createDirectory(sharedDir); - Path css = sharedDir.resolve("Frontpage.css"); - Files.createFile(css); - Path png = sharedDir.resolve("test.png"); Files.createFile(png); @@ -121,12 +118,12 @@ public abstract class AbstractHelpTest extends AbstractGenericTest { "\n" + "\n" + "Configure Tool\n" + - "\n" + + "\n" + "\n" + "\n" + "

        Configure Tool

        \n" + - " Some text with reference to shared image \n" + + " Some text with reference to shared image \n" + " \n" + "\n" + "\n"; @@ -147,7 +144,7 @@ public abstract class AbstractHelpTest extends AbstractGenericTest { "\n" + "\n" + "Configure Tool\n" + - "\n" + + "\n" + "\n" + "\n" + @@ -174,7 +171,7 @@ public abstract class AbstractHelpTest extends AbstractGenericTest { "\n" + "\n" + "Configure Tool\n" + - "\n" + + "\n" + "\n" + "\n" + diff --git a/Ghidra/Framework/Help/src/test/java/help/HelpBuildUtilsTest.java b/Ghidra/Framework/Help/src/test/java/help/HelpBuildUtilsTest.java index b6a3a53683..be92d6e263 100644 --- a/Ghidra/Framework/Help/src/test/java/help/HelpBuildUtilsTest.java +++ b/Ghidra/Framework/Help/src/test/java/help/HelpBuildUtilsTest.java @@ -36,10 +36,6 @@ public class HelpBuildUtilsTest extends AbstractHelpTest { private static final String TOPIC_AND_FILENAME = "FooTopic/FooFile.html"; private static final String HTML_FILE_PATH = HELP_TOPIC_PATH + '/' + TOPIC_AND_FILENAME; - public HelpBuildUtilsTest() { - super(); - } - @Override protected ApplicationLayout createApplicationLayout() throws IOException { return new GhidraTestApplicationLayout(new File(getTestDirectoryPath())); diff --git a/Ghidra/Framework/Help/src/test/java/help/validator/model/HelpFileTest.java b/Ghidra/Framework/Help/src/test/java/help/validator/model/HelpFileTest.java index db76305442..393c478e66 100644 --- a/Ghidra/Framework/Help/src/test/java/help/validator/model/HelpFileTest.java +++ b/Ghidra/Framework/Help/src/test/java/help/validator/model/HelpFileTest.java @@ -15,8 +15,7 @@ */ package help.validator.model; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.io.IOException; import java.nio.file.*; @@ -188,7 +187,7 @@ public class HelpFileTest extends AbstractHelpTest { "\n" + "\n" + "Configure Tool\n" + - "\n" + + "\n" + "\n" + "\n" + "

        Configure Tool

        \n" + @@ -213,7 +212,7 @@ public class HelpFileTest extends AbstractHelpTest { "\n" + "\n" + "Configure Tool\n" + - "\n" + + "\n" + "\n" + "\n" + "

        Configure Tool

        \n" + @@ -238,7 +237,7 @@ public class HelpFileTest extends AbstractHelpTest { "\n" + "\n" + "Configure Tool\n" + - "\n" + + "\n" + "\n" + "\n" + "

        Configure Tool

        \n" + @@ -267,7 +266,7 @@ public class HelpFileTest extends AbstractHelpTest { "\n" + "\n" + "

        Configure Tool

        \n" + - "Some text with reference to shared image \n" + + "Some text with reference to shared image \n" + "\n" + "\n" + "\n"; @@ -289,7 +288,7 @@ public class HelpFileTest extends AbstractHelpTest { "\n" + "\n" + "Configure Tool\n" + - "\n" + + "\n" + "\n" + "\n" + "

        Configure Tool

        \n" + diff --git a/GhidraBuild/Skeleton/src/main/help/help/shared/Frontpage.css b/GhidraBuild/Skeleton/src/main/help/help/shared/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/GhidraBuild/Skeleton/src/main/help/help/shared/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } diff --git a/GhidraBuild/Skeleton/src/main/help/help/topics/skeleton/help.html b/GhidraBuild/Skeleton/src/main/help/help/topics/skeleton/help.html index 8f858d23fd..5a062bc471 100644 --- a/GhidraBuild/Skeleton/src/main/help/help/topics/skeleton/help.html +++ b/GhidraBuild/Skeleton/src/main/help/help/topics/skeleton/help.html @@ -10,7 +10,7 @@ Skeleton Help File for a Module - + diff --git a/GhidraDocs/languages/html/Frontpage.css b/GhidraDocs/languages/html/Frontpage.css deleted file mode 100644 index 557c37ca39..0000000000 --- a/GhidraDocs/languages/html/Frontpage.css +++ /dev/null @@ -1,64 +0,0 @@ -/* ### - * IP: GHIDRA - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - WARNING! - This file is copied to all help directories. If you change this file, you must copy it - to each src/main/help/help/shared directory. - - - Java Help Note: JavaHelp does not accept sizes (like in 'margin-top') in anything but - px (pixel) or with no type marking. - -*/ - -body { margin-bottom: 50px; margin-left: 10px; margin-right: 10px; margin-top: 10px; } /* some padding to improve readability */ -li { font-family:times new roman; font-size:14pt; } -h1 { color:#000080; font-family:times new roman; font-size:36pt; font-style:italic; font-weight:bold; text-align:center; } -h2 { margin: 10px; margin-top: 20px; color:#984c4c; font-family:times new roman; font-size:18pt; font-weight:bold; } -h3 { margin-left: 10px; margin-top: 20px; color:#0000ff; font-family:times new roman; font-size:14pt; font-weight:bold; } -h4 { margin-left: 10px; margin-top: 20px; font-family:times new roman; font-size:14pt; font-style:italic; } - -/* - P tag code. Most of the help files nest P tags inside of blockquote tags (the was the - way it had been done in the beginning). The net effect is that the text is indented. In - modern HTML we would use CSS to do this. We need to support the Ghidra P tags, nested in - blockquote tags, as well as naked P tags. The following two lines accomplish this. Note - that the 'blockquote p' definition will inherit from the first 'p' definition. -*/ -p { margin-left: 40px; font-family:times new roman; font-size:14pt; } -blockquote p { margin-left: 10px; } - -p.providedbyplugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.ProvidedByPlugin { color:#7f7f7f; margin-left: 10px; font-size:14pt; margin-top:100px } -p.relatedtopic { color:#800080; margin-left: 10px; font-size:14pt; } -p.RelatedTopic { color:#800080; margin-left: 10px; font-size:14pt; } - -/* - We wish for a tables to have space between it and the preceding element, so that text - is not too close to the top of the table. Also, nest the table a bit so that it is clear - the table relates to the preceding text. -*/ -table { margin-left: 20px; margin-top: 10px; width: 80%;} -td { font-family:times new roman; font-size:14pt; vertical-align: top; } -th { font-family:times new roman; font-size:14pt; font-weight:bold; background-color: #EDF3FE; } - -/* - Code-like formatting for things such as file system paths and proper names of classes, - methods, etc. To apply this to a file path, use this syntax: - ... -*/ -code { color: black; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; } -code.path { color: #4682B4; font-weight: bold; font-family: courier new, monospace; font-size: 14pt; white-space: nowrap; }