misc: right align game/style filter, correct help text location

This commit is contained in:
Brendan Hagan
2022-06-20 00:15:19 -04:00
parent 766a99fbc4
commit b561e5ff77
2 changed files with 13 additions and 11 deletions
+4 -2
View File
@@ -212,6 +212,10 @@ help:
website: website:
about: about:
# New Set Window
search game list control: Filter the game list. Use - to exclude games. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
search stylesheet list control: Filter the stylesheet list. Use - to exclude styles. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
# Cards panel # Cards panel
collapse notes: Hide the card notes box collapse notes: Hide the card notes box
expand notes: Show the card notes box expand notes: Show the card notes box
@@ -462,9 +466,7 @@ label:
game type: &Game type: game type: &Game type:
style type: &Card style: style type: &Card style:
search game list : Filter Games search game list : Filter Games
search game list control: Filter the game list. Use - to exclude games. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
search stylesheet list: Filter Stylesheets search stylesheet list: Filter Stylesheets
search stylesheet list control: Filter the stylesheet list. Use - to exclude styles. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
stylesheet not found : stylesheet not found :
The set you are trying to open uses the stylesheet "%s". The set you are trying to open uses the stylesheet "%s".
+9 -9
View File
@@ -45,15 +45,15 @@ NewSetWindow::NewSetWindow(Window* parent)
wxSizer* s = new wxBoxSizer(wxVERTICAL); wxSizer* s = new wxBoxSizer(wxVERTICAL);
wxSizer* s2 = new wxBoxSizer(wxHORIZONTAL); wxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
s2->Add(game_text, 0, wxALL & ~wxLEFT, 4); s2->Add(game_text, 0, wxALL & ~wxLEFT, 4);
s2->AddSpacer(2); s2->AddStretchSpacer();
s2->Add(game_filter, 0, wxALL & ~wxRIGHT, 4); s2->Add(game_filter, 1, wxALIGN_RIGHT, 4);
s->Add(s2); s->Add(s2, wxSizerFlags().Expand().Border(wxALL, 6));
s->Add(game_list, 0, wxEXPAND | (wxALL & ~wxTOP), 4); s->Add(game_list, 0, wxEXPAND | (wxALL & ~wxTOP), 4);
wxSizer* s3 = new wxBoxSizer(wxHORIZONTAL); wxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
s3->Add(stylesheet_text, 0, wxALL & ~wxLEFT, 4); s3->Add(stylesheet_text, 0, wxALL & ~wxLEFT, 4);
s3->AddSpacer(2); s3->AddStretchSpacer();
s3->Add(stylesheet_filter, 0, wxALL & ~wxRIGHT, 4); s3->Add(stylesheet_filter, 1, wxALIGN_RIGHT, 4);
s->Add(s3); s->Add(s3, wxSizerFlags().Expand().Border(wxALL, 6));
s->Add(stylesheet_list, 0, wxEXPAND | (wxALL & ~wxTOP), 4); s->Add(stylesheet_list, 0, wxEXPAND | (wxALL & ~wxTOP), 4);
s->Add(CreateButtonSizer(wxOK | wxCANCEL) , 0, wxEXPAND | wxALL, 8); s->Add(CreateButtonSizer(wxOK | wxCANCEL) , 0, wxEXPAND | wxALL, 8);
s->SetSizeHints(this); s->SetSizeHints(this);
@@ -61,7 +61,7 @@ NewSetWindow::NewSetWindow(Window* parent)
// Resize // Resize
Layout(); Layout();
wxSize min_size = GetSizer()->GetMinSize() + GetSize() - GetClientSize(); wxSize min_size = GetSizer()->GetMinSize() + GetSize() - GetClientSize();
SetSize(630,min_size.y); SetSize(830, min_size.y);
// init lists // init lists
game_list->showData<Game>(); game_list->showData<Game>();
try { try {
@@ -84,7 +84,7 @@ void NewSetWindow::onGameSelect(wxCommandEvent&) {
// resize (yuck) // resize (yuck)
Layout(); Layout();
wxSize min_size = GetSizer()->GetMinSize() + GetSize() - GetClientSize(); wxSize min_size = GetSizer()->GetMinSize() + GetSize() - GetClientSize();
SetSize(630,min_size.y); SetSize(830,min_size.y);
} }
void NewSetWindow::onStyleSheetSelect(wxCommandEvent&) { void NewSetWindow::onStyleSheetSelect(wxCommandEvent&) {