[Outline] Add Collapse All button

3 files changed, 40 insertions, 24 deletions

diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
index 83c089da869..99a663ecc10 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
@@ -72,27 +72,35 @@ items:</p>
 </ul>
 
 <h2>Icons</h2>
-<p><table border="1" >
-	<tr>
-		<th id="icon">Icon</th>
-		<th id="description">Description</th>
-	</tr>
-	<tr>
-		<td headers="icon"><img src="../images/outlineView-hideFields.png" width="22" height="22" alt="Hide Fields Button"></td>
-		<td headers="description">Hide Fields </td>
-	</tr>
-	<tr>
-		<td headers="icon"><img src="../images/outlineView-hideStaticMembers.png" width="22" height="22" alt="Hide Static Members Button"></td>
-		<td headers="description">Hide Static Members </td>
-	</tr>
-	<tr>
-		<td headers="icon"><img src="../images/outlineView-hideNon-PublicMembers.png" width="22" height="22" alt="Hide Non Public Members Button"></td>
-		<td headers="description">Hide Non-Public Members </td>
-	</tr>
-	<tr>
-		<td headers="icon"><img src="../images/outlineView-Sort.png" width="22" height="22" alt="Sort Button"></td>
-		<td headers="description">Sort </td>
-	</tr>
+<p><table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#DDDDDD" width="34%">
+<tr>
+  <th style="width:19%" id="icon"><strong>Icon</strong></th>
+  <th style="width:81%" id="description"><strong>Description</strong></th>
+</tr>
+<tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/icon_collapse_all.png" alt="Collapse All Icon" width="16" height="16"></td>
+  <td headers="description">Collapse All</td>
+</tr>
+<tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/alphab_sort_co.gif" alt="Sort items alphabetically Icon" width="16" height="16"></td>
+  <td headers="description">Sort items alphabetically</td>
+</tr>
+<tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/fields_co.gif" alt="Hide Fields Icon" width="16" height="16"></td>
+  <td headers="description">Hide Fields</td>
+</tr>
+<tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/static_co.gif" alt="Hide Static Members Icon" width="16" height="16"></td>
+  <td headers="description">Hide Static Members </td>
+</tr>
+<tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/public_co.gif" alt="Hide Non-Public Members Icon" width="16" height="16"></td>
+  <td headers="description">Hide Non-Public Members </td>
+</tr>
+<tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/icon_hide_inactive_includes.png" alt="Hide Inactive Elements Icon" width="16" height="16"></td>
+  <td headers="description">Hide Inactive Elements </td>
+</tr>
 </table></p>
 
 <p>For more information about the Eclipse workbench, see <strong>Workbench User Guide &gt; Tasks &gt; Upgrading Eclipse</strong>.</p>
diff --git a/doc/org.eclipse.cdt.doc.user/images/outlineView.png b/doc/org.eclipse.cdt.doc.user/images/outlineView.png
index 3f9a9704f51..6a2c58c667b 100644
--- a/doc/org.eclipse.cdt.doc.user/images/outlineView.png
+++ b/doc/org.eclipse.cdt.doc.user/images/outlineView.png
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
index d70f7f370dd..84b5413056d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
@@ -28,6 +28,14 @@ open in the editor area, by listing the structural elements. </p>
   <th style="width:81%" id="description"><strong>Description</strong></th>
 </tr>
 <tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/icon_collapse_all.png" alt="Collapse All Icon" width="16" height="16"></td>
+  <td headers="description">Collapse All</td>
+</tr>
+<tr>
+  <td style="text-align:center;" headers="icon"><img src="../images/alphab_sort_co.gif" alt="Sort items alphabetically Icon" width="16" height="16"></td>
+  <td headers="description">Sort items alphabetically</td>
+</tr>
+<tr>
   <td style="text-align:center;" headers="icon"><img src="../images/fields_co.gif" alt="Hide Fields Icon" width="16" height="16"></td>
   <td headers="description">Hide Fields</td>
 </tr>
@@ -40,8 +48,8 @@ open in the editor area, by listing the structural elements. </p>
   <td headers="description">Hide Non-Public Members </td>
 </tr>
 <tr>
-  <td style="text-align:center;" headers="icon"><img src="../images/alphab_sort_co.gif" alt="Sort items alphabetically Icon" width="16" height="16"></td>
-  <td headers="description">Sort items alphabetically</td>
+  <td style="text-align:center;" headers="icon"><img src="../images/icon_hide_inactive_includes.png" alt="Hide Inactive Elements Icon" width="16" height="16"></td>
+  <td headers="description">Hide Inactive Elements </td>
 </tr>
 </table>
 
@@ -65,7 +73,7 @@ open in the editor area, by listing the structural elements. </p>
   </tr>
   <tr>
     <td style="text-align:center;" headers="icon2">
-    <img src="../images/container_obj.gif" width="16" height="16" alt="Namespace icon"></td>
+    <img src="../images/namespace_obj.gif" width="16" height="16" alt="Namespace icon"></td>
     <td headers="description2">Namespace</td>
   </tr>
   <tr>