yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'origin/GT-2853_dev747368_remove_tooltipmanager'

Conflicts:
	Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskMonitorComponent.java
This commit is contained in:
ghidra1 2019-05-09 16:48:56 -04:00
commit 7da1abe3ea
44 changed files with 163 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/EditPluginPathDialog.java
View file

@ -32,7 +32,6 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import docking.DialogComponentProvider;
import docking.ToolTipManager;
import docking.options.editor.ButtonPanelFactory;
import docking.widgets.filechooser.GhidraFileChooser;
import docking.widgets.label.GDLabel;
@ -409,8 +408,8 @@ class EditPluginPathDialog extends DialogComponentProvider {
// tooltip text problem where the text is obscured by a component
// added after tooltip has been added
//
ToolTipManager.setToolTipText(upButton, "Changes the order of search for plugins");
ToolTipManager.setToolTipText(downButton, "Changes the order of search for plugins");
upButton.setToolTipText("Changes the order of search for plugins");
downButton.setToolTipText("Changes the order of search for plugins");
pluginPathListPanel.validate();
return pluginPathListPanel;

5
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/LogPanel.java
View file

@ -25,7 +25,6 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import docking.StatusBarSpacer;
import docking.ToolTipManager;
import docking.help.Help;
import docking.help.HelpService;
import docking.widgets.EmptyBorderButton;
@ -67,7 +66,7 @@ public class LogPanel extends JPanel implements LogListener {
button.setPreferredSize(new Dimension(24, 24));
button.setFocusable(false);
ToolTipManager.setToolTipText(button, "Show Console (Refresh Open Console)");
button.setToolTipText("Show Console (Refresh Open Console)");
button.addActionListener(e -> {
FrontEndTool tool = (FrontEndTool) plugin.getTool();
tool.showGhidraUserLogFile();
@ -96,7 +95,7 @@ public class LogPanel extends JPanel implements LogListener {
label.setForeground(Color.RED);
}
label.setText(message);
ToolTipManager.setToolTipText(label, message);
label.setToolTipText(message);
});
}

3
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/ServerInfoComponent.java
View file

@ -22,7 +22,6 @@ import java.awt.event.ActionListener;
import javax.swing.*;
import javax.swing.event.*;
import docking.ToolTipManager;
import docking.widgets.label.GDLabel;
import ghidra.framework.model.ServerInfo;
import ghidra.framework.remote.GhidraServerHandle;
@ -151,7 +150,7 @@ public class ServerInfoComponent extends JPanel {
};
portNumberField.getDocument().addDocumentListener(portDocListener);
ToolTipManager.setToolTipText(portNumberField, "Enter port number");
portNumberField.setToolTipText("Enter port number");
JPanel panel = new JPanel(new PairLayout(5, 10));
panel.add(nameLabel);
panel.add(nameField);

5
Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/DataTree.java
View file

@ -18,8 +18,7 @@ package ghidra.framework.main.datatree;
import java.awt.Component;
import java.awt.event.KeyEvent;
import javax.swing.JTree;
import javax.swing.KeyStroke;
import javax.swing.*;
import javax.swing.tree.TreePath;
import docking.DockingUtils;
@ -43,7 +42,7 @@ public class DataTree extends GTree {
setCellRenderer(new DataTreeCellRenderer());
setShowsRootHandles(true); // need this to "drill down"
docking.ToolTipManager.sharedInstance().registerComponent(this);
ToolTipManager.sharedInstance().registerComponent(this);
if (tool != null) {
dragNDropHandler = new DataTreeDragNDropHandler(tool, this, isActive);

1
Ghidra/Framework/Project/src/main/java/ghidra/framework/task/gui/GProgressBar.java
View file

@ -21,7 +21,6 @@ import java.text.NumberFormat;
import javax.swing.*;
import docking.ToolTipManager;
import docking.util.AnimatedIcon;
import docking.widgets.EmptyBorderButton;
import docking.widgets.label.GDHtmlLabel;