5 files changed, 31 insertions, 2 deletions
diff --git a/launcher/ui/widgets/LanguageSelectionWidget.cpp b/launcher/ui/widgets/LanguageSelectionWidget.cpp
index cf70c7b4..256b09da 100644
--- a/launcher/ui/widgets/LanguageSelectionWidget.cpp
+++ b/launcher/ui/widgets/LanguageSelectionWidget.cpp
@@ -5,7 +5,9 @@
 #include <QHeaderView>
 #include <QLabel>
 #include "Application.h"
+#include "BuildConfig.h"
 #include "translations/TranslationsModel.h"
+#include "settings/Setting.h"
 
 LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
     QWidget(parent)
@@ -37,6 +39,9 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) :
     languageView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
     connect(languageView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &LanguageSelectionWidget::languageRowChanged);
     verticalLayout->setContentsMargins(0,0,0,0);
+
+    auto language_setting = APPLICATION->settings()->getSetting("Language");
+    connect(language_setting.get(), &Setting::SettingChanged, this, &LanguageSelectionWidget::languageSettingChanged);
 }
 
 QString LanguageSelectionWidget::getSelectedLanguageKey() const
@@ -48,7 +53,7 @@ QString LanguageSelectionWidget::getSelectedLanguageKey() const
 void LanguageSelectionWidget::retranslate()
 {
     QString text = tr("Don't see your language or the quality is poor?<br/><a href=\"%1\">Help us with translations!</a>")
-        .arg("https://github.com/MultiMC/Launcher/wiki/Translating-MultiMC");
+        .arg(BuildConfig.TRANSLATIONS_URL);
     helpUsLabel->setText(text);
 
 }
@@ -64,3 +69,10 @@ void LanguageSelectionWidget::languageRowChanged(const QModelIndex& current, con
     translations->selectLanguage(key);
     translations->updateLanguage(key);
 }
+
+void LanguageSelectionWidget::languageSettingChanged(const Setting &, const QVariant)
+{
+    auto translations = APPLICATION->translations();
+    auto index = translations->selectedIndex();
+    languageView->setCurrentIndex(index);
+}
diff --git a/launcher/ui/widgets/LanguageSelectionWidget.h b/launcher/ui/widgets/LanguageSelectionWidget.h
index e65936db..4a88924c 100644
--- a/launcher/ui/widgets/LanguageSelectionWidget.h
+++ b/launcher/ui/widgets/LanguageSelectionWidget.h
@@ -20,6 +20,7 @@
 class QVBoxLayout;
 class QTreeView;
 class QLabel;
+class Setting;
 
 class LanguageSelectionWidget: public QWidget
 {
@@ -33,6 +34,7 @@ public:
 
 protected slots:
     void languageRowChanged(const QModelIndex &current, const QModelIndex &previous);
+    void languageSettingChanged(const Setting &, const QVariant);
 
 private:
     QVBoxLayout *verticalLayout = nullptr;
diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp
index 74a6dff3..6de49467 100644
--- a/launcher/ui/widgets/PageContainer.cpp
+++ b/launcher/ui/widgets/PageContainer.cpp
@@ -207,7 +207,7 @@ void PageContainer::help()
         QString pageId = m_currentPage->helpPage();
         if (pageId.isEmpty())
             return;
-        DesktopServices::openUrl(QUrl("https://github.com/MultiMC/Launcher/wiki/" + pageId));
+        DesktopServices::openUrl(QUrl("https://github.com/PolyMC/PolyMC/wiki/" + pageId));
     }
 }
 
diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp
index cbd6c617..8d5bd12d 100644
--- a/launcher/ui/widgets/WideBar.cpp
+++ b/launcher/ui/widgets/WideBar.cpp
@@ -76,6 +76,20 @@ void WideBar::addSeparator()
     m_entries.push_back(entry);
 }
 
+void WideBar::insertActionBefore(QAction* before, QAction* action){
+    auto iter = std::find_if(m_entries.begin(), m_entries.end(), [before](BarEntry * entry) {
+        return entry->wideAction == before;
+    });
+    if(iter == m_entries.end()) {
+        return;
+    }
+    auto entry = new BarEntry();
+    entry->qAction = insertWidget((*iter)->qAction, new ActionButton(action, this));
+    entry->wideAction = action;
+    entry->type = BarEntry::Action;
+    m_entries.insert(iter, entry);
+}
+
 void WideBar::insertSpacer(QAction* action)
 {
     auto iter = std::find_if(m_entries.begin(), m_entries.end(), [action](BarEntry * entry) {
diff --git a/launcher/ui/widgets/WideBar.h b/launcher/ui/widgets/WideBar.h
index d1b8cbe7..2b676a8c 100644
--- a/launcher/ui/widgets/WideBar.h
+++ b/launcher/ui/widgets/WideBar.h
@@ -18,6 +18,7 @@ public:
     void addAction(QAction *action);
     void addSeparator();
     void insertSpacer(QAction *action);
+    void insertActionBefore(QAction *before, QAction *action);
     QMenu *createContextMenu(QWidget *parent = nullptr, const QString & title = QString());
 
 private: