-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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 UI for adding, renaming, and deleting a color scheme #8403
Merged
Merged
Changes from 6 commits
Commits
Show all changes
121 commits
Select commit
Hold shift + click to select a range
9493ca0
Add a Settings UI Prototype (#7370)
carlos-zamora 51ba054
Convert TerminalSettingsEditor into a DLL (#7675)
leonMSFT a305c0d
Add a Settings UI Prototype (#7370)
carlos-zamora 91d2148
Convert TerminalSettingsEditor into a DLL (#7675)
leonMSFT b87f6d6
Merge branch 'feature/settings-ui' of github.com:microsoft/terminal i…
leonMSFT bde5d5e
Add functionality to open the Settings UI tab through openSettings (#…
leonMSFT 09677fd
merging from master
leonMSFT 29578d3
Add settings UI string localization (#7833)
cinnamon-msft e002752
Merge branch 'master' into feature/settings-ui
carlos-zamora 0ce05b5
Merge branch 'master' into feature/settings-ui
carlos-zamora c14824e
Add save button to settings UI (#7949)
cinnamon-msft 8213cf1
Make sure TSE pulls in the wildcard resource targets (#7967)
DHowett 788e685
Merge remote-tracking branch 'origin/master' into HEAD
DHowett b0b5fc1
Replace ObjectModel references in SUI (#7970)
leonMSFT f5e9d95
merge from master
leonMSFT 3b04ba9
Add scrollviewers to settings UI (#7998)
cinnamon-msft 44d16b8
Add localization to settings tab (#8012)
cinnamon-msft 8a10d29
Update settings UI navigation icons (#8013)
cinnamon-msft d3d128d
Merge remote-tracking branch 'origin/master' into HEAD
DHowett 52b0915
Merge remote-tracking branch 'origin/main' into HEAD
DHowett 15b4565
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett 1ef9f13
Hook up the Settings UI ColorSchemes page (#8049)
leonMSFT 9c4d77a
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett b757e82
Fix build for broken merge in 15b4565c7
DHowett 22805bd
Fix spacing on profile advanced page (#8065)
cinnamon-msft 78545a0
Merge branch 'main' into feature/settings-ui
carlos-zamora 1a36ca6
Merge branch 'main' into feature/settings-ui
carlos-zamora e2dcd16
Hide incomplete settings UI features (#8078)
cinnamon-msft 9fc79d5
Hook up the Settings UI JSON button (#8059)
leonMSFT 60b154b
Change save to apply in SUI (#8082)
cinnamon-msft c8fd30e
Fix the Settings UI Color Pickers (#8079)
leonMSFT 96cbbb7
Add border to footer in SUI (#8083)
cinnamon-msft 666e179
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett 18ac211
Fix showTabsInTitlebar SUI logic (#8088)
cinnamon-msft 81ca24b
Make ITab an unsealed runtimeclass (#8053)
carlos-zamora 6f56738
Make all nav items top level and remove addprofile (#8089)
cinnamon-msft c0bca31
Add missing settings to Settings UI (#8116)
carlos-zamora 314baf9
Remove dead SUI files (#8119)
carlos-zamora aef3336
Update SUI nav for profiles (#8118)
cinnamon-msft a9dbe8f
Remove code to navigate to home page on SUI launch (#8134)
leonMSFT a8d52c1
Introduce a way to bind an Enum setting for the Settings UI (#8086)
leonMSFT 140784f
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett 644f732
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett a6eb2da
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett c58321a
Renormalize TSE Resources.resw to CRLF
DHowett 7c992c2
Change reset button to discard changes (#8139)
cinnamon-msft 36b2e29
Bind default profile global setting (#8136)
carlos-zamora 48ad994
List all profiles in the SUI Navigation View (#8149)
leonMSFT f1af7ab
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett 41d6cdd
Introduce Page parameters to SUI (#8165)
carlos-zamora ffa2252
Include icons in SUI DefaultProfile dropdown (#8174)
carlos-zamora 851fb02
Merge branch 'main' into feature/settings-ui
carlos-zamora c731b0f
Merge branch 'main' into feature/settings-ui
carlos-zamora f80ee27
fix build: remove deleted function call
carlos-zamora 5ca0db1
Polish layout for Settings UI (#8266)
carlos-zamora 79a99bd
Merge branch 'main' into feature/settings-ui
carlos-zamora 3cf7552
Remove dead code; Add default icon; Rename Base Layer (#8347)
carlos-zamora ddc4593
Merge remote-tracking branch 'origin/main' into feature/settings-ui
carlos-zamora 1a224cc
Add new BellStyle localization
carlos-zamora 05d1a7b
Implement UI for Rename/Delete
carlos-zamora 36fef26
Implement ColorScheme Add/Rename/Delete
carlos-zamora 0943ef8
address simple PR feedback
carlos-zamora f9fc986
Propagate IslandWindow's HWND into any component that needs it (#8391)
DHowett 879ed1b
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett cbcda1a
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett 62aa0ce
Bind Profile Color Schemes (#8388)
carlos-zamora 2f747a7
Hook up the Save and Reset buttons (#8348)
carlos-zamora 5770d23
Bind Launch Mode/Size, BI Opacity, Opacity, and FontWeight (#8219)
carlos-zamora 540fbb3
Merge branch 'main' into feature/settings-ui
carlos-zamora 16ca947
Merge branch 'feature/settings-ui' into dev/cazamor/sui/rename-and-de…
carlos-zamora 6e41aec
Color Schemes - Delete Button
carlos-zamora 1a11ae0
Add font fallback to profile.icon
carlos-zamora 722bf70
Bind visibility and value for Cursor Height
carlos-zamora 4e3b6e4
Move ScrollbarVisibility to Appearance (below Padding)
carlos-zamora 0dedf38
Merge remote-tracking branch 'origin/main' into feature/settings-ui
DHowett 9ff3a45
Add tooltip to 'open json' button
carlos-zamora 812c36c
Fix dangling ReapplyCompactTabSize from merge
DHowett af17c59
Update TSE to Microsoft.UI.Xaml 2.5 stable
DHowett bac748e
polish styling for Startup page
carlos-zamora ada4a0b
polish styling for Interaction page
carlos-zamora a20138c
polish styling for Appearance page
carlos-zamora 9daf48e
polish styling for Color Schemes page
carlos-zamora 0635849
polish styling for Rendering page
carlos-zamora 1ce0e55
polish CommonResources (propagate changes)
carlos-zamora 443f515
address Niksa PR comments
carlos-zamora b6874f6
Merge branch 'feature/settings-ui' of https://github.com/microsoft/Te…
carlos-zamora a030056
Merge branch 'main' into feature/settings-ui
carlos-zamora 93158e7
Add groupings to profile page (#8516)
cinnamon-msft 58c81ff
Bind BackgroundImageAlignment to Settings UI (#8313)
carlos-zamora 3a38333
add 'locked' to settings.json & defaults.json
carlos-zamora 106c1e3
address Griese PR comments
carlos-zamora 7133d05
Merge branch 'feature/settings-ui' into dev/cazamor/sui/rename-and-de…
carlos-zamora 91dc221
Merge branch 'main' into feature/settings-ui
carlos-zamora 67249d9
actually fix the merge conflict...
carlos-zamora b38df24
Merge remote-tracking branch 'origin/main' into feature/settings-ui
carlos-zamora f2379e6
Merge remote-tracking branch 'origin/main' into feature/settings-ui
carlos-zamora 69693f6
resolve second merge marker
DHowett d676103
Fix SwitchToTab build break (#8545)
carlos-zamora f829d5a
Fix crash on json change
carlos-zamora 6bdedbe
Merge branch 'feature/settings-ui' into dev/cazamor/sui/rename-and-de…
carlos-zamora 7315977
finalize UI for Color Schemes page
carlos-zamora e6a69fd
Merge branch 'feature/settings-ui' into dev/cazamor/sui/bind-launch-mode
carlos-zamora 8165371
finalize CS renaming + style Profile delete btn
carlos-zamora a24e49f
hook-up 'delete profile' btn
carlos-zamora 937a6d1
prevent deletion of CMD + Windows Pwsh
carlos-zamora 8953246
prevent deletion of in-box schemes
carlos-zamora 98377fa
polish content dialog theming and logic
carlos-zamora c240d76
add delete button disclaimer
carlos-zamora ac6c951
add base layer disclaimer and delete button visibility logic
carlos-zamora 9204c88
change delete profile architecture to be event based
carlos-zamora 2846605
bugfix: refresh the combobox on rename
carlos-zamora f7bb0fb
replace rename ContentDialog with TextBox
carlos-zamora 516a047
address PR comments; add tooltips to rename buttons
carlos-zamora a3d6695
add confirmation dialog to delete buttons
carlos-zamora cc8dec1
apply changes from design review w/ cinnamon
carlos-zamora dd2ef1c
address Dustin's PR comments
carlos-zamora a2ebc74
move and wrap disclaimer
carlos-zamora 541f46c
manually hide CS delete flyout
carlos-zamora fd8db96
accept enter for CS rename
carlos-zamora 4436762
reduce standard min width to prevent cropping on resize
carlos-zamora 556be58
fix Profile page scrolling bug
carlos-zamora File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
woah wait why is this a
make
and not amake_self
? Just curiousThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No reason, really. I've been using
winrt::make
for all the other navigation states so I guess to be consistent