Skip to content

Commit d6a4d8c

Browse files
cpmcgrathcpmcgrath
committed
Merge branch 'develop' into release
2 parents f8fb550 + ea3f5dc commit d6a4d8c

65 files changed

Lines changed: 436 additions & 202 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CodeAlignment.Common.WinForms/CodeAlignment.Common.WinForms.csproj‎

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{F343E003-1A69-41FE-A014-76BB53034914}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>CMcG.CodeAlignment</RootNamespace>
11+
<AssemblyName>CodeAlignment.Common.WinForms</AssemblyName>
12+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<DebugType>pdbonly</DebugType>
26+
<Optimize>true</Optimize>
27+
<OutputPath>bin\Release\</OutputPath>
28+
<DefineConstants>TRACE</DefineConstants>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
</PropertyGroup>
32+
<PropertyGroup>
33+
<SignAssembly>true</SignAssembly>
34+
</PropertyGroup>
35+
<PropertyGroup>
36+
<AssemblyOriginatorKeyFile>..\CodeAlignment.snk</AssemblyOriginatorKeyFile>
37+
</PropertyGroup>
38+
<ItemGroup>
39+
<Reference Include="System" />
40+
<Reference Include="System.Core" />
41+
<Reference Include="System.Drawing" />
42+
<Reference Include="System.Windows.Forms" />
43+
<Reference Include="System.Xml.Linq" />
44+
<Reference Include="System.Data.DataSetExtensions" />
45+
<Reference Include="System.Data" />
46+
<Reference Include="System.Xml" />
47+
</ItemGroup>
48+
<ItemGroup>
49+
<Compile Include="Controls\BaseForm.cs">
50+
<SubType>Form</SubType>
51+
</Compile>
52+
<Compile Include="Controls\BaseForm.Designer.cs">
53+
<DependentUpon>BaseForm.cs</DependentUpon>
54+
</Compile>
55+
<Compile Include="Controls\BaseUserControl.cs">
56+
<SubType>UserControl</SubType>
57+
</Compile>
58+
<Compile Include="Controls\BaseUserControl.Designer.cs">
59+
<DependentUpon>BaseUserControl.cs</DependentUpon>
60+
</Compile>
61+
<Compile Include="Controls\ListControl.cs">
62+
<SubType>UserControl</SubType>
63+
</Compile>
64+
<Compile Include="Controls\ListControl.Designer.cs">
65+
<DependentUpon>ListControl.cs</DependentUpon>
66+
</Compile>
67+
<Compile Include="FormAbout.cs">
68+
<SubType>Form</SubType>
69+
</Compile>
70+
<Compile Include="FormAbout.Designer.cs">
71+
<DependentUpon>FormAbout.cs</DependentUpon>
72+
</Compile>
73+
<Compile Include="FormCodeAlignment.cs">
74+
<SubType>Form</SubType>
75+
</Compile>
76+
<Compile Include="FormCodeAlignment.Designer.cs">
77+
<DependentUpon>FormCodeAlignment.cs</DependentUpon>
78+
</Compile>
79+
<Compile Include="FormKeyGrabber.cs">
80+
<SubType>Form</SubType>
81+
</Compile>
82+
<Compile Include="FormKeyGrabber.Designer.cs">
83+
<DependentUpon>FormKeyGrabber.cs</DependentUpon>
84+
</Compile>
85+
<Compile Include="Options\FormOptions.cs">
86+
<SubType>Form</SubType>
87+
</Compile>
88+
<Compile Include="Options\FormOptions.Designer.cs">
89+
<DependentUpon>FormOptions.cs</DependentUpon>
90+
</Compile>
91+
<Compile Include="Options\ScreenGeneral.cs">
92+
<SubType>UserControl</SubType>
93+
</Compile>
94+
<Compile Include="Options\ScreenGeneral.Designer.cs">
95+
<DependentUpon>ScreenGeneral.cs</DependentUpon>
96+
</Compile>
97+
<Compile Include="Options\ScreenSelectors.cs">
98+
<SubType>UserControl</SubType>
99+
</Compile>
100+
<Compile Include="Options\ScreenSelectors.Designer.cs">
101+
<DependentUpon>ScreenSelectors.cs</DependentUpon>
102+
</Compile>
103+
<Compile Include="Options\ScreenShortcuts.cs">
104+
<SubType>UserControl</SubType>
105+
</Compile>
106+
<Compile Include="Options\ScreenShortcuts.Designer.cs">
107+
<DependentUpon>ScreenShortcuts.cs</DependentUpon>
108+
</Compile>
109+
<Compile Include="Options\ShortcutLine.cs">
110+
<SubType>UserControl</SubType>
111+
</Compile>
112+
<Compile Include="Options\ShortcutLine.Designer.cs">
113+
<DependentUpon>ShortcutLine.cs</DependentUpon>
114+
</Compile>
115+
<Compile Include="Properties\AssemblyInfo.cs" />
116+
<Compile Include="Properties\Resources.Designer.cs">
117+
<DependentUpon>Resources.resx</DependentUpon>
118+
<AutoGen>True</AutoGen>
119+
<DesignTime>True</DesignTime>
120+
</Compile>
121+
<Compile Include="UIManager.cs" />
122+
</ItemGroup>
123+
<ItemGroup>
124+
<EmbeddedResource Include="FormAbout.resx">
125+
<DependentUpon>FormAbout.cs</DependentUpon>
126+
</EmbeddedResource>
127+
<EmbeddedResource Include="FormCodeAlignment.resx">
128+
<DependentUpon>FormCodeAlignment.cs</DependentUpon>
129+
</EmbeddedResource>
130+
<EmbeddedResource Include="FormKeyGrabber.resx">
131+
<DependentUpon>FormKeyGrabber.cs</DependentUpon>
132+
</EmbeddedResource>
133+
<EmbeddedResource Include="Options\FormOptions.resx">
134+
<DependentUpon>FormOptions.cs</DependentUpon>
135+
</EmbeddedResource>
136+
<EmbeddedResource Include="Options\ScreenGeneral.resx">
137+
<DependentUpon>ScreenGeneral.cs</DependentUpon>
138+
<SubType>Designer</SubType>
139+
</EmbeddedResource>
140+
<EmbeddedResource Include="Options\ScreenSelectors.resx">
141+
<DependentUpon>ScreenSelectors.cs</DependentUpon>
142+
</EmbeddedResource>
143+
<EmbeddedResource Include="Options\ScreenShortcuts.resx">
144+
<DependentUpon>ScreenShortcuts.cs</DependentUpon>
145+
</EmbeddedResource>
146+
<EmbeddedResource Include="Options\ShortcutLine.resx">
147+
<DependentUpon>ShortcutLine.cs</DependentUpon>
148+
</EmbeddedResource>
149+
<EmbeddedResource Include="Properties\Resources.resx">
150+
<Generator>ResXFileCodeGenerator</Generator>
151+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
152+
<SubType>Designer</SubType>
153+
</EmbeddedResource>
154+
</ItemGroup>
155+
<ItemGroup>
156+
<ProjectReference Include="..\CodeAlignment.Common\CodeAlignment.Common.csproj">
157+
<Project>{f33d2d88-a998-4f74-ab41-ab81878bb296}</Project>
158+
<Name>CodeAlignment.Common</Name>
159+
</ProjectReference>
160+
</ItemGroup>
161+
<ItemGroup>
162+
<None Include="..\CodeAlignment.snk">
163+
<Link>Properties\CodeAlignment.snk</Link>
164+
</None>
165+
<None Include="Resources\CodeAlignmentBanner96x16.png" />
166+
</ItemGroup>
167+
<ItemGroup>
168+
<None Include="Resources\CodeAlignmentIconBanner.png" />
169+
</ItemGroup>
170+
<ItemGroup>
171+
<None Include="Resources\Donate.gif" />
172+
</ItemGroup>
173+
<ItemGroup>
174+
<None Include="Resources\Options.png" />
175+
</ItemGroup>
176+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
177+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
178+
Other similar extension points exist, see Microsoft.Common.targets.
179+
<Target Name="BeforeBuild">
180+
</Target>
181+
<Target Name="AfterBuild">
182+
</Target>
183+
-->
184+
</Project>

