From 07ed391cf6eaf217590f65a3aa68bd176d0038b6 Mon Sep 17 00:00:00 2001 From: William JCM Date: Sun, 14 Jun 2020 12:18:44 +0200 Subject: [PATCH] MainFrame: reorganise the UI. Some of the widgets had wrong parents. --- GUI/MainFrame.cpp | 54 +- GUI/MainFrame.fbp | 2364 +++++++++++++++++++++++---------------------- GUI/MainFrame.h | 5 +- 3 files changed, 1240 insertions(+), 1183 deletions(-) diff --git a/GUI/MainFrame.cpp b/GUI/MainFrame.cpp index b13410c..75a63c8 100644 --- a/GUI/MainFrame.cpp +++ b/GUI/MainFrame.cpp @@ -16,13 +16,14 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - _managerBook = new wxSimplebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - _massPanel = new wxPanel( _managerBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxBoxSizer* bSizerPanel; - bSizerPanel = new wxBoxSizer( wxVERTICAL ); + _mainPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* bSizerMainPanel; + bSizerMainPanel = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizerMainUi; - bSizerMainUi = new wxBoxSizer( wxHORIZONTAL ); + _managerBook = new wxSimplebook( _mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + _massPanel = new wxPanel( _managerBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* bSizerMassPanel; + bSizerMassPanel = new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer* sbSizerInstalled; sbSizerInstalled = new wxStaticBoxSizer( new wxStaticBox( _massPanel, wxID_ANY, wxT("Installed M.A.S.S.es") ), wxVERTICAL ); @@ -60,7 +61,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co sbSizerInstalled->Add( bSizerSecondRow, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bSizerMainUi->Add( sbSizerInstalled, 1, wxEXPAND|wxALL, 5 ); + bSizerMassPanel->Add( sbSizerInstalled, 1, wxEXPAND|wxALL, 5 ); wxBoxSizer* bSizerImportExport; bSizerImportExport = new wxBoxSizer( wxVERTICAL ); @@ -77,7 +78,7 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co bSizerImportExport->Add( _exportButton, 0, wxALL|wxEXPAND, 5 ); - bSizerMainUi->Add( bSizerImportExport, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizerMassPanel->Add( bSizerImportExport, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxStaticBoxSizer* sbSizerStagingArea; sbSizerStagingArea = new wxStaticBoxSizer( new wxStaticBox( _massPanel, wxID_ANY, wxT("Staging area") ), wxVERTICAL ); @@ -92,26 +93,31 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co sbSizerStagingArea->Add( _stagingAreaButton, 0, wxALL|wxEXPAND, 5 ); - bSizerMainUi->Add( sbSizerStagingArea, 1, wxEXPAND|wxALL, 5 ); + bSizerMassPanel->Add( sbSizerStagingArea, 1, wxEXPAND|wxALL, 5 ); - bSizerPanel->Add( bSizerMainUi, 1, wxEXPAND, 5 ); + _massPanel->SetSizer( bSizerMassPanel ); + _massPanel->Layout(); + bSizerMassPanel->Fit( _massPanel ); + _managerBook->AddPage( _massPanel, wxT("a page"), false ); - _riskLabel = new wxStaticText( _massPanel, wxID_ANY, wxT("USE THIS TOOL AT YOUR OWN RISK!"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL ); + bSizerMainPanel->Add( _managerBook, 1, wxEXPAND, 5 ); + + _riskLabel = new wxStaticText( _mainPanel, wxID_ANY, wxT("USE THIS TOOL AT YOUR OWN RISK!"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL ); _riskLabel->Wrap( -1 ); _riskLabel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); _riskLabel->SetForegroundColour( wxColour( 255, 0, 0 ) ); - bSizerPanel->Add( _riskLabel, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizerMainPanel->Add( _riskLabel, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizerGameStatus; bSizerGameStatus = new wxBoxSizer( wxHORIZONTAL ); - _gameStatusLabel = new wxStaticText( _massPanel, wxID_ANY, wxT("Game status:"), wxDefaultPosition, wxDefaultSize, 0 ); + _gameStatusLabel = new wxStaticText( _mainPanel, wxID_ANY, wxT("Game status:"), wxDefaultPosition, wxDefaultSize, 0 ); _gameStatusLabel->Wrap( -1 ); bSizerGameStatus->Add( _gameStatusLabel, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); - _gameStatus = new wxStaticText( _massPanel, wxID_ANY, wxT("not running"), wxDefaultPosition, wxDefaultSize, 0 ); + _gameStatus = new wxStaticText( _mainPanel, wxID_ANY, wxT("not running"), wxDefaultPosition, wxDefaultSize, 0 ); _gameStatus->Wrap( -1 ); _gameStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); _gameStatus->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_CAPTIONTEXT ) ); @@ -119,22 +125,20 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co bSizerGameStatus->Add( _gameStatus, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - bSizerPanel->Add( bSizerGameStatus, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerMainPanel->Add( bSizerGameStatus, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); - _aboutText = new wxStaticText( _massPanel, wxID_ANY, wxT("This version of the application was tested on M.A.S.S. Builder early access version 0.3.7.\nIt may or may not work with other versions of the game.\nMade for the M.A.S.S. Builder community by Guillaume Jacquemin."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL ); + _aboutText = new wxStaticText( _mainPanel, wxID_ANY, wxT("This version of the application was tested on M.A.S.S. Builder early access version 0.3.7.\nIt may or may not work with other versions of the game.\nMade for the M.A.S.S. Builder community by Guillaume Jacquemin."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL ); _aboutText->Wrap( -1 ); - bSizerPanel->Add( _aboutText, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerMainPanel->Add( _aboutText, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 ); - _githubLink = new wxHyperlinkCtrl( _massPanel, wxID_ANY, wxT("https://github.com/williamjcm/wxMASSManager"), wxT("https://github.com/williamjcm/wxMASSManager"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); - bSizerPanel->Add( _githubLink, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + _githubLink = new wxHyperlinkCtrl( _mainPanel, wxID_ANY, wxT("https://github.com/williamjcm/wxMASSManager"), wxT("https://github.com/williamjcm/wxMASSManager"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + bSizerMainPanel->Add( _githubLink, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - _massPanel->SetSizer( bSizerPanel ); - _massPanel->Layout(); - bSizerPanel->Fit( _massPanel ); - _managerBook->AddPage( _massPanel, wxT("a page"), false ); - - bSizerMain->Add( _managerBook, 1, wxEXPAND, 5 ); + _mainPanel->SetSizer( bSizerMainPanel ); + _mainPanel->Layout(); + bSizerMainPanel->Fit( _mainPanel ); + bSizerMain->Add( _mainPanel, 1, wxEXPAND, 5 ); this->SetSizer( bSizerMain ); diff --git a/GUI/MainFrame.fbp b/GUI/MainFrame.fbp index b30cdb7..d596011 100644 --- a/GUI/MainFrame.fbp +++ b/GUI/MainFrame.fbp @@ -63,7 +63,7 @@ 5 wxEXPAND 1 - + 1 1 1 @@ -98,7 +98,7 @@ 0 1 - _managerBook + _mainPanel 1 @@ -113,927 +113,1112 @@ - - - a page - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - _massPanel - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - + wxTAB_TRAVERSAL + + + bSizerMainPanel + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bSizerPanel - wxVERTICAL - none - - 5 - wxEXPAND - 1 - + 1 + _managerBook + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + a page + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bSizerMainUi - wxHORIZONTAL - none - - 5 - wxEXPAND|wxALL - 1 - - wxID_ANY - Installed M.A.S.S.es - - sbSizerInstalled - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - _installedListView = new wxListView(_massPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_HRULES); - - 1 - wxListView* _installedListView; - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - #include <wx/listctrl.h> - - 0 - - - 0 - - 1 - _installedListView - 1 - - - protected - 1 - - Resizable - _installedListView->AppendColumn("Hangar", wxLIST_FORMAT_LEFT); _installedListView->AppendColumn("M.A.S.S. name", wxLIST_FORMAT_LEFT); - 1 - - ; ; forward_declare - 0 - - - - + 1 + _massPanel + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bSizerMassPanel + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALL + 1 + + wxID_ANY + Installed M.A.S.S.es + + sbSizerInstalled + wxVERTICAL + 1 + none + + 5 + wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + _installedListView = new wxListView(_massPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_HRULES); + + 1 + wxListView* _installedListView; + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + #include <wx/listctrl.h> + + 0 + + + 0 + + 1 + _installedListView + 1 + + + protected + 1 + + Resizable + _installedListView->AppendColumn("Hangar", wxLIST_FORMAT_LEFT); _installedListView->AppendColumn("M.A.S.S. name", wxLIST_FORMAT_LEFT); + 1 + + ; ; forward_declare + 0 + + + + + - - - 5 - wxEXPAND - 0 - - wxID_ANY - Hangar actions - - sbSizerButtons - wxHORIZONTAL - 1 - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move - - 0 - - 0 - - - 0 - - 1 - _moveButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - moveEvent + + 5 + wxEXPAND + 0 + + wxID_ANY + Hangar actions + + sbSizerButtons + wxHORIZONTAL + 1 + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move + + 0 + + 0 + + + 0 + + 1 + _moveButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + moveEvent + - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Delete - - 0 - - 0 - - - 0 - - 1 - _deleteButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - deleteEvent + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete + + 0 + + 0 + + + 0 + + 1 + _deleteButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + deleteEvent + - - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Rename - - 0 - - 0 - - - 0 - - 1 - _renameButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - renameMassEvent + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Rename + + 0 + + 0 + + + 0 + + 1 + _renameButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + renameMassEvent + - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - - bSizerSecondRow - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Backup save files - - 0 - - 0 - - - 0 - - 1 - _zipButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - backupEvent + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + + bSizerSecondRow + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 2 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Backup save files + + 0 + + 0 + + + 0 + + 1 + _zipButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + backupEvent + - - - 5 - wxEXPAND|wxALL - 2 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Open save directory - - 0 - - 0 - - - 0 - - 1 - _openSaveDirButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - openSaveDirEvent + + 5 + wxEXPAND|wxALL + 2 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Open save directory + + 0 + + 0 + + + 0 + + 1 + _openSaveDirButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + openSaveDirEvent + - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - - bSizerImportExport - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - Load From Art Provider; wxART_GO_BACK; wxART_BUTTON - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Import - - 0 - - 0 - - - 0 - - 1 - _importButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - importEvent + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + + bSizerImportExport + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + Load From Art Provider; wxART_GO_BACK; wxART_BUTTON + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Import + + 0 + + 0 + + + 0 + + 1 + _importButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + importEvent + - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From Art Provider; wxART_GO_FORWARD; wxART_BUTTON - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Export - - 0 - - 0 - - - 0 - - 1 - _exportButton - 1 - - - protected - 1 - - wxRIGHT - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - exportEvent + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Art Provider; wxART_GO_FORWARD; wxART_BUTTON + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Export + + 0 + + 0 + + + 0 + + 1 + _exportButton + 1 + + + protected + 1 + + wxRIGHT + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + exportEvent + - - - 5 - wxEXPAND|wxALL - 1 - - wxID_ANY - Staging area - - sbSizerStagingArea - wxVERTICAL - 1 - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - _stagingList - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_NEEDED_SB|wxLB_SINGLE - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - stagingSelectionEvent + + 5 + wxEXPAND|wxALL + 1 + + wxID_ANY + Staging area + + sbSizerStagingArea + wxVERTICAL + 1 + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + _stagingList + 1 + + + protected + 1 + + Resizable + 1 + + wxLB_NEEDED_SB|wxLB_SINGLE + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + stagingSelectionEvent + - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Delete staged M.A.S.S. - - 0 - - 0 - - - 0 - - 1 - _deleteStagedButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - deleteStagedEvent + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete staged M.A.S.S. + + 0 + + 0 + + + 0 + + 1 + _deleteStagedButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + deleteStagedEvent + - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Open staging area directory - - 0 - - 0 - - - 0 - - 1 - _stagingAreaButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - stagingButtonEvent + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Open staging area directory + + 0 + + 0 + + + 0 + + 1 + _stagingAreaButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + stagingButtonEvent + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + 255,0,0 + 1 + ,90,92,-1,70,0 + 0 + 0 + wxID_ANY + USE THIS TOOL AT YOUR OWN RISK! + 0 + + 0 + + + 0 + + 1 + _riskLabel + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_CENTER_HORIZONTAL + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_HORIZONTAL + 0 + + + bSizerGameStatus + wxHORIZONTAL + none 5 - wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Game status: + 0 + + 0 + + + 0 + + 1 + _gameStatusLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -1057,13 +1242,13 @@ 0 Left 1 - 255,0,0 + wxSYS_COLOUR_CAPTIONTEXT 1 ,90,92,-1,70,0 0 0 wxID_ANY - USE THIS TOOL AT YOUR OWN RISK! + not running 0 0 @@ -1072,7 +1257,7 @@ 0 1 - _riskLabel + _gameStatus 1 @@ -1082,7 +1267,7 @@ Resizable 1 - wxALIGN_CENTER_HORIZONTAL + ; ; forward_declare 0 @@ -1092,263 +1277,130 @@ -1 - - 5 - wxALIGN_CENTER_HORIZONTAL - 0 - - - bSizerGameStatus - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Game status: - 0 - - 0 - - - 0 - - 1 - _gameStatusLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - wxSYS_COLOUR_CAPTIONTEXT - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - not running - 0 - - 0 - - - 0 - - 1 - _gameStatus - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - This version of the application was tested on M.A.S.S. Builder early access version 0.3.7. It may or may not work with other versions of the game. Made for the M.A.S.S. Builder community by Guillaume Jacquemin. - 0 - - 0 - - - 0 - - 1 - _aboutText - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_CENTER_HORIZONTAL - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - - wxID_ANY - https://github.com/williamjcm/wxMASSManager - - 0 - - - 0 - - 1 - _githubLink - - 1 - - - protected - 1 - - Resizable - 1 - - wxHL_DEFAULT_STYLE - ; ; forward_declare - 0 - - https://github.com/williamjcm/wxMASSManager - - - - - - + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + This version of the application was tested on M.A.S.S. Builder early access version 0.3.7. It may or may not work with other versions of the game. Made for the M.A.S.S. Builder community by Guillaume Jacquemin. + 0 + + 0 + + + 0 + + 1 + _aboutText + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_CENTER_HORIZONTAL + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + + wxID_ANY + https://github.com/williamjcm/wxMASSManager + + 0 + + + 0 + + 1 + _githubLink + + 1 + + + protected + 1 + + Resizable + 1 + + wxHL_DEFAULT_STYLE + ; ; forward_declare + 0 + + https://github.com/williamjcm/wxMASSManager + + + + diff --git a/GUI/MainFrame.h b/GUI/MainFrame.h index 1b4e1ba..86dead8 100644 --- a/GUI/MainFrame.h +++ b/GUI/MainFrame.h @@ -22,10 +22,10 @@ #include #include #include -#include -#include #include #include +#include +#include #include #include @@ -40,6 +40,7 @@ class MainFrame : public wxFrame private: protected: + wxPanel* _mainPanel; wxSimplebook* _managerBook; wxPanel* _massPanel; wxListView* _installedListView;