Skip to content

Commit 2950a59

Browse files
committed
Screw the utter trash I made yesterday
Now we're talking
1 parent bd32e3a commit 2950a59

File tree

5 files changed

+714
-89
lines changed

5 files changed

+714
-89
lines changed

App.axaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
x:Class="WriterSharp.App"
44
RequestedThemeVariant="Default">
5-
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
5+
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
66

7-
<Application.Styles>
8-
<FluentTheme />
9-
</Application.Styles>
7+
<Application.Styles>
8+
<FluentTheme />
9+
<StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
10+
</Application.Styles>
1011
</Application>

MainWindow.axaml

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
66
x:Class="WriterSharp.MainWindow"
7+
xmlns:AvaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
78
Icon="avares://WriterSharp/Assets/TransparentIcon.ico"
89
Title="WriterSharp">
910
<Grid RowDefinitions="Auto, *, Auto" Name="MainGrid">
10-
<Grid Grid.Row="0" Margin="6">
11+
<Grid Grid.Row="0" Margin="4">
1112
<Menu>
1213
<MenuItem Header="_File" CornerRadius="10" Padding="5">
13-
<MenuItem Header="New text file"></MenuItem>
14+
<MenuItem Header="New text file" Click="OnClickNewFromScratch"></MenuItem>
1415
<MenuItem Header="New from template"></MenuItem>
1516
<Separator></Separator>
16-
<MenuItem Header="Open" Click="OnClickOpen"></MenuItem>
17+
<MenuItem Header="Open" Click="OnClickOpenFile"></MenuItem>
1718
<MenuItem Header="Open recent file"></MenuItem>
1819
<Separator></Separator>
19-
<MenuItem Header="Save"></MenuItem>
20-
<MenuItem Header="Save as"></MenuItem>
20+
<MenuItem Header="Save" Click="OnClickSaveFile"></MenuItem>
21+
<MenuItem Header="Save as" Click="OnClickSaveAs"></MenuItem>
2122
<Separator></Separator>
22-
<MenuItem Header="Exit" Click="OnClickExit"></MenuItem>
23+
<MenuItem Header="Exit"></MenuItem>
2324
<Separator></Separator>
2425
<MenuItem Header="Exit without saving" Click="OnClickExitWithoutSaving"></MenuItem>
2526
</MenuItem>
@@ -29,32 +30,51 @@
2930
<Separator></Separator>
3031
<MenuItem Header="Repository" Click="OnClickRepository"></MenuItem>
3132
<MenuItem Header="Website" Click="OnClickWebsite"></MenuItem>
32-
<Separator></Separator>
33-
<MenuItem Header="Nostalgia Hit"></MenuItem>
3433
</MenuItem>
3534
</Menu>
3635
</Grid>
3736
<Grid Grid.Row="1">
37+
<!--
3838
<TextBox AcceptsReturn="True"
3939
AcceptsTab="True"
4040
TextWrapping="Wrap"
4141
Name="MainTextBox"
4242
Margin="5"
4343
TextChanged="OnContentModification">
4444
</TextBox>
45+
-->
46+
<AvaloniaEdit:TextEditor
47+
Name="MainCodeEditor"
48+
ShowLineNumbers="True"
49+
FontFamily="Cascadia Code,Consolas,Menlo,Monospace"
50+
Margin="5"
51+
VerticalScrollBarVisibility="Auto"
52+
TextChanged="UpdateModifiedIndicator" />
4553
</Grid>
46-
<Grid Grid.Row="2" ColumnDefinitions="*, Auto, Auto, Auto" Margin="2">
47-
<Grid Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">
48-
<TextBlock>Language (Managed by: Plugin)</TextBlock>
54+
<Grid Grid.Row="2" ColumnDefinitions="*, Auto, Auto, Auto">
55+
<Grid Grid.Column="0">
56+
<TextBlock Padding="5" HorizontalAlignment="Center" VerticalAlignment="Center"
57+
Name="LangInd">
58+
Language (Managed by: Plugin)
59+
</TextBlock>
4960
</Grid>
50-
<Grid Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
51-
<TextBlock Padding="5">*</TextBlock>
61+
<Grid Grid.Column="1">
62+
<TextBlock Padding="5" HorizontalAlignment="Center" VerticalAlignment="Center"
63+
Name="ModInd">
64+
*
65+
</TextBlock>
5266
</Grid>
53-
<Grid Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center">
54-
<TextBlock Padding="5">Line Ending</TextBlock>
67+
<Grid Grid.Column="2">
68+
<TextBlock Padding="5" HorizontalAlignment="Center" VerticalAlignment="Center"
69+
Name="LEnInd">
70+
Line Ending
71+
</TextBlock>
5572
</Grid>
56-
<Grid Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center">
57-
<TextBlock Padding="5">Encoding</TextBlock>
73+
<Grid Grid.Column="3">
74+
<TextBlock Padding="5" HorizontalAlignment="Center" VerticalAlignment="Center"
75+
Name="EncInd">
76+
Encoding
77+
</TextBlock>
5878
</Grid>
5979
</Grid>
6080
</Grid>

0 commit comments

Comments
 (0)