commit changes

Source/Core/DolphinQt/AboutDialog.cpp

@@ -19,7 +19,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
 
   const QString text =
       QStringLiteral(R"(
-<p style='font-size:38pt; font-weight:400;'>Dolphin</p>
+<p style='font-size:38pt; font-weight:400;'>Dolphin MPN</p>
 
 <p style='font-size:18pt;'>%VERSION_STRING%</p>
 
@@ -61,7 +61,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
                    // is "free" as in "freedom" - it refers to certain properties of the
                    // software's license, not the software's price. (It is true that Dolphin
                    // can be downloaded at no cost, but that's not what this message says.)
-                   tr("Dolphin is a free and open-source GameCube and Wii emulator."))
+                   tr("Dolphin-MPN is a free and open-source GameCube and Wii emulator."))
           .replace(QStringLiteral("%GAMES_YOU_OWN%"),
                    tr("This software should not be used to play games you do not legally own."))
           .replace(QStringLiteral("%LICENSE%"), tr("License"))
@@ -79,7 +79,8 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
               // in your translation, please use the type of curly quotes that's appropriate for
               // your language. If you aren't sure which type is appropriate, see
               // https://en.wikipedia.org/wiki/Quotation_mark#Specific_language_features
-              tr("\u00A9 2003-2015+ Dolphin Team. \u201cGameCube\u201d and \u201cWii\u201d are "
+              tr("\u00A9 2003-2015+ Dolphin Team. "
+                 "\u201cGameCube\u201d and \u201cWii\u201d are "
                  "trademarks of Nintendo. Dolphin is not affiliated with Nintendo in any way.")));
 
   QLabel* logo = new QLabel();

Source/Core/DolphinQt/Main.cpp

@@ -156,12 +156,6 @@ int main(int argc, char* argv[])
   QCoreApplication::setOrganizationDomain(QStringLiteral("dolphin-emu.org"));
   QCoreApplication::setApplicationName(QStringLiteral("dolphin-emu"));
 
-  #ifdef _WIN32
-  // The windowsvista style doesn't support dark mode (and the windows style looks bad), so default
-  // to fusion on windows. Qt on other OSs defaults to styles which support dark mode.
-  QApplication::setStyle(QStringLiteral("fusion"));
-  #endif
-
   // MPN Lets inject our update code here
   QProcess* process = new QProcess();
   QString path = QStringLiteral("Updater\\UpdateSilent.bat");

Source/Core/DolphinQt/MainWindow.cpp

@@ -1386,7 +1386,7 @@ void MainWindow::ShowSettingsWindow()
     InstallHotkeyFilter(m_settings_window);
   }
 
-  SetQWidgetWindowDecorations(m_settings_window);
+  //SetQWidgetWindowDecorations(m_settings_window);
   m_settings_window->show();
   m_settings_window->raise();
   m_settings_window->activateWindow();

Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp

