Skip to content

Commit ee10f36

Browse files
retailcoderretailcoder
committed
Merge pull request #669 from ckuhn203/sourcecontrol
Sourcecontrol - Beta ready
2 parents 9ea3f5d + b16d6e7 commit ee10f36

19 files changed

+837
-127
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,4 @@ $RECYCLE.BIN/
166166
# Workbook for debugging
167167
*.xlsm
168168
Installers/
169+
*.xlsx

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,23 @@
402402
<Compile Include="UI\SourceControl\DeleteBranchForm.Designer.cs">
403403
<DependentUpon>DeleteBranchForm.cs</DependentUpon>
404404
</Compile>
405+
<Compile Include="UI\SourceControl\FailedActionControl.cs">
406+
<SubType>UserControl</SubType>
407+
</Compile>
408+
<Compile Include="UI\SourceControl\FailedActionControl.Designer.cs">
409+
<DependentUpon>FailedActionControl.cs</DependentUpon>
410+
</Compile>
405411
<Compile Include="UI\SourceControl\IBranchesView.cs" />
406412
<Compile Include="UI\SourceControl\IChangesView.cs" />
407413
<Compile Include="UI\SourceControl\ICreateBranchView.cs" />
408414
<Compile Include="UI\SourceControl\IDeleteBranchView.cs" />
409415
<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>
410422
<Compile Include="UI\SourceControl\ProviderPresenter.cs" />
411423
<Compile Include="UI\SourceControl\IRefreshableView.cs" />
412424
<Compile Include="UI\SourceControl\ISettingsView.cs" />
@@ -659,6 +671,12 @@
659671
<EmbeddedResource Include="UI\SourceControl\DeleteBranchForm.resx">
660672
<DependentUpon>DeleteBranchForm.cs</DependentUpon>
661673
</EmbeddedResource>
674+
<EmbeddedResource Include="UI\SourceControl\FailedActionControl.resx">
675+
<DependentUpon>FailedActionControl.cs</DependentUpon>
676+
</EmbeddedResource>
677+
<EmbeddedResource Include="UI\SourceControl\LoginControl.resx">
678+
<DependentUpon>LoginControl.cs</DependentUpon>
679+
</EmbeddedResource>
662680
<EmbeddedResource Include="UI\SourceControl\MergeForm.resx">
663681
<DependentUpon>MergeForm.cs</DependentUpon>
664682
</EmbeddedResource>

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ internal App(
2121
IMergeView mergeView
2222
)
2323
{
24-
_sourceControlView = new SourceControlPanel(branchesView, changesView, unsyncedCommitsView, settingsView);
24+
var failedActionView = new FailedActionControl();
25+
26+
_sourceControlView = new SourceControlPanel(branchesView, changesView, unsyncedCommitsView, settingsView, failedActionView);
2527
var changesPresenter = new ChangesPresenter(changesView);
2628
var branchesPresenter = new BranchesPresenter(branchesView, createBranchView, deleteBranchView, mergeView);
2729
var settingsPresenter = new SettingsPresenter(settingsView, configService, new DialogFactory());
@@ -39,7 +41,9 @@ IMergeView mergeView
3941
settingsPresenter,
4042
unsyncedPresenter,
4143
new DialogFactory(),
42-
new SourceControlProviderFactory()
44+
new SourceControlProviderFactory(),
45+
failedActionView,
46+
new LoginControl()
4347
);
4448
}
4549

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

Lines changed: 87 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/FailedActionControl.cs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+

2+
using System;
3+
using System.Diagnostics.CodeAnalysis;
4+
using System.Windows.Forms;
5+
6+
namespace Rubberduck.UI.SourceControl
7+
{
8+
[ExcludeFromCodeCoverage]
9+
public partial class FailedActionControl : UserControl, IFailedMessageView
10+
{
11+
public FailedActionControl()
12+
{
13+
InitializeComponent();
14+
DismissMessageButton.Click += DismissMessageButton_Click;
15+
}
16+
17+
public string Message
18+
{
19+
get { return this.ActionFailedMessage.Text; }
20+
set { this.ActionFailedMessage.Text = value; }
21+
}
22+
23+
public event EventHandler<EventArgs> DismissSecondaryPanel;
24+
void DismissMessageButton_Click(object sender, EventArgs e)
25+
{
26+
var handler = DismissSecondaryPanel;
27+
if (handler != null)
28+
{
29+
handler(this, e);
30+
}
31+
}
32+
}
33+
}

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

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
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+
</root>

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

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using System.Security;
3+
using Rubberduck.SourceControl;
24

35
namespace Rubberduck.UI.SourceControl
46
{
@@ -7,10 +9,46 @@ public interface ISourceControlView : IDockableUserControl
79
event EventHandler<EventArgs> RefreshData;
810
event EventHandler<EventArgs> OpenWorkingDirectory;
911
event EventHandler<EventArgs> InitializeNewRepository;
10-
event EventHandler<EventArgs> DismissMessage;
1112

1213
string Status { get; set; }
13-
string FailedActionMessage { get; set; }
14-
bool FailedActionMessageVisible { get; set; }
14+
15+
ISecondarySourceControlPanel SecondaryPanel { get; set; }
16+
bool SecondaryPanelVisible { get; set; }
17+
}
18+
19+
public interface ISecondarySourceControlPanel
20+
{
21+
event EventHandler<EventArgs> DismissSecondaryPanel;
22+
}
23+
24+
public interface IFailedMessageView : ISecondarySourceControlPanel
25+
{
26+
string Message { get; set; }
27+
}
28+
29+
public interface ILoginView : ICredentials<string>, ISecondarySourceControlPanel
30+
{
31+
event EventHandler Confirm;
32+
event EventHandler Cancel;
33+
}
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+
}
1553
}
1654
}

0 commit comments

Comments
 (0)