From 3b9f2cfdbcf8653450c06a000e80958190edacf4 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Thu, 2 Feb 2023 10:28:12 +0100 Subject: [PATCH] Improve about dialog --- src/MainWindow.cpp | 17 ++- src/gui.cpp | 26 +++- src/gui.h | 7 +- tools/wxFrameBuilder.fbp | 302 ++++++++++++++++++++++++++++++++------- 4 files changed, 292 insertions(+), 60 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 00e375d..55f35f5 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -287,11 +287,13 @@ TabInfos* MainWindow::NewGame(std::shared_ptr game) { void MainWindow::ShowAbout(){ DialogAbout *dialog=new DialogAbout(this); - dialog->ochess_icon->SetBitmap(LoadPNG("ochess",wxSize(80,80))); + wxFont font(wxFontInfo(12)); + dialog->app_icon->SetBitmap(LoadPNG("ochess",wxSize(80,80))); + dialog->appname_text->SetFont(wxFont(wxFontInfo(18).Bold())); + dialog->appname_text->SetLabel(wxT("OChess v"+std::string(OCHESS_VERSION))); // Populate info: wxRichTextCtrl *t=dialog->info_richtext; - wxFont font(wxFontInfo(12)); t->SetFont(font); t->BeginAlignment(wxTEXT_ALIGNMENT_CENTRE); t->BeginBold(); @@ -304,8 +306,6 @@ void MainWindow::ShowAbout(){ t->Newline(); t->Newline(); t->BeginFontSize(8); - t->WriteText(wxT("OChess version "+std::string(OCHESS_VERSION))); - t->Newline(); t->WriteText(wxT("OChess is delivered under GPLv3 license")); t->Newline(); t->WriteText(wxT("Built on "+std::string(BUILD_TIME))); @@ -332,5 +332,14 @@ void MainWindow::ShowAbout(){ t->Newline(); t->EndAlignment(); + // Populate credits: + wxRichTextCtrl *c=dialog->credits_richtext; + c->SetFont(font); + c->BeginBold(); + c->WriteText("Developers:"); + c->EndBold(); + c->Newline(); + c->WriteText(" - manzerbredes "); + dialog->Show(); } \ No newline at end of file diff --git a/src/gui.cpp b/src/gui.cpp index df02581..d1fcda1 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -57,8 +57,18 @@ DialogAbout::DialogAbout( wxWindow* parent, wxWindowID id, const wxString& title wxBoxSizer* main_sizer; main_sizer = new wxBoxSizer( wxVERTICAL ); - ochess_icon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - main_sizer->Add( ochess_icon, 0, wxALL, 5 ); + wxBoxSizer* top_sizer; + top_sizer = new wxBoxSizer( wxHORIZONTAL ); + + app_icon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + top_sizer->Add( app_icon, 0, wxALL, 5 ); + + appname_text = new wxStaticText( this, wxID_ANY, wxT("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 ); + appname_text->Wrap( -1 ); + top_sizer->Add( appname_text, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + main_sizer->Add( top_sizer, 0, wxEXPAND, 5 ); m_notebook3 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); info_panel = new wxPanel( m_notebook3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); @@ -73,6 +83,18 @@ DialogAbout::DialogAbout( wxWindow* parent, wxWindowID id, const wxString& title info_panel->Layout(); info_sizer->Fit( info_panel ); m_notebook3->AddPage( info_panel, wxT("Info"), false ); + credits_panel = new wxPanel( m_notebook3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* credits_sizer; + credits_sizer = new wxBoxSizer( wxVERTICAL ); + + credits_richtext = new wxRichTextCtrl( credits_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS ); + credits_sizer->Add( credits_richtext, 1, wxEXPAND | wxALL, 5 ); + + + credits_panel->SetSizer( credits_sizer ); + credits_panel->Layout(); + credits_sizer->Fit( credits_panel ); + m_notebook3->AddPage( credits_panel, wxT("Credits"), false ); main_sizer->Add( m_notebook3, 1, wxEXPAND | wxALL, 5 ); diff --git a/src/gui.h b/src/gui.h index 4d197c5..54477ca 100644 --- a/src/gui.h +++ b/src/gui.h @@ -23,11 +23,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -104,10 +104,13 @@ class DialogAbout : public wxDialog protected: wxNotebook* m_notebook3; wxPanel* info_panel; + wxPanel* credits_panel; public: - wxStaticBitmap* ochess_icon; + wxStaticBitmap* app_icon; + wxStaticText* appname_text; wxRichTextCtrl* info_richtext; + wxRichTextCtrl* credits_richtext; DialogAbout( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_DIALOG_STYLE ); diff --git a/tools/wxFrameBuilder.fbp b/tools/wxFrameBuilder.fbp index f99e296..861d3be 100644 --- a/tools/wxFrameBuilder.fbp +++ b/tools/wxFrameBuilder.fbp @@ -228,60 +228,132 @@ none 5 - wxALL + wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 + - 1 - ochess_icon - 1 - - - public - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - + top_sizer + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + app_icon + 1 + + + public + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + MyLabel + 0 + + 0 + + + 0 + + 1 + appname_text + 1 + + + public + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + @@ -467,6 +539,132 @@ + + + Credits + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + credits_panel + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + credits_sizer + wxVERTICAL + none + + 5 + wxEXPAND | wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + credits_richtext + 1 + + + public + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS + + + + +