From ff96831cf153da757ae5e0e55df0325b7936d428 Mon Sep 17 00:00:00 2001 From: Brendan Hagan Date: Fri, 18 Nov 2022 21:12:45 -0500 Subject: [PATCH] change WelcomeWindow's UI https://github.com/247321453/MagicSetEditor2Ex/commit/72e58c1825c1ad67369c8a17783ffd937a037c32 --- src/gui/welcome_window.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp index 62124a76..bcea461c 100644 --- a/src/gui/welcome_window.cpp +++ b/src/gui/welcome_window.cpp @@ -65,7 +65,7 @@ WelcomeWindow::WelcomeWindow() s2->AddStretchSpacer(); // - language = new wxComboBox(this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); + language = new wxComboBox(this, ID_APPLY_LANGUAGE, _(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); // set values vector locales; package_manager.findMatching(_("*.mse-locale"), locales); @@ -78,12 +78,13 @@ WelcomeWindow::WelcomeWindow() } n++; } + //auto apply_language = new wxButton(this, ID_APPLY_LANGUAGE, _BUTTON_("apply language")); wxSizer* s3 = new wxBoxSizer(wxHORIZONTAL); - s3->AddSpacer(5); + s3->AddSpacer(280); + // s3->Add(apply_language, 0, wxALL, 1); + // s3->AddSpacer(5); s3->Add(language, 0, wxALL, 1); - auto apply_language = new wxButton(this, ID_APPLY_LANGUAGE, _BUTTON_("apply language")); - s3->AddSpacer(25); - s3->Add(apply_language, 0, wxALL, 1); + s2->AddSpacer(30); s2->Add(s3); s1->Add(s2); SetSizer(s1); @@ -173,10 +174,10 @@ BEGIN_EVENT_TABLE(WelcomeWindow, wxFrame) EVT_BUTTON (ID_FILE_NEW, WelcomeWindow::onNewSet) EVT_BUTTON (ID_FILE_OPEN, WelcomeWindow::onOpenSet) EVT_BUTTON (ID_FILE_RECENT, WelcomeWindow::onOpenLast) - EVT_BUTTON (ID_APPLY_LANGUAGE, WelcomeWindow::onApplyLanguage) + EVT_COMBOBOX (ID_APPLY_LANGUAGE, WelcomeWindow::onApplyLanguage) EVT_BUTTON (ID_FILE_CHECK_UPDATES, WelcomeWindow::onCheckUpdates) EVT_PAINT ( WelcomeWindow::onPaint) -// EVT_IDLE ( WelcomeWindow::onIdle) +// EVT_IDLE ( WelcomeWindow::onIdle) END_EVENT_TABLE ()