Skip to content

Commit 5a6c3c1

Browse files
Issues 10, 16
1 parent 4adc10d commit 5a6c3c1

19 files changed

+543
-173
lines changed

ConTeXt-IDE.Desktop/ConTeXt-IDE.Desktop_Package/ConTeXt-IDE.Desktop_Package.wapproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
4646
<PackageCertificateThumbprint>376AA6396FAAAAC1B11EBBAA23AC4CF8C258291F</PackageCertificateThumbprint>
4747
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
48-
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
48+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
4949
<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
50-
<GenerateTestArtifacts>True</GenerateTestArtifacts>
50+
<GenerateTestArtifacts>False</GenerateTestArtifacts>
5151
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
5252
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
5353
</PropertyGroup>

ConTeXt-IDE.Desktop/ConTeXt-IDE.Desktop_Package/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Identity
1010
Name="7614MasterDevelopment.ConTeXtIDE"
1111
Publisher="CN=F3B9189F-4D2B-4342-889D-A9D7D5A98D3A"
12-
Version="1.4.1.0" />
12+
Version="1.4.8.0" />
1313

1414
<Properties>
1515
<DisplayName>ConTeXt IDE</DisplayName>

ConTeXt-IDE.Shared/App.xaml

Lines changed: 30 additions & 97 deletions
Large diffs are not rendered by default.

ConTeXt-IDE.Shared/ConTeXt-IDE.Shared.projitems

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
<Compile Include="$(MSBuildThisFileDirectory)Helpers\EditorActions.cs" />
1919
<Compile Include="$(MSBuildThisFileDirectory)Helpers\RichTextBlockHelper.cs" />
2020
<Compile Include="$(MSBuildThisFileDirectory)Helpers\ThemeHelper.cs" />
21+
<Compile Include="$(MSBuildThisFileDirectory)Models\ContextCommandList.cs" />
22+
<Compile Include="$(MSBuildThisFileDirectory)Models\ContextCommandOptiongroup.cs" />
23+
<Compile Include="$(MSBuildThisFileDirectory)Models\ContextCommand.cs" />
24+
<Compile Include="$(MSBuildThisFileDirectory)Models\ContextCommandOptionValue.cs" />
25+
<Compile Include="$(MSBuildThisFileDirectory)Models\ContextCommandOption.cs" />
26+
<Compile Include="$(MSBuildThisFileDirectory)Models\ContextModule.cs" />
2127
<Compile Include="$(MSBuildThisFileDirectory)Views\MainPage.xaml.cs">
2228
<DependentUpon>MainPage.xaml</DependentUpon>
2329
</Compile>

ConTeXt-IDE.Shared/Helpers/EditorActions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal class SaveAllAction : IActionDescriptor
4444
public string KeybindingContext => null;
4545

4646
//public int[] Keybindings => new int[] { Monaco.KeyMod.Chord(Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter, Monaco.KeyCode.F5) };
47-
public int[] Keybindings => new int[] { KeyMod.CtrlCmd | KeyCode.Shift | KeyCode.KEY_S };
47+
public int[] Keybindings => new int[] { KeyMod.CtrlCmd | KeyCode.KEY_W };
4848

4949
public string Label => "Save all";
5050
public string Precondition => null;

ConTeXt-IDE.Shared/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</Grid>
3030
<InfoBar Grid.Row="1" IsOpen="{Binding InfoOpen, Mode=TwoWay}" Severity="{Binding InfoSeverity, Mode=OneWay}" Title="{Binding InfoTitle, Mode=OneWay}" Message="{Binding InfoText, Mode=OneWay}" />
3131
<Frame Grid.Row="2" Loaded="RootFrame_Loaded" x:FieldModifier="public" x:Name="RootFrame"></Frame>
32-
<ProgressBar Name="Progressbar" Grid.Row="2" VerticalAlignment="Top" Foreground="{ThemeResource ForegroundColor}" Visibility="{Binding IsVisible, Mode=OneWay, Converter={StaticResource BoolToVisibility}}" ShowPaused="{Binding IsPaused}" HorizontalAlignment="Stretch" IsIndeterminate="True" ShowError="{Binding IsError}">
32+
<ProgressBar Name="Progressbar" Grid.Row="2" VerticalAlignment="Top" Foreground="{ThemeResource ForegroundColor}" Visibility="{Binding IsVisible, Mode=OneWay, Converter={StaticResource BoolToVisibility}}" ShowPaused="{Binding IsPaused}" Value="{Binding ProgressValue}" HorizontalAlignment="Stretch" IsIndeterminate="{Binding IsIndeterminate}" ShowError="{Binding IsError}">
3333
<animations:Implicit.ShowAnimations>
3434
<animations:OpacityAnimation Duration="0:0:0.5" From="0" To="1"></animations:OpacityAnimation>
3535
</animations:Implicit.ShowAnimations>

