From d52a14713313bfa3fbec34a3c0b245a2ae8fd6be Mon Sep 17 00:00:00 2001
From: Brendan Hagan <bhaganksu@gmail.com>
Date: Fri, 18 Nov 2022 21:27:00 -0500
Subject: [PATCH] misc: cleanup welcome window changes

---
 data/en.mse-locale/locale  |  1 -
 src/gui/about_window.cpp   |  2 +-
 src/gui/welcome_window.cpp | 19 ++++++++-----------
 src/gui/welcome_window.hpp |  4 ++--
 src/util/window_id.hpp     |  7 +++----
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index 3a75527e..0632de4b 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -667,7 +667,6 @@ button:
 	install group:			&Install All
 	upgrade group:			&Upgrade All
 	remove group:			&Remove All
-	apply language:			Apply language
 
 ############################################################## Titles in the GUI
 title:
diff --git a/src/gui/about_window.cpp b/src/gui/about_window.cpp
index b4626ca8..af99fb4a 100644
--- a/src/gui/about_window.cpp
+++ b/src/gui/about_window.cpp
@@ -33,7 +33,7 @@ void AboutWindow::onPaint(wxPaintEvent& ev) {
   draw(dc);
 }
 
-const char* MSE_AUTHORS[] = {"Twan van Laarhoven (twanvl)", "Sean Hunt (coppro)", "Alissa Rao (Lymia)", "CaiCai (247321453)"};
+const char* MSE_AUTHORS[] = {"Twan van Laarhoven (twanvl)", "Sean Hunt (coppro)", "Alissa Rao (Lymia)", "haganbmj", "CaiCai (247321453)"};
 
 void AboutWindow::draw(DC& dc) {
   wxSize ws = GetClientSize();
diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp
index bcea461c..841073d2 100644
--- a/src/gui/welcome_window.cpp
+++ b/src/gui/welcome_window.cpp
@@ -65,25 +65,22 @@ WelcomeWindow::WelcomeWindow()
     s2->AddStretchSpacer();
 
     //
-    language = new wxComboBox(this, ID_APPLY_LANGUAGE, _(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY);
+    select_language = new wxComboBox(this, ID_SELECT_LANGUAGE, _(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY);
     // set values
     vector<PackagedP> locales;
     package_manager.findMatching(_("*.mse-locale"), locales);
     sort(locales.begin(), locales.end(), __compare_package_name);
     int n = 0;
     FOR_EACH(package, locales) {
-        language->Append(package->full_name, package.get());
+      select_language->Append(package->full_name, package.get());
         if (settings.locale == package->name()) {
-            language->SetSelection(n);
+          select_language->SetSelection(n);
         }
         n++;
     }
-    //auto apply_language = new wxButton(this, ID_APPLY_LANGUAGE, _BUTTON_("apply language"));
     wxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
     s3->AddSpacer(280);
-   // s3->Add(apply_language, 0, wxALL, 1);
-   // s3->AddSpacer(5);
-    s3->Add(language, 0, wxALL, 1);
+    s3->Add(select_language, 0, wxALL, 1);
     s2->AddSpacer(30);
     s2->Add(s3);
   s1->Add(s2);
@@ -115,11 +112,11 @@ void WelcomeWindow::draw(DC& dc) {
   dc.DrawText(version_string, 4, ws.GetHeight()-th-4);
 }
 
-void WelcomeWindow::onApplyLanguage(wxCommandEvent&) {
+void WelcomeWindow::onSelectLanguage(wxCommandEvent&) {
     // locale
-    int n = language->GetSelection();
+    int n = select_language->GetSelection();
     if (n == wxNOT_FOUND) return;
-    Packaged* p = (Packaged*)language->GetClientData(n);
+    Packaged* p = (Packaged*)select_language->GetClientData(n);
     settings.locale = p->name();
     the_locale = Locale::byName(settings.locale);
 
@@ -174,7 +171,7 @@ 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_COMBOBOX       (ID_APPLY_LANGUAGE,     WelcomeWindow::onApplyLanguage)
+  EVT_COMBOBOX       (ID_SELECT_LANGUAGE,     WelcomeWindow::onSelectLanguage)
   EVT_BUTTON         (ID_FILE_CHECK_UPDATES, WelcomeWindow::onCheckUpdates)
   EVT_PAINT          (                       WelcomeWindow::onPaint)
 //  EVT_IDLE           (                     WelcomeWindow::onIdle)
diff --git a/src/gui/welcome_window.hpp b/src/gui/welcome_window.hpp
index 27d7b6a1..de92e894 100644
--- a/src/gui/welcome_window.hpp
+++ b/src/gui/welcome_window.hpp
@@ -35,7 +35,7 @@ private:
   #if USE_BETA_LOGO
   Bitmap logo2;
   #endif
-  wxComboBox* language;
+  wxComboBox* select_language;
     
   void onPaint(wxPaintEvent&);
   void draw(DC& dc);
@@ -44,7 +44,7 @@ private:
   void onNewSet      (wxCommandEvent&);
   void onOpenLast    (wxCommandEvent&);
   void onCheckUpdates(wxCommandEvent&);
-  void onApplyLanguage(wxCommandEvent&);
+  void onSelectLanguage(wxCommandEvent&);
 //  void onIdle    (wxIdleEvent& ev);
   
   /// Close the welcome window, and show the given set
diff --git a/src/util/window_id.hpp b/src/util/window_id.hpp
index 8fc9ea39..d487ef82 100644
--- a/src/util/window_id.hpp
+++ b/src/util/window_id.hpp
@@ -81,10 +81,9 @@ enum MenuID {
   ID_MODE_SYMMETRY,
   ID_MODE_PAINT,
   ID_MODE_MAX,
-
-
-
-  ID_APPLY_LANGUAGE,
+
+  // Welcome Window
+  ID_SELECT_LANGUAGE,
 };