-
Notifications
You must be signed in to change notification settings - Fork 10
Add new XAML option page #10
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
Draft
Evangelink
wants to merge
23
commits into
fsprojects:master
Choose a base branch
from
Evangelink:xaml-settings
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
114f2f1
Add new XAML option page
Evangelink 8a0bcee
Add fsharp-highlighting submodule
deviousasti 17ef949
Add submodule + reference Highlighter
Evangelink aba7997
Move fsharp-highlighting
deviousasti 06d6948
Add Editor for development
deviousasti ae8ea47
Basic layout
deviousasti 3b92159
Add new XAML option page
Evangelink 7d3a344
Add fsharp-highlighting submodule
deviousasti ebb9c8d
Add submodule + reference Highlighter
Evangelink a8ec456
Move fsharp-highlighting
deviousasti e7d54eb
Add Editor for development
deviousasti 8382e92
Basic layout
deviousasti 53d6862
Merge branch 'xaml-settings' of https://github.com/Evangelink/fsharp-…
deviousasti fbb6b05
Add generic property editor infrastructure
deviousasti 4c79e2e
Add compile-in fakes
deviousasti 7655a61
Add SpinControl
deviousasti 938e364
Copy FantomasOptionsPage
deviousasti 5f0faa5
Add property editor ui
deviousasti 9f5f37a
Move to SDK style project
deviousasti 3e74266
Update fantomas
deviousasti 6547dcb
Display sample on changing properties
deviousasti a48a1bd
Merge branch 'master' into xaml-settings
Evangelink 9dbde3b
Try to properly incorporate master
Evangelink 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 hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| namespace FantomasVs | ||
| { | ||
| using Microsoft.VisualStudio.Shell; | ||
| using System.Windows; | ||
|
|
||
| public class FantomasOptionsDialogPage : UIElementDialogPage | ||
| { | ||
| private FantomasOptionsPage2 _page; | ||
| protected override UIElement Child => _page ??= new FantomasOptionsPage2(); | ||
| } | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <UserControl | ||
|
||
| x:Class="FantomasVs.FantomasOptionsPage2" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| d:DesignHeight="450" | ||
| d:DesignWidth="800" | ||
| mc:Ignorable="d"> | ||
| <Grid> | ||
|
|
||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="Auto" /> | ||
| <RowDefinition Height="Auto" /> | ||
| <RowDefinition Height="2*" /> | ||
| <RowDefinition Height="*" /> | ||
| </Grid.RowDefinitions> | ||
|
|
||
| <TextBlock | ||
| Grid.Row="0" | ||
| Text="Displays settings as defined in the .editorconfig or if no settings can be found the user profile's formatting options." | ||
| TextWrapping="Wrap" /> | ||
|
|
||
| <Button | ||
| Grid.Row="1" | ||
| Margin="0,5" | ||
| Padding="5" | ||
| HorizontalAlignment="Left" | ||
| Content="Generate .editorconfig file from settings" /> | ||
|
|
||
| <DataGrid Grid.Row="2"> | ||
deviousasti marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| <!-- Here goes options --> | ||
| </DataGrid> | ||
|
|
||
| <Grid Grid.Row="3" Margin="0,5,0,0"> | ||
| <!-- Here goes code example --> | ||
deviousasti marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| </Grid> | ||
|
|
||
| </Grid> | ||
| </UserControl> | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| namespace FantomasVs | ||
| { | ||
| using System.Windows.Controls; | ||
|
|
||
| /// <summary> | ||
| /// Interaction logic for FantomasOptionsPage2.xaml | ||
| /// </summary> | ||
| public partial class FantomasOptionsPage2 : UserControl | ||
| { | ||
| public FantomasOptionsPage2() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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
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.



Uh oh!
There was an error while loading. Please reload this page.