diff --git a/UserInterface/ControlManager.cxx b/UserInterface/ControlManager.cxx index 3fb9ea5..98f64b9 100644 --- a/UserInterface/ControlManager.cxx +++ b/UserInterface/ControlManager.cxx @@ -2,6 +2,7 @@ ControlManager::ControlManager(wxWindow* parent) : parent_(parent), header_(nullptr), local_(nullptr) { + Init(); } void ControlManager::Init() diff --git a/UserInterface/ControlManager.h b/UserInterface/ControlManager.h index 1b13127..ca76f12 100644 --- a/UserInterface/ControlManager.h +++ b/UserInterface/ControlManager.h @@ -11,11 +11,13 @@ public: ControlManager(wxWindow* parent); ~ControlManager() = default; -public: +private: void Init(); -public: +private: wxWindow* parent_; + +public: HeaderControl* header_; LocalControl* local_; }; diff --git a/UserInterface/HeaderControl.cxx b/UserInterface/HeaderControl.cxx index d547e9d..06cf3f2 100644 --- a/UserInterface/HeaderControl.cxx +++ b/UserInterface/HeaderControl.cxx @@ -1,9 +1,29 @@ #include "HeaderControl.h" +#include "InterfaceDefine.hpp" HeaderControl::HeaderControl(wxWindow* parent) : wxPanel(parent) { + Init(); } HeaderControl::~HeaderControl() { } + +void HeaderControl::Init() +{ + auto* topSizer = new wxBoxSizer(wxHORIZONTAL); + + textIP_ = new wxTextCtrl(this, wxID_ANY); + textPort_ = new wxTextCtrl(this, wxID_ANY); + btnConnect_ = new wxButton(this, wxID_ANY, _("Connect")); + btnDisconnect_ = new wxButton(this, wxID_ANY, _("Disconnect")); + + topSizer->Add(textIP_, 0, wxALL, gBorder); + topSizer->Add(textPort_, 0, wxALL, gBorder); + topSizer->Add(btnConnect_, 0, wxALL, gBorder); + topSizer->Add(btnDisconnect_, 0, wxALL, gBorder); + + SetSizer(topSizer); + Layout(); +} \ No newline at end of file diff --git a/UserInterface/HeaderControl.h b/UserInterface/HeaderControl.h index 3a2aff7..baa7dfd 100644 --- a/UserInterface/HeaderControl.h +++ b/UserInterface/HeaderControl.h @@ -8,6 +8,15 @@ class HeaderControl : public wxPanel public: HeaderControl(wxWindow* parent); ~HeaderControl() override; + +private: + void Init(); + +public: + wxTextCtrl* textIP_; + wxTextCtrl* textPort_; + wxButton* btnConnect_; + wxButton* btnDisconnect_; }; #endif // HEADERCONTROL_H \ No newline at end of file diff --git a/UserInterface/InterfaceDefine.hpp b/UserInterface/InterfaceDefine.hpp new file mode 100644 index 0000000..a646ac8 --- /dev/null +++ b/UserInterface/InterfaceDefine.hpp @@ -0,0 +1,6 @@ +#ifndef INTERFACEDEFINE_HPP +#define INTERFACEDEFINE_HPP + +#define gBorder (5) + +#endif // INTERFACEDEFINE_HPP \ No newline at end of file diff --git a/UserInterface/UserInterface.cxx b/UserInterface/UserInterface.cxx index f32f3b0..c799809 100644 --- a/UserInterface/UserInterface.cxx +++ b/UserInterface/UserInterface.cxx @@ -16,10 +16,10 @@ void UserInterface::InitUI() { // Add Panel controlMgr_ = std::make_shared(this); - controlMgr_->Init(); - mgr_.AddPane(controlMgr_->header_, wxAuiPaneInfo().Name("header").Caption("header")); - mgr_.AddPane(controlMgr_->local_, wxAuiPaneInfo().Name("local").Caption("local")); + mgr_.AddPane(controlMgr_->header_, + wxAuiPaneInfo().Name("header").Caption("header").CloseButton(false).Floatable(false).MinSize(-1, 40)); + mgr_.AddPane(controlMgr_->local_, wxAuiPaneInfo().Name("local").Caption("local").CloseButton(false).BestSize(300, 400)); // update mgr_.Update();