Skip to content

Commit 868c5dd

Browse files
theznerdtheznerd
committed
2020.04.28 Commit
1 parent 1a0e326 commit 868c5dd

26 files changed

+404
-6501
lines changed

‎UI++Editor/HtmlConverter/HtmlCssParser.cs

-1,062
This file was deleted.

‎UI++Editor/HtmlConverter/HtmlFromXamlConverter.cs

-577
This file was deleted.

‎UI++Editor/HtmlConverter/HtmlLexicalAnalyzer.cs

-814
This file was deleted.

‎UI++Editor/HtmlConverter/HtmlParser.cs

-564
This file was deleted.

‎UI++Editor/HtmlConverter/HtmlSchema.cs

-772
This file was deleted.

‎UI++Editor/HtmlConverter/HtmlToXamlConverter.cs

-2,659
This file was deleted.

‎UI++Editor/HtmlConverter/HtmlTokenType.cs

-29
This file was deleted.

‎UI++Editor/UI++Editor.csproj

+43-7
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,6 @@
182182
<Compile Include="EventAggregators\ChangeUI.cs" />
183183
<Compile Include="EventAggregators\SendMessage.cs" />
184184
<Compile Include="EventAggregators\XmlUpdater.cs" />
185-
<Compile Include="HtmlConverter\HtmlCssParser.cs" />
186-
<Compile Include="HtmlConverter\HtmlFromXamlConverter.cs" />
187-
<Compile Include="HtmlConverter\HtmlLexicalAnalyzer.cs" />
188-
<Compile Include="HtmlConverter\HtmlParser.cs" />
189-
<Compile Include="HtmlConverter\HtmlSchema.cs" />
190-
<Compile Include="HtmlConverter\HtmlTokenType.cs" />
191-
<Compile Include="HtmlConverter\HtmlToXamlConverter.cs" />
192185
<Compile Include="ViewModels\Menus\Actions\ActionGroupViewModel.cs" />
193186
<Compile Include="ViewModels\Menus\Actions\AppTreeViewModel.cs" />
194187
<Compile Include="ViewModels\Menus\Actions\Children\CheckBoxInputViewModel.cs" />
@@ -231,6 +224,7 @@
231224
<Compile Include="ViewModels\Menus\SoftwareViewModel.cs" />
232225
<Compile Include="ViewModels\Preview\AppTreeViewModel.cs" />
233226
<Compile Include="ViewModels\Preview\ErrorInfoViewModel.cs" />
227+
<Compile Include="ViewModels\Preview\UserAuthViewModel.cs" />
234228
<Compile Include="ViewModels\Preview\PreflightViewModel.cs" />
235229
<Compile Include="ViewModels\Preview\InfoViewModel.cs" />
236230
<Compile Include="ViewModels\Preview\_IPreview.cs" />
@@ -349,9 +343,27 @@
349343
<Compile Include="Views\Preview\AppTreeView.xaml.cs">
350344
<DependentUpon>AppTreeView.xaml</DependentUpon>
351345
</Compile>
346+
<Compile Include="Views\Preview\Children\CheckBoxInput.xaml.cs">
347+
<DependentUpon>CheckBoxInput.xaml</DependentUpon>
348+
</Compile>
349+
<Compile Include="Views\Preview\Children\ChoiceInput.xaml.cs">
350+
<DependentUpon>ChoiceInput.xaml</DependentUpon>
351+
</Compile>
352+
<Compile Include="Views\Preview\Children\InputInfo.xaml.cs">
353+
<DependentUpon>InputInfo.xaml</DependentUpon>
354+
</Compile>
355+
<Compile Include="Views\Preview\Children\TextInput.xaml.cs">
356+
<DependentUpon>TextInput.xaml</DependentUpon>
357+
</Compile>
352358
<Compile Include="Views\Preview\ErrorInfoView.xaml.cs">
353359
<DependentUpon>ErrorInfoView.xaml</DependentUpon>
354360
</Compile>
361+
<Compile Include="Views\Preview\InputView.xaml.cs">
362+
<DependentUpon>InputView.xaml</DependentUpon>
363+
</Compile>
364+
<Compile Include="Views\Preview\UserAuthView.xaml.cs">
365+
<DependentUpon>UserAuthView.xaml</DependentUpon>
366+
</Compile>
355367
<Compile Include="Views\Preview\InfoView.xaml.cs">
356368
<DependentUpon>InfoView.xaml</DependentUpon>
357369
</Compile>
@@ -562,10 +574,34 @@
562574
<SubType>Designer</SubType>
563575
<Generator>MSBuild:Compile</Generator>
564576
</Page>
577+
<Page Include="Views\Preview\Children\CheckBoxInput.xaml">
578+
<SubType>Designer</SubType>
579+
<Generator>MSBuild:Compile</Generator>
580+
</Page>
581+
<Page Include="Views\Preview\Children\ChoiceInput.xaml">
582+
<SubType>Designer</SubType>
583+
<Generator>MSBuild:Compile</Generator>
584+
</Page>
585+
<Page Include="Views\Preview\Children\InputInfo.xaml">
586+
<SubType>Designer</SubType>
587+
<Generator>MSBuild:Compile</Generator>
588+
</Page>
589+
<Page Include="Views\Preview\Children\TextInput.xaml">
590+
<SubType>Designer</SubType>
591+
<Generator>MSBuild:Compile</Generator>
592+
</Page>
565593
<Page Include="Views\Preview\ErrorInfoView.xaml">
566594
<Generator>MSBuild:Compile</Generator>
567595
<SubType>Designer</SubType>
568596
</Page>
597+
<Page Include="Views\Preview\InputView.xaml">
598+
<Generator>MSBuild:Compile</Generator>
599+
<SubType>Designer</SubType>
600+
</Page>
601+
<Page Include="Views\Preview\UserAuthView.xaml">
602+
<Generator>MSBuild:Compile</Generator>
603+
<SubType>Designer</SubType>
604+
</Page>
569605
<Page Include="Views\Preview\InfoView.xaml">
570606
<SubType>Designer</SubType>
571607
<Generator>MSBuild:Compile</Generator>

