Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a Settings UI Prototype #7370

Merged
106 commits merged into from
Sep 17, 2020
Merged
Show file tree
Hide file tree
Changes from 105 commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
e07667a
add settings ui prototype
cinnamon-msft May 20, 2020
9e40d01
fix packages filepaths
carlos-zamora Jul 23, 2020
bb07e3c
Add panel list items to match mockups
almedina-ms Jul 23, 2020
5e45058
add rudimentary object model
carlos-zamora Jul 23, 2020
4f888db
Merge pull request #1 from cinnamon-msft/almedina-ms/NavPanel
vineeththomasalex Jul 23, 2020
d6d835c
Replicate sub menus
almedina-ms Jul 23, 2020
d22616c
Fix submenus
almedina-ms Jul 23, 2020
fe1261b
Remove extra line
almedina-ms Jul 23, 2020
ad723f7
move objects to new folder; initialize XAML with settings object
carlos-zamora Jul 24, 2020
0160cdc
Rename VS Project to SettingsControl
carlos-zamora Jul 24, 2020
f053823
~polish~
carlos-zamora Jul 24, 2020
69f2b54
Update Top-Level Navigation Items
carlos-zamora Jul 24, 2020
e7c0a8c
merge master
carlos-zamora Jul 24, 2020
e3d1906
Add rudimentary object model
carlos-zamora Jul 24, 2020
c59bfcf
merge master
carlos-zamora Jul 24, 2020
b462e91
keep ObjectModel in TerminalSettings though
carlos-zamora Jul 24, 2020
bb61353
Rename VS Project to SettingsControl
carlos-zamora Jul 24, 2020
3c5fc97
Tweaking the UI to be closer to the mockups
vithoma Jul 24, 2020
6229da3
Merge pull request #5 from cinnamon-msft/vithoma/ObjectBinding_General
vineeththomasalex Jul 24, 2020
e5970a5
fix carlos
cinnamon-msft Jul 27, 2020
af572e2
Kayla broke the build
carlos-zamora Jul 27, 2020
48fad75
Profiles page almost done
vithoma Jul 27, 2020
ac9174f
Added more UI changes
vithoma Jul 27, 2020
75da7e1
cleanup
vithoma Jul 27, 2020
b435b53
add launch page
cinnamon-msft Jul 27, 2020
2864818
Add launch page
carlos-zamora Jul 27, 2020
b97af15
add interaction page
cinnamon-msft Jul 27, 2020
932ceda
Merge pull request #10 from cinnamon-msft/cinnamon/general-xaml
cinnamon-msft Jul 27, 2020
49b0080
add rendering page
cinnamon-msft Jul 27, 2020
53b3b16
add appearance - global page
cinnamon-msft Jul 27, 2020
ab56031
Merge pull request #11 from cinnamon-msft/cinnamon/general-xaml
vineeththomasalex Jul 27, 2020
a0643fd
Merge branch 'cinnamon/settings-ui-v2' into vithoma/ObjectBinding_Gen…
vineeththomasalex Jul 27, 2020
f8d91b8
Merge pull request #8 from cinnamon-msft/vithoma/ObjectBinding_General
vineeththomasalex Jul 27, 2020
fd36244
add home page
cinnamon-msft Jul 27, 2020
51a092e
merge with settings-ui-v2
cinnamon-msft Jul 27, 2020
76382a2
Adding a color picker
Jul 27, 2020
7597129
add some stuff to home page
cinnamon-msft Jul 27, 2020
502e0cf
Adding a border to the color picker button
Jul 27, 2020
2dfd8c0
Merge pull request #13 from cinnamon-msft/cinnamon/general-xaml
cinnamon-msft Jul 27, 2020
ecadd0e
Merge pull request #12 from cinnamon-msft/user/jograndl/ColorSchemes
xerootg Jul 27, 2020
ae48469
Adds AddProfile view
scott-armiger Jul 27, 2020
b196461
Merge pull request #14 from cinnamon-msft/hack/scott-armiger/add-new-…
cinnamon-msft Jul 27, 2020
c9b86d7
initial search bar functionality
cinnamon-msft Jul 28, 2020
5403873
Merge pull request #15 from cinnamon-msft/cinnamon/search-bar-2
vineeththomasalex Jul 28, 2020
0b4a9ea
fix casing on search query
cinnamon-msft Jul 28, 2020
a71567f
Merge pull request #16 from cinnamon-msft/cinnamon/search-bar-2
cinnamon-msft Jul 28, 2020
f2ddb3b
sort search results
cinnamon-msft Jul 28, 2020
d454e76
Merge pull request #17 from cinnamon-msft/cinnamon/search-bar-2
cinnamon-msft Jul 28, 2020
6a72b26
random visual improvements
cinnamon-msft Jul 28, 2020
1e121d6
Merge pull request #18 from cinnamon-msft/cinnamon/home-page
cinnamon-msft Jul 28, 2020
27b7ea9
Working data bindings!!!
Jul 29, 2020
499f741
Add keybindings v-
almedina-ms Jul 29, 2020
fb75160
Add small optimization on search
almedina-ms Jul 29, 2020
cf2c431
Revert "Add small optimization on search"
almedina-ms Jul 29, 2020
a8f4105
Add optimization for search
almedina-ms Jul 29, 2020
7270c91
Merge pull request #19 from cinnamon-msft/almedina-ms/SearchOptimization
cinnamon-msft Jul 29, 2020
1c57176
Merge branch 'cinnamon/settings-ui-v2' into almedina-ms/NavPanel
almedina-ms Jul 29, 2020
c3e2d13
implement part of tutorial
cinnamon-msft Jul 29, 2020
2b9c401
Merge branch 'cinnamon/settings-ui-v2' into cinnamon/home-page
cinnamon-msft Jul 29, 2020
265287e
Add databinding to profiles
carlos-zamora Jul 29, 2020
4683838
xaml data binding for home page
cinnamon-msft Jul 29, 2020
c6606e0
add databinding for profiles (most of them)
carlos-zamora Jul 29, 2020
f00c4a5
Background color all the ways John, all the ways.
Jul 29, 2020
70e0d91
Working data binding for GlobalSettings
scott-armiger Jul 29, 2020
8d07f5a
code cleanup
cinnamon-msft Jul 29, 2020
8a22432
Merge pull request #20 from cinnamon-msft/cinnamon/home-page
cinnamon-msft Jul 29, 2020
c9f8cc2
A model for all colors
Jul 29, 2020
eae0474
Hook the model up
Jul 29, 2020
2b24263
Merge branch 'cinnamon/settings-ui-v2' into user/jograndl/databound
Jul 29, 2020
7d9871a
Merge branch 'cinnamon/settings-ui-v2' into hack/scott-armiger/add-gl…
Jul 29, 2020
95e2fce
Merge pull request #22 from cinnamon-msft/hack/scott-armiger/add-glob…
xerootg Jul 29, 2020
de59e91
get home page nav working
cinnamon-msft Jul 29, 2020
6b3cd1c
code cleanup
cinnamon-msft Jul 29, 2020
6f3f30d
enable back button
cinnamon-msft Jul 29, 2020
45ab020
Add databinding to profiles
carlos-zamora Jul 29, 2020
8f83a5e
add databinding for profiles (most of them)
carlos-zamora Jul 29, 2020
1afeed7
finishing up merging
Jul 30, 2020
ee3a0d8
Merge pull request #21 from cinnamon-msft/hack/cazamor/profiles-datab…
xerootg Jul 30, 2020
a8776d4
Merge branch 'cinnamon/settings-ui-v2' into cinnamon/home-page
Jul 30, 2020
d7bc868
Merge pull request #24 from cinnamon-msft/cinnamon/home-page
xerootg Jul 30, 2020
ae82e74
Merge branch 'cinnamon/settings-ui-v2' into user/jograndl/databound
Jul 30, 2020
75bdfe6
I have no idea where this include came from, but its 1) not needed an…
Jul 30, 2020
a1839e4
Add decent keybindings pop up window
almedina-ms Jul 30, 2020
2f4e0c3
Merge branch 'cinnamon/settings-ui-v2' into almedina-ms/NavPanel
carlos-zamora Jul 30, 2020
c43ec17
Keybindings page
carlos-zamora Jul 30, 2020
20d466a
Merge branch 'cinnamon/settings-ui-v2' into user/jograndl/databound
carlos-zamora Jul 30, 2020
bdd6195
Databindings for Color Profiles
carlos-zamora Jul 30, 2020
c89088a
Add a file picker
carlos-zamora Jul 30, 2020
6debfe8
Accept .exe for commandline
carlos-zamora Jul 30, 2020
4b27b65
Merge pull request #26 from cinnamon-msft/hack/cazamor/file-picker
cinnamon-msft Jul 30, 2020
8d81740
I did a lot of polish
cinnamon-msft Aug 20, 2020
12d5ca5
Polish the thing
carlos-zamora Aug 20, 2020
d6f12a3
Merge branch 'master' into dev/cazamor/settings-ui
carlos-zamora Aug 20, 2020
3cd1945
Move project to OpenConsole.sln
carlos-zamora Aug 21, 2020
6d78fb2
Add Copyright Headers. Remove dead code. General cleanup.
carlos-zamora Aug 21, 2020
2be3a96
rename project and namespace
carlos-zamora Aug 21, 2020
47dfbf1
code format
carlos-zamora Aug 21, 2020
c69a4b5
fix build error and warnings
carlos-zamora Aug 24, 2020
4f9d926
Polish vcxproj, includes, and build
carlos-zamora Aug 25, 2020
3a599ef
address spell checker and CI failure
carlos-zamora Aug 26, 2020
351e1af
fix CI
carlos-zamora Aug 31, 2020
c14dea3
remove TODO CARLOS
carlos-zamora Sep 9, 2020
f214ebc
TODOs, cleanups, namespaces
leonMSFT Sep 14, 2020
b2e3da9
formatting
leonMSFT Sep 14, 2020
07d1480
ok fine i'll separate the word in two
leonMSFT Sep 14, 2020
3f4b2d2
Merge branch 'feature/settings-ui' into dev/cazamor/settings-ui
leonMSFT Sep 16, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/actions/spell-check/dictionary/apis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,16 @@ RSHIFT
rx
serializer
SIZENS
snprintf
spsc
STDCPP
Subheader
Subpage
syscall
tmp
tolower
tx
userenv
wcsstr
XDocument
XElement
1 change: 1 addition & 0 deletions .github/actions/spell-check/dictionary/microsoft.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ LKG
mfcribbon
microsoft
microsoftonline
muxc
netcore
osgvsowi
pgc
Expand Down
41 changes: 41 additions & 0 deletions OpenConsole.sln
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "s
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wt", "src\cascadia\wt\wt.vcxproj", "{506FD703-BAA7-4F6E-9361-64F550EC8FCA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalSettingsEditor", "src\cascadia\TerminalSettingsEditor\TerminalSettingsEditor.vcxproj", "{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
AuditMode|Any CPU = AuditMode|Any CPU
Expand Down Expand Up @@ -1986,6 +1988,44 @@ Global
{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x64.Build.0 = Release|x64
{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.ActiveCfg = Release|Win32
{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.Build.0 = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|Any CPU.ActiveCfg = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|Any CPU.Build.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|Any CPU.Deploy.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|ARM64.ActiveCfg = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|ARM64.Build.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|ARM64.Deploy.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|DotNet_x64Test.ActiveCfg = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|DotNet_x64Test.Build.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|DotNet_x64Test.Deploy.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|DotNet_x86Test.ActiveCfg = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|DotNet_x86Test.Build.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|DotNet_x86Test.Deploy.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|x64.ActiveCfg = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|x64.Build.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|x64.Deploy.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|x86.ActiveCfg = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|x86.Build.0 = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.AuditMode|x86.Deploy.0 = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|Any CPU.ActiveCfg = Debug|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|ARM64.ActiveCfg = Debug|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|x64.ActiveCfg = Debug|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|x64.Build.0 = Debug|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|x64.Deploy.0 = Debug|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|x86.ActiveCfg = Debug|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|x86.Build.0 = Debug|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Debug|x86.Deploy.0 = Debug|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|Any CPU.ActiveCfg = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|ARM64.ActiveCfg = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|x64.ActiveCfg = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|x64.Build.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|x64.Deploy.0 = Release|x64
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|x86.ActiveCfg = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|x86.Build.0 = Release|Win32
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}.Release|x86.Deploy.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2066,6 +2106,7 @@ Global
{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {81C352DB-1818-45B7-A284-18E259F1CC87}
{1588FD7C-241E-4E7D-9113-43735F3E6BAD} = {59840756-302F-44DF-AA47-441A9D673202}
{506FD703-BAA7-4F6E-9361-64F550EC8FCA} = {59840756-302F-44DF-AA47-441A9D673202}
{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {59840756-302F-44DF-AA47-441A9D673202}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}
Expand Down
17 changes: 17 additions & 0 deletions src/cascadia/TerminalSettingsEditor/AddProfile.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

#include "pch.h"
#include "AddProfile.h"
#include "AddProfile.g.cpp"

using namespace winrt;
using namespace winrt::Windows::UI::Xaml;

namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
AddProfile::AddProfile()
{
InitializeComponent();
}
}
20 changes: 20 additions & 0 deletions src/cascadia/TerminalSettingsEditor/AddProfile.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

#pragma once

#include "AddProfile.g.h"
#include "Utils.h"

namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
struct AddProfile : AddProfileT<AddProfile>
{
AddProfile();
};
}

namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
{
BASIC_FACTORY(AddProfile);
}
7 changes: 7 additions & 0 deletions src/cascadia/TerminalSettingsEditor/AddProfile.idl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Microsoft.Terminal.Settings.Editor
{
[default_interface] runtimeclass AddProfile : Windows.UI.Xaml.Controls.Page
{
AddProfile();
}
}
Loading