Skip to content

Commit b16d6e7

Browse files
rubberduck203rubberduck203
committed
closes #667; Git integration is a shippable beta
1 parent 5523265 commit b16d6e7

File tree

12 files changed

+456
-43
lines changed

12 files changed

+456
-43
lines changed

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,12 @@
413413
<Compile Include="UI\SourceControl\ICreateBranchView.cs" />
414414
<Compile Include="UI\SourceControl\IDeleteBranchView.cs" />
415415
<Compile Include="UI\SourceControl\IMergeView.cs" />
416+
<Compile Include="UI\SourceControl\LoginControl.cs">
417+
<SubType>UserControl</SubType>
418+
</Compile>
419+
<Compile Include="UI\SourceControl\LoginControl.Designer.cs">
420+
<DependentUpon>LoginControl.cs</DependentUpon>
421+
</Compile>
416422
<Compile Include="UI\SourceControl\ProviderPresenter.cs" />
417423
<Compile Include="UI\SourceControl\IRefreshableView.cs" />
418424
<Compile Include="UI\SourceControl\ISettingsView.cs" />
@@ -668,6 +674,9 @@
668674
<EmbeddedResource Include="UI\SourceControl\FailedActionControl.resx">
669675
<DependentUpon>FailedActionControl.cs</DependentUpon>
670676
</EmbeddedResource>
677+
<EmbeddedResource Include="UI\SourceControl\LoginControl.resx">
678+
<DependentUpon>LoginControl.cs</DependentUpon>
679+
</EmbeddedResource>
671680
<EmbeddedResource Include="UI\SourceControl\MergeForm.resx">
672681
<DependentUpon>MergeForm.cs</DependentUpon>
673682
</EmbeddedResource>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ IMergeView mergeView
4242
unsyncedPresenter,
4343
new DialogFactory(),
4444
new SourceControlProviderFactory(),
45-
failedActionView
45+
failedActionView,
46+
new LoginControl()
4647
);
4748
}
4849

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,29 @@ public interface IFailedMessageView : ISecondarySourceControlPanel
2626
string Message { get; set; }
2727
}
2828

29-
public interface ILoginView : ICredentials<SecureString>, ISecondarySourceControlPanel
29+
public interface ILoginView : ICredentials<string>, ISecondarySourceControlPanel
3030
{
3131
event EventHandler Confirm;
3232
event EventHandler Cancel;
3333
}
34+
35+
public interface ISecondaryPanelFactory
36+
{
37+
ILoginView CreateLogin();
38+
IFailedMessageView CreateFailedMessage();
39+
}
40+
41+
public class SecondaryPanelFactory : ISecondaryPanelFactory
42+
{
43+
44+
public ILoginView CreateLogin()
45+
{
46+
return new LoginControl();
47+
}
48+
49+
public IFailedMessageView CreateFailedMessage()
50+
{
51+
return new FailedActionControl();
52+
}
53+
}
3454
}

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

Lines changed: 125 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/LoginControl.cs

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
using System;
2+
using System.Diagnostics.CodeAnalysis;
3+
using System.Windows.Forms;
4+
5+
namespace Rubberduck.UI.SourceControl
6+
{
7+
[ExcludeFromCodeCoverage]
8+
public partial class LoginControl : UserControl, ILoginView
9+
{
10+
public LoginControl()
11+
{
12+
InitializeComponent();
13+
}
14+
15+
public string Username
16+
{
17+
get { return this.UsernameBox.Text; }
18+
set { this.UsernameBox.Text = value; }
19+
}
20+
21+
public string Password
22+
{
23+
get { return this.PasswordBox.Text; }
24+
set { this.PasswordBox.Text = value; }
25+
}
26+
27+
public event EventHandler Confirm;
28+
public event EventHandler Cancel;
29+
public event EventHandler<EventArgs> DismissSecondaryPanel;
30+
31+
private void OkButton_Click(object sender, EventArgs e)
32+
{
33+
var handler = Confirm;
34+
if (handler != null)
35+
{
36+
handler(this, e);
37+
}
38+
39+
var dismiss = DismissSecondaryPanel;
40+
if (dismiss != null)
41+
{
42+
dismiss(this, e);
43+
}
44+
}
45+
46+
private void CancelButton_Click(object sender, EventArgs e)
47+
{
48+
var handler = Confirm;
49+
if (handler != null)
50+
{
51+
handler(this, e);
52+
}
53+
54+
var dismiss = DismissSecondaryPanel;
55+
if (dismiss != null)
56+
{
57+
dismiss(this, e);
58+
}
59+
}
60+
}
61+
}

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

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
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+
<metadata name="helpProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121+
<value>17, 17</value>
122+
</metadata>
123+
</root>

0 commit comments

Comments
 (0)