Browse Source

remove hard-coded magnifier - added to resource + fix the VisualizerPicker.xaml

pull/15/head
Eusebiu Marcu 15 years ago
parent
commit
7091c64e9f
  1. 0
      data/resources/image/BitmapResources/BitmapResources-data/magnifier.png
  2. 1
      data/resources/image/BitmapResources/BitmapResources.res
  3. 1
      src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj
  4. 8
      src/AddIns/Debugger/Debugger.AddIn/Tooltips/VisualizerPicker.xaml
  5. BIN
      src/Main/StartUp/Project/Resources/BitmapResources.resources

0
src/AddIns/Debugger/Debugger.AddIn/Tooltips/magnifier.png → data/resources/image/BitmapResources/BitmapResources-data/magnifier.png

Before

Width:  |  Height:  |  Size: 564 B

After

Width:  |  Height:  |  Size: 564 B

1
data/resources/image/BitmapResources/BitmapResources.res

@ -227,6 +227,7 @@ Icons.16x16.HtmlElements.FieldSetElement = BitmapResources-data\Icons.1
Icons.16x16.SplitWindow = BitmapResources-data\Icons.16x16.SplitWindow.png Icons.16x16.SplitWindow = BitmapResources-data\Icons.16x16.SplitWindow.png
Icons.16x16.DeleteHistory = BitmapResources-data\Icons.16x16.DeleteHistory.png Icons.16x16.DeleteHistory = BitmapResources-data\Icons.16x16.DeleteHistory.png
Icons.16x16.Refresh = BitmapResources-data\Icons.16x16.Refresh.png Icons.16x16.Refresh = BitmapResources-data\Icons.16x16.Refresh.png
Icons.Magnifier = BitmapResources-data\magnifier.png
#pad icons #pad icons
PadIcons.ErrorList = PadIcons\ErrorList.png PadIcons.ErrorList = PadIcons\ErrorList.png

1
src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj

@ -319,7 +319,6 @@
<Compile Include="Visualizers\PresentationBindings\EnumViewModel.cs" /> <Compile Include="Visualizers\PresentationBindings\EnumViewModel.cs" />
<Compile Include="Visualizers\PresentationBindings\ViewModelBase.cs" /> <Compile Include="Visualizers\PresentationBindings\ViewModelBase.cs" />
<None Include="COPYING" /> <None Include="COPYING" />
<None Include="Tooltips\magnifier.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Debugger.AddIn.addin"> <Content Include="Debugger.AddIn.addin">

8
src/AddIns/Debugger/Debugger.AddIn/Tooltips/VisualizerPicker.xaml

@ -1,10 +1,8 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero" xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
xmlns:debugging="clr-namespace:Debugger.AddIn.Tooltips"> xmlns:debugging="clr-namespace:Debugger.AddIn.Tooltips"
xmlns:core="http://icsharpcode.net/sharpdevelop/core">
<BitmapImage x:Key="MagnifierImage" UriSource="magnifier.png" />
<Style x:Key="ComboBoxFocusVisual"> <Style x:Key="ComboBoxFocusVisual">
<Setter Property="Control.Template"> <Setter Property="Control.Template">
<Setter.Value> <Setter.Value>
@ -40,7 +38,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- <!--
<Rectangle Width="10" Height="10" Grid.Column="0" Fill="Black"></Rectangle> --> <Rectangle Width="10" Height="10" Grid.Column="0" Fill="Black"></Rectangle> -->
<Image Grid.Column="0" Width="10" Height="10" Stretch="Fill" Source="{StaticResource MagnifierImage}" /> <Image Grid.Column="0" Width="10" Height="10" Stretch="Fill" Source="{core:GetBitmap Icons.Magnifier}" />
<Path Grid.Column="1" x:Name="Arrow" Fill="Black" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" Data="{StaticResource DownArrowGeometry}"/> <Path Grid.Column="1" x:Name="Arrow" Fill="Black" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" Data="{StaticResource DownArrowGeometry}"/>
</Grid> </Grid>
</Border> </Border>

BIN
src/Main/StartUp/Project/Resources/BitmapResources.resources

Binary file not shown.
Loading…
Cancel
Save