Skip to content

Commit

Permalink
Merged develop into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ennerperez committed Jun 10, 2016
2 parents 8a5be4d + a6b06ce commit 9b9169f
Show file tree
Hide file tree
Showing 93 changed files with 15,075 additions and 4 deletions.
19 changes: 19 additions & 0 deletions .files/AssemblyInfo.Shared.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

using System.Reflection;
using System.Runtime.InteropServices;

#if DEBUG
[assembly: AssemblyConfiguration("Debug")]
#else
[assembly: AssemblyConfiguration("Release")]
#endif

[assembly: AssemblyCompany("Marco Minerva")]
[assembly: AssemblyCopyright("Copyright © Marco Minerva")]
[assembly: AssemblyTrademark("WindowsFormsAero")]
[assembly: AssemblyCulture("")]

[assembly: ComVisible(false)]

[assembly: AssemblyVersion("2.1.1.0")]
[assembly: AssemblyFileVersion("2.1.1.0")]
Binary file added .files/PrivateKey.snk
Binary file not shown.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [2.1.1] - [2016-06-10]
### Changes
- Rebuild in NETFX40
- Minor fixes

## [2.0.0]
### Reference
- [Changesets](http://windowsformsaero.codeplex.com/SourceControl/list/changesets)
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ All credits are for [Marco Minerva](http://www.codeplex.com/site/users/view/marc

// Marco Minerva thanks so much. Since 2007.

<!--[![Build status](https://ci.appveyor.com/api/projects/status/wxt0ch5qb3f8412m?svg=true)](https://ci.appveyor.com/project/ennerperez/WindowsFormsAero)-->
<!--[![NuGet](http://img.shields.io/nuget/v/WindowsFormsAero.svg)](https://www.nuget.org/packages/WindowsFormsAero/)-->
[![Build status](https://ci.appveyor.com/api/projects/status/192can949c1pqs9y?svg=true)](https://ci.appveyor.com/project/ennerperez/windowsformsaero)
[![NuGet](http://img.shields.io/nuget/v/WindowsFormsAero.svg)](https://www.nuget.org/packages/WindowsFormsAero/)

---------------------------------------

Expand All @@ -28,11 +28,10 @@ See the [changelog](CHANGELOG.md) for changes.

**Add the library to your project**

<!--Add the [NuGet Package](https://www.nuget.org/packages/WindowsFormsAero/). Right click on your project and click 'Manage NuGet Packages...'. Search for 'WindowsFormsAero' and click on install. Once installed the library will be included in your project references. (Or install it through the package manager console: PM> Install-Package WindowsFormsAero).-->
Add the [NuGet Package](https://www.nuget.org/packages/WindowsFormsAero/). Right click on your project and click 'Manage NuGet Packages...'. Search for 'WindowsFormsAero' and click on install. Once installed the library will be included in your project references. (Or install it through the package manager console: PM> Install-Package WindowsFormsAero).

### Introduction
The current version contains several native Vista controls (such as Buttons, Combo boxes with cue banner, Command links, native List views, Progress bars, explorer-like TreeView...) and some modules that empower the user to exploit some of Vista's advanced GUI features (Glass sheet effect, text on glass, live thumbnails and the new Task dialogs).
The intellisense documentation file is now available as well.

### Features
- Controls
Expand Down
157 changes: 157 additions & 0 deletions WindowsFormsAero.Demo/ControlPanel.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 48 additions & 0 deletions WindowsFormsAero.Demo/ControlPanel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;

namespace VistaControlsApp
{
public partial class ControlPanel : WindowsFormsAero.Dwm.Helpers.GlassForm
{
public ControlPanel()
{
InitializeComponent();
}

protected override void OnShown(EventArgs e)
{
base.OnShown(e);

//Initialize glass sheet
GlassMargins = new WindowsFormsAero.Dwm.Margins(0, 0, 30, 28);

// Place the panel on the form... since I'm not docking this control currently I just manually
// put the position and the height in.
aeroVerticalPanel1.Top = 30;
aeroVerticalPanel1.Left = 0;
aeroVerticalPanel1.Height = 365;

// Now, move the normal panel with the white background to fill the rest.
panel1.Top = aeroVerticalPanel1.Top;
panel1.Left = aeroVerticalPanel1.Right;
panel1.Height = aeroVerticalPanel1.Height;

}

private void ControlPanel_Load(object sender, EventArgs e)
{

}

private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
this.Close();
}
}
}
120 changes: 120 additions & 0 deletions WindowsFormsAero.Demo/ControlPanel.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading

0 comments on commit 9b9169f

Please sign in to comment.