From 1a94d87ec7a5730941fba25486c9232885fc2345 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Tue, 23 Sep 2014 11:46:16 +0200
Subject: [PATCH] Terminal: Bug 435119 - Make the Alt+Up / Alt+Right keyboard
 shortcuts discoverable

---
 .../org.eclipse.tm.terminal-feature/feature.xml   |  2 +-
 .../org.eclipse.tm.terminal-feature/pom.xml       |  2 +-
 .../feature.xml                                   |  2 +-
 .../pom.xml                                       |  2 +-
 .../feature.xml                                   |  2 +-
 .../org.eclipse.tm.terminal.sdk-feature/pom.xml   |  2 +-
 .../org.eclipse.tm.terminal/META-INF/MANIFEST.MF  |  2 +-
 .../org.eclipse.tm.terminal/plugin.properties     |  4 +++-
 .../plugins/org.eclipse.tm.terminal/plugin.xml    | 15 +++++++++++++--
 terminal/plugins/org.eclipse.tm.terminal/pom.xml  |  2 +-
 10 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/terminal/features/org.eclipse.tm.terminal-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
index 89d2c0dbce0..d227a5f0a0a 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal"
       label="%featureName"
-      version="3.6.1.qualifier"
+      version="3.6.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
index 3b5f2548cdb..c012929912b 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal</artifactId>
-  <version>3.6.1.qualifier</version>
+  <version>3.6.100.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
index f02647d0812..ad8394363fc 100644
--- a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.core.sdk"
       label="%featureName"
-      version="3.6.1.qualifier"
+      version="3.6.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
index 43485d98b75..ec5e20b489e 100644
--- a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.core.sdk</artifactId>
-  <version>3.6.1.qualifier</version>
+  <version>3.6.100.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
index a70f5a9ea76..1cd7ba752bf 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="3.6.1.qualifier"
+      version="3.6.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
index 863293c3650..b634951649e 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.sdk</artifactId>
-  <version>3.6.1.qualifier</version>
+  <version>3.6.100.qualifier</version>
   <packaging>eclipse-feature</packaging>
   
   <build>
diff --git a/terminal/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/terminal/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
index afaabe2c76e..19d3c814b4e 100644
--- a/terminal/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
+++ b/terminal/plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
-Bundle-Version: 3.2.301.qualifier
+Bundle-Version: 3.2.400.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/terminal/plugins/org.eclipse.tm.terminal/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal/plugin.properties
index c239a2a2bd2..6db51558ef0 100644
--- a/terminal/plugins/org.eclipse.tm.terminal/plugin.properties
+++ b/terminal/plugins/org.eclipse.tm.terminal/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2012, 2014 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
@@ -34,6 +34,8 @@ terminal.view.insertion.description = Terminal view commands
 
 terminal.command.copy.name=Copy
 terminal.command.paste.name=Paste
+terminal.command.maximize.name=Maximize Active View or Editor
+terminal.command.quickaccess.name=Quick Access
 
 terminal.preferences.name = Terminal
 terminal.font.description = The font for the terminal console.
diff --git a/terminal/plugins/org.eclipse.tm.terminal/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal/plugin.xml
index d9ea23975d4..1ec047e252e 100644
--- a/terminal/plugins/org.eclipse.tm.terminal/plugin.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal/plugin.xml
@@ -50,6 +50,15 @@
             categoryId="org.eclipse.tm.terminal.category1"
             id="org.eclipse.tm.terminal.paste"
             name="%terminal.command.paste.name"/>
+      <command
+            categoryId="org.eclipse.tm.terminal.category1"
+            id="org.eclipse.tm.terminal.maximize"
+            name="%terminal.command.maximize.name">
+      </command>
+      <command
+            categoryId="org.eclipse.tm.terminal.category1"
+            id="org.eclipse.tm.terminal.quickaccess"
+            name="%terminal.command.quickaccess.name"/>
       <category
             description="%terminal.view.insertion.description"
             id="org.eclipse.tm.terminal.category1"
@@ -217,13 +226,15 @@
            since these are extremely valuable, but the original shortcut may need
            to go to the Terminal.
       -->
+      <!-- org.eclipse.ui.window.quickAccess -->
       <key
-            commandId="org.eclipse.ui.window.quickAccess"
+            commandId="org.eclipse.tm.terminal.quickaccess"
             contextId="org.eclipse.tm.terminal.EditContext"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M3+ARROW_RIGHT"/>
+      <!-- org.eclipse.ui.window.maximizePart -->
       <key
-            commandId="org.eclipse.ui.window.maximizePart"
+            commandId="org.eclipse.tm.terminal.maximize"
             contextId="org.eclipse.tm.terminal.EditContext"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M3+ARROW_UP"/>
diff --git a/terminal/plugins/org.eclipse.tm.terminal/pom.xml b/terminal/plugins/org.eclipse.tm.terminal/pom.xml
index ceed05b4adf..517e362fcf2 100644
--- a/terminal/plugins/org.eclipse.tm.terminal/pom.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.tm</groupId>
   <artifactId>org.eclipse.tm.terminal</artifactId>
-  <version>3.2.301.qualifier</version>
+  <version>3.2.400.qualifier</version>
   <packaging>eclipse-plugin</packaging>
 </project>