diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game_tab/left_panel/GameTabLeftPanel.cpp | 26 | ||||
| -rw-r--r-- | src/game_tab/left_panel/GameTabLeftPanel.hpp | 3 | ||||
| -rw-r--r-- | src/gui.cpp | 31 | ||||
| -rw-r--r-- | src/gui.h | 35 |
4 files changed, 71 insertions, 24 deletions
diff --git a/src/game_tab/left_panel/GameTabLeftPanel.cpp b/src/game_tab/left_panel/GameTabLeftPanel.cpp index 79894d0..bc33d33 100644 --- a/src/game_tab/left_panel/GameTabLeftPanel.cpp +++ b/src/game_tab/left_panel/GameTabLeftPanel.cpp @@ -2,24 +2,16 @@ #include <wx/clipbrd.h> GameTabLeftPanel::GameTabLeftPanel(wxFrame *parent, Game *game) - : wxPanel(parent), game(game) { + : TabGameLeftPanel(parent), game(game) { - wxBoxSizer *board_panel_sizer = new wxBoxSizer(wxVERTICAL); + // Add board board_canvas = new BoardCanvas((wxFrame *)this); - board_panel_sizer->Add(board_canvas, 1, wxEXPAND); + main_sizer->Insert(0, board_canvas, 1, wxEXPAND); - // Left Panel buttons - wxBoxSizer *board_panel_button_sizer = new wxBoxSizer(wxHORIZONTAL); - board_panel_button_sizer->Add( - new wxBitmapButton(this, SWAP_BTN, LoadPNG("swap")), 0); - board_panel_button_sizer->Add( - new wxBitmapButton(this, ZOOM_IN_BTN, LoadPNG("zoomin")), 0); - board_panel_button_sizer->Add( - new wxBitmapButton(this, ZOOM_OUT_BTN, LoadPNG("zoomout")), 0); - board_panel_button_sizer->Add(new wxButton(this, COPY_FEN_BTN, L"Copy FEN"), - 0, wxEXPAND); - board_panel_sizer->Add(board_panel_button_sizer, 0); - this->SetSizer(board_panel_sizer); + // Configure buttons + swap_button->SetBitmapLabel(LoadPNG("swap")); + zoomin_button->SetBitmapLabel(LoadPNG("zoomin")); + zoomout_button->SetBitmapLabel(LoadPNG("zoomout")); Bind(PLAY_MOVE_EVENT, &GameTabLeftPanel::OnPlay, this, wxID_ANY); Bind(PREVIOUS_MOVE_EVENT, &GameTabLeftPanel::OnPreviousMove, this, wxID_ANY); @@ -91,6 +83,4 @@ void GameTabLeftPanel::NotifyEditor() { ProcessEvent(previousEvent); } -void GameTabLeftPanel::ApplyPreferences() { - board_canvas->ApplyPreferences(); -} +void GameTabLeftPanel::ApplyPreferences() { board_canvas->ApplyPreferences(); } diff --git a/src/game_tab/left_panel/GameTabLeftPanel.hpp b/src/game_tab/left_panel/GameTabLeftPanel.hpp index 85b1e6e..d2ad3f1 100644 --- a/src/game_tab/left_panel/GameTabLeftPanel.hpp +++ b/src/game_tab/left_panel/GameTabLeftPanel.hpp @@ -7,9 +7,8 @@ // Foreign events wxDECLARE_EVENT(GAME_CHANGE, wxCommandEvent); -enum { COPY_FEN_BTN = wxID_HIGHEST + 1, ZOOM_IN_BTN, ZOOM_OUT_BTN, SWAP_BTN }; -class GameTabLeftPanel : public wxPanel { +class GameTabLeftPanel : public TabGameLeftPanel { Game *game; BoardCanvas *board_canvas; void NotifyEditor(); diff --git a/src/gui.cpp b/src/gui.cpp index 6d76c61..9091001 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -421,6 +421,37 @@ TabBase::~TabBase() { } +TabGameLeftPanel::TabGameLeftPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + main_sizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bar_sizer; + bar_sizer = new wxBoxSizer( wxHORIZONTAL ); + + swap_button = new wxBitmapButton( this, SWAP_BTN, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + bar_sizer->Add( swap_button, 0, wxALL|wxEXPAND, 5 ); + + zoomin_button = new wxBitmapButton( this, ZOOM_IN_BTN, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + bar_sizer->Add( zoomin_button, 0, wxALL|wxEXPAND, 5 ); + + zoomout_button = new wxBitmapButton( this, ZOOM_OUT_BTN, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + bar_sizer->Add( zoomout_button, 0, wxALL|wxEXPAND, 5 ); + + copy_fen_button = new wxButton( this, COPY_FEN_BTN, wxT("Copy FEN"), wxDefaultPosition, wxDefaultSize, 0 ); + bar_sizer->Add( copy_fen_button, 0, wxALL|wxEXPAND, 5 ); + + + main_sizer->Add( bar_sizer, 0, wxEXPAND, 5 ); + + + this->SetSizer( main_sizer ); + this->Layout(); +} + +TabGameLeftPanel::~TabGameLeftPanel() +{ +} + TabGameRightPanel::TabGameRightPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* main_sizer; @@ -36,6 +36,7 @@ #include <wx/clrpicker.h> #include <wx/checkbox.h> #include <wx/splitter.h> +#include <wx/bmpbuttn.h> #include <wx/notebook.h> /////////////////////////////////////////////////////////////////////////// @@ -49,10 +50,14 @@ #define ID_EXPORT_BUTTON 1006 #define ID_IMPORT_BUTTON 1007 #define ID_DELETE_BUTTON 1008 -#define COMMENT_INPUT_BOX 1009 -#define UPDATE_BTN 1010 -#define DELETE_BTN 1011 -#define LIVE_ANALYSIS_GAME_BUTTON 1012 +#define SWAP_BTN 1009 +#define ZOOM_IN_BTN 1010 +#define ZOOM_OUT_BTN 1011 +#define COPY_FEN_BTN 1012 +#define COMMENT_INPUT_BOX 1013 +#define UPDATE_BTN 1014 +#define DELETE_BTN 1015 +#define LIVE_ANALYSIS_GAME_BUTTON 1016 /////////////////////////////////////////////////////////////////////////////// /// Class MainFrame @@ -244,6 +249,28 @@ class TabBase : public wxPanel }; /////////////////////////////////////////////////////////////////////////////// +/// Class TabGameLeftPanel +/////////////////////////////////////////////////////////////////////////////// +class TabGameLeftPanel : public wxPanel +{ + private: + + protected: + wxBoxSizer* main_sizer; + wxBitmapButton* swap_button; + wxBitmapButton* zoomin_button; + wxBitmapButton* zoomout_button; + wxButton* copy_fen_button; + + public: + + TabGameLeftPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + + ~TabGameLeftPanel(); + +}; + +/////////////////////////////////////////////////////////////////////////////// /// Class TabGameRightPanel /////////////////////////////////////////////////////////////////////////////// class TabGameRightPanel : public wxPanel |