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 6d2872436c..b7253dc0f9 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 @@ -36,10 +36,9 @@ see an entry for each in the Search Results window. The title bar shows the number of entries being displayed.

-

The tool has an option for the maximum number of - search results. The search will stop after this number has been exceeded. To see more search - results, increase your search +

The tool has an option for the maximum number of search results. The search will stop after + this number has been exceeded. To see more search results, + increase your search limit.

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 f91253bf16..b2781cc519 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 @@ -279,19 +279,20 @@ "Query_Results_Dialog.htm">Query Results display, your cursor in the Code Browser is moved to that location where the match was found. So, if the match was found in an operand, then the location is moved to the matching string within the operand.

- -

The tool has an option for the number of search - results. The search will stop after this number has been exceeded. A dialog as shown - below warns you of the partial results. To see more search results, increase your search limit.

+ + +

Search Limit Option

+ +
+

The tool has an option to limit the number of search results. The search will stop after + this number has been exceeded. The below dialog warns you of the partial results. To see more + search results, select EditTool + Options... from the menu bar, then select the Search node in the tree. Edit the + Search Limit field to increase your search limit.

-
- -

 

@@ -412,11 +413,6 @@

Query Results

-
  • -

    Search Limit tool option

    -
    • -

  • Data

    • diff --git a/Ghidra/Features/Base/src/main/help/help/topics/Search/images/SearchLimitExceeded.png b/Ghidra/Features/Base/src/main/help/help/topics/Search/images/SearchLimitExceeded.png index 9974b6c954..391bd7c030 100644 Binary files a/Ghidra/Features/Base/src/main/help/help/topics/Search/images/SearchLimitExceeded.png and b/Ghidra/Features/Base/src/main/help/help/topics/Search/images/SearchLimitExceeded.png differ 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 e65a69aed7..85621a9a6e 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 @@ -283,13 +283,11 @@ window. The Tool panel defines the options for the Tool. The table below lists the basic options. Plugins may add their own options to the Tool options. If a tool does not have a plugin that uses an option, the option will not show up on the Tool panel. - For example, the Ghidra Project Window does not have plugins that use the Max Go to Entries, - Search Limit, or Subroutine Model so these options will not appear on the Tool panel. + For example, the Ghidra Project Window does not have plugins that use the Max Go to Entries + or Subroutine Model, so these options will not appear on the Tool panel. If an option has a description, it will show up in the description panel below the tree when you pass the mouse pointer over the component in the options panel.

    -

    -
    @@ -318,17 +316,6 @@ Label dialog - - - - - - diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java index a083af743c..dbca8c83a7 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchmem/MemSearchPlugin.java @@ -593,7 +593,7 @@ public class MemSearchPlugin extends Plugin implements OptionsChangeListener, JComponent resultsTable = provider.getComponent(); Msg.showInfo(getClass(), resultsTable, "Search Limit Exceeded!", "Stopped search after finding " + matchCount + " matches.\n" + - "The Search limit can be changed in the Edit->Options, under Tool Options"); + "The search limit can be changed at Edit->Tool Options, under Search."); } // suggestion to not close search dialog. TODO remove next line in future versions. diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java index 0981bab88b..f7676357e2 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/searchtext/SearchTextPlugin.java @@ -562,7 +562,7 @@ public class SearchTextPlugin extends ProgramPlugin implements OptionsChangeList Msg.showWarn(getClass(), getParentComponent(), "Search Limit Exceeded!", "Stopped search after finding " + matchCount + " matches.\n" + - "The Search limit can be changed in the Edit->Options, under Tool Options"); + "The search limit can be changed at Edit->Tool Options, under Search."); } // there was a suggestion that the dialog should not go way after a search all // searchDialog.close(); diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java index 133aaad0a8..dee311d524 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java @@ -651,7 +651,7 @@ public class GoToQuery { SwingUtilities.invokeLater(() -> Msg.showWarn(getClass(), parent, "Search Limit Exceeded!", "Stopped search after finding " + matchCount + " matches.\n" + - "The Search limit can be changed in the Edit->Options, under Tool Options")); + "The search limit can be changed at Edit->Tool Options, under Search.")); } } diff --git a/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java b/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java index 2935c686ee..15d76fced7 100644 --- a/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java +++ b/Ghidra/Test/IntegrationTest/src/screen/java/help/screenshot/SearchScreenShots.java @@ -25,6 +25,7 @@ import org.junit.Test; import docking.ComponentProvider; import docking.DialogComponentProvider; +import docking.widgets.combobox.GhidraComboBox; import docking.widgets.table.threaded.ThreadedTableModel; import ghidra.GhidraOptions; import ghidra.app.plugin.core.searchtext.SearchTextPlugin; @@ -105,8 +106,10 @@ public class SearchScreenShots extends AbstractSearchScreenShots { JRadioButton rbAll = (JRadioButton) getInstanceField("searchAllRB", dialog); rbAll.setSelected(true); - JTextField textField = (JTextField) getInstanceField("valueField", dialog); - setText(textField, "LAB"); + @SuppressWarnings("unchecked") + GhidraComboBox comboBox = + (GhidraComboBox) getInstanceField("valueComboBox", dialog); + setComboBoxSelection(comboBox, "LAB"); final JButton allButton = (JButton) getInstanceField("allButton", dialog); pressButton(allButton); @@ -167,8 +170,10 @@ public class SearchScreenShots extends AbstractSearchScreenShots { JRadioButton rbAll = (JRadioButton) getInstanceField("searchAllRB", dialog); rbAll.setSelected(true); - JTextField textField = (JTextField) getInstanceField("valueField", dialog); - setText(textField, "0"); + @SuppressWarnings("unchecked") + GhidraComboBox comboBox = + (GhidraComboBox) getInstanceField("valueComboBox", dialog); + setComboBoxSelection(comboBox, "0"); final JButton allButton = (JButton) getInstanceField("allButton", dialog); pressButton(allButton);
    Search LimitNumeric: The maximum number of search hits to allow; - for example, when you search - for text in the Program, the search is stopped when the number of matches - exceeds this limit, or the max number of addresses displayed while doing a Go To for an entry - that has multiple matches.
    Subroutine Model