2
0
Tig 10 сар өмнө
parent
commit
6b7c15547d

+ 1 - 1
Terminal.Gui/Configuration/ConfigurationManager.cs

@@ -24,7 +24,7 @@ namespace Terminal.Gui;
 ///     </para>
 ///     </para>
 ///     <para>
 ///     <para>
 ///         Settings are defined in JSON format, according to this schema:
 ///         Settings are defined in JSON format, according to this schema:
-///         https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json
+///        https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json
 ///     </para>
 ///     </para>
 ///     <para>
 ///     <para>
 ///         Settings that will apply to all applications (global settings) reside in files named <c>config.json</c>.
 ///         Settings that will apply to all applications (global settings) reside in files named <c>config.json</c>.

+ 2 - 2
Terminal.Gui/Configuration/SettingsScope.cs

@@ -14,7 +14,7 @@ namespace Terminal.Gui;
 /// <example>
 /// <example>
 ///     <code>
 ///     <code>
 ///  {
 ///  {
-///    "$schema" : "https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json",
+///    "$schema" : "https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json",
 ///    "Application.UseSystemConsole" : true,
 ///    "Application.UseSystemConsole" : true,
 ///    "Theme" : "Default",
 ///    "Theme" : "Default",
 ///    "Themes": {
 ///    "Themes": {
@@ -32,7 +32,7 @@ public class SettingsScope : Scope<SettingsScope>
     /// <summary>Points to our JSON schema.</summary>
     /// <summary>Points to our JSON schema.</summary>
     [JsonInclude]
     [JsonInclude]
     [JsonPropertyName ("$schema")]
     [JsonPropertyName ("$schema")]
-    public string Schema { get; set; } = "https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json";
+    public string Schema { get; set; } = "https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json";
 
 
     /// <summary>Updates the <see cref="SettingsScope"/> with the settings in a JSON string.</summary>
     /// <summary>Updates the <see cref="SettingsScope"/> with the settings in a JSON string.</summary>
     /// <param name="stream">Json document to update the settings with.</param>
     /// <param name="stream">Json document to update the settings with.</param>

+ 2 - 3
Terminal.Gui/Resources/config.json

@@ -10,8 +10,7 @@
   // note that not all values here will be recreated (e.g. the Light and Dark themes and any property initialized
   // note that not all values here will be recreated (e.g. the Light and Dark themes and any property initialized
   // null).
   // null).
   //
   //
-  // TODO: V2 - Reference via http
-  "$schema": "../../docfx/schemas/tui-config-schema.json",
+  "$schema": "https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json",
 
 
   // Set this to true in a .config file to be loaded to cause JSON parsing errors
   // Set this to true in a .config file to be loaded to cause JSON parsing errors
   // to throw exceptions. 
   // to throw exceptions. 
@@ -22,7 +21,7 @@
   "Application.NextTabGroupKey": "F6",
   "Application.NextTabGroupKey": "F6",
   "Application.PrevTabGroupKey": "Shift+F6",
   "Application.PrevTabGroupKey": "Shift+F6",
   "Application.QuitKey": "Esc",
   "Application.QuitKey": "Esc",
-  "Application.ArrangeKey":  "Ctrl+F5",
+  "Application.ArrangeKey": "Ctrl+F5",
   "Key.Separator": "+",
   "Key.Separator": "+",
 
 
   "Theme": "Default",
   "Theme": "Default",

+ 1 - 1
UICatalog/Resources/config.json

@@ -1,5 +1,5 @@
 {
 {
-  "$schema": "https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json",
+  "$schema": "https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json",
   "FileDialog.MaxSearchResults": 10000,
   "FileDialog.MaxSearchResults": 10000,
   "FileDialogStyle.DefaultUseColors": false,
   "FileDialogStyle.DefaultUseColors": false,
   "FileDialogStyle.DefaultUseUnicodeCharacters": false,
   "FileDialogStyle.DefaultUseUnicodeCharacters": false,

+ 1 - 1
UnitTests/Configuration/ConfigurationMangerTests.cs

@@ -666,7 +666,7 @@ public class ConfigurationManagerTests
         // Arrange
         // Arrange
         var json = @"
         var json = @"
 {
 {
-  ""$schema"": ""https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json"",
+  ""$schema"": ""https://gui-cs.github.io/Terminal.GuiV2Docs/schemas/tui-config-schema.json"",
   ""Application.QuitKey"": ""Alt-Z"",
   ""Application.QuitKey"": ""Alt-Z"",
   ""Theme"": ""Default"",
   ""Theme"": ""Default"",
   ""Themes"": [
   ""Themes"": [

+ 0 - 1
UnitTests/Configuration/KeyJsonConverterTests.cs

@@ -40,7 +40,6 @@ public class KeyJsonConverterTests
     [InlineData (KeyCode.D4, "4")]
     [InlineData (KeyCode.D4, "4")]
     [InlineData (KeyCode.Esc, "Esc")]
     [InlineData (KeyCode.Esc, "Esc")]
     [InlineData ((KeyCode)'+' | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt++")]
     [InlineData ((KeyCode)'+' | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt++")]
-    [InlineData ((KeyCode)'+' | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt++")]
     public void TestKeyRoundTripConversion (KeyCode key, string expectedStringTo)
     public void TestKeyRoundTripConversion (KeyCode key, string expectedStringTo)
     {
     {
         // Arrange
         // Arrange