Tweaks to api docs

CONTRIBUTING.md

@@ -124,7 +124,7 @@ Great care has been provided thus far in ensuring **Terminal.Gui** has great [AP
 - Keep the `<summary></summary>` terse.
 - Use `<see cref=""/>` liberally to cross-link topics.
 - Use `<remarks></remarks>` to add more context and explanation.
-- For complex topics, provide conceptual documentation in the `docfx/articles` folder as a `.md` file. It will automatically get picked up and be added to [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/articles/index.html).
+- For complex topics, provide conceptual documentation in the `docfx/articles` folder as a `.md` file. It will automatically get picked up and be added to [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/docs/index.html).
 - Use proper English and good grammar.
 
 ### Defining Events
@@ -156,7 +156,7 @@ The [Microsoft .NET Framework Design Guidelines](https://docs.microsoft.com/en-u
    - Sub-classes of the class implementing `EventToRaise` can override `OnEventToRaise` as needed.
 4. Where possible, a subclass of `EventArgs` should be provided and the old and new state should be included. By doing this, event handler methods do not have to query the sender for state.
 
-See also: https://www.codeproject.com/Articles/20550/C-Event-Implementation-Fundamentals-Best-Practices
+See also: https://www.codeproject.com/docs/20550/C-Event-Implementation-Fundamentals-Best-Practices
 
 ### Defining new `View` classes
 

README.md

@@ -1,6 +1,6 @@
-![Terminal.Gui](https://socialify.git.ci/gui-cs/Terminal.Gui/image?description=1&font=Rokkitt&forks=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Fgui-cs%2FTerminal.Gui%2Fdevelop%2Fdocfx%2Fimages%2Flogo.png&name=1&owner=1&pattern=Circuit%20Board&stargazers=1&theme=Auto)
-![.NET Core](https://github.com/gui-cs/Terminal.Gui/workflows/.NET%20Core/badge.svg?branch=develop)
-![Code scanning - action](https://github.com/gui-cs/Terminal.Gui/workflows/Code%20scanning%20-%20action/badge.svg)
+![Terminal.Gui](https://socialify.git.ci/gui-cs/Terminal.GuiV2Docs/image?description=1&font=Rokkitt&forks=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2Fgui-cs%2FTerminal.Gui%2Fdevelop%2Fdocfx%2Fimages%2Flogo.png&name=1&owner=1&pattern=Circuit%20Board&stargazers=1&theme=Auto)
+![.NET Core](https://github.com/gui-cs/Terminal.GuiV2Docs/workflows/.NET%20Core/badge.svg?branch=develop)
+![Code scanning - action](https://github.com/gui-cs/Terminal.GuiV2Docs/workflows/Code%20scanning%20-%20action/badge.svg)
 [![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui)
 ![Code Coverage](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/migueldeicaza/90ef67a684cb71db1817921a970f8d27/raw/code-coverage.json)
 [![Downloads](https://img.shields.io/nuget/dt/Terminal.Gui)](https://www.nuget.org/packages/Terminal.Gui)
@@ -9,7 +9,7 @@
 
 ***The current, stable, release of Terminal.Gui is [v1.x](https://www.nuget.org/packages/Terminal.Gui). It is stable, rich, and broadly used. The team is now focused on designing and building a significant upgrade we're referring to as `v2`. Therefore:***
  * *`v1` is now in maintenance mode, meaning we will accept PRs for v1.x (the `develop` branch) only for issues impacting existing functionality.*
- * *All new development happens on the `v2_develop` branch. See the V2 discussion [here](https://github.com/gui-cs/Terminal.Gui/discussions/1940).*
+ * *All new development happens on the `v2_develop` branch. See the V2 discussion [here](https://github.com/gui-cs/Terminal.GuiV2Docs/discussions/1940).*
  * *Developers are encouraged to continue building on [v1.x](https://www.nuget.org/packages/Terminal.Gui) until we announce `v2` is stable.*
 
 **Terminal.Gui**: A toolkit for building rich console apps for .NET, .NET Core, and Mono that works on Windows, the Mac, and Linux/Unix.
@@ -31,160 +31,26 @@ dotnet run
 
 ## Documentation 
 
-* [Documentation Home](https://gui-cs.github.io/Terminal.Gui/index.html)
-* [Terminal.Gui Overview](https://gui-cs.github.io/Terminal.Gui/articles/overview.html)
-* [List of Views/Controls](https://gui-cs.github.io/Terminal.Gui/articles/views.html)
-* [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/articles/index.html)
-* [API Documentation](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui.html)
-
-_The Documentation matches the most recent Nuget release from the `main` branch ([![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui))_
-
-## New in Version 2
-
-* *Modern Look & Feel* - Apps built with Terminal.Gui now look and feel modern thanks to these improvements:
-	* *TrueColor support* - 24-bit color support for Windows, Mac, and Linux. Legacy 16-color systems are still supported, automatically. See [TrueColor](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#truecolor) for details.
-	* *User Configurable Color Themes* - See [Color Themes](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#color-themes) for details.
-	* *Enhanced Unicode/Wide Character support *- Terminal.Gui now supports the full range of Unicode/wide characters. See [Unicode](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#unicode) for details.
-	* *Line Canvas* - Terminal.Gui now supports a line canvas enabling high performance drawing of lines and shapes using box-drawing glyphs. `LineCanvas` provides *auto join*, a smart TUI drawing system that auotmatically selects the correct line/box drawing glyphs for intersections making drawing complex shapes easy. See [Line Canvas](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#line-canvas) for details.
-	* *Enhanced Borders and Padding* - Terminal.Gui now supports a `Border`, `Margin`, and `Padding` property on all views. This simplifies View development and enables more sophisticated look and fee. See [Padding](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#padding) for details.
-	* *Modern File Dialog* - Terminal.Gui now supports a modern file dialog that includes icons (in TUI!) for files/folders, search, and a tree-view. See [FileDialog](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#filedialog) for details.
-* *Configuration Manager* - Terminal.Gui now supports a configuration manager enabling library and app settings to be persisted and loaded from the file system. See [Configuration Manager](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#configuration-manager) for details.
-* *Simplified API* - The entire library has been reviewed and simplified. As a result the API is more consistent and uses modern .NET API standards (e.g. for events). This refactoring resulted in the removal of thousands of lines of code, better unit tests, and higher-performance than v1. See [Simplified API](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#simplified-api) for details.
-
-
-## Features
-
-* **Cross Platform** - Windows, Mac, and Linux. Terminal drivers for Curses, [Windows Console](https://github.com/gui-cs/Terminal.Gui/issues/27), and the .NET Console mean apps will work well on both color and monochrome terminals. 
-* **Keyboard and Mouse Input** - Both keyboard and mouse input are supported, including support for drag & drop.
-* **[Flexible Layout](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#layout)** - Supports both *Absolute layout* and an innovative *Computed Layout* system. *Computed Layout* makes it easy to lay out controls relative to each other and enables dynamic terminal UIs.
-* **Clipboard support** - Cut, Copy, and Paste of text provided through the [`Clipboard`](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui.Clipboard.html) class.
-* **[Arbitrary Views](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui.View.html)** - All visible UI elements are subclasses of the `View` class, and these in turn can contain an arbitrary number of sub-views.
-* **Advanced App Features** - The [Mainloop](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui.MainLoop.html) supports processing events, idle handlers, timers, and monitoring file
-descriptors. Most classes are safe for threading.
-* **Reactive Extensions** - Use [reactive extensions](https://github.com/dotnet/reactive) and benefit from increased code readability, and the ability to apply the MVVM pattern and [ReactiveUI](https://www.reactiveui.net/) data bindings. See the [source code](https://github.com/gui-cs/Terminal.Gui/tree/master/ReactiveExample) of a sample app in order to learn how to achieve this.
+* [Documentation Home](https://gui-cs.github.io/Terminal.GuiV2Docs)
+* [API Documentation](https://gui-cs.github.io/Terminal.GuiV2Docs/api/Terminal.Gui.html)
 
 ## Showcase & Examples
 
-* **[UI Catalog](https://github.com/gui-cs/Terminal.Gui/tree/master/UICatalog)** - The UI Catalog project provides an easy to use and extend sample illustrating the capabilities of **Terminal.Gui**. Run `dotnet run --project UICatalog` to run the UI Catalog.
-* **[C# Example](https://github.com/gui-cs/Terminal.Gui/tree/master/Example)** - Run `dotnet run` in the `Example` directory to run the C# Example.
-* **[F# Example](https://github.com/gui-cs/Terminal.Gui/tree/master/FSharpExample)** - An example showing how to build a Terminal.Gui app using F#.
-* **[Reactive Example](https://github.com/gui-cs/Terminal.Gui/tree/master/ReactiveExample)** - A sample app that shows how to use `System.Reactive` and `ReactiveUI` with `Terminal.Gui`. The app uses the MVVM architecture that may seem familiar to folks coming from WPF, Xamarin Forms, UWP, Avalonia, or Windows Forms. In this app, we implement the data bindings using ReactiveUI `WhenAnyValue` syntax and [Pharmacist](https://github.com/reactiveui/pharmacist) — a tool that converts all events in a NuGet package into observable wrappers.
+* **[UI Catalog](https://github.com/gui-cs/Terminal.GuiV2Docs/tree/master/UICatalog)** - The UI Catalog project provides an easy to use and extend sample illustrating the capabilities of **Terminal.Gui**. Run `dotnet run --project UICatalog` to run the UI Catalog.
+* **[C# Example](https://github.com/gui-cs/Terminal.GuiV2Docs/tree/master/Example)** - Run `dotnet run` in the `Example` directory to run the C# Example.
+* **[F# Example](https://github.com/gui-cs/Terminal.GuiV2Docs/tree/master/FSharpExample)** - An example showing how to build a Terminal.Gui app using F#.
+* **[Reactive Example](https://github.com/gui-cs/Terminal.GuiV2Docs/tree/master/ReactiveExample)** - A sample app that shows how to use `System.Reactive` and `ReactiveUI` with `Terminal.Gui`. The app uses the MVVM architecture that may seem familiar to folks coming from WPF, Xamarin Forms, UWP, Avalonia, or Windows Forms. In this app, we implement the data bindings using ReactiveUI `WhenAnyValue` syntax and [Pharmacist](https://github.com/reactiveui/pharmacist) — a tool that converts all events in a NuGet package into observable wrappers.
 * **[PowerShell's `Out-ConsoleGridView`](https://github.com/PowerShell/GraphicalTools)** - `OCGV` sends the output from a command to an interactive table. 
 * **[F7History](https://github.com/gui-cs/F7History)** - Graphical Command History for PowerShell (built on PowerShell's `Out-ConsoleGridView`).
 * **[PoshRedisViewer](https://github.com/En3Tho/PoshRedisViewer)** - A compact Redis viewer module for PowerShell written in F#.
 * **[PoshDotnetDumpAnalyzeViewer](https://github.com/En3Tho/PoshDotnetDumpAnalyzeViewer)** - dotnet-dump UI module for PowerShell.
 * **[TerminalGuiDesigner](https://github.com/tznind/TerminalGuiDesigner)** - Cross platform view designer for building Terminal.Gui applications.
 
-See the [`Terminal.Gui/` README](https://github.com/gui-cs/Terminal.Gui/tree/master/Terminal.Gui) for an overview of how the library is structured. The [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/articles/index.html) provides insight into core concepts.
-
-## Sample Usage in C#
-
-The following example shows a basic Terminal.Gui application in C#:
-
-```csharp
-// A simple Terminal.Gui example in C# - using C# 9.0 Top-level statements
-
-using Terminal.Gui;
-
-Application.Run<ExampleWindow> ();
-
-System.Console.WriteLine ($"Username: {((ExampleWindow)Application.Top).usernameText.Text}");
-
-// Before the application exits, reset Terminal.Gui for clean shutdown
-Application.Shutdown ();
-
-// Defines a top-level window with border and title
-public class ExampleWindow : Window {
-	public TextField usernameText;
-	
-	public ExampleWindow ()
-	{
-		Title = "Example App (Ctrl+Q to quit)";
-
-		// Create input components and labels
-		var usernameLabel = new Label () { 
-			Text = "Username:" 
-		};
-
-		usernameText = new TextField ("") {
-			// Position text field adjacent to the label
-			X = Pos.Right (usernameLabel) + 1,
-
-			// Fill remaining horizontal space
-			Width = Dim.Fill (),
-		};
-
-		var passwordLabel = new Label () {
-			Text = "Password:",
-			X = Pos.Left (usernameLabel),
-			Y = Pos.Bottom (usernameLabel) + 1
-		};
-
-		var passwordText = new TextField ("") {
-			Secret = true,
-			// align with the text box above
-			X = Pos.Left (usernameText),
-			Y = Pos.Top (passwordLabel),
-			Width = Dim.Fill (),
-		};
-
-		// Create login button
-		var btnLogin = new Button () {
-			Text = "Login",
-			Y = Pos.Bottom(passwordLabel) + 1,
-			// center the login button horizontally
-			X = Pos.Center (),
-			IsDefault = true,
-		};
-
-		// When login button is clicked display a message popup
-		btnLogin.Clicked += () => {
-			if (usernameText.Text == "admin" && passwordText.Text == "password") {
-				MessageBox.Query ("Logging In", "Login Successful", "Ok");
-				Application.RequestStop ();
-			} else {
-				MessageBox.ErrorQuery ("Logging In", "Incorrect username or password", "Ok");
-			}
-		};
-
-		// Add the views to the Window
-		Add (usernameLabel, usernameText, passwordLabel, passwordText, btnLogin);
-	}
-}
-```
-
-When run the application looks as follows:
-
-![Simple Usage app](./docfx/images/Example.png)
-
-_Sample application running_
-
-## Installing
-
-Use NuGet to install the `Terminal.Gui` NuGet package: https://www.nuget.org/packages/Terminal.Gui
-
-### Installation in .NET Core Projects
-
-To install Terminal.Gui into a .NET Core project, use the `dotnet` CLI tool with this command.
-
-```
-dotnet add package Terminal.Gui
-```
-
-Or, you can use the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates).
-
-## Building the Library and Running the Examples
-
-* Windows, Mac, and Linux - Build and run using the .NET SDK command line tools (`dotnet build` in the root directory). Run `UICatalog` with `dotnet run --project UICatalog`.
-* Windows - Open `Terminal.sln` with Visual Studio 2022.
-
-See [CONTRIBUTING.md](CONTRIBUTING.md) for instructions for downloading and forking the source.
-
 ## Contributing
 
-See [CONTRIBUTING.md](https://github.com/gui-cs/Terminal.Gui/blob/master/CONTRIBUTING.md).
+See [CONTRIBUTING.md](https://github.com/gui-cs/Terminal.GuiV2Docs/blob/master/CONTRIBUTING.md).
 
-Debates on architecture and design can be found in Issues tagged with [design](https://github.com/gui-cs/Terminal.Gui/issues?q=is%3Aopen+is%3Aissue+label%3Adesign).
+Debates on architecture and design can be found in Issues tagged with [design](https://github.com/gui-cs/Terminal.GuiV2Docs/issues?q=is%3Aopen+is%3Aissue+label%3Adesign).
 
 ## History
 

Terminal.Gui/Views/TableView/ColumnStyle.cs

@@ -6,7 +6,7 @@ namespace Terminal.Gui;
 /// Describes how to render a given column in  a <see cref="TableView"/> including <see cref="Alignment"/> 
 /// and textual representation of cells (e.g. date formats)
 /// 
-/// <a href="https://gui-cs.github.io/Terminal.Gui/articles/tableview.html">See TableView Deep Dive for more information</a>.
+/// <a href="https://gui-cs.github.io/Terminal.Gui/docs/tableview.html">See TableView Deep Dive for more information</a>.
 /// </summary>
 public class ColumnStyle {
 

Terminal.Gui/Views/TableView/TableStyle.cs

@@ -5,7 +5,7 @@ namespace Terminal.Gui;
 /// <summary>
 /// Defines rendering options that affect how the table is displayed.
 /// 
-/// <a href="https://gui-cs.github.io/Terminal.Gui/articles/tableview.html">See TableView Deep Dive for more information</a>.
+/// <a href="https://gui-cs.github.io/Terminal.Gui/docs/tableview.html">See TableView Deep Dive for more information</a>.
 /// </summary>
 public class TableStyle {
 

Terminal.Gui/Views/TableView/TableView.cs

@@ -24,7 +24,7 @@ namespace Terminal.Gui {
 	/// <summary>
 	/// View for tabular data based on a <see cref="ITableSource"/>.
 	/// 
-	/// <a href="https://gui-cs.github.io/Terminal.Gui/articles/tableview.html">See TableView Deep Dive for more information</a>.
+	/// <a href="https://gui-cs.github.io/Terminal.Gui/docs/tableview.html">See TableView Deep Dive for more information</a>.
 	/// </summary>
 	public class TableView : View {
 

Terminal.Gui/Views/TreeView/TreeView.cs

@@ -14,7 +14,7 @@ namespace Terminal.Gui {
 	/// <summary>
 	/// Interface for all non generic members of <see cref="TreeView{T}"/>.
 	/// 
-	/// <a href="https://gui-cs.github.io/Terminal.Gui/articles/treeview.html">See TreeView Deep Dive for more information</a>.
+	/// <a href="https://gui-cs.github.io/Terminal.Gui/docs/treeview.html">See TreeView Deep Dive for more information</a>.
 	/// </summary>
 	public interface ITreeView {
 		/// <summary>
@@ -37,7 +37,7 @@ namespace Terminal.Gui {
 	/// Convenience implementation of generic <see cref="TreeView{T}"/> for any tree were all nodes
 	/// implement <see cref="ITreeNode"/>.
 	/// 
-	/// <a href="https://gui-cs.github.io/Terminal.Gui/articles/treeview.html">See TreeView Deep Dive for more information</a>.
+	/// <a href="https://gui-cs.github.io/Terminal.Gui/docs/treeview.html">See TreeView Deep Dive for more information</a>.
 	/// </summary>
 	public class TreeView : TreeView<ITreeNode> {
 
@@ -56,7 +56,7 @@ namespace Terminal.Gui {
 	/// Hierarchical tree view with expandable branches. Branch objects are dynamically determined
 	/// when expanded using a user defined <see cref="ITreeBuilder{T}"/>.
 	/// 
-	/// <a href="https://gui-cs.github.io/Terminal.Gui/articles/treeview.html">See TreeView Deep Dive for more information</a>.
+	/// <a href="https://gui-cs.github.io/Terminal.Gui/docs/treeview.html">See TreeView Deep Dive for more information</a>.
 	/// </summary>
 	public class TreeView<T> : View, ITreeView where T : class {
 		private int scrollOffsetVertical;

UICatalog/UICatalog.cs

@@ -273,7 +273,7 @@ namespace UICatalog {
 					_themeMenuBarItem,
 					new MenuBarItem ("Diag_nostics", CreateDiagnosticMenuItems()),
 					new MenuBarItem ("_Help", new MenuItem [] {
-						new MenuItem ("_gui.cs API Overview", "", () => OpenUrl ("https://gui-cs.github.io/Terminal.Gui/articles/overview.html"), null, null, Key.F1),
+						new MenuItem ("_gui.cs API Overview", "", () => OpenUrl ("https://gui-cs.github.io/Terminal.Gui/docs/overview.html"), null, null, Key.F1),
 						new MenuItem ("gui.cs _README", "", () => OpenUrl ("https://github.com/gui-cs/Terminal.Gui"), null, null, Key.F2),
 						new MenuItem ("_About...",
 							"About UI Catalog", () =>  MessageBox.Query ("About UI Catalog", _aboutMessage!.ToString(), 0, false, "_Ok"), null, null, Key.CtrlMask | Key.A),

docfx/README.md

@@ -1,6 +1,6 @@
 This folder generates the API docs for Terminal.Gui. 
 
-The API documentation is generated via a GitHub Action (`.github/workflows/api-docs.yml`) using [DocFX](https://github.com/dotnet/docfx). The Action publishes the docs to the `gh-pages` branch, which gets published to https://gui-cs.github.io/Terminal.Gui/.
+The API documentation is generated via a GitHub Action (`.github/workflows/api-docs.yml`) using [DocFX](https://github.com/dotnet/docfx). 
 
 ## To Generate the Docs Locally
 
@@ -8,7 +8,3 @@ The API documentation is generated via a GitHub Action (`.github/workflows/api-d
 1. Change to the `./docfx` folder and run `./build.ps1`
 2. Browse to http://localhost:8080 and verify everything looks good.
 3. Hit ctrl-c to stop the script.
-
-If `docfx` fails with a `Stackoverflow` error. Just run it again. And again. Sometimes it takes a few times. If that doesn't work, create a fresh clone or delete the `docfx/api`, `docfx/obj`, and `docs/` folders and run the steps above again.
-
-Note the `./docfx/build.ps1` script will create a `./docs` folder. This folder is ignored by `.gitignore`.

docfx/docfx.json

@@ -54,7 +54,7 @@
       "pdf": false,
       "_appFaviconPath": "images/icon48.png",
       "_appLogoPath": "images/logo48.png",
-      "_appFooter": "Terminal.Gui - Part of the gui-cs Organization",
+      "_appFooter": "Terminal.Gui - Part of the <a href=https://github.com/gui-cs>gui-cs Organization</a>",
       "_enableSearch": true,
       "_disableSideFilter": false,
       "_enableNewTab": true,

docfx/docs/getting-started.md

@@ -1 +1,110 @@
-# Getting Started
+# Getting Started
+
+Paste these commands into your favorite terminal on Windows, Mac, or Linux. This will install the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates), create a new "Hello World" TUI app, and run it.
+
+(Press `CTRL-Q` to exit the app)
+
+```ps1
+dotnet new --install Terminal.Gui.templates
+dotnet new tui -n myproj
+cd myproj
+dotnet run
+```
+
+## Adding Terminal.Gui to a Project
+
+To install Terminal.Gui from [Nuget](https://www.nuget.org/packages/Terminal.Gui) into a .NET Core project, use the `dotnet` CLI tool with this command.
+
+```ps1
+dotnet add package Terminal.Gui
+```
+
+## Using the Templates
+
+Use the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates).
+
+## Sample Usage in C#
+
+The following example shows a basic Terminal.Gui application in C#:
+
+```csharp
+// A simple Terminal.Gui example in C# - using C# 9.0 Top-level statements
+
+using Terminal.Gui;
+
+Application.Run<ExampleWindow> ();
+
+System.Console.WriteLine ($"Username: {((ExampleWindow)Application.Top).usernameText.Text}");
+
+// Before the application exits, reset Terminal.Gui for clean shutdown
+Application.Shutdown ();
+
+// Defines a top-level window with border and title
+public class ExampleWindow : Window {
+	public TextField usernameText;
+	
+	public ExampleWindow ()
+	{
+		Title = "Example App (Ctrl+Q to quit)";
+
+		// Create input components and labels
+		var usernameLabel = new Label () { 
+			Text = "Username:" 
+		};
+
+		usernameText = new TextField ("") {
+			// Position text field adjacent to the label
+			X = Pos.Right (usernameLabel) + 1,
+
+			// Fill remaining horizontal space
+			Width = Dim.Fill (),
+		};
+
+		var passwordLabel = new Label () {
+			Text = "Password:",
+			X = Pos.Left (usernameLabel),
+			Y = Pos.Bottom (usernameLabel) + 1
+		};
+
+		var passwordText = new TextField ("") {
+			Secret = true,
+			// align with the text box above
+			X = Pos.Left (usernameText),
+			Y = Pos.Top (passwordLabel),
+			Width = Dim.Fill (),
+		};
+
+		// Create login button
+		var btnLogin = new Button () {
+			Text = "Login",
+			Y = Pos.Bottom(passwordLabel) + 1,
+			// center the login button horizontally
+			X = Pos.Center (),
+			IsDefault = true,
+		};
+
+		// When login button is clicked display a message popup
+		btnLogin.Clicked += () => {
+			if (usernameText.Text == "admin" && passwordText.Text == "password") {
+				MessageBox.Query ("Logging In", "Login Successful", "Ok");
+				Application.RequestStop ();
+			} else {
+				MessageBox.ErrorQuery ("Logging In", "Incorrect username or password", "Ok");
+			}
+		};
+
+		// Add the views to the Window
+		Add (usernameLabel, usernameText, passwordLabel, passwordText, btnLogin);
+	}
+}
+```
+
+When run the application looks as follows:
+
+![Simple Usage app](../images/Example.png)
+
+## Building the Library and Running the Examples
+
+* Windows, Mac, and Linux - Build and run using the .NET SDK command line tools (`dotnet build` in the root directory). Run `UICatalog` with `dotnet run --project UICatalog`.
+* Windows - Open `Terminal.sln` with Visual Studio 202x.
+

docfx/docs/index.md

@@ -1,6 +1,9 @@
-# Conceptual Documentation
+# Terminal.Gui v2 Overview
+
+ A toolkit for building rich console apps for .NET, .NET Core, and Mono that works on Windows, the Mac, and Linux/Unix.
+
+## Conceptual Documentation
 
-* [Terminal.Gui Overview](overview.md)
 * [List of Views](views.md)
 * [Keyboard Event Processing](keyboard.md)
 * [Event Processing and the Application Main Loop](mainloop.md)
@@ -8,3 +11,413 @@
 * [Configuration and Theme Manager](config.md)
 * [TableView Deep Dive](tableview.md)
 * [TreeView Deep Dive](treeview.md)
+
+## Features
+
+* **Cross Platform** - Windows, Mac, and Linux. Terminal drivers for Curses, [Windows Console](https://github.com/gui-cs/Terminal.GuiV2Docs/issues/27), and the .NET Console mean apps will work well on both color and monochrome terminals. 
+* **Keyboard and Mouse Input** - Both keyboard and mouse input are supported, including support for drag & drop.
+* **[Flexible Layout](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#layout)** - Supports both *Absolute layout* and an innovative *Computed Layout* system. *Computed Layout* makes it easy to lay out controls relative to each other and enables dynamic terminal UIs.
+* **Clipboard support** - Cut, Copy, and Paste of text provided through the [`Clipboard`](https://gui-cs.github.io/Terminal.GuiV2Docs/api/Terminal.Gui.Clipboard.html) class.
+* **[Arbitrary Views](https://gui-cs.github.io/Terminal.GuiV2Docs/api/Terminal.Gui.View.html)** - All visible UI elements are subclasses of the `View` class, and these in turn can contain an arbitrary number of sub-views.
+* **Advanced App Features** - The [Mainloop](https://gui-cs.github.io/Terminal.GuiV2Docs/api/Terminal.Gui.MainLoop.html) supports processing events, idle handlers, timers, and monitoring file
+descriptors. Most classes are safe for threading.
+* **Reactive Extensions** - Use [reactive extensions](https://github.com/dotnet/reactive) and benefit from increased code readability, and the ability to apply the MVVM pattern and [ReactiveUI](https://www.reactiveui.net/) data bindings. See the [source code](https://github.com/gui-cs/Terminal.GuiV2Docs/tree/master/ReactiveExample) of a sample app in order to learn how to achieve this.
+
+
+
+`Terminal.Gui` is a library intended to create console-based
+applications using C#. The framework has been designed to make it
+easy to write applications that will work on monochrome terminals, as
+well as modern color terminals with mouse support.
+
+This library works across Windows, Linux and MacOS.
+
+This library provides a text-based toolkit as works in a way similar
+to graphic toolkits. There are many controls that can be used to
+create your applications and it is event based, meaning that you
+create the user interface, hook up various events and then let the
+a processing loop run your application, and your code is invoked via
+one or more callbacks.
+
+The simplest application looks like this:
+
+```csharp
+using Terminal.Gui;
+
+class Demo {
+    static int Main ()
+    {
+        Application.Init ();
+
+        var n = MessageBox.Query (50, 7, 
+            "Question", "Do you like console apps?", "Yes", "No");
+            
+		Application.Shutdown ();
+        return n;
+    }
+}
+```
+
+This example shows a prompt and returns an integer value depending on
+which value was selected by the user (Yes, No, or if they use chose
+not to make a decision and instead pressed the ESC key).
+
+More interesting user interfaces can be created by composing some of
+the various views that are included. In the following sections, you
+will see how applications are put together.
+
+In the example above, you can see that we have initialized the runtime by calling  
+[Applicaton.Init](~/api/Terminal.Gui.Application.yml#Terminal_Gui_Application_Init_Terminal_Gui_ConsoleDriver_) method in the Application class - this sets up the environment, initializes the color
+schemes available for your application and clears the screen to start your application.
+
+The [Application](~/api/Terminal.Gui.Application.yml) class, additionally creates an instance of the [Toplevel](~/api/Terminal.Gui.Toplevel.yml) class that is ready to be consumed, 
+this instance is available in the `Application.Top` property, and can be used like this:
+
+```csharp
+using Terminal.Gui;
+
+class Demo {
+    static int Main ()
+    {
+        Application.Init ();
+
+        var label = new Label ("Hello World") {
+            X = Pos.Center (),
+            Y = Pos.Center (),
+            Height = 1,
+        };
+        Application.Top.Add (label);
+        Application.Run ();
+        Application.Shutdown ();
+    }
+}
+```
+
+Typically, you will want your application to have more than a label, you might
+want a menu, and a region for your application to live in, the following code
+does this:
+
+```csharp
+using Terminal.Gui;
+
+class Demo {
+    static int Main ()
+    {
+        Application.Init ();
+        var menu = new MenuBar (new MenuBarItem [] {
+            new MenuBarItem ("_File", new MenuItem [] {
+                new MenuItem ("_Quit", "", () => { 
+                    Application.RequestStop (); 
+                })
+            }),
+        });
+        
+        var win = new Window ("Hello") {
+            X = 0,
+            Y = 1,
+            Width = Dim.Fill (),
+            Height = Dim.Fill () - 1
+        };
+
+        // Add both menu and win in a single call
+        Application.Top.Add (menu, win);
+        Application.Run ();
+        Application.Shutdown ();
+    }
+}
+```
+
+## Views
+
+All visible elements on a Terminal.Gui application are implemented as
+[Views](~/api/Terminal.Gui.View.yml). Views are self-contained objects that take care of displaying themselves, can receive keyboard and mouse input and participate in the focus mechanism.
+
+See the full list of [Views provided by the Terminal.Gui library here](views.md).
+
+Every view can contain an arbitrary number of children views. These are called
+the Subviews. You can add a view to an existing view, by calling the 
+[Add](~/api/Terminal.Gui.View.yml#Terminal_Gui_View_Add_Terminal_Gui_View_) method, for example, to add a couple of buttons to a UI, you can do this:
+
+```csharp
+void SetupMyView (View myView)
+{
+    var label = new Label ("Username: ") {
+        X = 1,
+        Y = 1,
+        Width = 20,
+        Height = 1
+    };
+    myView.Add (label);
+
+    var username = new TextField ("") {
+        X = 1,
+        Y = 2,
+        Width = 30,
+        Height = 1
+    };
+    myView.Add (username);
+}
+```
+
+The container of a given view is called the `SuperView` and it is a property of every
+View.
+
+## Layout
+
+Terminal.Gui supports two different layout systems, absolute and computed \
+(controlled by the [LayoutStyle](~/api/Terminal.Gui.LayoutStyle.yml)
+property on the view.
+
+The absolute system is used when you want the view to be positioned exactly in
+one location and want to manually control where the view is. This is done
+by invoking your View constructor with an argument of type [Rect](~/api/Terminal.Gui.Rect.yml). When you do this, to change the position of the View, you can change the `Frame` property on the View.
+
+The computed layout system offers a few additional capabilities, like automatic
+centering, expanding of dimensions and a handful of other features. To use
+this you construct your object without an initial `Frame`, but set the 
+ `X`, `Y`, `Width` and `Height` properties after the object has been created.
+
+Examples:
+
+```csharp
+
+// Dynamically computed
+var label = new Label ("Hello") {
+    X = 1,
+    Y = Pos.Center (),
+    Width = Dim.Fill (),
+    Height = 1
+};
+
+// Absolute position using the provided rectangle
+var label2 = new Label (new Rect (1, 2, 20, 1), "World")
+```
+
+The computed layout system does not take integers, instead the `X` and `Y` properties are of type [Pos](~/api/Terminal.Gui.Pos.yml) and the `Width` and `Height` properties are of type [Dim](~/api/Terminal.Gui.Dim.yml) both which can be created implicitly from integer values.
+
+### The `Pos` Type
+
+The `Pos` type on `X` and `Y` offers a few options:
+* Absolute position, by passing an integer
+* Percentage of the parent's view size - `Pos.Percent(n)`
+* Anchored from the end of the dimension - `AnchorEnd(int margin=0)`
+* Centered, using `Center()`
+* Reference the Left (X), Top (Y), Bottom, Right positions of another view
+
+The `Pos` values can be added or subtracted, like this:
+
+```csharp
+// Set the X coordinate to 10 characters left from the center
+view.X = Pos.Center () - 10;
+
+view.Y = Pos.Percent (20);
+
+anotherView.X = AnchorEnd (10);
+anotherView.Width = 9;
+
+myView.X = Pos.X (view);
+myView.Y = Pos.Bottom (anotherView);
+```
+
+### The `Dim` Type
+
+The `Dim` type is used for the `Width` and `Height` properties on the View and offers
+the following options:
+
+* Absolute size, by passing an integer
+* Percentage of the parent's view size - `Dim.Percent(n)`
+* Fill to the end - `Dim.Fill ()`
+* Reference the Width or Height of another view
+
+Like, `Pos`, objects of type `Dim` can be added an subtracted, like this:
+
+
+```csharp
+// Set the Width to be 10 characters less than filling 
+// the remaining portion of the screen
+view.Width = Dim.Fill () - 10;
+
+view.Height = Dim.Percent(20) - 1;
+
+anotherView.Height = Dim.Height (view)+1
+```
+
+## TopLevels, Windows and Dialogs.
+
+Among the many kinds of views, you typically will create a [Toplevel](~/api/Terminal.Gui.Toplevel.yml) view (or any of its subclasses), like [Window](~/api/Terminal.Gui.Window.yml) or [Dialog](~/api/Terminal.Gui.Dialog.yml) which is special kind of views that can be executed modally - that is, the view can take over all input and returns
+only when the user chooses to complete their work there. 
+
+The following sections cover the differences.
+
+### TopLevel Views
+
+[Toplevel](~/api/Terminal.Gui.Toplevel.yml) views have no visible user interface elements and occupy an arbitrary portion of the screen.
+
+You would use a toplevel Modal view for example to launch an entire new experience in your application, one where you would have a new top-level menu for example. You 
+typically would add a Menu and a Window to your Toplevel, it would look like this:
+
+```csharp
+using Terminal.Gui;
+
+class Demo {
+    static void Edit (string filename)
+    {
+        var top = new Toplevel () { 
+            X = 0, 
+            Y = 0, 
+            Width = Dim.Fill (), 
+            Height = Dim.Fill () 
+        };
+        var menu = new MenuBar (new MenuBarItem [] {
+            new MenuBarItem ("_File", new MenuItem [] {
+                new MenuItem ("_Close", "", () => { 
+                    Application.RequestStop ();
+                })
+            }),
+        });
+        
+        // nest a window for the editor
+        var win = new Window (filename) {
+            X = 0,
+            Y = 1,
+            Width = Dim.Fill (),
+            Height = Dim.Fill () - 1
+        };
+
+        var editor = new TextView () {
+            X = 0, 
+            Y = 0,
+            Width = Dim.Fill (),
+            Height = Dim.Fill ()
+        };
+        editor.Text = System.IO.File.ReadAllText (filename);
+        win.Add (editor);
+
+        // Add both menu and win in a single call
+        top.Add (win, menu);
+        Application.Run (top);
+        Application.Shutdown ();
+    }
+}
+```
+
+### Window Views
+
+[Window](~/api/Terminal.Gui.Window.yml) views extend the Toplevel view by providing a frame and a title around the toplevel - and can be moved on the screen with the mouse (caveat: code is currently disabled)
+
+From a user interface perspective, you might have more than one Window on the screen at a given time.
+
+### Dialogs
+
+[Dialog](~/api/Terminal.Gui.Dialog.yml) are [Window](~/api/Terminal.Gui.Window.yml) objects that happen to be centered in the middle of the screen.
+
+Dialogs are instances of a Window that are centered in the screen, and are intended
+to be used modally - that is, they run, and they are expected to return a result 
+before resuming execution of your application.
+
+Dialogs are a subclass of `Window` and additionally expose the 
+[`AddButton`](https://migueldeicaza.github.io/gui.cs/api/Terminal.Gui.Dialog.yml#Terminal_Gui_Dialog_AddButton_Terminal_Gui_Button_) API which manages the layout
+of any button passed to it, ensuring that the buttons are at the bottom of the dialog.
+
+Example:
+```csharp
+bool okpressed = false;
+var ok = new Button("Ok");
+var cancel = new Button("Cancel");
+var dialog = new Dialog ("Quit", 60, 7, ok, cancel);
+```
+
+Which will show something like this:
+```
++- Quit -----------------------------------------------+
+|                                                      |
+|                                                      |
+|                  [ Ok ] [ Cancel ]                   |
++------------------------------------------------------+
+```
+
+### Running Modally
+
+To run your Dialog, Window or Toplevel modally, you will invoke the `Application.Run`
+method on the toplevel. It is up to your code and event handlers to invoke the `Application.RequestStop()` method to terminate the modal execution.
+
+```csharp
+bool okpressed = false;
+var ok = new Button(3, 14, "Ok") { 
+    Clicked = () => { Application.RequestStop (); okpressed = true; }
+};
+var cancel = new Button(10, 14, "Cancel") {
+    Clicked = () => Application.RequestStop () 
+};
+var dialog = new Dialog ("Login", 60, 18, ok, cancel);
+
+var entry = new TextField () {
+    X = 1, 
+    Y = 1,
+    Width = Dim.Fill (),
+    Height = 1
+};
+dialog.Add (entry);
+Application.Run (dialog);
+if (okpressed)
+    Console.WriteLine ("The user entered: " + entry.Text);
+```
+
+There is no return value from running modally, so your code will need to have a mechanism
+of indicating the reason that the execution of the modal dialog was completed, in the 
+case above, the `okpressed` value is set to true if the user pressed or selected the Ok button.
+
+## Input Handling
+
+Every view has a focused view, and if that view has nested views, one of those is 
+the focused view. This is called the focus chain, and at any given time, only one
+View has the focus. 
+
+The library binds the key Tab to focus the next logical view, and the Shift-Tab combination to focus the previous logical view. 
+
+Keyboard processing details are available on the [Keyboard Event Processing](keyboard.md) document.
+
+## Colors and Color Schemes
+
+All views have been configured with a color scheme that will work both in color
+terminals as well as the more limited black and white terminals. 
+
+The various styles are captured in the [Colors](~/api/Terminal.Gui.Colors.yml) class which defined color schemes for
+the toplevel, the normal views, the menu bar, popup dialog boxes and error dialog boxes, that you can use like this:
+
+* `Colors.Toplevel`
+* `Colors.Base`
+* `Colors.Menu`
+* `Colors.Dialog`
+* `Colors.Error`
+
+You can use them for example like this to set the colors for a new Window:
+
+```
+var w = new Window ("Hello");
+w.ColorScheme = Colors.Error
+```
+
+The [ColorScheme](~/api/Terminal.Gui.ColorScheme.yml) represents
+four values, the color used for Normal text, the color used for normal text when
+a view is focused an the colors for the hot-keys both in focused and unfocused modes.
+
+By using `ColorSchemes` you ensure that your application will work correctbly both
+in color and black and white terminals.
+
+Some views support setting individual color attributes, you create an
+attribute for a particular pair of Foreground/Background like this:
+
+```
+var myColor = Application.Driver.MakeAttribute (Color.Blue, Color.Red);
+var label = new Label (...);
+label.TextColor = myColor
+```
+
+## MainLoop, Threads and Input Handling
+
+Detailed description of the mainloop is described on the [Event Processing and the Application Main Loop](~/docs/mainloop.md) document.
+
+## Cross-Platform Drivers
+
+See [Cross-platform Driver Model](drivers.md).

docfx/docs/introduction.md

@@ -1 +0,0 @@
-# Introduction

docfx/docs/newinv2.md

@@ -1,15 +1,15 @@
 # Terminal.Gui v2
 
-Checkout this Discussion: https://github.com/gui-cs/Terminal.Gui/discussions/2448
+Check out this Discussion: https://github.com/gui-cs/Terminal.Gui/discussions/2448
 
 * *Modern Look & Feel* - Apps built with Terminal.Gui now feel modern thanks to these improvements:
-	* *TrueColor support* - 24-bit color support for Windows, Mac, and Linux. Legacy 16-color systems are still supported, automatically. See [TrueColor](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#truecolor) for details.
-	* *User Configurable Color Themes* - See [Color Themes](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#color-themes) for details.
-	* *Enhanced Unicode/Wide Character support *- Terminal.Gui now supports the full range of Unicode/wide characters. See [Unicode](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#unicode) for details.
-	* *Line Canvas* - Terminal.Gui now supports a line canvas enabling high-performance drawing of lines and shapes using box-drawing glyphs. `LineCanvas` provides *auto join*, a smart TUI drawing system that automatically selects the correct line/box drawing glyphs for intersections making drawing complex shapes easy. See [Line Canvas](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#line-canvas) for details.
-	* *Enhanced Borders and Padding* - Terminal.Gui now supports a `Border`, `Margin`, and `Padding` property on all views. This simplifies View development and enables a sophisticated look and feel. See [Padding](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#padding) for details.
-	* *Modern File Dialog* - Terminal.Gui now supports a modern file dialog that includes icons (in TUI!) for files/folders, search, and a `TreeView``. See [FileDialog](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#filedialog) for details.
-* *Configuration Manager* - Terminal.Gui now supports a configuration manager enabling library and app settings to be persisted and loaded from the file system. See [Configuration Manager](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#configuration-manager) for details.
-* *Simplified API* - The entire library has been reviewed and simplified. As a result, the API is more consistent and uses modern .NET API standards (e.g. for events). This refactoring resulted in the removal of thousands of lines of code, better unit tests, and higher performance than v1. See [Simplified API](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#simplified-api) for details.
+	* *TrueColor support* - 24-bit color support for Windows, Mac, and Linux. Legacy 16-color systems are still supported, automatically. See [TrueColor](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#truecolor) for details.
+	* *User Configurable Color Themes* - See [Color Themes](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#color-themes) for details.
+	* *Enhanced Unicode/Wide Character support *- Terminal.Gui now supports the full range of Unicode/wide characters. See [Unicode](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#unicode) for details.
+	* *Line Canvas* - Terminal.Gui now supports a line canvas enabling high-performance drawing of lines and shapes using box-drawing glyphs. `LineCanvas` provides *auto join*, a smart TUI drawing system that automatically selects the correct line/box drawing glyphs for intersections making drawing complex shapes easy. See [Line Canvas](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#line-canvas) for details.
+	* *Enhanced Borders and Padding* - Terminal.Gui now supports a `Border`, `Margin`, and `Padding` property on all views. This simplifies View development and enables a sophisticated look and feel. See [Padding](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#padding) for details.
+	* *Modern File Dialog* - Terminal.Gui now supports a modern file dialog that includes icons (in TUI!) for files/folders, search, and a `TreeView``. See [FileDialog](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#filedialog) for details.
+* *Configuration Manager* - Terminal.Gui now supports a configuration manager enabling library and app settings to be persisted and loaded from the file system. See [Configuration Manager](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#configuration-manager) for details.
+* *Simplified API* - The entire library has been reviewed and simplified. As a result, the API is more consistent and uses modern .NET API standards (e.g. for events). This refactoring resulted in the removal of thousands of lines of code, better unit tests, and higher performance than v1. See [Simplified API](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/overview.html#simplified-api) for details.
 
 ...

docfx/docs/overview.md

@@ -1,398 +0,0 @@
-# Terminal.Gui v2 API Overview
-
-`Terminal.Gui` is a library intended to create console-based
-applications using C#. The framework has been designed to make it
-easy to write applications that will work on monochrome terminals, as
-well as modern color terminals with mouse support.
-
-This library works across Windows, Linux and MacOS.
-
-This library provides a text-based toolkit as works in a way similar
-to graphic toolkits. There are many controls that can be used to
-create your applications and it is event based, meaning that you
-create the user interface, hook up various events and then let the
-a processing loop run your application, and your code is invoked via
-one or more callbacks.
-
-The simplest application looks like this:
-
-```csharp
-using Terminal.Gui;
-
-class Demo {
-    static int Main ()
-    {
-        Application.Init ();
-
-        var n = MessageBox.Query (50, 7, 
-            "Question", "Do you like console apps?", "Yes", "No");
-            
-		Application.Shutdown ();
-        return n;
-    }
-}
-```
-
-This example shows a prompt and returns an integer value depending on
-which value was selected by the user (Yes, No, or if they use chose
-not to make a decision and instead pressed the ESC key).
-
-More interesting user interfaces can be created by composing some of
-the various views that are included. In the following sections, you
-will see how applications are put together.
-
-In the example above, you can see that we have initialized the runtime by calling  
-[Applicaton.Init](~/api/Terminal.Gui.Application.yml#Terminal_Gui_Application_Init_Terminal_Gui_ConsoleDriver_) method in the Application class - this sets up the environment, initializes the color
-schemes available for your application and clears the screen to start your application.
-
-The [Application](~/api/Terminal.Gui.Application.yml) class, additionally creates an instance of the [Toplevel](~/api/Terminal.Gui.Toplevel.yml) class that is ready to be consumed, 
-this instance is available in the `Application.Top` property, and can be used like this:
-
-```csharp
-using Terminal.Gui;
-
-class Demo {
-    static int Main ()
-    {
-        Application.Init ();
-
-        var label = new Label ("Hello World") {
-            X = Pos.Center (),
-            Y = Pos.Center (),
-            Height = 1,
-        };
-        Application.Top.Add (label);
-        Application.Run ();
-        Application.Shutdown ();
-    }
-}
-```
-
-Typically, you will want your application to have more than a label, you might
-want a menu, and a region for your application to live in, the following code
-does this:
-
-```csharp
-using Terminal.Gui;
-
-class Demo {
-    static int Main ()
-    {
-        Application.Init ();
-        var menu = new MenuBar (new MenuBarItem [] {
-            new MenuBarItem ("_File", new MenuItem [] {
-                new MenuItem ("_Quit", "", () => { 
-                    Application.RequestStop (); 
-                })
-            }),
-        });
-        
-        var win = new Window ("Hello") {
-            X = 0,
-            Y = 1,
-            Width = Dim.Fill (),
-            Height = Dim.Fill () - 1
-        };
-
-        // Add both menu and win in a single call
-        Application.Top.Add (menu, win);
-        Application.Run ();
-        Application.Shutdown ();
-    }
-}
-```
-
-## Views
-
-All visible elements on a Terminal.Gui application are implemented as
-[Views](~/api/Terminal.Gui.View.yml). Views are self-contained objects that take care of displaying themselves, can receive keyboard and mouse input and participate in the focus mechanism.
-
-See the full list of [Views provided by the Terminal.Gui library here](views.md).
-
-Every view can contain an arbitrary number of children views. These are called
-the Subviews. You can add a view to an existing view, by calling the 
-[Add](~/api/Terminal.Gui.View.yml#Terminal_Gui_View_Add_Terminal_Gui_View_) method, for example, to add a couple of buttons to a UI, you can do this:
-
-```csharp
-void SetupMyView (View myView)
-{
-    var label = new Label ("Username: ") {
-        X = 1,
-        Y = 1,
-        Width = 20,
-        Height = 1
-    };
-    myView.Add (label);
-
-    var username = new TextField ("") {
-        X = 1,
-        Y = 2,
-        Width = 30,
-        Height = 1
-    };
-    myView.Add (username);
-}
-```
-
-The container of a given view is called the `SuperView` and it is a property of every
-View.
-
-## Layout
-
-Terminal.Gui supports two different layout systems, absolute and computed \
-(controlled by the [LayoutStyle](~/api/Terminal.Gui.LayoutStyle.yml)
-property on the view.
-
-The absolute system is used when you want the view to be positioned exactly in
-one location and want to manually control where the view is. This is done
-by invoking your View constructor with an argument of type [Rect](~/api/Terminal.Gui.Rect.yml). When you do this, to change the position of the View, you can change the `Frame` property on the View.
-
-The computed layout system offers a few additional capabilities, like automatic
-centering, expanding of dimensions and a handful of other features. To use
-this you construct your object without an initial `Frame`, but set the 
- `X`, `Y`, `Width` and `Height` properties after the object has been created.
-
-Examples:
-
-```csharp
-
-// Dynamically computed
-var label = new Label ("Hello") {
-    X = 1,
-    Y = Pos.Center (),
-    Width = Dim.Fill (),
-    Height = 1
-};
-
-// Absolute position using the provided rectangle
-var label2 = new Label (new Rect (1, 2, 20, 1), "World")
-```
-
-The computed layout system does not take integers, instead the `X` and `Y` properties are of type [Pos](~/api/Terminal.Gui.Pos.yml) and the `Width` and `Height` properties are of type [Dim](~/api/Terminal.Gui.Dim.yml) both which can be created implicitly from integer values.
-
-### The `Pos` Type
-
-The `Pos` type on `X` and `Y` offers a few options:
-* Absolute position, by passing an integer
-* Percentage of the parent's view size - `Pos.Percent(n)`
-* Anchored from the end of the dimension - `AnchorEnd(int margin=0)`
-* Centered, using `Center()`
-* Reference the Left (X), Top (Y), Bottom, Right positions of another view
-
-The `Pos` values can be added or subtracted, like this:
-
-```csharp
-// Set the X coordinate to 10 characters left from the center
-view.X = Pos.Center () - 10;
-
-view.Y = Pos.Percent (20);
-
-anotherView.X = AnchorEnd (10);
-anotherView.Width = 9;
-
-myView.X = Pos.X (view);
-myView.Y = Pos.Bottom (anotherView);
-```
-
-### The `Dim` Type
-
-The `Dim` type is used for the `Width` and `Height` properties on the View and offers
-the following options:
-
-* Absolute size, by passing an integer
-* Percentage of the parent's view size - `Dim.Percent(n)`
-* Fill to the end - `Dim.Fill ()`
-* Reference the Width or Height of another view
-
-Like, `Pos`, objects of type `Dim` can be added an subtracted, like this:
-
-
-```csharp
-// Set the Width to be 10 characters less than filling 
-// the remaining portion of the screen
-view.Width = Dim.Fill () - 10;
-
-view.Height = Dim.Percent(20) - 1;
-
-anotherView.Height = Dim.Height (view)+1
-```
-
-## TopLevels, Windows and Dialogs.
-
-Among the many kinds of views, you typically will create a [Toplevel](~/api/Terminal.Gui.Toplevel.yml) view (or any of its subclasses), like [Window](~/api/Terminal.Gui.Window.yml) or [Dialog](~/api/Terminal.Gui.Dialog.yml) which is special kind of views that can be executed modally - that is, the view can take over all input and returns
-only when the user chooses to complete their work there. 
-
-The following sections cover the differences.
-
-### TopLevel Views
-
-[Toplevel](~/api/Terminal.Gui.Toplevel.yml) views have no visible user interface elements and occupy an arbitrary portion of the screen.
-
-You would use a toplevel Modal view for example to launch an entire new experience in your application, one where you would have a new top-level menu for example. You 
-typically would add a Menu and a Window to your Toplevel, it would look like this:
-
-```csharp
-using Terminal.Gui;
-
-class Demo {
-    static void Edit (string filename)
-    {
-        var top = new Toplevel () { 
-            X = 0, 
-            Y = 0, 
-            Width = Dim.Fill (), 
-            Height = Dim.Fill () 
-        };
-        var menu = new MenuBar (new MenuBarItem [] {
-            new MenuBarItem ("_File", new MenuItem [] {
-                new MenuItem ("_Close", "", () => { 
-                    Application.RequestStop ();
-                })
-            }),
-        });
-        
-        // nest a window for the editor
-        var win = new Window (filename) {
-            X = 0,
-            Y = 1,
-            Width = Dim.Fill (),
-            Height = Dim.Fill () - 1
-        };
-
-        var editor = new TextView () {
-            X = 0, 
-            Y = 0,
-            Width = Dim.Fill (),
-            Height = Dim.Fill ()
-        };
-        editor.Text = System.IO.File.ReadAllText (filename);
-        win.Add (editor);
-
-        // Add both menu and win in a single call
-        top.Add (win, menu);
-        Application.Run (top);
-        Application.Shutdown ();
-    }
-}
-```
-
-### Window Views
-
-[Window](~/api/Terminal.Gui.Window.yml) views extend the Toplevel view by providing a frame and a title around the toplevel - and can be moved on the screen with the mouse (caveat: code is currently disabled)
-
-From a user interface perspective, you might have more than one Window on the screen at a given time.
-
-### Dialogs
-
-[Dialog](~/api/Terminal.Gui.Dialog.yml) are [Window](~/api/Terminal.Gui.Window.yml) objects that happen to be centered in the middle of the screen.
-
-Dialogs are instances of a Window that are centered in the screen, and are intended
-to be used modally - that is, they run, and they are expected to return a result 
-before resuming execution of your application.
-
-Dialogs are a subclass of `Window` and additionally expose the 
-[`AddButton`](https://migueldeicaza.github.io/gui.cs/api/Terminal.Gui.Dialog.yml#Terminal_Gui_Dialog_AddButton_Terminal_Gui_Button_) API which manages the layout
-of any button passed to it, ensuring that the buttons are at the bottom of the dialog.
-
-Example:
-```csharp
-bool okpressed = false;
-var ok = new Button("Ok");
-var cancel = new Button("Cancel");
-var dialog = new Dialog ("Quit", 60, 7, ok, cancel);
-```
-
-Which will show something like this:
-```
-+- Quit -----------------------------------------------+
-|                                                      |
-|                                                      |
-|                  [ Ok ] [ Cancel ]                   |
-+------------------------------------------------------+
-```
-
-### Running Modally
-
-To run your Dialog, Window or Toplevel modally, you will invoke the `Application.Run`
-method on the toplevel. It is up to your code and event handlers to invoke the `Application.RequestStop()` method to terminate the modal execution.
-
-```csharp
-bool okpressed = false;
-var ok = new Button(3, 14, "Ok") { 
-    Clicked = () => { Application.RequestStop (); okpressed = true; }
-};
-var cancel = new Button(10, 14, "Cancel") {
-    Clicked = () => Application.RequestStop () 
-};
-var dialog = new Dialog ("Login", 60, 18, ok, cancel);
-
-var entry = new TextField () {
-    X = 1, 
-    Y = 1,
-    Width = Dim.Fill (),
-    Height = 1
-};
-dialog.Add (entry);
-Application.Run (dialog);
-if (okpressed)
-    Console.WriteLine ("The user entered: " + entry.Text);
-```
-
-There is no return value from running modally, so your code will need to have a mechanism
-of indicating the reason that the execution of the modal dialog was completed, in the 
-case above, the `okpressed` value is set to true if the user pressed or selected the Ok button.
-
-## Input Handling
-
-Every view has a focused view, and if that view has nested views, one of those is 
-the focused view. This is called the focus chain, and at any given time, only one
-View has the focus. 
-
-The library binds the key Tab to focus the next logical view, and the Shift-Tab combination to focus the previous logical view. 
-
-Keyboard processing details are available on the [Keyboard Event Processing](keyboard.md) document.
-
-## Colors and Color Schemes
-
-All views have been configured with a color scheme that will work both in color
-terminals as well as the more limited black and white terminals. 
-
-The various styles are captured in the [Colors](~/api/Terminal.Gui.Colors.yml) class which defined color schemes for
-the toplevel, the normal views, the menu bar, popup dialog boxes and error dialog boxes, that you can use like this:
-
-* `Colors.Toplevel`
-* `Colors.Base`
-* `Colors.Menu`
-* `Colors.Dialog`
-* `Colors.Error`
-
-You can use them for example like this to set the colors for a new Window:
-
-```
-var w = new Window ("Hello");
-w.ColorScheme = Colors.Error
-```
-
-The [ColorScheme](~/api/Terminal.Gui.ColorScheme.yml) represents
-four values, the color used for Normal text, the color used for normal text when
-a view is focused an the colors for the hot-keys both in focused and unfocused modes.
-
-By using `ColorSchemes` you ensure that your application will work correctbly both
-in color and black and white terminals.
-
-Some views support setting individual color attributes, you create an
-attribute for a particular pair of Foreground/Background like this:
-
-```
-var myColor = Application.Driver.MakeAttribute (Color.Blue, Color.Red);
-var label = new Label (...);
-label.TextColor = myColor
-```
-
-## MainLoop, Threads and Input Handling
-
-Detailed description of the mainloop is described on the [Event Processing and the Application Main Loop](~/docs/mainloop.md) document.
-
-## Cross-Platform Drivers
-
-See [Cross-platform Driver Model](drivers.md).

docfx/docs/toc.yml

@@ -1,12 +1,21 @@
-- name: What's new in Terminal.Gui v2
-  href: newinv2.md
 - name: Overview
-  href: overview.md
-- name: Conceptual Docs
   href: index.md
-# - name: API Reference
-#   href: api/Terminal.Gui/
-# - name: UI Catalog API
-#   href: api/UICatalog/
-- name: Source
-  href: https://github.com/gui-cs/Terminal.Gui
+- name: Getting Started
+  href: getting-started.md
+- name: What's new in v2
+  href: newinv2.md
+- name: List of Views
+  href: views.md
+- name: Configuration
+  href: config.md
+- name: Cross-platform Driver Model
+  href: drivers.md
+- name: Event Processing and the Application Main Loop
+  href: mainloop.md
+- name: Keyboard Event Processing
+  href: keyboard.md
+- name: TableView Deep Dive
+  href: tableview.md
+- name: TreeView Deep Dive
+  href: treeview.md
+

docfx/index.md

@@ -1,8 +1,8 @@
 # Terminal.Gui v2 - Cross Platform Terminal UI toolkit for .NET
 
-**NOTE** v2 is still in development (see the `v2_develop` branch). The current stable version of v1 is in the `develop` branch, and released from main. 
+**NOTE** v2 is still in development (see the `v2_develop` branch). The current stable version of v1 is in the `develop` branch. 
 
-A toolkit for building rich console apps for .NET, .NET Core, and Mono that works on Windows, the Mac, and Linux/Unix.
+A toolkit for building rich console apps for .NET that run on Windows, the Mac, and Linux.
 
 ![Sample](images/sample.gif)
 
@@ -13,7 +13,7 @@ A toolkit for building rich console apps for .NET, .NET Core, and Mono that work
 * [What's new in v2](~/docs/newinv2.md)
 * [API Reference](~/api/Terminal.Gui.yml)
 * [Views and controls built into the Terminal.Gui library](~/docs/views.md)
-* [Terminal.Gui API Overview](~/docs/overview.md)
+* [Terminal.Gui API Overview](~/docs/index.md)
 * [Keyboard Event Processing](~/docs/keyboard.md)
 * [Event Processing and the Application Main Loop](~/docs/mainloop.md)
 * [Cross-platform Driver Model](~/docs/drivers.md)

docfx/runbuild.cmd

@@ -1 +0,0 @@
-powershell.exe -executionpolicy bypass -file .\build.ps1

docfx/toc.yml

@@ -1,17 +1,8 @@
-- name: Docs
+- name: Conceptual Docs
   href: docs/
+
 - name: API
   href: api/
 
-# - name: What's new in Terminal.Gui v2
-#   href: articles/newinv2.md
-# - name: Overview
-#   href: articles/overview.md
-# - name: Conceptual Docs
-#   href: articles/index.md
-# - name: API Reference
-#   href: api/Terminal.Gui/
-# # - name: UI Catalog API
-# #   href: api/UICatalog/
-# - name: Source
-#   href: https://github.com/gui-cs/Terminal.Gui
+- name: Source
+  href: https://github.com/gui-cs/Terminal.Gui