diff --git a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/images/ImporterDialog.png b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/images/ImporterDialog.png index 3f70064d34..386d3f7c3b 100644 Binary files a/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/images/ImporterDialog.png and b/Ghidra/Features/Base/src/main/help/help/topics/ImporterPlugin/images/ImporterDialog.png differ 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 4581f782ab..cb701dc931 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 @@ -16,8 +16,8 @@
-

Ghidra can import a variety of different types of files into a Ghidra project as Ghidra - "programs." There are separate actions for importing single files, importing multiple +

Ghidra can import a variety of different types of files into a Ghidra project. + There are separate actions for importing single files, importing multiple files, and importing a file into an existing program. The actions for importing single or multiple files into a new program are available in both the front-end project window or the CodeBrowser tool. The action for adding to an existing program is only available from the @@ -87,7 +87,7 @@

  • Press OK from the Importer Dialog to perform the import.
    • -
  • A results summary dialog will appear and, if successful, the new program will appear +
  • A results summary dialog will appear and, if successful, the imported file will appear in the project window and if initiated from a CodeBrowser tool, it will be opened in the tool.
    • @@ -99,7 +99,7 @@ onto the Ghidra Project Tree destination folder. Dropping onto the table view is not supported. In the case of Ghidra Zip File (GZF), Ghidra Zip Debugger Trace file (GZT), or Ghidra Data Type Archive (GDT) file - imports, an immediate unpack can be performed wthout a popup dialog if the Front End option + imports, an immediate unpack can be performed without a popup dialog if the Front End option Enable simple GZF/GZT/GDT unpack is enabled ( EditTool Options... File ImportEnable simple GZF/GZT/GDT unpack). @@ -114,7 +114,7 @@
  • Press OK to initiate the import.
    • -
  • A results summary dialog will appear and, if successful, the new program will appear +
  • A results summary dialog will appear and, if successful, the newly imported file will appear in the project window and if initiated from a CodeBrowser tool, it will be opened in the tool.
    • @@ -266,20 +266,20 @@ file without any interpretation.
  • Language - This field specifies the language/compiler specification that will - be used in the resulting program. Often, this will be automatically detected from the + be used when importing a program. Often, this will be automatically detected from the file format. The Language/Compiler Spec Chooser Dialog can be used to enter or change the language/compiler spec that will be used.

  • Destination Folder - This field is used to specify the destination folder - within the current project for where the newly imported program will be saved. If a + within the current project for where the newly imported file will be saved. If a folder is selected in the front-end project window, then this field will default to that folder, otherwise the root folder will be the default. The ... will bring up a dialog for changing the destination folder.

    • -
  • Program Name - This field specifies the name for the newly imported file into +
  • Name - This field specifies the name for the newly imported file into the active project. - By default, it will be the name of the imported file with any format specific extenstion + By default, it will be the name of the imported file with any format specific extension removed (e.g., .xml, .gzf, .gzt, .gdt). Path information at the beginning of this field will be used to create a destination folder in the current project under the root folder specified by the Destination Folder field.

    • @@ -827,7 +827,7 @@

    This dialog is used specify of the Ghidra language (Processor/Compiler Spec) of the - program being imported. Certain formats, like "PE", "ELF", or "XML", will usually choose + file being imported. Certain formats, like "PE", "ELF", or "XML", will usually choose the appropriate language/compiler spec. If not, this dialog can be used to select one or override the default selection.


    diff --git a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ImporterDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ImporterDialog.java index 3410837d29..0b85d0c863 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ImporterDialog.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/plugin/importer/ImporterDialog.java @@ -177,7 +177,7 @@ public class ImporterDialog extends DialogComponentProvider { panel.add(buildFolderNameField()); panel.add(buildFolderNameBrowseButton()); - panel.add(new GLabel("Program Name: ", SwingConstants.RIGHT)); + panel.add(new GLabel("Name: ", SwingConstants.RIGHT)); panel.add(buildNameTextField()); panel.add(new JLabel());