ConTeXt-IDE.Shared/MainWindow.xaml.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private async Task<bool> DownloadEvergreen()
9393
{
9494
WebClient wc = new WebClient();
9595

96-
wc.DownloadProgressChanged += (a, b) => { Progressbar.Value = b.ProgressPercentage; };
96+
wc.DownloadProgressChanged += (a, b) => { VM.ProgressValue = b.ProgressPercentage; };
9797
wc.DownloadFileCompleted += (a, b) =>
9898
{
9999
Install();
@@ -111,23 +111,23 @@ private async Task<bool> DownloadEvergreen()
111111

112112
private async void Install()
113113
{
114-
Progressbar.IsIndeterminate = true;
114+
VM.IsIndeterminate = true;
115115
VM.InfoMessage(true, "Installing...", "Please wait up to 2 minutes for the Evergreen WebView2 Runtime to install.", InfoBarSeverity.Informational);
116116
bool InstallSuccessful = false;
117117
await Task.Run(async () => { InstallSuccessful = await InstallTask(); });
118118
if (InstallSuccessful)
119119
{
120120
VM.Default.EvergreenInstalled = true;
121121
VM.InfoMessage(true, "Success!", "The editor and viewer controls are now fully operational.", InfoBarSeverity.Success);
122-
Progressbar.Visibility = Visibility.Collapsed;
122+
VM.IsVisible = false;
123123
await Task.Delay(2500);
124-
Progressbar.IsIndeterminate = true;
124+
VM.IsIndeterminate = true;
125125
RootFrame.Navigate(typeof(MainPage));
126126
}
127127
else
128128
{
129129
VM.InfoMessage(true, "Error", "Something went wrong. Please try again later.", InfoBarSeverity.Error);
130-
Progressbar.Visibility = Visibility.Collapsed;
130+
VM.IsVisible = false;
131131
}
132132
}
133133

@@ -169,7 +169,7 @@ private async void RootFrame_Loaded(object sender, RoutedEventArgs e)
169169

170170
if (VM.Default.EvergreenInstalled)
171171
{
172-
Progressbar.IsIndeterminate = true;
172+
VM.IsIndeterminate = true;
173173
RootFrame.Navigate(typeof(MainPage));
174174
}
175175
else
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace ConTeXt_IDE.Models
6+
{
7+
public class ContextCommand
8+
{
9+
public ContextCommand(string command, List<ContextCommandOptiongroup> optiongroups)
10+
{
11+
Command = command;
12+
Optiongroups = optiongroups;
13+
}
14+
15+
public string Command { get; set; }
16+
17+
public List<ContextCommandOptiongroup> Optiongroups { get; set; }
18+
}
19+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
using ConTeXt_IDE.Models;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Text;
5+
6+
namespace ConTeXt_IDE.Models
7+
{
8+
public class ContextCommandList
9+
{
10+
public List<ContextCommand> ContextCommands = new List<ContextCommand>()
11+
{
12+
new ContextCommand("startsection", new List<ContextCommandOptiongroup>())
13+
14+
15+
};
16+
}
17+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace ConTeXt_IDE.Models
6+
{
7+
public class ContextCommandOption
8+
{
9+
public string Option { get; set; }
10+
11+
public List<ContextCommandOptionValue> Values { get; set; }
12+
}
13+
}

0 commit comments

Comments
 (0)