diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dbfe5b..f14f27a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,13 @@ cmake_minimum_required(VERSION 3.10) project(ochess VERSION 0.0.0) # wxWidgets -find_package(wxWidgets COMPONENTS net gl core base adv aui propgrid REQUIRED) +find_package(wxWidgets COMPONENTS net gl core base adv aui propgrid richtext REQUIRED) include(${wxWidgets_USE_FILE}) # Ochess include_directories(src) file(GLOB_RECURSE CPP_FILES src/*.cpp) +string(TIMESTAMP BUILD_TIME "%Y-%m-%d %H:%M") configure_file(${CMAKE_SOURCE_DIR}/src/config.h.in ${CMAKE_BINARY_DIR}/config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) # Enable access to config.h add_executable(ochess ${CPP_FILES}) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 3a67975..c11e25b 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -43,6 +43,8 @@ MainWindow::MainWindow() wxCommandEvent dummy(REFRESH_ENGINE_LIST, GetId()); OnRefreshEngineList(dummy); + menu_help->Append(8, "About", "OChess Informations"); + Bind(wxEVT_AUINOTEBOOK_PAGE_CHANGED, &MainWindow::OnPageChange, this, wxID_ANY); Bind(REFRESH_TAB_TITLE, &MainWindow::OnRefreshTabTitle, this, wxID_ANY); @@ -171,6 +173,8 @@ void MainWindow::OnMenuItemClick(wxCommandEvent &event) { } } else if (id == 7) { // Create new engine NewEngine(); + } else if (id == 8) { // Create new engine + ShowAbout(); } } @@ -278,3 +282,52 @@ TabInfos* MainWindow::NewGame(std::shared_ptr game) { this->AddPage(gt,gt); return(gt); } + +void MainWindow::ShowAbout(){ + DialogAbout *dialog=new DialogAbout(this); + wxRichTextCtrl *t=dialog->info_richtext; + + // Populate info: + wxFont font(wxFontInfo(12)); + t->SetFont(font); + t->BeginAlignment(wxTEXT_ALIGNMENT_CENTRE); + t->BeginBold(); + t->BeginFontSize(20); + t->WriteText(wxT("OChess")); + t->EndFontSize(); + t->Newline(); + t->EndBold(); + t->WriteText(wxT("An open source software for chess games analysis and database management.")); + 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))); + t->EndFontSize(); + t->Newline(); + t->Newline(); + t->WriteText("Repository:"); + t->Newline(); + t->BeginURL("https://gitlab.com/manzerbredes/ochess"); + t->BeginUnderline(); + t->WriteText(wxT("https://gitlab.com/manzerbredes/ochess")); + t->EndUnderline(); + t->EndURL(); + t->Newline(); + t->Newline(); + t->BeginFontSize(10); + t->WriteText("For any questions/discussion please join the IRC chat at "); + t->BeginURL("irc://irc.libera.chat/ochess"); + t->BeginUnderline(); + t->WriteText(wxT("irc://irc.libera.chat/ochess")); + t->EndUnderline(); + t->EndURL(); + t->EndFontSize(); + t->Newline(); + t->EndAlignment(); + + dialog->Show(); +} \ No newline at end of file diff --git a/src/MainWindow.hpp b/src/MainWindow.hpp index b8025aa..8c541dd 100644 --- a/src/MainWindow.hpp +++ b/src/MainWindow.hpp @@ -31,6 +31,7 @@ class MainWindow : public MainFrame { void OnAuiNotebookPageCheck(wxAuiNotebookEvent& event); void OnCloseTabLinkedTo(wxCommandEvent &event); void AddPage(wxWindow* window, TabInfos* infos); + void ShowAbout(); public: MainWindow(); TabInfos* NewGame(std::shared_ptr game); diff --git a/src/config.h.in b/src/config.h.in index b00a11d..4c4ac80 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -3,3 +3,5 @@ #define OCHESS_MINOR "@PROJECT_VERSION_MINOR@" #define OCHESS_PATCH "@PROJECT_VERSION_PATCH@" #define OCHESS_TWEAK "@PROJECT_VERSION_TWEAK@" + +#define BUILD_TIME "@BUILD_TIME@" diff --git a/src/gui.cpp b/src/gui.cpp index b3d564b..d427211 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -26,6 +26,9 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co menu_engine = new wxMenu(); menu_bar->Append( menu_engine, wxT("Engine") ); + menu_help = new wxMenu(); + menu_bar->Append( menu_help, wxT("Help") ); + this->SetMenuBar( menu_bar ); status_bar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY ); @@ -47,6 +50,40 @@ MainFrame::~MainFrame() { } +DialogAbout::DialogAbout( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* main_sizer; + main_sizer = new wxBoxSizer( wxVERTICAL ); + + m_notebook3 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + info_panel = new wxPanel( m_notebook3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* info_sizer; + info_sizer = new wxBoxSizer( wxVERTICAL ); + + info_richtext = new wxRichTextCtrl( info_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS ); + info_sizer->Add( info_richtext, 1, wxEXPAND | wxALL, 5 ); + + + info_panel->SetSizer( info_sizer ); + info_panel->Layout(); + info_sizer->Fit( info_panel ); + m_notebook3->AddPage( info_panel, wxT("Info"), false ); + + main_sizer->Add( m_notebook3, 1, wxEXPAND | wxALL, 5 ); + + + this->SetSizer( main_sizer ); + this->Layout(); + + this->Centre( wxBOTH ); +} + +DialogAbout::~DialogAbout() +{ +} + DialogLiveEngine::DialogLiveEngine( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); diff --git a/src/gui.h b/src/gui.h index 0b1aef6..576b4b2 100644 --- a/src/gui.h +++ b/src/gui.h @@ -19,24 +19,25 @@ #include #include #include -#include -#include +#include +#include #include #include #include +#include +#include +#include +#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include #include #include @@ -80,6 +81,7 @@ class MainFrame : public wxFrame wxMenu* menu_game; wxMenu* menu_db; wxMenu* menu_engine; + wxMenu* menu_help; wxStatusBar* status_bar; public: @@ -91,6 +93,26 @@ class MainFrame : public wxFrame }; +/////////////////////////////////////////////////////////////////////////////// +/// Class DialogAbout +/////////////////////////////////////////////////////////////////////////////// +class DialogAbout : public wxDialog +{ + private: + + protected: + wxNotebook* m_notebook3; + wxPanel* info_panel; + + public: + wxRichTextCtrl* info_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 ); + + ~DialogAbout(); + +}; + /////////////////////////////////////////////////////////////////////////////// /// Class DialogLiveEngine /////////////////////////////////////////////////////////////////////////////// diff --git a/tools/wxFrameBuilder.fbp b/tools/wxFrameBuilder.fbp index 4d69b71..8062d15 100644 --- a/tools/wxFrameBuilder.fbp +++ b/tools/wxFrameBuilder.fbp @@ -57,7 +57,7 @@ wxTAB_TRAVERSAL 1 - + 1 @@ -98,6 +98,11 @@ menu_engine protected + + Help + menu_help + protected + @@ -122,7 +127,7 @@ - + main_sizer wxVERTICAL @@ -190,6 +195,225 @@ + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DialogAbout + + 600,400 + wxDEFAULT_DIALOG_STYLE + ; ; forward_declare + + + 0 + + + + + + main_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 + m_notebook3 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + + + Info + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + info_panel + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + info_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 + info_richtext + 1 + + + public + 1 + + Resizable + 1 + + wxTE_READONLY + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS + + + + + + + + + + 0 wxAUI_MGR_DEFAULT @@ -216,7 +440,7 @@ - + main_sizer wxVERTICAL @@ -437,20 +661,20 @@ - + 5 wxEXPAND 0 - + infos_sizer wxVERTICAL none - + 5 wxEXPAND 0 - + infos_sizer_row1 wxHORIZONTAL @@ -1844,7 +2068,7 @@ - + 0 wxAUI_MGR_DEFAULT @@ -1867,7 +2091,7 @@ wxTAB_TRAVERSAL - + 2 0 @@ -3720,7 +3944,7 @@ - + 0 wxAUI_MGR_DEFAULT @@ -3743,16 +3967,16 @@ wxTAB_TRAVERSAL - + main_sizer wxVERTICAL protected - + 5 wxEXPAND 0 - + 1 1 1 @@ -3810,20 +4034,20 @@ - + 5 wxEXPAND 0 - + bar_sizer wxHORIZONTAL none - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -3892,11 +4116,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -3965,11 +4189,11 @@ - + 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -4106,7 +4330,7 @@ - + 0 wxAUI_MGR_DEFAULT @@ -4129,16 +4353,16 @@ wxTAB_TRAVERSAL - + main_sizer wxVERTICAL none - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -4191,11 +4415,11 @@ - + Editor 0 - + 1 1 1 @@ -4246,16 +4470,16 @@ wxTAB_TRAVERSAL - + editor_page_sizer wxVERTICAL protected - + 5 wxALL|wxEXPAND 0 - + 1 1 1