From 8eba787d8309684d25b42bed327c74d3a0519cc4 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Mon, 15 Jun 2015 09:15:37 +0200
Subject: [PATCH] Terminal: Prepare "New Terminal View" action

---
 .../icons/clcl16/new_terminal_view.gif        | Bin 0 -> 934 bytes
 .../icons/dlcl16/new_terminal_view.gif        | Bin 0 -> 175 bytes
 .../icons/elcl16/new_terminal_view.gif        | Bin 0 -> 173 bytes
 .../ui/actions/NewTerminalViewAction.java     |  47 ++++++++++++++++++
 .../terminal/view/ui/activator/UIPlugin.java  |   7 +++
 .../view/ui/interfaces/ImageConsts.java       |  15 ++++++
 .../tm/terminal/view/ui/nls/Messages.java     |   3 ++
 .../terminal/view/ui/nls/Messages.properties  |   3 ++
 .../view/ui/tabs/TabFolderToolbarHandler.java |  29 +++++++++--
 9 files changed, 100 insertions(+), 4 deletions(-)
 create mode 100644 plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/new_terminal_view.gif
 create mode 100644 plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/new_terminal_view.gif
 create mode 100644 plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/new_terminal_view.gif
 create mode 100644 plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java

diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/new_terminal_view.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/clcl16/new_terminal_view.gif
new file mode 100644
index 0000000000000000000000000000000000000000..008962684244e23e41eb580ae10bc6755ad685f5
GIT binary patch
literal 934
zcmW+#O-NN?5WS&AhN!K}$`)l%yB7T{Mi<!&S||~O1Y^*`t-Em1-2PAl!F5C<A=xH$
zQM=$sK~TFO=!an1v}$8SQ4~yP9JqY%&7E`3ob$bR_T1QslUD|sfo86$YPX(t>uC9{
zZ8un-Hy*v&R1p(#5r~9HiinD;n2M`FB~(&tNKMSdO<)oxX$4akb8#2AgiCr6Da0TS
z0VE&^A+?5Bh=(8~LNbJ6nqn!Qf|N+f6e)4FB32YgQ<OcHsk$muLp3>N)iP5zg=v_k
zDVOGuxw<P{!!=!LgD`_S6wrVsl*UM8p&p9R2+dGhCAFn`DpDggQ$>toRz?kF!ct7s
zw8YJe*rGtjDfU=y2D30r;@r3*TkZz8a7#Ca$fY^tFu($qFvdz7gn1akA}qrgG>wtS
z(~uTvnI_`2N@}l|Jt{&Mb=4B{GU`z#Tx!9R_mUzpX$ay78&z-*_aqaXk#R+~01tS=
zd8rJMOLGX}5uV|^X2wbzgdsiBGhGA>n#M?kx@4q46sl#F)To$|3Nfgad5WQo(iTl{
zWiD9qC@B(?h9HixQ58S}63~D}t%yJb^6%#I@=Dvb$=`W4xpna5C)UuP?yhPd<xBn}
z2AYwbx0>wP+Zq4T-puL2&iAzkFXw*V9v<#|+uvOOx1;y*>deEXu3i0?-pwx^99{f%
z>fZCtldoe7J-N`mzJB%mo!`?v+s5A>8l4=u(bxI-WA#k4XK3H?*@?kti(ONFmuDyL
qU!2)}_|?km@%i^_lXq@Ey*72^#oYt_ZTHlLW6k#F!>8Vz&FTN+NbnZ`

literal 0
HcmV?d00001

diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/new_terminal_view.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/dlcl16/new_terminal_view.gif
new file mode 100644
index 0000000000000000000000000000000000000000..25adc24b2a6e2f0afd73f174670b52ec640dbc6a
GIT binary patch
literal 175
zcmZ?wbhEHb6krfwXl7ve|Np<Xw)X!0`(0dIu3fv<)YO!bk-^BwIDh{9_wU~`U;xFR
zEX*K59S{LBgMlSR;DqPWl_Ht7yoc_ml(+@dIwlC{RHr%^@F*M3+Mpxyy7pLe(}woR
zJSv-b4~4~uF|5t-{1hlKZ}A(E4~h(H{CiSgZk0Q#{potaKfx0mtv?>SNQfx%cpC<s
KILaW%U=08QuRC!7

literal 0
HcmV?d00001

diff --git a/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/new_terminal_view.gif b/plugins/org.eclipse.tm.terminal.view.ui/icons/elcl16/new_terminal_view.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b81882b503d20b1dccc8cf1c46c35699eaf0ea5d
GIT binary patch
literal 173
zcmZ?wbhEHb6krfwXl7ve|NsBBYu938VhRchgoK0{7#Nh4l=ko6-_+FP;NUQS{`~v*
z_uJdYzkmPUz`$Vr`t^!GS(t%}7<51c$P5RTD1j56OIJ9svNZi~d=SEwV9=w`qO>84
zF@S^9Eojy4pr@V776xjD-MC>iv)3s=L$<Q(#igfDX7XrXI9g@J5W3j&?2!psWlNRZ
ZkKW@<*mOX`xJ8r8-Cr^AfV?t;H2^6KLe~HQ

literal 0
HcmV?d00001

diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java
new file mode 100644
index 00000000000..9f4ba462e2b
--- /dev/null
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/actions/NewTerminalViewAction.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.actions;
+
+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.ImageConsts;
+import org.eclipse.tm.terminal.view.ui.nls.Messages;
+
+/**
+ * Opens a new terminal view with a new secondary view ID.
+ */
+public class NewTerminalViewAction extends AbstractTerminalAction {
+
+	private ITerminalsView view = null;
+
+	/**
+	 * Constructor.
+	 */
+	public NewTerminalViewAction(ITerminalsView view) {
+		super(null, NewTerminalViewAction.class.getName(), IAction.AS_PUSH_BUTTON);
+
+		this.view = view;
+		setupAction(Messages.NewTerminalViewAction_menu, Messages.NewTerminalViewAction_tooltip,
+						UIPlugin.getImageDescriptor(ImageConsts.ACTION_NewTerminalView_Hover),
+						UIPlugin.getImageDescriptor(ImageConsts.ACTION_NewTerminalView_Enabled),
+						UIPlugin.getImageDescriptor(ImageConsts.ACTION_NewTerminalView_Disabled), true);
+		setEnabled(true);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#run()
+	 */
+	@Override
+	public void run() {
+	}
+
+}
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java
index ccf5df983e0..dd2368fc6d4 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/activator/UIPlugin.java
@@ -239,6 +239,13 @@ public class UIPlugin extends AbstractUIPlugin {
 		registry.put(ImageConsts.ACTION_ToggleCommandField_Enabled, ImageDescriptor.createFromURL(url));
 		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_DLCL + "command_input_field.gif"); //$NON-NLS-1$
 		registry.put(ImageConsts.ACTION_ToggleCommandField_Disabled, ImageDescriptor.createFromURL(url));
+
+		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_CLCL + "new_terminal_view.gif"); //$NON-NLS-1$
+		registry.put(ImageConsts.ACTION_NewTerminalView_Hover, ImageDescriptor.createFromURL(url));
+		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_ELCL + "new_terminal_view.gif"); //$NON-NLS-1$
+		registry.put(ImageConsts.ACTION_NewTerminalView_Enabled, ImageDescriptor.createFromURL(url));
+		url = bundle.getEntry(ImageConsts.IMAGE_DIR_ROOT + ImageConsts.IMAGE_DIR_DLCL + "new_terminal_view.gif"); //$NON-NLS-1$
+		registry.put(ImageConsts.ACTION_NewTerminalView_Disabled, ImageDescriptor.createFromURL(url));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java
index 931874d38ba..9d5265d587e 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/interfaces/ImageConsts.java
@@ -79,6 +79,21 @@ public interface ImageConsts {
      */
     public static final String  ACTION_PinTerminal_Hover = "PinTerminalAction_hover"; //$NON-NLS-1$
 
+    /**
+     * The key to access the new terminal view action image (enabled).
+     */
+    public static final String  ACTION_NewTerminalView_Enabled = "NewTerminalViewAction_enabled"; //$NON-NLS-1$
+
+    /**
+     * The key to access the new terminal view action image (disabled).
+     */
+    public static final String  ACTION_NewTerminalView_Disabled = "NewTerminalViewAction_disabled"; //$NON-NLS-1$
+
+    /**
+     * The key to access the new terminal view action image (hover).
+     */
+    public static final String  ACTION_NewTerminalView_Hover = "NewTerminalViewAction_hover"; //$NON-NLS-1$
+
     /**
      * The key to access the toggle command field action image (enabled).
      */
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java
index 4b94845bc88..5e0c6c2585a 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.java
@@ -73,6 +73,9 @@ public class Messages extends NLS {
 	public static String PinTerminalAction_menu;
 	public static String PinTerminalAction_toolTip;
 
+	public static String NewTerminalViewAction_menu;
+	public static String NewTerminalViewAction_tooltip;
+
 	public static String ToggleCommandFieldAction_menu;
 	public static String ToggleCommandFieldAction_toolTip;
 
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties
index f7a77a435dc..1060c0dc0b7 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/nls/Messages.properties
@@ -31,6 +31,9 @@ TabTerminalListener_consoleConnecting={0} : {1}...
 PinTerminalAction_menu=Pin
 PinTerminalAction_toolTip=Pin the Terminal View
 
+NewTerminalViewAction_menu=New Terminal View
+NewTerminalViewAction_tooltip=Opens a new Terminal View
+
 ToggleCommandFieldAction_menu=Toggle Command Input Field
 ToggleCommandFieldAction_toolTip=Toggle Command Input Field
 
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java
index 44bdcfe6d18..c4a5872116d 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/tabs/TabFolderToolbarHandler.java
@@ -29,6 +29,7 @@ import org.eclipse.tm.internal.terminal.control.actions.TerminalActionCopy;
 import org.eclipse.tm.internal.terminal.control.actions.TerminalActionPaste;
 import org.eclipse.tm.internal.terminal.provisional.api.TerminalState;
 import org.eclipse.tm.terminal.view.ui.actions.AbstractAction;
+import org.eclipse.tm.terminal.view.ui.actions.NewTerminalViewAction;
 import org.eclipse.tm.terminal.view.ui.actions.PinTerminalAction;
 import org.eclipse.tm.terminal.view.ui.actions.TabScrollLockAction;
 import org.eclipse.tm.terminal.view.ui.actions.ToggleCommandFieldAction;
@@ -284,6 +285,17 @@ public class TabFolderToolbarHandler extends PlatformObject {
 				return getActiveTerminalViewControl();
 			}
 		});
+
+		// Create and add the new terminal view action
+//		add (new NewTerminalViewAction(getParentView()) {
+//			/* (non-Javadoc)
+//			 * @see org.eclipse.tm.internal.terminal.control.actions.AbstractTerminalAction#getTarget()
+//			 */
+//			@Override
+//			protected ITerminalViewControl getTarget() {
+//				return getActiveTerminalViewControl();
+//			}
+//		});
 	}
 
 	/**
@@ -301,7 +313,8 @@ public class TabFolderToolbarHandler extends PlatformObject {
 		manager.add(new Separator("anchor")); //$NON-NLS-1$
 
 		// we want that at the end
-		PinTerminalAction pinAction=null;
+		PinTerminalAction pinAction = null;
+		NewTerminalViewAction newTerminalAction = null;
 
 		// Loop all actions and add them to the menu manager
 		for (AbstractTerminalAction action : toolbarActions) {
@@ -311,17 +324,25 @@ public class TabFolderToolbarHandler extends PlatformObject {
 				manager.insertAfter("anchor", new Separator()); //$NON-NLS-1$
 			}
 			// skip pin action for now
-			if(action instanceof PinTerminalAction){
+			if (action instanceof PinTerminalAction){
 				pinAction=(PinTerminalAction)action;
 				continue;
 			}
+			// skip new terminal view action for now
+			if (action instanceof NewTerminalViewAction){
+				newTerminalAction = (NewTerminalViewAction)action;
+				continue;
+			}
 			// Add the action itself
 			manager.insertAfter("anchor", action); //$NON-NLS-1$
 		}
 		// now add pin at the end
-		if(pinAction!=null){
+		if (pinAction != null){
 			manager.add(pinAction);
 		}
+		if (newTerminalAction != null){
+			manager.add(newTerminalAction);
+		}
 	}
 
 	/**
@@ -337,7 +358,7 @@ public class TabFolderToolbarHandler extends PlatformObject {
 			// If the terminal control is not available, the updateAction
 			// method of certain actions enable the action (bugzilla #260372).
 			// Workaround by forcing the action to get disabled with setEnabled.
-			if (control == null && !(action instanceof PinTerminalAction)) {
+			if (control == null && !(action instanceof PinTerminalAction) && !(action instanceof NewTerminalViewAction)) {
 				action.setEnabled(false);
 			}
 			else {