From ee0bed7189f21059cb7f383f2e0aebaea56a5dd0 Mon Sep 17 00:00:00 2001
From: William JCM <w.jcm59@gmail.com>
Date: Fri, 10 Jan 2020 22:46:51 +0100
Subject: [PATCH] MainFrame: change some UI stuff.

---
 GUI/MainFrame.cpp | 20 ++++++++++----------
 GUI/MainFrame.fbp |  9 ++++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/GUI/MainFrame.cpp b/GUI/MainFrame.cpp
index 23d5e70..431da5d 100644
--- a/GUI/MainFrame.cpp
+++ b/GUI/MainFrame.cpp
@@ -28,20 +28,20 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	_installedListView->AppendColumn("M.A.S.S. name", wxLIST_FORMAT_LEFT);
 	sbSizerInstalled->Add( _installedListView, 1, wxALL|wxEXPAND, 5 );
 
-	wxBoxSizer* bSizerInstalledButtons;
-	bSizerInstalledButtons = new wxBoxSizer( wxHORIZONTAL );
+	wxStaticBoxSizer* sbSizerButtons;
+	sbSizerButtons = new wxStaticBoxSizer( new wxStaticBox( sbSizerInstalled->GetStaticBox(), wxID_ANY, wxT("Hangar actions") ), wxHORIZONTAL );
 
-	_importButton = new wxButton( sbSizerInstalled->GetStaticBox(), wxID_ANY, wxT("Import"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerInstalledButtons->Add( _importButton, 1, wxALL|wxEXPAND, 5 );
+	_importButton = new wxButton( sbSizerButtons->GetStaticBox(), wxID_ANY, wxT("Import"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizerButtons->Add( _importButton, 1, wxALL|wxEXPAND, 5 );
 
-	_moveButton = new wxButton( sbSizerInstalled->GetStaticBox(), wxID_ANY, wxT("Move"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerInstalledButtons->Add( _moveButton, 1, wxALL|wxEXPAND, 5 );
+	_moveButton = new wxButton( sbSizerButtons->GetStaticBox(), wxID_ANY, wxT("Move"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizerButtons->Add( _moveButton, 1, wxALL|wxEXPAND, 5 );
 
-	_deleteButton = new wxButton( sbSizerInstalled->GetStaticBox(), wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerInstalledButtons->Add( _deleteButton, 1, wxALL|wxEXPAND, 5 );
+	_deleteButton = new wxButton( sbSizerButtons->GetStaticBox(), wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizerButtons->Add( _deleteButton, 1, wxALL|wxEXPAND, 5 );
 
 
-	sbSizerInstalled->Add( bSizerInstalledButtons, 0, wxEXPAND, 5 );
+	sbSizerInstalled->Add( sbSizerButtons, 0, wxEXPAND, 5 );
 
 	wxBoxSizer* bSizerSecondRow;
 	bSizerSecondRow = new wxBoxSizer( wxHORIZONTAL );
@@ -50,7 +50,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	bSizerSecondRow->Add( 0, 0, 1, wxEXPAND, 5 );
 
 	_openSaveDirButton = new wxButton( sbSizerInstalled->GetStaticBox(), wxID_ANY, wxT("Open save directory"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerSecondRow->Add( _openSaveDirButton, 1, wxALL|wxEXPAND, 5 );
+	bSizerSecondRow->Add( _openSaveDirButton, 1, wxEXPAND|wxALL, 5 );
 
 
 	bSizerSecondRow->Add( 0, 0, 1, wxEXPAND, 5 );
diff --git a/GUI/MainFrame.fbp b/GUI/MainFrame.fbp
index 5109563..a63cab5 100644
--- a/GUI/MainFrame.fbp
+++ b/GUI/MainFrame.fbp
@@ -146,10 +146,13 @@
                                     <property name="border">5</property>
                                     <property name="flag">wxEXPAND</property>
                                     <property name="proportion">0</property>
-                                    <object class="wxBoxSizer" expanded="1">
+                                    <object class="wxStaticBoxSizer" expanded="1">
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Hangar actions</property>
                                         <property name="minimum_size"></property>
-                                        <property name="name">bSizerInstalledButtons</property>
+                                        <property name="name">sbSizerButtons</property>
                                         <property name="orient">wxHORIZONTAL</property>
+                                        <property name="parent">1</property>
                                         <property name="permission">none</property>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
@@ -393,7 +396,7 @@
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="flag">wxEXPAND|wxALL</property>
                                             <property name="proportion">1</property>
                                             <object class="wxButton" expanded="1">
                                                 <property name="BottomDockable">1</property>