From a97c3dc4afa53ef148d10104c5bed0ff0e3ddcb7 Mon Sep 17 00:00:00 2001 From: dev747368 <48332326+dev747368@users.noreply.github.com> Date: Thu, 3 Jun 2021 15:23:05 -0400 Subject: [PATCH] GP-984 simplify LoadPdbDialog gui --- Ghidra/Features/PDB/certification.manifest | 3 +- .../PDB/src/main/help/help/TOC_Source.xml | 2 +- .../Pdb/{LoadPDBNew.html => LoadPDB.html} | 27 +--- .../PDB/src/main/help/help/topics/Pdb/PDB.htm | 4 +- .../images/LoadPdb_Advanced_NeedsConfig.png | Bin 43525 -> 34434 bytes .../images/LoadPdb_Advanced_Screenshot.png | Bin 78344 -> 50859 bytes .../Pdb/images/LoadPdb_Initial_Screenshot.png | Bin 28637 -> 30048 bytes .../images/SymbolServerConfig_Configured.png | Bin 0 -> 20962 bytes .../pdb/symbolserver/LocalSymbolStore.java | 62 +++---- .../pdb/symbolserver/SameDirSymbolStore.java | 9 +- .../pdb/symbolserver/ui/ConfigPdbDialog.java | 35 +++- .../pdb/symbolserver/ui/LoadPdbDialog.java | 151 +++++------------- .../pdb/symbolserver/ui/SymbolFilePanel.java | 2 +- .../symbolserver/ui/SymbolServerPanel.java | 36 ++--- .../java/help/screenshot/PdbScreenShots.java | 45 ++++-- 15 files changed, 151 insertions(+), 225 deletions(-) rename Ghidra/Features/PDB/src/main/help/help/topics/Pdb/{LoadPDBNew.html => LoadPDB.html} (88%) create mode 100644 Ghidra/Features/PDB/src/main/help/help/topics/Pdb/images/SymbolServerConfig_Configured.png diff --git a/Ghidra/Features/PDB/certification.manifest b/Ghidra/Features/PDB/certification.manifest index dce9dc413e..8ae04a48be 100644 --- a/Ghidra/Features/PDB/certification.manifest +++ b/Ghidra/Features/PDB/certification.manifest @@ -16,13 +16,14 @@ 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/LoadPDBNew.html||GHIDRA||||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| diff --git a/Ghidra/Features/PDB/src/main/help/help/TOC_Source.xml b/Ghidra/Features/PDB/src/main/help/help/TOC_Source.xml index 16c4f1abb5..3ddcfbbd9b 100644 --- a/Ghidra/Features/PDB/src/main/help/help/TOC_Source.xml +++ b/Ghidra/Features/PDB/src/main/help/help/TOC_Source.xml @@ -51,7 +51,7 @@ - + diff --git a/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDBNew.html b/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDB.html similarity index 88% rename from Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDBNew.html rename to Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDB.html index 6d8ff3b3d9..5d63a9cb10 100644 --- a/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDBNew.html +++ b/Ghidra/Features/PDB/src/main/help/help/topics/Pdb/LoadPDB.html @@ -33,7 +33,7 @@
  • myprogram.pdb/012345670123012301230123456789AB1/myprogram.pdb.
  • myprogram.pdb is the name of the file and the name of the initial subdirectory off the root of the server.
  • 012345670123012301230123456789AB is the 32 character hexadecimal value (made up for this example) of the GUID - "012345678-0123-0123-0123-0123456789AB" of the PDB file.
    • + "01234567-0123-0123-0123-0123456789AB" of the PDB file.
  • 1 is the hexadecimal value of the 'age' (build number) of the PDB file. Note: most PDB files will have an age value of 1.
    • @@ -56,14 +56,8 @@
  • Unorganized directories:
    • @@ -88,16 +82,10 @@ which PDB file to choose.
  • If needed, click the Advanced button:
    • -
  • The Local Symbol Storage location is required to enable searching. If missing, set it to a directory where Ghidra can store PDB files.
    • - -
  • Add additional search locations by clicking the button. - The Microsoft symbol server and Program's Import Location are good defaults.
    • -
  • Save any changes to the configuration by clicking the button.
    • +
  • The Local Symbol Storage location (in the Symbol Server Config screen) is required + to enable searching. If missing, click the Config... button.
  • Set search options as needed.
    • -
  • Click the Search button to search the configured locations.
    • +
  • Click the Search Local or Search All button to search the configured locations.
  • The Local Symbol Storage location is searched first, followed by any locations listed in the Additional Search Paths list, in listed order.
    • @@ -111,7 +99,7 @@

    Symbol Server Config

    Allows the user to configure the location where PDB symbol files are stored and additional locations to search for - existing PDB files. This is also available in the Load PDB File, Advanced screen.

    + existing PDB files.

    Steps:

     (Add)

    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 c349ce849f..278e99af73 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 @@ -37,7 +37,7 @@

    PDB files can be loaded in two ways: