From c3e224bd76d7765782bb96bc4bd2a50f542158a4 Mon Sep 17 00:00:00 2001
From: gambas <g4mba5@gmail.com>
Date: Sun, 11 Oct 2020 22:37:52 +0200
Subject: [PATCH] Fix GUI default layouts.

[DEVELOPMENT ENVIRONMENT]
* BUG: Fix GUI default layouts.
---
 app/src/gambas3/.src/Options/FOption.class | 10 +++-------
 app/src/gambas3/layout/$compact.layout     | 12 ++++++------
 app/src/gambas3/layout/$default.layout     | 12 ++++++------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/src/gambas3/.src/Options/FOption.class b/app/src/gambas3/.src/Options/FOption.class
index 9dcc27b47..04e891231 100644
--- a/app/src/gambas3/.src/Options/FOption.class
+++ b/app/src/gambas3/.src/Options/FOption.class
@@ -1748,13 +1748,9 @@ Private Sub LoadLayout(sName As String)
   
   RefreshWindow
   
-  For Each sSlot In hSettings.Keys
-    For Each sKey In hSettings.Keys[sSlot]
-      vVal = hSettings[sSlot &/ sKey]
-      If sSlot = "Toolbar" Then
-        ToolBar.SetLayout(LCase(sKey), vVal)
-      Endif
-    Next
+  For Each sKey In hSettings.Keys["Toolbar"]
+    vVal = hSettings[sSlot &/ sKey]
+    ToolBar.SetLayout(sKey, vVal)
   Next
   
 Finally
diff --git a/app/src/gambas3/layout/$compact.layout b/app/src/gambas3/layout/$compact.layout
index b03050beb..8f9d2b3eb 100644
--- a/app/src/gambas3/layout/$compact.layout
+++ b/app/src/gambas3/layout/$compact.layout
@@ -14,10 +14,10 @@ Zoom=90
 Help=False
 
 [Toolbar]
-Main="Tiny,menu-file,new-project,open-project,save-project,save-project-as,project-property,|,menu-edit,menu-project,exec,translate,|,compile,compile-all,menu-debug,start,pause,stop,step,forward,return,until,gui,|,option,menu-tool,menu-view,menu-help,~,find-project,go-back,go-forward,$btnShowMenu"
-Editor="Tiny"
-Text="Tiny"
-Connection="Tiny"
-Form="Tiny,show-class,save,reload,run-me,|,undo,redo,|,menu,grid,tooltip,|,raise,lower,align-top,align-bottom,align-left,align-right,same-width,same-height,arrange-hcenter,arrange-vcenter,|,move-tab-first,move-tab-previous,move-tab-next,move-tab-last,show-tab,|,text-font,text-bold,text-italic,text-underline,text-zoom-in,text-zoom-out,text-zoom-normal,format-background,format-foreground,~,locked"
-Image="Tiny"
+FMain.main="Tiny,menu-file,new-project,open-project,save-project,save-project-as,project-property,|,menu-edit,menu-project,exec,translate,|,compile,compile-all,menu-debug,start,pause,stop,step,forward,return,until,gui,|,option,menu-tool,menu-view,menu-help,~,find-project,go-back,go-forward,$btnShowMenu"
+FEditor.editor="Tiny"
+FTextEditor.text="Tiny"
+FConnection.connection="Tiny"
+FForm.form="Tiny,show-class,save,reload,run-me,|,undo,redo,|,menu,grid,tooltip,|,raise,lower,align-top,align-bottom,align-left,align-right,same-width,same-height,arrange-hcenter,arrange-vcenter,|,move-tab-first,move-tab-previous,move-tab-next,move-tab-last,show-tab,|,text-font,text-bold,text-italic,text-underline,text-zoom-in,text-zoom-out,text-zoom-normal,format-background,format-foreground,~,locked"
+FImageEditor.image="Tiny"
 
diff --git a/app/src/gambas3/layout/$default.layout b/app/src/gambas3/layout/$default.layout
index a0d3b39cb..92c0777d5 100644
--- a/app/src/gambas3/layout/$default.layout
+++ b/app/src/gambas3/layout/$default.layout
@@ -14,10 +14,10 @@ Zoom=80
 Help=True
 
 [Toolbar]
-Main="Tiny"
-Editor="Tiny"
-Text="Tiny"
-Connection="Tiny"
-Form="Tiny"
-Image="Tiny"
+FMain.main="Tiny"
+FEditor.editor="Tiny"
+FTextEditor.text="Tiny"
+FConnectionEditor.connection="Tiny"
+FForm.form="Tiny"
+FImageEditor.image="Tiny"