Skip to content

Commit c8f1642

Browse files
author
ArthurHub
committed
resources stuff
1 parent 1b91ec8 commit c8f1642

10 files changed

Lines changed: 20 additions & 22 deletions

File tree

‎Source/Demo/Common/HtmlRenderer.Demo.Common.csproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,11 @@
110110
<EmbeddedResource Include="Samples\01.History.htm" />
111111
<EmbeddedResource Include="Samples\00.Intro.htm" />
112112
<EmbeddedResource Include="Resources\web_pallete.gif" />
113-
<EmbeddedResource Include="Resources\refreshdocument32.png" />
114-
<EmbeddedResource Include="Resources\property32.png" />
115113
<EmbeddedResource Include="Resources\property16.gif" />
116-
<EmbeddedResource Include="Resources\paly32.png" />
117114
<EmbeddedResource Include="Resources\method16.gif" />
118-
<EmbeddedResource Include="Resources\image32.png" />
119115
<EmbeddedResource Include="Resources\formula32.png" />
120116
<EmbeddedResource Include="Resources\font32.png" />
121117
<EmbeddedResource Include="Resources\favorites32.png" />
122-
<EmbeddedResource Include="Resources\exclamation32.png" />
123118
</ItemGroup>
124119
<ItemGroup>
125120
<EmbeddedResource Include="Resources\Tooltip.html" />
@@ -140,7 +135,7 @@
140135
<EmbeddedResource Include="Resources\form.png" />
141136
</ItemGroup>
142137
<ItemGroup>
143-
<EmbeddedResource Include="Resources\ie.png" />
138+
<EmbeddedResource Include="Resources\browser.png" />
144139
</ItemGroup>
145140
<ItemGroup>
146141
<EmbeddedResource Include="Resources\image.png" />
@@ -157,6 +152,9 @@
157152
<Name>HtmlRenderer</Name>
158153
</ProjectReference>
159154
</ItemGroup>
155+
<ItemGroup>
156+
<EmbeddedResource Include="Resources\image32.png" />
157+
</ItemGroup>
160158
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
161159
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
162160
Other similar extension points exist, see Microsoft.Common.targets.

‎Source/Demo/Common/Properties/Resources.Designer.cs‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/Demo/Common/Properties/Resources.resx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,18 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="chrome" type="System.Resources.ResXFileRef, System.Windows.Forms">
122122
<value>..\Resources\chrome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123123
</data>
124124
<data name="form" type="System.Resources.ResXFileRef, System.Windows.Forms">
125125
<value>..\Resources\form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126126
</data>
127-
<data name="IE" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>..\Resources\ie.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129-
</data>
130127
<data name="image" type="System.Resources.ResXFileRef, System.Windows.Forms">
131128
<value>..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132129
</data>
@@ -139,4 +136,7 @@
139136
<data name="code" type="System.Resources.ResXFileRef, System.Windows.Forms">
140137
<value>..\Resources\code.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
141138
</data>
139+
<data name="browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
140+
<value>..\resources\browser.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
141+
</data>
142142
</root>

Source/Demo/Common/Resources/ie.png renamed to Source/Demo/Common/Resources/browser.png

File renamed without changes.

‎Source/Demo/Common/Resources/exclamation32.png‎

-2.05 KB
Binary file not shown.

‎Source/Demo/Common/Resources/paly32.png‎

-2.1 KB
Binary file not shown.

‎Source/Demo/Common/Resources/property32.png‎

-3.48 KB
Binary file not shown.

‎Source/Demo/Common/Resources/refreshdocument32.png‎

-3.12 KB
Binary file not shown.

‎Source/Demo/WPF/DemoWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Separator/>
2323
<ToggleButton x:Name="_showIEView" Click="OnShowIEView_ButtonClick">
2424
<StackPanel Orientation="Horizontal">
25-
<Image Source="{Binding ConverterParameter=ie, Converter={StaticResource Converter}}" MaxHeight="18" Margin="0 0 5 0"/>
25+
<Image Source="{Binding ConverterParameter=browser, Converter={StaticResource Converter}}" MaxHeight="18" Margin="0 0 5 0"/>
2626
<TextBlock Text="Show Browser" VerticalAlignment="Center"/>
2727
</StackPanel>
2828
</ToggleButton>

‎Source/Demo/WinForms/DemoForm.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public DemoForm()
4646

4747
Icon = GetIcon();
4848
_openSampleFormTSB.Image = Common.Properties.Resources.form;
49-
_showIEViewTSSB.Image = Common.Properties.Resources.IE;
49+
_showIEViewTSSB.Image = Common.Properties.Resources.browser;
5050
_openInExternalViewTSB.Image = Common.Properties.Resources.chrome;
5151
_useGeneratedHtmlTSB.Image = Common.Properties.Resources.code;
5252
_generateImageSTB.Image = Common.Properties.Resources.image;

0 commit comments

Comments
 (0)