Add icons for WatchPad toolbar

data/resources/image/BitmapResources/BitmapList.txt

@@ -272,6 +272,7 @@ PadIcons\Parallel.png
 PadIcons\ProjectBrowser.png
 PadIcons\TaskList.png
 PadIcons\Toolbar.png
+PadIcons\WatchPad.png
 PadIcons\memory.png
 PadIcons\nextmemory.png
 PadIcons\previousmemory.png
@@ -326,7 +327,9 @@ SubversionIcons\Svn.CreatePatch.png
 SubversionIcons\Svn.Export.png
 SubversionIcons\Svn.Import.png
 SubversionIcons\Svn.Update.png
-
+WatchIcons\WatchAdd.png
+WatchIcons\WatchDelete.png
+WatchIcons\WatchesDelete.png
 
 -------------------------------------------------------------------------------
 Copied from the Fugue Icon Library and modified or mashed up with other Fugue 

data/resources/image/BitmapResources/BitmapResources.res

@@ -88,6 +88,11 @@ Icons.16x16.Debug.StepInto							= DebuggerIcons\Icons.16x16.Debug.StepInto.png
 Icons.16x16.Debug.StepOut							= DebuggerIcons\Icons.16x16.Debug.StepOut.png
 Icons.16x16.Debug.Assembly							= DebuggerIcons\Icons.16x16.Debug.Assembly.png
 
+# Watches
+Icons.16x16.WatchAdd                                = WatchIcons\WatchAdd.png
+Icons.16x16.WatchDelete                             = WatchIcons\WatchDelete.png
+Icons.16x16.WatchesDelete                           = WatchIcons\WatchesDelete.png
+
 # TestRunner
 Icons.16x16.TestRunner.Yellow						= BitmapResources-data\Icons.16x16.TestRunner.Yellow.png
 Icons.16x16.TestRunner.Red							= BitmapResources-data\Icons.16x16.TestRunner.Red.png
@@ -271,6 +276,7 @@ PadIcons.BreakPoints								= PadIcons\Breakpoints.png
 PadIcons.CallStack									= PadIcons\CallStack.png
 PadIcons.LoadedModules								= PadIcons\LoadedModules.png
 PadIcons.LocalVariables								= PadIcons\LocalVariables.png
+PadIcons.Watches                                    = PadIcons\WatchPad.png
 PadIcons.Threads									= PadIcons\Threads.png
 PadIcons.Exceptions									= PadIcons\Exceptions.png
 PadIcons.XPathQuery									= PadIcons\XPathQuery.png

src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin

@@ -123,7 +123,7 @@
 		<Pad id    = "WatchPad"
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Watch}"
-		     icon     = "PadIcons.LocalVariables"
+		     icon     = "PadIcons.Watches"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.WatchPad"
 		     defaultPosition = "Bottom, Hidden" />
 	</Path>
@@ -160,7 +160,8 @@
 	</Path>
 	
 	<Path name="/SharpDevelop/TreeNodeFactories">
-		<Class id="DebuggerTreeNodesFactory" class="ICSharpCode.SharpDevelop.Gui.Pads.DebuggerTreeNodesFactory" />
+		<Class id="DebuggerTreeNodesFactory"
+		       class="ICSharpCode.SharpDevelop.Gui.Pads.DebuggerTreeNodesFactory" />
 	</Path>
 	
 	<Path name = "/SharpDevelop/Services/DebuggerService/ModuleContextMenu">
@@ -187,4 +188,21 @@
 	<Path name="/AddIns/Debugger/Tooltips/ContextMenu/ValueNode">
 		<Include path="/AddIns/Debugger/Tooltips/ContextMenu/TreeNode" />
 	</Path>
+	
+	<Path name="/SharpDevelop/Pads/WatchPad/ToolBar">
+		<ToolbarItem id="AddWatch"
+		             icon="Icons.16x16.WatchAdd"
+		             tooltip="${res:MainWindow.Windows.Debug.Watch.AddWatch}"
+		             class="Debugger.AddIn.AddWatchCommand" />
+		<ToolbarItem id="RemoveWatch"
+		             icon="Icons.16x16.WatchDelete"
+		             tooltip="${res:MainWindow.Windows.Debug.Watch.RemoveWatch}"
+		             class="Debugger.AddIn.RemoveWatchCommand" />
+		<ToolbarItem type="Separator" />
+		<ToolbarItem id="ClearWatches"
+		             icon="Icons.16x16.WatchesDelete"
+		             tooltip="${res:MainWindow.Windows.Debug.Watch.RemoveAll}"
+		             class="Debugger.AddIn.ClearWatchesCommand" />
+		<ToolbarItem type="Separator" />
+	</Path>
 </AddIn>