epicalert/facecam2d
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add cancel button and rename OK to apply

Browse source
This commit is contained in:
Epicalert 2021-07-02 03:10:37 +08:00
parent d18f9d3162
commit dbd3afb6fe
No known key found for this signature in database
GPG key ID: CAA46F858D0979BD
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/fc2dconfig.cpp
View file

@ -22,6 +22,7 @@ class ConfigurationFrame : public wxFrame {
std::vector<std::string> modelVec; std::vector<std::string> modelVec;
wxCheckBox* useHaarCheckBox; wxCheckBox* useHaarCheckBox;
wxChoice* modelNameChoice; wxChoice* modelNameChoice;
void OnApply(wxCommandEvent& event);
void OnExit(wxCommandEvent& event); void OnExit(wxCommandEvent& event);
}; };
@ -55,21 +56,27 @@ ConfigurationFrame::ConfigurationFrame() : wxFrame(NULL, wxID_ANY, "Configure "
modelNameChoice = new wxChoice(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, modelVec.size(), modelArray); modelNameChoice = new wxChoice(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, modelVec.size(), modelArray);
// TODO: cancel button to exit without saving settings // TODO: cancel button to exit without saving settings
wxButton* okButton = new wxButton(panel, wxID_OK, "OK"); wxButton* cancelButton = new wxButton(panel, wxID_CANCEL, "Cancel");
wxButton* applyButton = new wxButton(panel, wxID_APPLY, "Apply settings");
wxBoxSizer* bottomButtonSizer = new wxBoxSizer(wxHORIZONTAL);
bottomButtonSizer->Add(cancelButton, 0, wxALL, 5);
bottomButtonSizer->Add(applyButton, 0, wxALL, 5);
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
sizer->Add(placeholderText, 0, wxALL | wxALIGN_LEFT, 10); sizer->Add(placeholderText, 0, wxALL | wxALIGN_LEFT, 10);
sizer->Add(useHaarCheckBox, 0, wxALL | wxALIGN_LEFT, 5); sizer->Add(useHaarCheckBox, 0, wxALL | wxALIGN_LEFT, 5);
sizer->Add(modelNameChoice, 0, wxALL | wxALIGN_LEFT, 5); sizer->Add(modelNameChoice, 0, wxALL | wxALIGN_LEFT, 5);
sizer->AddStretchSpacer(1); sizer->AddStretchSpacer(1);
sizer->Add(okButton, 0, wxALIGN_RIGHT | wxALL, 10); sizer->Add(bottomButtonSizer, 0, wxALIGN_RIGHT | wxALL, 10);
panel->SetSizerAndFit(sizer); panel->SetSizerAndFit(sizer);
Bind(wxEVT_BUTTON, &ConfigurationFrame::OnExit, this, wxID_OK); Bind(wxEVT_BUTTON, &ConfigurationFrame::OnApply, this, wxID_APPLY);
Bind(wxEVT_BUTTON, &ConfigurationFrame::OnExit, this, wxID_CANCEL);
} }
void ConfigurationFrame::OnExit(wxCommandEvent& event) { void ConfigurationFrame::OnApply(wxCommandEvent& event) {
// write options to config file // write options to config file
std::ofstream configFile; std::ofstream configFile;
configFile.open(prefixCustom + "config.toml"); configFile.open(prefixCustom + "config.toml");
@ -83,3 +90,7 @@ void ConfigurationFrame::OnExit(wxCommandEvent& event) {
Close(true); Close(true);
} }
void ConfigurationFrame::OnExit(wxCommandEvent& event) {
Close(true);
}