CtrlLib, Doc: Added tutorial about using Key function to handle keyboard keys + alligning directory structure for tutorials.

tutorial/Gui05a/main.cpp

@@ -29,6 +29,5 @@ struct MyAppWindow : TopWindow {
 
 GUI_APP_MAIN
 {
-	MyAppWindow app;
-	app.Run();
+	MyAppWindow().Run();
 }

tutorial/Gui05b/Gui05b.upp

@@ -1,5 +1,3 @@
-description "Menu\377";
-
 uses
 	CtrlLib;
 

tutorial/Gui05b/main.cpp

@@ -0,0 +1,45 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	String text = "Press any arrow key...";
+
+	bool Key(dword key, int count) override {
+		switch(key) {
+		case K_UP:
+			text = "Up ⬆";
+			Refresh();
+			return true;
+		case K_DOWN:
+			text = "Down ⬇";
+			Refresh();
+			return true;
+		case K_LEFT:
+			text = "Left ⬅";
+			Refresh();
+			return true;
+		case K_RIGHT:
+			text = "Right ⮕";
+			Refresh();
+			return true;
+		default:
+			return TopWindow::Key(key, count);
+		}
+	}
+
+	void Paint(Draw& w) override {
+		w.DrawRect(GetSize(), SWhite);
+		w.DrawText(45, 20, text, Arial(20), Magenta);
+	}
+
+	MyAppWindow() {
+		Title("My application").Zoomable();
+		SetRect(0, 0, 400, 100);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow().Run();
+}

tutorial/Gui07/main.cpp

@@ -1,32 +0,0 @@
-#include <CtrlLib/CtrlLib.h>
-
-using namespace Upp;
-
-struct MyAppWindow : TopWindow {
-	MenuBar menu;
-
-	void Exit() {
-		if(PromptOKCancel("Exit MyApp?"))
-			Break();
-	}
-
-	void SubMenu(Bar& bar) {
-		bar.Add("Exit", [=] { Exit(); });
-	}
-
-	void MainMenu(Bar& bar) {
-		bar.Sub("Menu", [=](Bar& bar) { SubMenu(bar); });
-	}
-
-	MyAppWindow() {
-		Title("My application with menu").Sizeable();
-		AddFrame(menu);
-		menu.Set([=](Bar& bar) { MainMenu(bar); });
-	}
-};
-
-GUI_APP_MAIN
-{
-	MyAppWindow app;
-	app.Run();
-}

tutorial/Gui07a/Gui07a.upp

@@ -1,4 +1,4 @@
-description "Menu - as single lambda\377";
+description "Menu\377";
 
 uses
 	CtrlLib;

tutorial/Gui07a/main.cpp

@@ -5,23 +5,23 @@ using namespace Upp;
 struct MyAppWindow : TopWindow {
 	MenuBar menu;
 
-	MyAppWindow() {
-		Title("My application with menu").Sizeable();
-		AddFrame(menu);
-		menu.Set(
-			[=](Bar& bar) {
-				bar.Sub("Menu",
-						[=](Bar& bar) {
-							bar.Add("Exit",
-								[=] {
+	void Exit() {
 		if(PromptOKCancel("Exit MyApp?"))
 			Break();
 	}
-							);
+
+	void SubMenu(Bar& bar) {
+		bar.Add("Exit", [=] { Exit(); });
 	}
-				);
+
+	void MainMenu(Bar& bar) {
+		bar.Sub("Menu", [=](Bar& bar) { SubMenu(bar); });
 	}
-		);
+
+	MyAppWindow() {
+		Title("My application with menu").Sizeable();
+		AddFrame(menu);
+		menu.Set([=](Bar& bar) { MainMenu(bar); });
 	}
 };
 

tutorial/Gui07b/Gui07b.upp

@@ -0,0 +1,11 @@
+description "Menu - as single lambda\377";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+

tutorial/Gui07b/main.cpp

@@ -0,0 +1,32 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct MyAppWindow : TopWindow {
+	MenuBar menu;
+
+	MyAppWindow() {
+		Title("My application with menu").Sizeable();
+		AddFrame(menu);
+		menu.Set(
+			[=](Bar& bar) {
+				bar.Sub("Menu",
+						[=](Bar& bar) {
+							bar.Add("Exit",
+								[=] {
+									if(PromptOKCancel("Exit MyApp?"))
+										Break();
+								}
+							);
+						}
+				);
+			}
+		);
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyAppWindow app;
+	app.Run();
+}