- Debugger tooltips display icons

- fixed warnings

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4638 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs

@@ -301,7 +301,6 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		
 		ToolTip toolTip;
 		Popup popup;
-		bool settingFocus = false;
 
 		void textEditor_MouseHover(object sender, MouseEventArgs e)
 		{

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/DebuggerResourceService.cs

@@ -6,7 +6,6 @@
 // </file>
 using ICSharpCode.SharpDevelop;
 using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

src/Main/Base/Project/Src/Services/Debugger/DebuggerPopup.cs

@@ -4,11 +4,13 @@
 //     <owner name="Martin Koníček" email="martin.konicek@gmail.com"/>
 //     <version>$Revision$</version>
 // </file>
-using ICSharpCode.Core;
 using System;
 using System.Collections.Generic;
 using System.Windows.Controls.Primitives;
 
+using ICSharpCode.Core;
+using System.Windows.Input;
+
 namespace ICSharpCode.SharpDevelop.Debugging
 {
 	/// <summary>
@@ -24,6 +26,9 @@ namespace ICSharpCode.SharpDevelop.Debugging
 			this.contentControl.containingPopup = this;
 			this.Child = this.contentControl;
 			this.IsLeaf = false;
+			
+			this.contentControl.Focusable = true;
+			Keyboard.Focus(this.contentControl);
 			//this.AllowsTransparency = true;
 			//this.PopupAnimation = PopupAnimation.Slide;
 		}

src/Main/Base/Project/Src/Services/Debugger/DebuggerTooltipControl.xaml

@@ -138,30 +138,31 @@
                             <DataTemplate>
                                 <Grid Background="White">
                                     <StackPanel VerticalAlignment="Center">
-                                        <ToggleButton x:Name="btnExpander" Style="{StaticResource ExpandCollapseToggleStyle}" Click="btnExpander_Click" Padding="0" Margin="0 0 0 0" />
+                                        <ToggleButton x:Name="btnExpander" Style="{StaticResource ExpandCollapseToggleStyle}" Click="btnExpander_Click" Padding="0" Margin="0" />
                                     </StackPanel>
                                 </Grid>
                                 <DataTemplate.Triggers>
                                     <DataTrigger Binding="{Binding Path=HasChildNodes}" Value="False">
                                         <Setter TargetName="btnExpander"
-                                                    Property="Visibility" Value="Hidden"/>
+                                                    Property="Visibility" Value="Collapsed"/>
                                     </DataTrigger>
                                 </DataTemplate.Triggers>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>	
-                	  																<!-- Icon
+                	  																<!-- Icon -->
 					  <DataGridTemplateColumn>
                 	  		<DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
+                	  				<Image Source="{Binding ImageSource}"></Image>
 							   </DataTemplate>
                           </DataGridTemplateColumn.CellTemplate>
-                 	  </DataGridTemplateColumn>	 -->
+                 	  </DataGridTemplateColumn>
                     <DataGridTemplateColumn MinWidth="20" Header="Name">		<!-- Name -->
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <Border BorderBrush="#FFDDDDDD"  BorderThickness="0 0 1 0">
-                                    <TextBlock Margin="6 0" Text="{Binding Path=Name, Mode=OneWay}" VerticalAlignment="Center"></TextBlock>
+                                    <TextBlock Margin="6 0" Text="{Binding Path=Name, Mode=OneWay}" VerticalAlignment="Top"></TextBlock>
                                 </Border>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
@@ -177,7 +178,7 @@
                 	  <DataGridTemplateColumn MinWidth="20" Header="Text">	    <!-- Text (value) -->
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                        			<TextBlock Margin="6 0" Text="{Binding Path=Text, Mode=OneWay}" VerticalAlignment="Center"></TextBlock>
+                        			<TextBlock Margin="6 0" Text="{Binding Path=Text, Mode=OneWay}" VerticalAlignment="Top"></TextBlock>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>