From 73aa7788409c9c48583dd03eecfd9991eaf144dd Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Thu, 19 Sep 2013 13:19:02 +0100 Subject: [PATCH] More interface tweaks (issue #23). --- src/gui/editor.cpp | 11 +++++++---- src/gui/main.cpp | 6 +++--- src/gui/settings.cpp | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/gui/editor.cpp b/src/gui/editor.cpp index de9e4481..b493cf8a 100644 --- a/src/gui/editor.cpp +++ b/src/gui/editor.cpp @@ -811,7 +811,7 @@ FileEditDialog::FileEditDialog(wxWindow *parent, const wxString& title) : wxDial GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Condition:")), leftItem); GridSizer->Add(_condition, rightItem); - bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 10); + bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 15); bigBox->AddSpacer(10); bigBox->AddStretchSpacer(1); @@ -876,7 +876,7 @@ MessageEditDialog::MessageEditDialog(wxWindow *parent, const wxString& title) : rightItem.Right(); wxSizerFlags wholeItem(0); - wholeItem.Expand().Border(wxLEFT|wxRIGHT|wxBOTTOM, 10); + wholeItem.Expand().Border(wxLEFT|wxRIGHT|wxBOTTOM, 15); wxBoxSizer * bigBox = new wxBoxSizer(wxVERTICAL); @@ -889,6 +889,8 @@ MessageEditDialog::MessageEditDialog(wxWindow *parent, const wxString& title) : GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Condition:")), leftItem); GridSizer->Add(_condition, rightItem); + bigBox->AddSpacer(15); + bigBox->Add(GridSizer, wholeItem); bigBox->Add(_content, wholeItem); @@ -908,7 +910,7 @@ MessageEditDialog::MessageEditDialog(wxWindow *parent, const wxString& title) : hbox->Add(addBtn, 0, wxRIGHT, 5); hbox->Add(editBtn, 0, wxLEFT|wxRIGHT, 5); hbox->Add(removeBtn, 0, wxLEFT, 5); - bigBox->Add(hbox, 0, wxALIGN_RIGHT|wxRIGHT, 10); + bigBox->Add(hbox, 0, wxALIGN_RIGHT|wxLEFT|wxRIGHT, 15); bigBox->AddSpacer(10); bigBox->AddStretchSpacer(1); @@ -920,6 +922,7 @@ MessageEditDialog::MessageEditDialog(wxWindow *parent, const wxString& title) : //Set defaults. _type->SetSelection(0); + _language->SetSelection(0); SetBackgroundColour(wxColour(255,255,255)); SetIcon(wxIconLocation("BOSS.exe")); @@ -1034,7 +1037,7 @@ TagEditDialog::TagEditDialog(wxWindow *parent, const wxString& title) : wxDialog GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Condition:")), leftItem); GridSizer->Add(_condition, rightItem); - bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 10); + bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 15); bigBox->AddSpacer(10); bigBox->AddStretchSpacer(1); diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 30eff073..7dac0547 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -1037,14 +1037,14 @@ LoadOrderPreview::LoadOrderPreview(wxWindow *parent, const wxString title, const //Set up layout. wxBoxSizer * bigBox = new wxBoxSizer(wxVERTICAL); - bigBox->Add(_loadOrder, 1, wxEXPAND|wxALL, 10); + bigBox->Add(_loadOrder, 1, wxEXPAND|wxALL, 15); wxBoxSizer * hbox = new wxBoxSizer(wxHORIZONTAL); hbox->Add(_moveUp, 0, wxRIGHT, 5); hbox->Add(_moveDown, 0, wxLEFT, 5); - bigBox->Add(hbox, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 10); + bigBox->Add(hbox, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 15); - bigBox->Add(new wxStaticText(this, wxID_ANY, translate("Please submit any alterations made for reasons other than user preference \nto the BOSS team so that they may include the changes in the masterlist.")), 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 10); + bigBox->Add(new wxStaticText(this, wxID_ANY, translate("Please submit any alterations made for reasons other than user preference \nto the BOSS team so that they may include the changes in the masterlist.")), 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 15); //Need to add 'OK' and 'Cancel' buttons. wxSizer * sizer = CreateSeparatedButtonSizer(wxOK|wxCANCEL); diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp index 27e0221f..5379b604 100644 --- a/src/gui/settings.cpp +++ b/src/gui/settings.cpp @@ -88,7 +88,7 @@ SettingsFrame::SettingsFrame(wxWindow *parent, const wxString& title, YAML::Node rightItem.Right(); wxSizerFlags wholeItem(0); - wholeItem.Border(wxLEFT|wxRIGHT|wxBOTTOM, 10); + wholeItem.Border(wxLEFT|wxRIGHT|wxBOTTOM, 15); wxBoxSizer * bigBox = new wxBoxSizer(wxVERTICAL); @@ -104,7 +104,7 @@ SettingsFrame::SettingsFrame(wxWindow *parent, const wxString& title, YAML::Node GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Debug Verbosity:")), leftItem); GridSizer->Add(DebugVerbosityChoice, rightItem); - bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 10); + bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 15); bigBox->Add(gamesList, wholeItem); @@ -112,7 +112,7 @@ SettingsFrame::SettingsFrame(wxWindow *parent, const wxString& title, YAML::Node hbox2->Add(addBtn, 0, wxRIGHT, 5); hbox2->Add(editBtn, 0, wxLEFT|wxRIGHT, 5); hbox2->Add(removeBtn, 0, wxLEFT, 5); - bigBox->Add(hbox2, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 10); + bigBox->Add(hbox2, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 15); bigBox->Add(UpdateMasterlistBox, wholeItem); @@ -434,7 +434,7 @@ GameEditDialog::GameEditDialog(wxWindow *parent, const wxString& title) : wxDial GridSizer->Add(new wxStaticText(this, wxID_ANY, translate("Install Path Registry Key:")), leftItem); GridSizer->Add(_registry, rightItem); - bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 10); + bigBox->Add(GridSizer, 0, wxEXPAND|wxALL, 15); bigBox->AddSpacer(10); bigBox->AddStretchSpacer(1);