diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/MainWindow.cpp | 53 | ||||
| -rw-r--r-- | src/MainWindow.hpp | 1 | ||||
| -rw-r--r-- | src/config.h.in | 2 | ||||
| -rw-r--r-- | src/gui.cpp | 37 | ||||
| -rw-r--r-- | src/gui.h | 32 | ||||
| -rw-r--r-- | tools/wxFrameBuilder.fbp | 284 |
7 files changed, 376 insertions, 36 deletions
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> 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> 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 ); @@ -19,24 +19,25 @@ #include <wx/aui/auibook.h> #include <wx/sizer.h> #include <wx/frame.h> -#include <wx/stattext.h> -#include <wx/button.h> +#include <wx/richtext/richtextctrl.h> +#include <wx/panel.h> #include <wx/bitmap.h> #include <wx/image.h> #include <wx/icon.h> +#include <wx/notebook.h> +#include <wx/dialog.h> +#include <wx/stattext.h> +#include <wx/button.h> #include <wx/spinctrl.h> #include <wx/listctrl.h> -#include <wx/dialog.h> #include <wx/listbox.h> #include <wx/textctrl.h> #include <wx/statline.h> #include <wx/propgrid/propgrid.h> #include <wx/propgrid/advprops.h> -#include <wx/panel.h> #include <wx/clrpicker.h> #include <wx/checkbox.h> #include <wx/splitter.h> -#include <wx/notebook.h> #include <wx/toolbar.h> #include <wx/bmpbuttn.h> #include <wx/combobox.h> @@ -80,6 +81,7 @@ class MainFrame : public wxFrame wxMenu* menu_game; wxMenu* menu_db; wxMenu* menu_engine; + wxMenu* menu_help; wxStatusBar* status_bar; public: @@ -92,6 +94,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 /////////////////////////////////////////////////////////////////////////////// class DialogLiveEngine : public wxDialog 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 @@ <property name="window_name"></property> <property name="window_style">wxTAB_TRAVERSAL</property> <property name="xrc_skip_sizer">1</property> - <object class="wxMenuBar" expanded="0"> + <object class="wxMenuBar" expanded="1"> <property name="bg"></property> <property name="context_help"></property> <property name="context_menu">1</property> @@ -98,6 +98,11 @@ <property name="name">menu_engine</property> <property name="permission">protected</property> </object> + <object class="wxMenu" expanded="1"> + <property name="label">Help</property> + <property name="name">menu_help</property> + <property name="permission">protected</property> + </object> </object> <object class="wxStatusBar" expanded="0"> <property name="bg"></property> @@ -122,7 +127,7 @@ <property name="window_name"></property> <property name="window_style"></property> </object> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">main_sizer</property> <property name="orient">wxVERTICAL</property> @@ -202,6 +207,225 @@ <property name="fg"></property> <property name="font"></property> <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="maximum_size"></property> + <property name="minimum_size"></property> + <property name="name">DialogAbout</property> + <property name="pos"></property> + <property name="size">600,400</property> + <property name="style">wxDEFAULT_DIALOG_STYLE</property> + <property name="subclass">; ; forward_declare</property> + <property name="title"></property> + <property name="tooltip"></property> + <property name="two_step_creation">0</property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">main_sizer</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND | wxALL</property> + <property name="proportion">1</property> + <object class="wxNotebook" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="bitmapsize"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">m_notebook3</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style"></property> + <object class="notebookpage" expanded="1"> + <property name="bitmap"></property> + <property name="label">Info</property> + <property name="select">0</property> + <object class="wxPanel" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">info_panel</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">protected</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxTAB_TRAVERSAL</property> + <object class="wxBoxSizer" expanded="1"> + <property name="minimum_size"></property> + <property name="name">info_sizer</property> + <property name="orient">wxVERTICAL</property> + <property name="permission">none</property> + <object class="sizeritem" expanded="1"> + <property name="border">5</property> + <property name="flag">wxEXPAND | wxALL</property> + <property name="proportion">1</property> + <object class="wxRichTextCtrl" expanded="1"> + <property name="BottomDockable">1</property> + <property name="LeftDockable">1</property> + <property name="RightDockable">1</property> + <property name="TopDockable">1</property> + <property name="aui_layer"></property> + <property name="aui_name"></property> + <property name="aui_position"></property> + <property name="aui_row"></property> + <property name="best_size"></property> + <property name="bg"></property> + <property name="caption"></property> + <property name="caption_visible">1</property> + <property name="center_pane">0</property> + <property name="close_button">1</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="default_pane">0</property> + <property name="dock">Dock</property> + <property name="dock_fixed">0</property> + <property name="docking">Left</property> + <property name="enabled">1</property> + <property name="fg"></property> + <property name="floatable">1</property> + <property name="font"></property> + <property name="gripper">0</property> + <property name="hidden">0</property> + <property name="id">wxID_ANY</property> + <property name="max_size"></property> + <property name="maximize_button">0</property> + <property name="maximum_size"></property> + <property name="min_size"></property> + <property name="minimize_button">0</property> + <property name="minimum_size"></property> + <property name="moveable">1</property> + <property name="name">info_richtext</property> + <property name="pane_border">1</property> + <property name="pane_position"></property> + <property name="pane_size"></property> + <property name="permission">public</property> + <property name="pin_button">1</property> + <property name="pos"></property> + <property name="resize">Resizable</property> + <property name="show">1</property> + <property name="size"></property> + <property name="style">wxTE_READONLY</property> + <property name="subclass">; ; forward_declare</property> + <property name="toolbar_pane">0</property> + <property name="tooltip"></property> + <property name="validator_data_type"></property> + <property name="validator_style">wxFILTER_NONE</property> + <property name="validator_type">wxDefaultValidator</property> + <property name="validator_variable"></property> + <property name="value"></property> + <property name="window_extra_style"></property> + <property name="window_name"></property> + <property name="window_style">wxVSCROLL|wxHSCROLL|wxNO_BORDER|wxWANTS_CHARS</property> + </object> + </object> + </object> + </object> + </object> + </object> + </object> + </object> + </object> + <object class="Dialog" expanded="0"> + <property name="aui_managed">0</property> + <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> + <property name="bg"></property> + <property name="center">wxBOTH</property> + <property name="context_help"></property> + <property name="context_menu">1</property> + <property name="enabled">1</property> + <property name="event_handler">impl_virtual</property> + <property name="extra_style"></property> + <property name="fg"></property> + <property name="font"></property> + <property name="hidden">0</property> <property name="id">ID_LIVE_ENGINE_DIALOG</property> <property name="maximum_size"></property> <property name="minimum_size"></property> @@ -216,7 +440,7 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">main_sizer</property> <property name="orient">wxVERTICAL</property> @@ -437,20 +661,20 @@ </object> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">infos_sizer</property> <property name="orient">wxVERTICAL</property> <property name="permission">none</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">infos_sizer_row1</property> <property name="orient">wxHORIZONTAL</property> @@ -1844,7 +2068,7 @@ </object> </object> </object> - <object class="Panel" expanded="1"> + <object class="Panel" expanded="0"> <property name="aui_managed">0</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="bg"></property> @@ -1867,7 +2091,7 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style">wxTAB_TRAVERSAL</property> - <object class="wxGridSizer" expanded="1"> + <object class="wxGridSizer" expanded="0"> <property name="cols">2</property> <property name="hgap">0</property> <property name="minimum_size"></property> @@ -3720,7 +3944,7 @@ </object> </object> </object> - <object class="Panel" expanded="1"> + <object class="Panel" expanded="0"> <property name="aui_managed">0</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="bg"></property> @@ -3743,16 +3967,16 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style">wxTAB_TRAVERSAL</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">main_sizer</property> <property name="orient">wxVERTICAL</property> <property name="permission">protected</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">0</property> - <object class="wxToolBar" expanded="1"> + <object class="wxToolBar" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -3810,20 +4034,20 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">bar_sizer</property> <property name="orient">wxHORIZONTAL</property> <property name="permission">none</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBitmapButton" expanded="1"> + <object class="wxBitmapButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -3892,11 +4116,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBitmapButton" expanded="1"> + <object class="wxBitmapButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -3965,11 +4189,11 @@ <property name="window_style"></property> </object> </object> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxBitmapButton" expanded="1"> + <object class="wxBitmapButton" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -4106,7 +4330,7 @@ </object> </object> </object> - <object class="Panel" expanded="1"> + <object class="Panel" expanded="0"> <property name="aui_managed">0</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="bg"></property> @@ -4129,16 +4353,16 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style">wxTAB_TRAVERSAL</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">main_sizer</property> <property name="orient">wxVERTICAL</property> <property name="permission">none</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxEXPAND | wxALL</property> <property name="proportion">1</property> - <object class="wxNotebook" expanded="1"> + <object class="wxNotebook" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -4191,11 +4415,11 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style"></property> - <object class="notebookpage" expanded="1"> + <object class="notebookpage" expanded="0"> <property name="bitmap"></property> <property name="label">Editor</property> <property name="select">0</property> - <object class="wxPanel" expanded="1"> + <object class="wxPanel" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> @@ -4246,16 +4470,16 @@ <property name="window_extra_style"></property> <property name="window_name"></property> <property name="window_style">wxTAB_TRAVERSAL</property> - <object class="wxBoxSizer" expanded="1"> + <object class="wxBoxSizer" expanded="0"> <property name="minimum_size"></property> <property name="name">editor_page_sizer</property> <property name="orient">wxVERTICAL</property> <property name="permission">protected</property> - <object class="sizeritem" expanded="1"> + <object class="sizeritem" expanded="0"> <property name="border">5</property> <property name="flag">wxALL|wxEXPAND</property> <property name="proportion">0</property> - <object class="wxTextCtrl" expanded="1"> + <object class="wxTextCtrl" expanded="0"> <property name="BottomDockable">1</property> <property name="LeftDockable">1</property> <property name="RightDockable">1</property> |