diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties index edfcad0fcc3..b6b72e96cea 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties @@ -37,6 +37,6 @@ STLink.name=ST-LINK Generic.name=Generic TCP/IP launchDelegate.jtag.name=Legacy GDB Hardware Debugging -launchDelegate.jtag.description=Jtag hardware debugging using the legacy debugger Framework (CDI). +launchDelegate.jtag.description=GDB hardware debugging using the legacy debugger Framework (CDI). launchDelegate.jtagDsf.name=GDB (DSF) Hardware Debugging -launchDelegate.jtagDsf.description=Jtag hardware debugging using the Debugger Services Framework (DSF). +launchDelegate.jtagDsf.description=GDB hardware debugging using the Debugger Services Framework (DSF). diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Message.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Message.properties index e16f8a9999b..b19a86c50bf 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Message.properties +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/Message.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2008 - 2019 QNX Software Systems and others. +# Copyright (c) 2008, 2022 QNX Software Systems and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -12,6 +12,7 @@ # QNX Software Systems - initial API and implementation # John Dallaway - Test for reset/delay/halt command not defined (Bug 361881) # John Dallaway - Report download progress (Bug 543149) +# John Dallaway - Unify remote target nomenclature (Bug 535143) ############################################################################### GDBJtagDebugger.0=Starting debug session GDBJtagDebugger.1=Error getting debug target @@ -26,7 +27,7 @@ src.common.No_answer=No answer GDBJtagDebugger.err_no_sym_file=Symbolics loading was requested but file was not specified or not found. GDBJtagDebugger.err_no_img_file=Image loading was requested but file was not specified or not found. -GDBJtagDebugger.delay_not_defined=Delay command not defined for device '%s' -GDBJtagDebugger.halt_not_defined=Halt command not defined for device '%s' -GDBJtagDebugger.reset_not_defined=Reset command not defined for device '%s' +GDBJtagDebugger.delay_not_defined=Delay command not defined for debug server '%s' +GDBJtagDebugger.halt_not_defined=Halt command not defined for debug server '%s' +GDBJtagDebugger.reset_not_defined=Reset command not defined for debug server '%s' GDBJtagDebugger.downloading=Downloading %s diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java index 8c62e9fe7eb..8893bcb9d7c 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java @@ -216,6 +216,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { useRemote = new Button(group, SWT.CHECK); useRemote.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); useRemote.setText(Messages.getString("GDBJtagDebuggerTab.useRemote_Text")); //$NON-NLS-1$ + useRemote.setToolTipText(Messages.getString("GDBJtagDebuggerTab.useRemoteTooltip")); //$NON-NLS-1$ useRemote.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -249,9 +250,11 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { jtagDeviceLabel = new Label(comp, SWT.NONE); jtagDeviceLabel.setText(Messages.getString("GDBJtagDebuggerTab.jtagDeviceLabel")); //$NON-NLS-1$ + jtagDeviceLabel.setToolTipText(Messages.getString("GDBJtagDebuggerTab.jtagDeviceTooltip")); //$NON-NLS-1$ jtagDevice = new Combo(comp, SWT.READ_ONLY | SWT.DROP_DOWN); jtagDevice.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + jtagDevice.setToolTipText(Messages.getString("GDBJtagDebuggerTab.jtagDeviceTooltip")); //$NON-NLS-1$ GDBJtagDeviceContribution[] availableDevices = GDBJtagDeviceContributionFactory.getInstance() .getGDBJtagDeviceContribution(); @@ -268,14 +271,18 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { protocolLabel = new Label(comp, SWT.NONE); protocolLabel.setText(Messages.getString("GDBJtagDebuggerTab.protocolLabel")); //$NON-NLS-1$ + protocolLabel.setToolTipText(Messages.getString("GDBJtagDebuggerTab.protocolTooltip")); //$NON-NLS-1$ protocol = new ComboViewer(comp, SWT.READ_ONLY | SWT.DROP_DOWN); protocol.setContentProvider(new ArrayContentProvider()); protocol.getCombo().setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + protocol.getCombo().setToolTipText(Messages.getString("GDBJtagDebuggerTab.protocolTooltip")); //$NON-NLS-1$ connectionLabel = new Label(comp, SWT.NONE); connectionLabel.setText(Messages.getString("GDBJtagDebuggerTab.connectionLabel")); //$NON-NLS-1$ + connectionLabel.setToolTipText(Messages.getString("GDBJtagDebuggerTab.connectionTooltip")); //$NON-NLS-1$ connection = new Text(comp, SWT.BORDER); connection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + connection.setToolTipText(Messages.getString("GDBJtagDebuggerTab.connectionTooltip")); //$NON-NLS-1$ // // Add watchers for user data entry diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/JtagUi.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/JtagUi.properties index d0c96d7cb0a..1d62a2f05b2 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/JtagUi.properties +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/JtagUi.properties @@ -65,11 +65,15 @@ GDBJtagDebuggerTab.miProtocolLabel=Protocol Version: GDBJtagDebuggerTab.verboseModeLabel=Verbose console mode GDBJtagDebuggerTab.remoteGroup_Text=Remote Target GDBJtagDebuggerTab.useRemote_Text=Use remote target +GDBJtagDebuggerTab.useRemoteTooltip=Refer to the GDB documentation section "Connecting to a Remote Target". GDBJtagDebuggerTab.jtagDeviceLabel=Debug server: +GDBJtagDebuggerTab.jtagDeviceTooltip=The debug server to which GDB will connect. The debug server must be listening for a connection prior to launch of the debug session. GDBJtagDebuggerTab.ipAddressLabel=Host name or IP address: GDBJtagDebuggerTab.portNumberLabel=Port number: GDBJtagDebuggerTab.protocolLabel=Protocol: +GDBJtagDebuggerTab.protocolTooltip=The protocol used by GDB to communicate with the debug server. GDBJtagDebuggerTab.connectionLabel=Connection: +GDBJtagDebuggerTab.connectionTooltip=The protocol-specific connection parameters used to locate the debug server. Examples:\n \u2022 192.168.0.100:1234\n \u2022 /dev/ttyS0\n \u2022 COM1\n \u2022 \\\\.\\COM10 GDBJtagDebuggerTab.update_thread_list_on_suspend=Force thread list update on suspend GDBJtagDebuggerTab.remoteTimeout=Timeout (seconds): GDBJtagDebuggerTab.remoteTimeoutTooltip=Timeout for the remote target to respond. If unchecked, uses GDB default value. See GDB's help for "set remotetimeout num".