Skip to content

Commit 113c1ef

Browse files
Hosch250Hosch250
committed
Close #1694 
1 parent 1c0c239 commit 113c1ef

File tree

6 files changed

+222
-29
lines changed

6 files changed

+222
-29
lines changed

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,11 @@
850850
<DependentUpon>SettingsView.xaml</DependentUpon>
851851
</Compile>
852852
<Compile Include="UI\SourceControl\SettingsViewViewModel.cs" />
853+
<Compile Include="UI\SourceControl\SourceControl.Designer.cs">
854+
<AutoGen>True</AutoGen>
855+
<DesignTime>True</DesignTime>
856+
<DependentUpon>SourceControl.resx</DependentUpon>
857+
</Compile>
853858
<Compile Include="UI\SourceControl\SourceControlPanel.cs">
854859
<SubType>UserControl</SubType>
855860
</Compile>
@@ -1066,6 +1071,10 @@
10661071
<SubType>Designer</SubType>
10671072
<LastGenOutput>RubberduckUI.Designer.cs</LastGenOutput>
10681073
</EmbeddedResource>
1074+
<EmbeddedResource Include="UI\SourceControl\SourceControl.resx">
1075+
<Generator>ResXFileCodeGenerator</Generator>
1076+
<LastGenOutput>SourceControl.Designer.cs</LastGenOutput>
1077+
</EmbeddedResource>
10691078
<EmbeddedResource Include="UI\SourceControl\SourceControlPanel.resx">
10701079
<DependentUpon>SourceControlPanel.cs</DependentUpon>
10711080
</EmbeddedResource>

‎RetailCoder.VBE/UI/RubberduckUI.Designer.cs

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

‎RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,13 +1526,6 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
15261526
<data name="CodeExplorer_Commit" xml:space="preserve">
15271527
<value>Commit...</value>
15281528
</data>
1529-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
1530-
<data name="cross_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
1531-
<value>..\Resources\cross-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
1532-
</data>
1533-
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
1534-
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
1535-
</data>
15361529
<data name="SourceControl_CommitStatus" xml:space="preserve">
15371530
<value>Commit status.</value>
15381531
</data>

‎RetailCoder.VBE/UI/SourceControl/SourceControl.Designer.cs

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

‎RetailCoder.VBE/UI/SourceControl/SourceControl.resx

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="cross_circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\..\Resources\cross-circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
124+
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>..\..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126+
</data>
127+
</root>

‎RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Rubberduck.UI.Command;
1818
using Rubberduck.UI.Command.MenuItems;
1919
using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
20+
using resx = Rubberduck.UI.SourceControl.SourceControl;
2021

2122
namespace Rubberduck.UI.SourceControl
2223
{
@@ -179,8 +180,8 @@ private void ComponentRenamed(object sender, IComponentRenamedEventArgs e)
179180
private static readonly IDictionary<NotificationType, BitmapImage> IconMappings =
180181
new Dictionary<NotificationType, BitmapImage>
181182
{
182-
{ NotificationType.Info, GetImageSource((Bitmap) RubberduckUI.ResourceManager.GetObject("information", CultureInfo.InvariantCulture))},
183-
{ NotificationType.Error, GetImageSource((Bitmap) RubberduckUI.ResourceManager.GetObject("cross_circle", CultureInfo.InvariantCulture))}
183+
{ NotificationType.Info, GetImageSource((Bitmap) resx.ResourceManager.GetObject("information", CultureInfo.InvariantCulture))},
184+
{ NotificationType.Error, GetImageSource((Bitmap) resx.ResourceManager.GetObject("cross_circle", CultureInfo.InvariantCulture))}
184185
};
185186

186187
private void _state_StateChanged(object sender, ParserStateEventArgs e)

0 commit comments

Comments
 (0)