mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Improve "New Terminal View" handling.

Browse source 
- Add a command to open the new terminal view. Allows to associate a
short cut
- Open the "Open Terminal" dialog on creating a new terminal view
This commit is contained in:
Uwe Stieber 2015-09-14 08:06:44 +02:00
parent 0a79c61273
commit 1a1bcf774b
4 changed files with 81 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
View file

@ -42,6 +42,8 @@ command.disconnect.name=Disconnect Terminal
command.disconnect.label=Disconnect
command.disconnect.tooltip=Disconnect Terminal Connection
command.newview.name=New Terminal View
menu.showIn.label = Show In
menu.showIn.mnemonic=I

15
plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
View file

@ -239,6 +239,12 @@
id="org.eclipse.tm.terminal.view.ui.command.disconnect"
name="%command.disconnect.name">
</command>
<command
categoryId="org.eclipse.tm.terminal.view.ui.commands.category"
helpContextId="org.eclipse.tm.terminal.view.ui.command_NewView"
id="org.eclipse.tm.terminal.view.ui.command.newview"
name="%command.newview.name">
</command>
</extension>
<!-- Key bindings -->
@ -291,6 +297,15 @@
</activeWhen>
</handler>
<handler
class="org.eclipse.tm.terminal.view.ui.internal.handler.NewTerminalViewHandler"
commandId="org.eclipse.tm.terminal.view.ui.command.newview">
<activeWhen>
<with variable="activePartId">
<equals value="org.eclipse.tm.terminal.view.ui.TerminalsView"/>
</with>
</activeWhen>
</handler>
</extension>
<!-- Help Context contributions -->

34
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java
View file

@ -9,14 +9,21 @@
*******************************************************************************/
package org.eclipse.tm.terminal.view.ui.actions;
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.action.IAction;
import org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction;
import org.eclipse.tm.terminal.view.ui.activator.UIPlugin;
import org.eclipse.tm.terminal.view.ui.interfaces.ITerminalsView;
import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants;
import org.eclipse.tm.terminal.view.ui.interfaces.ImageConsts;
import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager;
import org.eclipse.tm.terminal.view.ui.nls.Messages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.handlers.IHandlerService;
/**
* Opens a new terminal view with a new secondary view ID.
@ -44,10 +51,27 @@ public class NewTerminalViewAction extends AbstractTerminalAction {
/* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run()
*/
@Override
@SuppressWarnings("cast")
@Override
public void run() {
String secondaryId = ConsoleManager.getInstance().getNextTerminalSecondaryId(IUIConstants.ID);
ConsoleManager.getInstance().showConsoleView(IUIConstants.ID, secondaryId);
ICommandService service = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.view.ui.command.newview") : null; //$NON-NLS-1$
if (command != null && command.isDefined() && command.isEnabled()) {
try {
ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null);
Assert.isNotNull(pCmd);
IHandlerService handlerSvc = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
Assert.isNotNull(handlerSvc);
handlerSvc.executeCommandInContext(pCmd, null, handlerSvc.getCurrentState());
} catch (Exception e) {
// If the platform is in debug mode, we print the exception to the log view
if (Platform.inDebugMode()) {
IStatus status = new Status(IStatus.ERROR, UIPlugin.getUniqueIdentifier(),
Messages.AbstractTriggerCommandHandler_error_executionFailed, e);
UIPlugin.getDefault().getLog().log(status);
}
}
}
}
}

35
plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/internal/handler/NewTerminalViewHandler.java Normal file
View file

@ -0,0 +1,35 @@
/*******************************************************************************
* Copyright (c) 2015 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Wind River Systems - initial API and implementation
*******************************************************************************/
package org.eclipse.tm.terminal.view.ui.internal.handler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.tm.terminal.view.ui.interfaces.IUIConstants;
import org.eclipse.tm.terminal.view.ui.manager.ConsoleManager;
/**
* New Terminal View handler implementation
*/
public class NewTerminalViewHandler extends AbstractTriggerCommandHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
String secondaryId = ConsoleManager.getInstance().getNextTerminalSecondaryId(IUIConstants.ID);
ConsoleManager.getInstance().showConsoleView(IUIConstants.ID, secondaryId);
triggerCommand("org.eclipse.tm.terminal.view.ui.command.launchToolbar", null); //$NON-NLS-1$
return null;
}
}