diff --git a/PowerToys.sln b/PowerToys.sln index a7366e334d..ef269b3f85 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -174,6 +174,13 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreview", "src\modules\previewpane\powerpreview\powerpreview.vcxproj", "{217DF501-135C-4E38-BFC8-99D4821032EA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreviewTest", "src\modules\previewpane\powerpreviewTest\powerpreviewTest.vcxproj", "{47310AB4-9034-4BD1-8D8B-E88AD21A171B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingsui", "src\settingsui\settingsui.csproj", "{A7D5099E-F0FD-4BF3-8522-5A682759F915}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingswpf", "src\settings_v2\settingswpf.csproj", "{806222E4-A9BE-431D-A1E7-3B0B15ABD160}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "settingsUintTests", "src\settingsUintTests\settingsUintTests.csproj", "{E56203D2-1BC4-4D4B-A5D8-F6302ADED104}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settingsv2", "settingsv2", "{852D6EFE-D679-409D-A112-AEC69DB2DEE7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -321,6 +328,20 @@ Global {47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Debug|x64.Build.0 = Debug|x64 {47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.ActiveCfg = Release|x64 {47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.Build.0 = Release|x64 + {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.ActiveCfg = Debug|x64 + {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Build.0 = Debug|x64 + {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Deploy.0 = Debug|x64 + {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.ActiveCfg = Release|x64 + {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Build.0 = Release|x64 + {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Deploy.0 = Release|x64 + {806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Debug|x64.ActiveCfg = Debug|x64 + {806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Debug|x64.Build.0 = Debug|x64 + {806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Release|x64.ActiveCfg = Release|Any CPU + {806222E4-A9BE-431D-A1E7-3B0B15ABD160}.Release|x64.Build.0 = Release|Any CPU + {E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Debug|x64.ActiveCfg = Debug|x64 + {E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Debug|x64.Build.0 = Debug|x64 + {E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Release|x64.ActiveCfg = Release|Any CPU + {E56203D2-1BC4-4D4B-A5D8-F6302ADED104}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -364,6 +385,9 @@ Global {748417CA-F17E-487F-9411-CAFB6D3F4877} = {2F305555-C296-497E-AC20-5FA1B237996A} {217DF501-135C-4E38-BFC8-99D4821032EA} = {2F305555-C296-497E-AC20-5FA1B237996A} {47310AB4-9034-4BD1-8D8B-E88AD21A171B} = {2F305555-C296-497E-AC20-5FA1B237996A} + {A7D5099E-F0FD-4BF3-8522-5A682759F915} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7} + {806222E4-A9BE-431D-A1E7-3B0B15ABD160} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7} + {E56203D2-1BC4-4D4B-A5D8-F6302ADED104} = {852D6EFE-D679-409D-A112-AEC69DB2DEE7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0} diff --git a/src/settingsUintTests/UnitTest1.cs b/src/settingsUintTests/UnitTest1.cs new file mode 100644 index 0000000000..efdf0b7925 --- /dev/null +++ b/src/settingsUintTests/UnitTest1.cs @@ -0,0 +1,13 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace settingsUintTests +{ + [TestClass] + public class UnitTest1 + { + [TestMethod] + public void TestMethod1() + { + } + } +} diff --git a/src/settingsUintTests/settingsUintTests.csproj b/src/settingsUintTests/settingsUintTests.csproj new file mode 100644 index 0000000000..660c450ca3 --- /dev/null +++ b/src/settingsUintTests/settingsUintTests.csproj @@ -0,0 +1,18 @@ + + + + netcoreapp3.1 + + false + + AnyCPU;x64 + + + + + + + + + + diff --git a/src/settings_v2/App.xaml b/src/settings_v2/App.xaml new file mode 100644 index 0000000000..af355d9c37 --- /dev/null +++ b/src/settings_v2/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/src/settings_v2/App.xaml.cs b/src/settings_v2/App.xaml.cs new file mode 100644 index 0000000000..8ca60a4000 --- /dev/null +++ b/src/settings_v2/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace settings_v2 +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/src/settings_v2/AssemblyInfo.cs b/src/settings_v2/AssemblyInfo.cs new file mode 100644 index 0000000000..8b5504ecfb --- /dev/null +++ b/src/settings_v2/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/src/settings_v2/MainWindow.xaml b/src/settings_v2/MainWindow.xaml new file mode 100644 index 0000000000..bd2d5667b9 --- /dev/null +++ b/src/settings_v2/MainWindow.xaml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/src/settings_v2/MainWindow.xaml.cs b/src/settings_v2/MainWindow.xaml.cs new file mode 100644 index 0000000000..bada888538 --- /dev/null +++ b/src/settings_v2/MainWindow.xaml.cs @@ -0,0 +1,16 @@ +using System.Windows; +using Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT; + +namespace settings_v2 +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/src/settings_v2/Program.cs b/src/settings_v2/Program.cs new file mode 100644 index 0000000000..cc427372af --- /dev/null +++ b/src/settings_v2/Program.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace settings_v2 +{ + public class Program + { + [System.STAThreadAttribute()] + public static void Main() + { + using (new settingsui.App()) + { + settings_v2.App app = new settings_v2.App(); + app.InitializeComponent(); + app.Run(); + } + } + } +} diff --git a/src/settings_v2/icon.ico b/src/settings_v2/icon.ico new file mode 100644 index 0000000000..8125e60d0c Binary files /dev/null and b/src/settings_v2/icon.ico differ diff --git a/src/settings_v2/settingswpf.csproj b/src/settings_v2/settingswpf.csproj new file mode 100644 index 0000000000..0d3b66f33d --- /dev/null +++ b/src/settings_v2/settingswpf.csproj @@ -0,0 +1,38 @@ + + + + WinExe + netcoreapp3.1 + true + settings_v2.Program + Microsoft Corporation + PowerToys + Windows system utilities to maximize productivity + Microsoft Corporation + logo.png + + https://github.com/microsoft/PowerToys + Github + PowerToys + 0.15.2.0 + AnyCPU;x64 + icon.ico + + + + + + + + + + + + + + True + + + + + \ No newline at end of file diff --git a/src/settingsui/App.xaml b/src/settingsui/App.xaml new file mode 100644 index 0000000000..5bfc8e22a2 --- /dev/null +++ b/src/settingsui/App.xaml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/src/settingsui/App.xaml.cs b/src/settingsui/App.xaml.cs new file mode 100644 index 0000000000..950ac5c2a5 --- /dev/null +++ b/src/settingsui/App.xaml.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.IO; +using Microsoft.Toolkit.Win32.UI.XamlHost; + +namespace settingsui +{ + public sealed partial class App : XamlApplication + { + public App() + { + this.Initialize(); + } + } +} diff --git a/src/settingsui/Assets/logo.png b/src/settingsui/Assets/logo.png new file mode 100644 index 0000000000..8495aaf09d Binary files /dev/null and b/src/settingsui/Assets/logo.png differ diff --git a/src/settingsui/Assets/logo150.png b/src/settingsui/Assets/logo150.png new file mode 100644 index 0000000000..3186a72996 Binary files /dev/null and b/src/settingsui/Assets/logo150.png differ diff --git a/src/settingsui/Assets/logo44.png b/src/settingsui/Assets/logo44.png new file mode 100644 index 0000000000..cbc9822292 Binary files /dev/null and b/src/settingsui/Assets/logo44.png differ diff --git a/src/settingsui/Package.appxmanifest b/src/settingsui/Package.appxmanifest new file mode 100644 index 0000000000..db901142ab --- /dev/null +++ b/src/settingsui/Package.appxmanifest @@ -0,0 +1,47 @@ + + + + + + + + + + PowerToys + Microsoft Corporation + Assets\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/settingsui/Properties/AssemblyInfo.cs b/src/settingsui/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..5075b70069 --- /dev/null +++ b/src/settingsui/Properties/AssemblyInfo.cs @@ -0,0 +1,29 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("settingsui")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("settingsui")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: ComVisible(false)] \ No newline at end of file diff --git a/src/settingsui/Properties/Default.rd.xml b/src/settingsui/Properties/Default.rd.xml new file mode 100644 index 0000000000..af00722cdf --- /dev/null +++ b/src/settingsui/Properties/Default.rd.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/settingsui/settingsui.csproj b/src/settingsui/settingsui.csproj new file mode 100644 index 0000000000..616ba519ee --- /dev/null +++ b/src/settingsui/settingsui.csproj @@ -0,0 +1,159 @@ + + + + + Debug + x86 + {A7D5099E-F0FD-4BF3-8522-5A682759F915} + AppContainerExe + Properties + settingsui + settingsui + en-US + UAP + 10.0.18362.0 + 10.0.18362.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true + false + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + + + true + bin\x64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x64 + false + prompt + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + PackageReference + + + + App.xaml + + + + + + Designer + + + + + + + + + + MSBuild:Compile + Designer + + + + + 6.2.9 + + + 6.0.0 + + + + 14.0 + + + + \ No newline at end of file