CodeAlignment.Common/Controls/BaseForm.Designer.cs renamed to CodeAlignment.Common.WinForms/Controls/BaseForm.Designer.cs

File renamed without changes.

CodeAlignment.Common/Controls/BaseForm.cs renamed to CodeAlignment.Common.WinForms/Controls/BaseForm.cs

File renamed without changes.

CodeAlignment.Common/Controls/BaseUserControl.Designer.cs renamed to CodeAlignment.Common.WinForms/Controls/BaseUserControl.Designer.cs

File renamed without changes.

CodeAlignment.Common/Controls/BaseUserControl.cs renamed to CodeAlignment.Common.WinForms/Controls/BaseUserControl.cs

File renamed without changes.

CodeAlignment.Common/Controls/ListControl.Designer.cs renamed to CodeAlignment.Common.WinForms/Controls/ListControl.Designer.cs

File renamed without changes.

CodeAlignment.Common/Controls/ListControl.cs renamed to CodeAlignment.Common.WinForms/Controls/ListControl.cs

File renamed without changes.

CodeAlignment.Common/FormAbout.Designer.cs renamed to CodeAlignment.Common.WinForms/FormAbout.Designer.cs

File renamed without changes.

‎CodeAlignment.Common.WinForms/FormAbout.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using System.Linq;
3+
using System.Windows.Forms;
4+
using Process = System.Diagnostics.Process;
5+
6+
namespace CMcG.CodeAlignment
7+
{
8+
public partial class FormAbout : Controls.BaseForm
9+
{
10+
public FormAbout()
11+
{
12+
InitializeComponent();
13+
var data = new AboutData();
14+
Text = string.Format("About {0}", data.AssemblyTitle);
15+
labelVersion .Text = string.Format("Version {0}", data.AssemblyVersion);
16+
labelCopyright.Text = data.AssemblyCopyright;
17+
if (AboutData.Image != null)
18+
ctlLogo.Image = AboutData.Image;
19+
}
20+
21+
void GoToWebsite(object sender, LinkLabelLinkClickedEventArgs e)
22+
{
23+
Process.Start("http://www.codealignment.com");
24+
}
25+
26+
void Donate(object sender, EventArgs e)
27+
{
28+
Process.Start("https://www.paypal.com/cgi-bin/webscr?hosted_button_id=AZZSHWMQ946V2&cmd=_s-xclick");
29+
}
30+
}
31+
}

CodeAlignment.Common/FormAbout.resx renamed to CodeAlignment.Common.WinForms/FormAbout.resx

File renamed without changes.

0 commit comments

Comments
 (0)