Skip to content

Commit 403896a

Browse files
committed
Removed old embedded images from resource files and re-added the original ones because VS2015 designer keeps changing them.
1 parent acaa4ed commit 403896a

File tree

7 files changed

+49
-51
lines changed

7 files changed

+49
-51
lines changed

GitTfs.GitExtensions.Plugin.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@
8787
<Name>ResourceManager</Name>
8888
</ProjectReference>
8989
</ItemGroup>
90+
<ItemGroup>
91+
<None Include="Icons\pull.png" />
92+
</ItemGroup>
93+
<ItemGroup>
94+
<None Include="Icons\push.png" />
95+
</ItemGroup>
96+
<ItemGroup>
97+
<None Include="Icons\cow-head.ico" />
98+
</ItemGroup>
9099
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91100
<PropertyGroup>
92101
<PostBuildEvent>

GitTfsDialog.Designer.cs

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

GitTfsDialog.resx

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -112,37 +112,15 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121-
<data name="PushButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
122-
<value>
123-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
124-
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
125-
CwgBwL2l2gAAAQpJREFUOE9j+P//PwMlGK6ZAQ2Yz7s+DYj/g2h0OWQLsRoA03wTqBKbIXgNgGne/fP/
126-
//nv/v8H0eiG4DQApnnbt///Jzz//7/9MYQG8ZENwWoATPPGj///d9z//7/uNgKD+CBxmCG4DPh/+hfQ
127-
2UAbG4CeL72CwCA+SBwkDzIEqwFGU07Oh9rwv+/W///ZpxEYxIfJgdThCgNuYHQpgRROBGpIOvwPjkF8
128-
kDhIHoi5CcXC/y6g8yN2fYdjEB9qADhJEDSg+eyf//6bP8IxiE+SAbUnv/93W/MajkF8kgxYCPRzxZGv
129-
cAziE22Aft+hJbAQR6ZB4rA8QSgvgGMDiHWRMDj08RpAbpYGAOPSWF0vy2YFAAAAAElFTkSuQmCC
130-
</value>
131-
</data>
132-
<data name="PullButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
133-
<value>
134-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
135-
YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
136-
CwgBwL2l2gAAAQpJREFUOE9j+P//PwMlGK6ZAQrM512fBsT/seBpMDXIFmIz4P8FoIptPxEYxAcZSLQB
137-
m7/9/9/3AoFBfJIMWPvp///2xwgM4pNkwPI3///X3UZgEJ8kA+Y///+/9AoCg/gEDUAO/b5b//9nn0Zg
138-
EB8pVqZhjQWQgoMf//+fCFScd/L//6TD/+AYxAeJg+RB6rAaYDTl5HyQ5DSgwtSDv/5H7PoOxyA+SBwk
139-
D1KHKx1wazVvXQtSNOHq//8xO7/899/8EUyD+CBxkDwwLXDjS0hwQ7ou/P6fuOvjfxCNrBmUmPCmRJAN
140-
MJesf4RqM1EpEaoIbgjM2TDNxLgAppYbyBADuQhZM04DyM3SANNLWL4PTDUqAAAAAElFTkSuQmCC
141-
</value>
142-
</data>
143-
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
120+
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
144121
<value>True</value>
145122
</metadata>
123+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
146124
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
147125
<value>
148126
AAABAAUAgIAAAAEAIAAoCAEAVgAAAEBAAAABACAAKEIAAH4IAQAgIAAAAQAgAKgQAACmSgEAGBgAAAEA

Properties/Resources.Designer.cs

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

Properties/Resources.resx

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,27 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121+
<data name="pull" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
122+
<value>
123+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
124+
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAD8SURBVDhPpZCxCwFRHMftdn+E
125+
0eLPsBoslEnZrBaDMlyUbmQ0ySCKTSZZbiDFxsBgOYlQvt733L2HjnN869t739/v+z5XFwDwl9XFVrQ2
126+
04XhYt2ueAJgiEH3pMzMuV3xBrQPgLZRZvYFaO6A4kqZ2RegsQXyC2VmX4D6GshNlJk9AaIg/742BzJj
127+
ZWZnx947AAYmUBHl7AhIDa/SzJxzz57zhpaXSHVU51IXxfTgjHj/KM3MOffsuQKEguFCp8lSeQokenvE
128+
2qZ1MnPOPXvvAJSElIwLkn3TOh8fs/QJQElIa/n85fvaG0BJyOtj6hsAxUch+3ySK+A3I3AD00tYvgGa
129+
0N0AAAAASUVORK5CYII=
130+
</value>
131+
</data>
132+
<data name="push" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
133+
<value>
134+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
135+
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAESSURBVDhPY/j//z9FGMFAA+bz
136+
rk8D4v8gGioEBwQNgGm+CZTAZghMD1gfnAEFMM27f/7/P//dfzCNbghOA2Cat337/3/C8///2x9DaBAf
137+
2RCsBsA0b/z4/3/H/f//624jMIgPEocZgsuA/6d/AZ0NtLEB6PnSKwgM4oPEQfIgdTA9IAxnGE05OR9q
138+
w/++W///Z59GYBAfJgdSh9UAIOAGYiWQoolADUmH/8ExiA8SB8mD1OEyAAxACruAzo7Y9R2OQXyoAWBA
139+
0IDms3/++2/+CMcgPkkG1J78/t9tzWs4BvFJMmAh0M8VR77CMYhPtAH6fYeWgBSjY5A4VAl+A4AAHBtA
140+
rIuEwaEPxGCA1QDy8H8GAOPSWF3RF0fJAAAAAElFTkSuQmCC
141+
</value>
142+
</data>
120143
</root>

ShelveDialog.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ShelveDialog.resx

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -112,23 +112,12 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121-
<data name="ShelveButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
122-
<value>
123-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
124-
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAAEKSURBVDhPY/j//z8DJRiumQEN
125-
mM+7Pg2I/4NodDlkC7EaANN8E6gSmyF4DYBp3v3z///57/7/B9HohuA0AKZ527f//yc8//+//TGEBvGR
126-
DcFqAEzzxo///3fc//+/7jYCg/ggcZghuAz4f/oX0NlAGxuAni+9gsAgPkgcJA8yBKsBRlNOzofa8L/v
127-
1v//2acRGMSHyYHU4QoDbmB0KYEUTgRqSDr8D45BfJA4SB6IuQnFwv8uoPMjdn2HYxAfagA4SRA0oPns
128-
n//+mz/CMYhPkgG1J7//d1vzGo5BfJIMWAj0c8WRr3AM4hNtgH7foSWwEEemQeKwPEEoL4BjA4h1kTA4
129-
9PEaQG6WBgDj0lhdL8tmBQAAAABJRU5ErkJggg==
130-
</value>
131-
</data>
120+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
132121
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
133122
<value>
134123
AAABAAgAAAAAAAEACADoPwAAhgAAADAwAAABAAgAqA4AAG5AAAAgIAAAAQAIAKgIAAAWTwAAEBAAAAEA

0 commit comments

Comments
 (0)