@@ -176,7 +176,7 @@ void NetPlaySetupDialog::CreateMainLayout()
   connection_layout->addWidget(
       new QLabel(tr(
           "ALERT:\n\n"
-          "All players must use the same Dolphin version, unless MPN Dolphin is used to host\n"
+          "All players must use the same Dolphin version, unless Dolphin-MPN is used to host\n"
           "If enabled, SD cards must be identical between players.\n"
           "If DSP LLE is used, DSP ROMs must be identical between players.\n"
           "If a game is hanging on boot, it may not support Dual Core Netplay."
@@ -249,16 +249,18 @@ NetPlaySetupDialog::~NetPlaySetupDialog()
 
 void NetPlaySetupDialog::ConnectWidgets()
 {
-  connect(m_connection_type, &QComboBox::currentIndexChanged, this,
+  connect(m_connection_type, qOverload<int>(&QComboBox::currentIndexChanged), this,
           &NetPlaySetupDialog::OnConnectionTypeChanged);
   connect(m_nickname_edit, &QLineEdit::textChanged, this, &NetPlaySetupDialog::SaveSettings);
 
   // Connect widget
   connect(m_ip_edit, &QLineEdit::textChanged, this, &NetPlaySetupDialog::SaveSettings);
-  connect(m_connect_port_box, &QSpinBox::valueChanged, this, &NetPlaySetupDialog::SaveSettings);
+  connect(m_connect_port_box, qOverload<int>(&QSpinBox::valueChanged), this,
+          &NetPlaySetupDialog::SaveSettings);
   // Host widget
-  connect(m_host_port_box, &QSpinBox::valueChanged, this, &NetPlaySetupDialog::SaveSettings);
-  connect(m_host_games, &QListWidget::currentRowChanged, [this](int index) {
+  connect(m_host_port_box, qOverload<int>(&QSpinBox::valueChanged), this,
+          &NetPlaySetupDialog::SaveSettings);
+  connect(m_host_games, qOverload<int>(&QListWidget::currentRowChanged), [this](int index) {
     Settings::GetQSettings().setValue(QStringLiteral("netplay/hostgame"),
                                       m_host_games->item(index)->text());
   });
@@ -268,16 +270,6 @@ void NetPlaySetupDialog::ConnectWidgets()
 
   connect(m_host_games, &QListWidget::itemDoubleClicked, this, &NetPlaySetupDialog::accept);
 
-  connect(m_host_chunked_upload_limit_check, &QCheckBox::toggled, this, [this](bool value) {
-    m_host_chunked_upload_limit_box->setEnabled(value);
-    SaveSettings();
-  });
-  
-  connect(m_host_chunked_upload_limit_box, &QSpinBox::valueChanged, this,
-          &NetPlaySetupDialog::SaveSettings);
-
-  connect(m_host_server_browser, &QCheckBox::toggled, this, &NetPlaySetupDialog::SaveSettings);
-
   connect(m_host_server_name, &QLineEdit::textChanged, this, &NetPlaySetupDialog::SaveSettings);
 
 #ifdef USE_UPNP

Source/Core/DolphinQt/Resources.cpp

@@ -26,9 +26,9 @@ QIcon Resources::LoadNamedIcon(std::string_view name, const QString& dir)
   const QString svg_path = base_path + QStringLiteral(".svg");
 
   // Prefer svg
-  if (m_svg_supported && QFileInfo(svg_path).exists())
-    return QIcon(svg_path);
-
+  //if (m_svg_supported && QFileInfo(svg_path).exists())
+  //  return QIcon(svg_path);
+  //
   QIcon icon;
 
   auto load_png = [&](int scale) {

Source/Core/DolphinQt/Settings/InterfacePane.cpp

@@ -133,17 +133,17 @@ void InterfacePane::CreateUI()
 
   // User Style Combobox
   m_combobox_userstyle = new QComboBox;
-  m_label_userstyle = new QLabel(tr("Window Theme:"));
+  m_label_userstyle = new QLabel(tr("Style:"));
   combobox_layout->addRow(m_label_userstyle, m_combobox_userstyle);
 
   auto userstyle_search_results = Common::DoFileSearch({File::GetUserPath(D_STYLES_IDX)});
 
-  m_combobox_userstyle->addItem(tr("(System)"), static_cast<int>(Settings::StyleType::System));
+  m_combobox_userstyle->addItem(tr("System"), static_cast<int>(Settings::StyleType::System));
 
   // TODO: Support forcing light/dark on other OSes too.
 #ifdef _WIN32
-  m_combobox_userstyle->addItem(tr("(Light)"), static_cast<int>(Settings::StyleType::Light));
-  m_combobox_userstyle->addItem(tr("(Dark)"), static_cast<int>(Settings::StyleType::Dark));
+  m_combobox_userstyle->addItem(tr("Light"), static_cast<int>(Settings::StyleType::Light));
+  m_combobox_userstyle->addItem(tr("Dark"), static_cast<int>(Settings::StyleType::Dark));
 #endif
 
   for (const std::string& path : userstyle_search_results)
@@ -222,7 +222,6 @@ void InterfacePane::ConnectLayout()
 {
   connect(m_checkbox_use_builtin_title_database, &QCheckBox::toggled, this,
           &InterfacePane::OnSaveConfig);
-  connect(m_checkbox_use_userstyle, &QCheckBox::toggled, this, &InterfacePane::OnSaveConfig);
   connect(m_checkbox_use_covers, &QCheckBox::toggled, this, &InterfacePane::OnSaveConfig);
   connect(m_checkbox_disable_screensaver, &QCheckBox::toggled, this, &InterfacePane::OnSaveConfig);
   connect(m_checkbox_show_debugging_ui, &QCheckBox::toggled, this, &InterfacePane::OnSaveConfig);