Skip to content

Commit

Permalink
Merge pull request #6 from ChanpleCai/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Oliviaophia authored Mar 4, 2018
2 parents 0e472e6 + 48c6dfe commit 2d48b38
Show file tree
Hide file tree
Showing 49 changed files with 1,836 additions and 81 deletions.
50 changes: 40 additions & 10 deletions SmartTaskbar.sln
Original file line number Diff line number Diff line change
@@ -1,26 +1,56 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2024
VisualStudioVersion = 15.0.27130.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SmartTaskbar", "SmartTaskbar\SmartTaskbar.vcxproj", "{1A13D6CA-746D-4242-AA90-87F15312FF56}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartTaskbar", "SmartTaskbar\SmartTaskbar.csproj", "{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TaskbarSwitcher", "TaskbarSwitcher\TaskbarSwitcher.vcxproj", "{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TaskbarSwitcherWin10", "TaskbarSwitcherWin10\TaskbarSwitcherWin10.vcxproj", "{30E30399-983D-4F30-AB64-62F4D13F6F3B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Debug|x64.ActiveCfg = Debug|x64
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Debug|x64.Build.0 = Debug|x64
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Debug|x86.ActiveCfg = Debug|Win32
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Debug|x86.Build.0 = Debug|Win32
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Release|x64.ActiveCfg = Release|x64
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Release|x64.Build.0 = Release|x64
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Release|x86.ActiveCfg = Release|Win32
{1A13D6CA-746D-4242-AA90-87F15312FF56}.Release|x86.Build.0 = Release|Win32
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Debug|x64.ActiveCfg = Debug|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Debug|x64.Build.0 = Debug|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Debug|x86.ActiveCfg = Debug|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Debug|x86.Build.0 = Debug|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Release|Any CPU.Build.0 = Release|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Release|x64.ActiveCfg = Release|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Release|x64.Build.0 = Release|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Release|x86.ActiveCfg = Release|Any CPU
{6A7CF22A-900B-4234-AE5C-E2CB53615AD8}.Release|x86.Build.0 = Release|Any CPU
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Debug|Any CPU.ActiveCfg = Debug|Win32
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Debug|x64.ActiveCfg = Debug|x64
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Debug|x64.Build.0 = Debug|x64
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Debug|x86.ActiveCfg = Debug|Win32
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Debug|x86.Build.0 = Debug|Win32
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Release|Any CPU.ActiveCfg = Release|Win32
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Release|x64.ActiveCfg = Release|x64
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Release|x64.Build.0 = Release|x64
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Release|x86.ActiveCfg = Release|Win32
{78CFFA36-7E0B-4DDE-8824-9FDF2AB42F94}.Release|x86.Build.0 = Release|Win32
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Debug|Any CPU.ActiveCfg = Debug|Win32
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Debug|x64.ActiveCfg = Debug|x64
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Debug|x64.Build.0 = Debug|x64
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Debug|x86.ActiveCfg = Debug|Win32
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Debug|x86.Build.0 = Debug|Win32
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Release|Any CPU.ActiveCfg = Release|Win32
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Release|x64.ActiveCfg = Release|x64
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Release|x64.Build.0 = Release|x64
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Release|x86.ActiveCfg = Release|Win32
{30E30399-983D-4F30-AB64-62F4D13F6F3B}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
21 changes: 21 additions & 0 deletions SmartTaskbar/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="SmartTaskbar.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
</startup>
<userSettings>
<SmartTaskbar.Settings>
<setting name="SwitcherVersion" serializeAs="String">
<value>0</value>
</setting>
<setting name="TaskbarState" serializeAs="String">
<value>auto</value>
</setting>
</SmartTaskbar.Settings>
</userSettings>
</configuration>
20 changes: 20 additions & 0 deletions SmartTaskbar/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System;
using System.Windows.Forms;

namespace SmartTaskbar
{
static class Program
{
/// <summary>
/// 应用程序的主入口点。
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
new SystemTray();
Application.Run();
}
}
}
36 changes: 36 additions & 0 deletions SmartTaskbar/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("SmartTaskbar")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Chanple")]
[assembly: AssemblyProduct("SmartTaskbar")]
[assembly: AssemblyCopyright("Copyright © 2018 ChanpleCai")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]

// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
[assembly: Guid("6a7cf22a-900b-4234-ae5c-e2cb53615ad8")]

// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
71 changes: 71 additions & 0 deletions SmartTaskbar/Properties/Resources.Designer.cs

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

117 changes: 117 additions & 0 deletions SmartTaskbar/Properties/Resources.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<?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.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: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" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</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" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</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>
30 changes: 30 additions & 0 deletions SmartTaskbar/Properties/Settings.Designer.cs

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

7 changes: 7 additions & 0 deletions SmartTaskbar/Properties/Settings.settings
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
Loading

0 comments on commit 2d48b38

Please sign in to comment.