1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-11 19:15:22 +02:00

Hook up the new connection wizard the target selector action area.

Also externalize strings for the target selector.

Change-Id: Ib082066560a1ab786783d47f165d7638189d338d
This commit is contained in:
Doug Schaefer 2015-03-02 21:24:57 -05:00
parent 9c7de82238
commit 210058b955
4 changed files with 25 additions and 10 deletions

View file

@ -17,6 +17,7 @@ public class Messages extends NLS {
public static String LaunchBarControl_Build; public static String LaunchBarControl_Build;
public static String LaunchBarControl_Launch; public static String LaunchBarControl_Launch;
public static String LaunchBarControl_Stop; public static String LaunchBarControl_Stop;
public static String TargetSelector_CreateNewTarget;
static { static {
// initialize resource bundle // initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class); NLS.initializeMessages(BUNDLE_NAME, Messages.class);

View file

@ -13,6 +13,12 @@ package org.eclipse.launchbar.ui.internal.controls;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.NotEnabledException;
import org.eclipse.core.commands.NotHandledException;
import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
@ -20,6 +26,7 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.launchbar.core.internal.LaunchBarManager; import org.eclipse.launchbar.core.internal.LaunchBarManager;
import org.eclipse.launchbar.ui.internal.Activator; import org.eclipse.launchbar.ui.internal.Activator;
import org.eclipse.launchbar.ui.internal.LaunchBarUIManager; import org.eclipse.launchbar.ui.internal.LaunchBarUIManager;
import org.eclipse.launchbar.ui.internal.Messages;
import org.eclipse.remote.core.IRemoteConnection; import org.eclipse.remote.core.IRemoteConnection;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseAdapter;
@ -36,12 +43,14 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
public class TargetSelector extends CSelector { public class TargetSelector extends CSelector {
private final LaunchBarUIManager uiManager = Activator.getDefault().getLaunchBarUIManager(); private final LaunchBarUIManager uiManager = Activator.getDefault().getLaunchBarUIManager();
private static final String[] noTargets = new String[] { "---" }; private static final String[] noTargets = new String[] { "---" }; //$NON-NLS-1$
public TargetSelector(Composite parent, int style) { public TargetSelector(Composite parent, int style) {
super(parent, style); super(parent, style);
@ -74,7 +83,7 @@ public class TargetSelector extends CSelector {
@Override @Override
public Image getImage(Object element) { public Image getImage(Object element) {
if (element instanceof IRemoteConnection) { if (element instanceof IRemoteConnection) {
IRemoteConnection target = (IRemoteConnection) element; //IRemoteConnection target = (IRemoteConnection) element;
// TODO need to get icon form ui service // TODO need to get icon form ui service
} }
return super.getImage(element); return super.getImage(element);
@ -141,15 +150,19 @@ public class TargetSelector extends CSelector {
final Label createLabel = new Label(createButton, SWT.None); final Label createLabel = new Label(createButton, SWT.None);
createLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); createLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
createLabel.setText("Create New Target..."); createLabel.setText(Messages.TargetSelector_CreateNewTarget);
createLabel.setBackground(backgroundColor); createLabel.setBackground(backgroundColor);
MouseListener mouseListener = new MouseAdapter() { MouseListener mouseListener = new MouseAdapter() {
public void mouseUp(org.eclipse.swt.events.MouseEvent e) { public void mouseUp(org.eclipse.swt.events.MouseEvent event) {
// TODO try {
// NewLaunchTargetWizard wizard = new NewLaunchTargetWizard(uiManager); ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
// WizardDialog dialog = new WizardDialog(getShell(), wizard); // TODO the command id should be in a remote ui interface
// dialog.open(); Command newConnectionCmd = commandService.getCommand("org.eclipse.remote.ui.command.newConnection"); //$NON-NLS-1$
newConnectionCmd.executeWithChecks(new ExecutionEvent());
} catch (ExecutionException | NotDefinedException | NotEnabledException | NotHandledException e) {
Activator.log(e);
}
} }
}; };

View file

@ -1,3 +1,4 @@
LaunchBarControl_Build=Build LaunchBarControl_Build=Build
LaunchBarControl_Launch=Launch LaunchBarControl_Launch=Launch
LaunchBarControl_Stop=Stop LaunchBarControl_Stop=Stop
TargetSelector_CreateNewTarget=Create New Connection...

View file

@ -45,7 +45,7 @@
</repository> </repository>
<repository> <repository>
<id>platform</id> <id>platform</id>
<url>http://download.eclipse.org/eclipse/updates/4.5milestones</url> <url>http://download.eclipse.org/eclipse/updates/4.5milestones/</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
<repository> <repository>
@ -60,7 +60,7 @@
</repository> </repository>
<repository> <repository>
<id>remote</id> <id>remote</id>
<url>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</url> <url>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0/</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories> </repositories>