Bug 193538 - [WorkingSets] making the window working set action visible again.
diff --git a/bundles/org.eclipse.ui.ide/plugin.properties b/bundles/org.eclipse.ui.ide/plugin.properties
index 9935e8d..bcae3c5 100644
--- a/bundles/org.eclipse.ui.ide/plugin.properties
+++ b/bundles/org.eclipse.ui.ide/plugin.properties
@@ -74,8 +74,11 @@
NavigateActionSet.label = Resource Navigation
NavigateActionSet.description = Action set containing resource navigation actions
-WindowWorkingSetsActionSet.label = Window Working Set
-WindowWorkingSetsActionSet.description = Window working set manipulation actions
+WindowWorkingSetsActionSet.menu.label = Window Working Set Menu
+WindowWorkingSetsActionSet.menu.description = Window working set manipulation actions
+
+WindowWorkingSetsActionSet.toolbar.label = Window Working Set Toolbar
+WindowWorkingSetsActionSet.toolbar.description = Window working set manipulation actions
WorkingSetsActionSet.label = Working Set Manipulation
WorkingSetsActionSet.description = Actions set containing actions that add and remove from working sets
diff --git a/bundles/org.eclipse.ui.ide/plugin.xml b/bundles/org.eclipse.ui.ide/plugin.xml
index 5cb7a59..d77c799 100644
--- a/bundles/org.eclipse.ui.ide/plugin.xml
+++ b/bundles/org.eclipse.ui.ide/plugin.xml
@@ -297,9 +297,24 @@
</action>
</actionSet>
<actionSet
- label="%WindowWorkingSetsActionSet.label"
- description="%WindowWorkingSetsActionSet.description"
+ label="%WindowWorkingSetsActionSet.toolbar.label"
+ description="%WindowWorkingSetsActionSet.toolbar.description"
visible="false"
+ id="org.eclipse.ui.WorkingSetActionSet.toolbar">
+ <action
+ class="org.eclipse.ui.internal.actions.SelectWorkingSetsAction"
+ definitionId="org.eclipse.ui.navigate.selectWorkingSets"
+ icon="$nl$/icons/full/elcl16/workingsets.gif"
+ id="selectWorkingSets"
+ label="%SelectWorkingSetsAction.label"
+ style="pulldown"
+ toolbarPath="workingSets"
+ tooltip="%SelectWorkingSetsAction.tooltip"/>
+ </actionSet>
+ <actionSet
+ label="%WindowWorkingSetsActionSet.menu.label"
+ description="%WindowWorkingSetsActionSet.menu.description"
+ visible="true"
id="org.eclipse.ui.WorkingSetActionSet">
<action
class="org.eclipse.ui.internal.actions.SelectWorkingSetsAction"
@@ -309,7 +324,6 @@
label="%SelectWorkingSetsAction.label"
menubarPath="window/additions"
style="pulldown"
- toolbarPath="workingSets"
tooltip="%SelectWorkingSetsAction.tooltip"/>
</actionSet>
<actionSet