‎UI++Editor/ViewModels/Menus/ActionsViewModel.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public ActionsViewModel(IEventAggregator ea)
4242
_eventAggregator.Subscribe(this);
4343
}
4444

45-
private object _previewBox = new Preview.PreflightViewModel();
45+
private object _previewBox = new Preview.UserAuthViewModel();
4646
public object PreviewBox
4747
{
4848
get { return _previewBox; }

‎UI++Editor/ViewModels/Preview/ErrorInfoViewModel.cs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Text;
55
using System.Threading.Tasks;
66
using Caliburn.Micro;
7-
using RichTextBlockSample.HtmlConverter;
87
using UI__Editor.Views.Menus.Actions;
98

109
namespace UI__Editor.ViewModels.Preview

‎UI++Editor/ViewModels/Preview/InfoViewModel.cs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Text;
55
using System.Threading.Tasks;
66
using Caliburn.Micro;
7-
using RichTextBlockSample.HtmlConverter;
87
using UI__Editor.Views.Menus.Actions;
98

109
namespace UI__Editor.ViewModels.Preview

‎UI++Editor/ViewModels/Preview/PreflightViewModel.cs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Text;
55
using System.Threading.Tasks;
66
using Caliburn.Micro;
7-
using RichTextBlockSample.HtmlConverter;
87
using UI__Editor.Views.Menus.Actions;
98

109
namespace UI__Editor.ViewModels.Preview

‎UI++Editor/ViewModels/Preview/UserAuthViewModel.cs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using Caliburn.Micro;
7+
using UI__Editor.Views.Menus.Actions;
8+
9+
namespace UI__Editor.ViewModels.Preview
10+
{
11+
class UserAuthViewModel : PropertyChangedBase, IPreview
12+
{
13+
public bool PreviewRefreshButtonVisible { get { return false; } }
14+
public bool PreviewBackButtonVisible { get { return false; } }
15+
public bool PreviewCancelButtonVisible { get { return true; } }
16+
public bool PreviewAcceptButtonVisible { get { return true; } }
17+
18+
private string title = "Welcome";
19+
public string Title
20+
{
21+
get { return title; }
22+
set
23+
{
24+
title = value;
25+
NotifyOfPropertyChange(() => Title);
26+
}
27+
}
28+
}
29+
}

‎UI++Editor/Views/Preview/AppTreeView.xaml

+30-13
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:UI__Editor.Views.Preview"
7-
xmlns:tv="clr-namespace:UI__Editor.Converters"
7+
xmlns:tv="clr-namespace:UI__Editor.Converters" xmlns:s="clr-namespace:System;assembly=mscorlib"
88
mc:Ignorable="d"
99
d:DesignHeight="450" d:DesignWidth="800">
1010
<UserControl.Resources>
@@ -68,23 +68,26 @@
6868
</Grid.RowDefinitions>
6969

7070
<!-- Insert Lines -->
71-
<Rectangle x:Name="HorLn" Margin="14,1,0,0" Height="1" StrokeDashCap="Square" StrokeDashArray="0,2" StrokeDashOffset="1" Stroke="#888888" SnapsToDevicePixels="True"/>
72-
<Rectangle x:Name="VerLn" Width="1" StrokeDashCap="Square" StrokeDashArray="0,2" Stroke="#888888" Margin="0,0,1,0" Grid.RowSpan="2" SnapsToDevicePixels="true" Fill="White"/>
71+
<Rectangle x:Name="HorLn" Margin="10,1,0,0" Height="1" StrokeDashCap="Square" StrokeDashArray="0,2" StrokeDashOffset="1" Stroke="#888888" SnapsToDevicePixels="True"/>
72+
<Rectangle x:Name="VerLn" Width="1" StrokeDashCap="Square" StrokeDashArray="0,2" Stroke="#888888" Margin="0,0,1,0" Grid.RowSpan="2" SnapsToDevicePixels="True" Fill="White"/>
7373

7474
<!-- Insert Toggle Button -->
75-
<ToggleButton Margin="0,0,0,0" x:Name="Expander" Style="{StaticResource TreeViewToggle}" IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" />
75+
<ToggleButton Margin="0,0,0,0" x:Name="Expander"
76+
Style="{StaticResource TreeViewToggle}"
77+
IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
78+
ClickMode="Press" />
7679

7780
<!-- Content -->
7881
<Border Name="Bd" Grid.Column="1" Margin="0,3,0,0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
7982
<StackPanel Orientation="Horizontal">
8083
<Image Stretch="None">
8184
<Image.Source>
82-
<CroppedBitmap Source="H:\Personal OneDrive\OneDrive\_Code\C#\UI++Editor\UI++Editor\Images\checkStyle.png" SourceRect="16,0,16,16" />
85+
<CroppedBitmap Source="pack://application:,,,/Images/checkStyle.png" SourceRect="16,0,16,16" />
8386
</Image.Source>
8487
</Image>
8588
<Image Margin="0,0,4,0" Width="18">
8689
<Image.Source>
87-
<CroppedBitmap Source="H:\Personal OneDrive\OneDrive\_Code\C#\UI++Editor\UI++Editor\Images\appStyle.png" SourceRect="36,0,18,18" />
90+
<CroppedBitmap Source="pack://application:,,,/Images/appStyle.png" SourceRect="36,0,18,18" />
8891
</Image.Source>
8992
</Image>
9093
<ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" MinWidth="20">
@@ -107,6 +110,15 @@
107110
<Setter TargetName="VerLn" Property="Height" Value="{Binding RelativeSource={RelativeSource Self}, Path=Parent.ActualHeight, Converter={StaticResource FirstItemTreeViewHeightConverter}}"/>
108111
<Setter TargetName="VerLn" Property="VerticalAlignment" Value="Bottom" />
109112
</DataTrigger>
113+
<Trigger Property="ItemsControl.HasItems">
114+
<Setter TargetName="Expander" Property="UIElement.Visibility" Value="{x:Static Visibility.Hidden}" />
115+
<Trigger.Value>
116+
<s:Boolean>False</s:Boolean>
117+
</Trigger.Value>
118+
</Trigger>
119+
<Trigger Property="IsExpanded" Value="false">
120+
<Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed"/>
121+
</Trigger>
110122
</ControlTemplate.Triggers>
111123
</ControlTemplate>
112124
</Setter.Value>
@@ -119,21 +131,26 @@
119131
<RowDefinition Height="*" />
120132
</Grid.RowDefinitions>
121133
<Label x:Name="Title" FontSize="32" Margin="5,8,10,5">Please choose your software</Label>
122-
<TreeView x:Name="TreeView" Grid.Row="1" Margin="30,0,10,40" ScrollViewer.HorizontalScrollBarVisibility="Hidden" BorderThickness="0" >
123-
<TreeViewItem Header="Hello" IsExpanded="True">
124-
<TreeViewItem Header="Hello" IsExpanded="True" />
134+
<TreeView x:Name="TreeView" Grid.Row="1" Margin="30,0,10,40" ScrollViewer.HorizontalScrollBarVisibility="Hidden" BorderThickness="0" >
135+
<TreeViewItem Header="Hello" IsExpanded="False">
136+
<TreeViewItem Header="Hello" />
137+
<TreeViewItem Header="Hello" />
138+
<TreeViewItem Header="Hello" />
139+
<TreeViewItem Header="Hello" />
140+
<TreeViewItem Header="Hello" />
141+
<TreeViewItem Header="Hello" />
125142
</TreeViewItem>
126143
<TreeViewItem Header="Hello" IsExpanded="True">
127-
<TreeViewItem Header="Hello" IsExpanded="True" />
144+
<TreeViewItem Header="Hello" />
128145
</TreeViewItem>
129146
<TreeViewItem Header="Hello" IsExpanded="True">
130-
<TreeViewItem Header="Hello" IsExpanded="True" />
147+
<TreeViewItem Header="Hello" />
131148
</TreeViewItem>
132149
<TreeViewItem Header="Hello" IsExpanded="True">
133-
<TreeViewItem Header="Hello" IsExpanded="True" />
150+
<TreeViewItem Header="Hello" />
134151
</TreeViewItem>
135152
<TreeViewItem Header="Hello" IsExpanded="True">
136-
<TreeViewItem Header="Hello" IsExpanded="True" />
153+
<TreeViewItem Header="Hello" />
137154
</TreeViewItem>
138155
</TreeView>
139156
</Grid>

‎UI++Editor/Views/Preview/Children/CheckBoxInput.xaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<UserControl x:Class="UI__Editor.Views.Preview.Children.CheckBoxInput"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:UI__Editor.Views.Preview.Children"
7+
mc:Ignorable="d"
8+
d:DesignHeight="450" d:DesignWidth="800">
9+
<Grid>
10+
<CheckBox FontFamily="Segoe UI" FontSize="16" Padding="12">Check, mate.</CheckBox>
11+
</Grid>
12+
</UserControl>

‎UI++Editor/Views/Preview/Children/CheckBoxInput.xaml.cs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.Windows;
7+
using System.Windows.Controls;
8+
using System.Windows.Data;
9+
using System.Windows.Documents;
10+
using System.Windows.Input;
11+
using System.Windows.Media;
12+
using System.Windows.Media.Imaging;
13+
using System.Windows.Navigation;
14+
using System.Windows.Shapes;
15+
16+
namespace UI__Editor.Views.Preview.Children
17+
{
18+
/// <summary>
19+
/// Interaction logic for CheckBoxInput.xaml
20+
/// </summary>
21+
public partial class CheckBoxInput : UserControl
22+
{
23+
public CheckBoxInput()
24+
{
25+
InitializeComponent();
26+
}
27+
}
28+
}

‎UI++Editor/Views/Preview/Children/ChoiceInput.xaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<UserControl x:Class="UI__Editor.Views.Preview.Children.ChoiceInput"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:UI__Editor.Views.Preview.Children"
7+
mc:Ignorable="d"
8+
d:DesignHeight="450" d:DesignWidth="800">
9+
<Grid>
10+
<Grid.RowDefinitions>
11+
<RowDefinition Height="Auto" />
12+
<RowDefinition Height="Auto" />
13+
</Grid.RowDefinitions>
14+
<Label FontFamily="Segoe UI" FontSize="16" Padding="0,0,0,3">Question</Label>
15+
<ComboBox Padding="0,-3,0,0" FontFamily="Segoe UI" FontSize="16" Grid.Row="1" Height="15" Margin="0,0,0,9" />
16+
</Grid>
17+
</UserControl>

‎UI++Editor/Views/Preview/Children/ChoiceInput.xaml.cs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.Windows;
7+
using System.Windows.Controls;
8+
using System.Windows.Data;
9+
using System.Windows.Documents;
10+
using System.Windows.Input;
11+
using System.Windows.Media;
12+
using System.Windows.Media.Imaging;
13+
using System.Windows.Navigation;
14+
using System.Windows.Shapes;
15+
16+
namespace UI__Editor.Views.Preview.Children
17+
{
18+
/// <summary>
19+
/// Interaction logic for ChoiceInput.xaml
20+
/// </summary>
21+
public partial class ChoiceInput : UserControl
22+
{
23+
public ChoiceInput()
24+
{
25+
InitializeComponent();
26+
}
27+
}
28+
}

‎UI++Editor/Views/Preview/Children/InputInfo.xaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<UserControl x:Class="UI__Editor.Views.Preview.Children.InputInfo"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:UI__Editor.Views.Preview.Children"
7+
mc:Ignorable="d"
8+
d:DesignHeight="450" d:DesignWidth="800">
9+
<Grid>
10+
<TextBlock FontFamily="Segoe UI" FontSize="16" Padding="0,0,0,3" TextWrapping="Wrap" MaxHeight="36">Question</TextBlock>
11+
</Grid>
12+
</UserControl>

‎UI++Editor/Views/Preview/Children/InputInfo.xaml.cs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.Windows;
7+
using System.Windows.Controls;
8+
using System.Windows.Data;
9+
using System.Windows.Documents;
10+
using System.Windows.Input;
11+
using System.Windows.Media;
12+
using System.Windows.Media.Imaging;
13+
using System.Windows.Navigation;
14+
using System.Windows.Shapes;
15+
16+
namespace UI__Editor.Views.Preview.Children
17+
{
18+
/// <summary>
19+
/// Interaction logic for InputInfo.xaml
20+
/// </summary>
21+
public partial class InputInfo : UserControl
22+
{
23+
public InputInfo()
24+
{
25+
InitializeComponent();
26+
}
27+
}
28+
}

0 commit comments

Comments
 (0)