From bddeeeac3b856a3564fb31ba65aaf04157c69ed7 Mon Sep 17 00:00:00 2001
From: Simeon Andreev <simeon.danailov.andreev@gmail.com>
Date: Fri, 20 Nov 2020 13:49:00 +0100
Subject: [PATCH] Bug 568923 - add activity for TM terminal main toolbar button

This change adds an extra activity for the TM terminal main toolbar
contribution. This allows applications to disable the contribution
without disabling the rest of TM terminal functionality.

With this change, disabling of the TM terminal main toolbar button can
be done with a product customization file containing the line:

org.eclipse.ui.workbench/UIActivities.org.eclipse.tm.terminal.view.ui.activity.maintoolbar=false

The product customization file is specified to Eclipse arguments:

-pluginCustomization /some/path/plugin_customization.ini

Change-Id: Id1c34616f4f2a0ac77edbfe201c1db095f9ce7b8
Signed-off-by: Simeon Andreev <simeon.danailov.andreev@gmail.com>
---
 .../plugin.properties                         |  3 ++
 .../plugin.xml                                | 37 ++++++++++++++++---
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
index f31042b63fb..dd968a731d3 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.properties
@@ -69,6 +69,9 @@ activities.category.terminals.description=Use the terminal to connect to remote
 activities.activity.terminals.views.name=Terminal Views
 activities.activity.terminals.views.description=Terminal related views.
 
+activities.activity.terminals.maintoolbar.name=Terminal Main Toolbar
+activities.activity.terminals.maintoolbar.description=Terminal main toolbar buttons.
+
 # ----- Preference Pages -----
 
 preference.page.name=Local Terminal
diff --git a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
index b4c5e77f1f1..fcaa0db55bf 100644
--- a/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal.view.ui/plugin.xml
@@ -457,11 +457,7 @@
       </activityPatternBinding>
       <activityPatternBinding
             activityId="org.eclipse.tm.terminal.view.ui.activity.views"
-            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.toolbar">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.tm.terminal.view.ui.activity.views"
-            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.commands\..*">
+            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.commands\.^(?!org\.eclipse\.tm\.terminal\.view\.ui\.commands\.launchToolbar).*">
       </activityPatternBinding>
       
       <categoryActivityBinding
@@ -492,6 +488,37 @@
       </categoryActivityBinding>
       -->
    </extension>
+   <extension point="org.eclipse.ui.activities">
+      <category
+            description="%activities.category.terminals.description"
+            id="org.eclipse.tm.terminal.view.ui.category"
+            name="%activities.category.terminals.name">
+      </category>
+
+      <activity
+            description="%activities.activity.terminals.maintoolbar.description"
+            id="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            name="%activities.activity.terminals.maintoolbar.name">
+      </activity>
+
+      <activityPatternBinding
+            activityId="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.toolbar">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            pattern="org\.eclipse\.tm\.terminal\.view\.ui/org\.eclipse\.tm\.terminal\.view\.ui\.commands\.launchToolbar">
+      </activityPatternBinding>
+
+      <categoryActivityBinding
+            activityId="org.eclipse.tm.terminal.view.ui.activity.maintoolbar"
+            categoryId="org.eclipse.tm.terminal.view.ui.category">
+      </categoryActivityBinding>
+
+      <defaultEnablement
+            id="org.eclipse.tm.terminal.view.ui.activity.maintoolbar">
+      </defaultEnablement>
+   </extension>
 
    <extension point="org.eclipse.ui.contexts">
       <context