loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improved user input handling with validators.

Browse Source
This commit is contained in:
WrinklyNinja
2013-10-11 15:48:14 +01:00
parent f825ccbd3e
commit 084f467642
2 changed files with 22 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/editor.cpp
+17 -84
View File
@@ -416,16 +416,6 @@ void Editor::OnAddRow(wxCommandEvent& event) {
return;
}
if (rowDialog->GetName().empty()) {
BOOST_LOG_TRIVIAL(error) << "No filename specified. Row will not be added.";
wxMessageBox(
translate("Error: No filename specified. Row will not be added."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
}
wxListView * list;
if (listBook->GetSelection() == 0)
list = reqsList;
@@ -469,16 +459,6 @@ void Editor::OnAddRow(wxCommandEvent& event) {
return;
}
if (rowDialog->GetName().empty()) {
BOOST_LOG_TRIVIAL(error) << "No Bash Tag specified. Row will not be added.";
wxMessageBox(
translate("Error: No Bash Tag specified. Row will not be added."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
}
long i = tagsList->GetItemCount();
tagsList->InsertItem(i, rowDialog->GetState());
tagsList->SetItem(i, 1, rowDialog->GetName());
@@ -493,24 +473,6 @@ void Editor::OnAddRow(wxCommandEvent& event) {
return;
}
if (rowDialog->GetCRC().empty()) {
BOOST_LOG_TRIVIAL(error) << "No CRC specified. Row will not be added.";
wxMessageBox(
translate("Error: No CRC specified. Row will not be added."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
} else if (rowDialog->GetUtility().empty()) {
BOOST_LOG_TRIVIAL(error) << "No cleaning utility specified. Row will not be added.";
wxMessageBox(
translate("Error: No cleaning utility specified. Row will not be added."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
}
long i = tagsList->GetItemCount();
dirtyList->InsertItem(i, rowDialog->GetCRC());
dirtyList->SetItem(i, 1, FromUTF8(boss::IntToString(rowDialog->GetITMs())));
@@ -542,16 +504,6 @@ void Editor::OnEditRow(wxCommandEvent& event) {
return;
}
if (rowDialog->GetName().empty()) {
BOOST_LOG_TRIVIAL(error) << "No filename specified. Row will not be edited.";
wxMessageBox(
translate("Error: No filename specified. Row will not be edited."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
}
list->SetItem(i, 0, rowDialog->GetName());
list->SetItem(i, 1, rowDialog->GetDisplayName());
list->SetItem(i, 2, rowDialog->GetCondition());
@@ -598,16 +550,6 @@ void Editor::OnEditRow(wxCommandEvent& event) {
return;
}
if (rowDialog->GetName().empty()) {
BOOST_LOG_TRIVIAL(error) << "No Bash Tag specified. Row will not be edited.";
wxMessageBox(
translate("Error: No Bash Tag specified. Row will not be edited."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
}
tagsList->SetItem(i, 0, rowDialog->GetState());
tagsList->SetItem(i, 1, rowDialog->GetName());
tagsList->SetItem(i, 2, rowDialog->GetCondition());
@@ -628,24 +570,6 @@ void Editor::OnEditRow(wxCommandEvent& event) {
return;
}
if (rowDialog->GetCRC().empty()) {
BOOST_LOG_TRIVIAL(error) << "No CRC specified. Row will not be edited.";
wxMessageBox(
translate("Error: No CRC specified. Row will not be edited."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
} else if (rowDialog->GetUtility().empty()) {
BOOST_LOG_TRIVIAL(error) << "No cleaning utility specified. Row will not be edited.";
wxMessageBox(
translate("Error: No cleaning utility specified. Row will not be edited."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
}
dirtyList->SetItem(i, 0, rowDialog->GetCRC());
dirtyList->SetItem(i, 1, FromUTF8(boss::IntToString(rowDialog->GetITMs())));
dirtyList->SetItem(i, 2, FromUTF8(boss::IntToString(rowDialog->GetUDRs())));
@@ -994,7 +918,7 @@ boss::PluginDirtyInfo Editor::RowToPluginDirtyInfo(wxListView * list, long row)
FileEditDialog::FileEditDialog(wxWindow *parent, const wxString& title) : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
_name = new wxTextCtrl(this, wxID_ANY);
_name = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_EMPTY));
_display = new wxTextCtrl(this, wxID_ANY);
_condition = new wxTextCtrl(this, wxID_ANY);
@@ -1009,7 +933,7 @@ FileEditDialog::FileEditDialog(wxWindow *parent, const wxString& title) : wxDial
wxFlexGridSizer * GridSizer = new wxFlexGridSizer(2, 5, 5);
GridSizer->AddGrowableCol(1,1);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Filename:")), leftItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Filename (required):")), leftItem);
GridSizer->Add(_name, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Displayed Name:")), leftItem);
@@ -1130,6 +1054,8 @@ MessageEditDialog::MessageEditDialog(wxWindow *parent, const wxString& title) :
//Set defaults.
_type->SetSelection(0);
_language->SetSelection(0);
editBtn->Enable(false);
removeBtn->Enable(false);
SetBackgroundColour(wxColour(255,255,255));
SetIcon(wxIconLocation("BOSS.exe"));
@@ -1182,6 +1108,8 @@ boss::Message MessageEditDialog::GetMessage() const {
void MessageEditDialog::OnSelect(wxListEvent& event) {
_language->SetSelection(GetLangIndex(_content->GetItemText(event.GetIndex(), 0)));
_str->SetValue(_content->GetItemText(event.GetIndex(), 1));
editBtn->Enable(true);
removeBtn->Enable(true);
}
void MessageEditDialog::OnAdd(wxCommandEvent& event) {
@@ -1216,6 +1144,8 @@ void MessageEditDialog::OnRemove(wxCommandEvent& event) {
return;
}
_content->DeleteItem(_content->GetFirstSelected());
editBtn->Enable(false);
removeBtn->Enable(false);
}
TagEditDialog::TagEditDialog(wxWindow *parent, const wxString& title) : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
@@ -1223,7 +1153,7 @@ TagEditDialog::TagEditDialog(wxWindow *parent, const wxString& title) : wxDialog
//Initialise controls.
_state = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, State);
_name = new wxTextCtrl(this, wxID_ANY);
_name = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_EMPTY));
_condition = new wxTextCtrl(this, wxID_ANY);
wxSizerFlags leftItem(0);
@@ -1240,7 +1170,7 @@ TagEditDialog::TagEditDialog(wxWindow *parent, const wxString& title) : wxDialog
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Add/Remove:")), leftItem);
GridSizer->Add(_state, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Name:")), leftItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Name (required):")), leftItem);
GridSizer->Add(_name, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Condition:")), leftItem);
@@ -1285,11 +1215,14 @@ wxString TagEditDialog::GetCondition() const {
DirtInfoEditDialog::DirtInfoEditDialog(wxWindow * parent, const wxString& title) : wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) {
//Initialise controls.
wxTextValidator val(wxFILTER_EMPTY | wxFILTER_INCLUDE_CHAR_LIST);
val.SetCharIncludes("0123456789ABCDEFabcdef");
_itm = new wxSpinCtrl(this, wxID_ANY, "0");
_udr = new wxSpinCtrl(this, wxID_ANY, "0");
_nav = new wxSpinCtrl(this, wxID_ANY, "0");
_crc = new wxTextCtrl(this, wxID_ANY);
_utility = new wxTextCtrl(this, wxID_ANY);
_crc = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, val);
_utility = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_EMPTY));
wxSizerFlags leftItem(0);
leftItem.Left();
@@ -1302,7 +1235,7 @@ DirtInfoEditDialog::DirtInfoEditDialog(wxWindow * parent, const wxString& title)
wxFlexGridSizer * GridSizer = new wxFlexGridSizer(2, 5, 5);
GridSizer->AddGrowableCol(1,1);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("CRC:")), leftItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("CRC (required):")), leftItem);
GridSizer->Add(_crc, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("ITM Count:")), leftItem);
@@ -1314,7 +1247,7 @@ DirtInfoEditDialog::DirtInfoEditDialog(wxWindow * parent, const wxString& title)
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Deleted Navmesh Count:")), leftItem);
GridSizer->Add(_nav, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Cleaning Utility:")), leftItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Cleaning Utility (required):")), leftItem);
GridSizer->Add(_utility, rightItem);
bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 15);
src/gui/settings.cpp
+5 -21
View File
@@ -280,23 +280,7 @@ void SettingsFrame::OnAddGame(wxCommandEvent& event) {
if (rowDialog->ShowModal() == wxID_OK) {
if (rowDialog->GetName().empty()) {
BOOST_LOG_TRIVIAL(error) << "Tried to add a new game with no name given.";
wxMessageBox(
translate("Error: Name is required. Row will not be added."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
} else if (rowDialog->GetFolderName().empty()) {
BOOST_LOG_TRIVIAL(error) << "Tried to add a new game with no folder given.";
wxMessageBox(
translate("Error: Folder is required. Row will not be added."),
translate("BOSS: Error"),
wxOK | wxICON_ERROR,
this);
return;
} else if (rowDialog->GetPath().empty() && rowDialog->GetRegistryKey().empty()) {
if (rowDialog->GetPath().empty() && rowDialog->GetRegistryKey().empty()) {
BOOST_LOG_TRIVIAL(error) << "Tried to add a new game with no path or registry key given.";
wxMessageBox(
translate("Error: A path and/or registry key is required. Row will not be added."),
@@ -416,8 +400,8 @@ GameEditDialog::GameEditDialog(wxWindow *parent, const wxString& title) : wxDial
//Initialise controls.
_type = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 4, Types);
_name = new wxTextCtrl(this, wxID_ANY);
_folderName = new wxTextCtrl(this, wxID_ANY);
_name = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_EMPTY));
_folderName = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_EMPTY));
_master = new wxTextCtrl(this, wxID_ANY);
_url = new wxTextCtrl(this, wxID_ANY);
_path = new wxTextCtrl(this, wxID_ANY);
@@ -435,13 +419,13 @@ GameEditDialog::GameEditDialog(wxWindow *parent, const wxString& title) : wxDial
wxFlexGridSizer * GridSizer = new wxFlexGridSizer(2, 5, 5);
GridSizer->AddGrowableCol(1,1);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Name:")), leftItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Name (required):")), leftItem);
GridSizer->Add(_name, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Type:")), leftItem);
GridSizer->Add(_type, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("BOSS Folder Name:")), leftItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("BOSS Folder Name (required):")), leftItem);
GridSizer->Add(_folderName, rightItem);
GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Master File:")), leftItem);