Merge pull request #10073 from JosJuice/revert-10025

Revert "DolphinQt: Minor consistency fixes for the Settings window"

Source/Core/DolphinQt/CMakeLists.txt

@@ -287,8 +287,6 @@ add_executable(dolphin-emu
   Settings/AdvancedPane.h
   Settings/AudioPane.cpp
   Settings/AudioPane.h
-  Settings/BroadbandAdapterSettingsDialog.cpp
-  Settings/BroadbandAdapterSettingsDialog.h
   Settings/GameCubePane.cpp
   Settings/GameCubePane.h
   Settings/GeneralPane.cpp

Source/Core/DolphinQt/DolphinQt.vcxproj

@@ -179,7 +179,6 @@
     <ClCompile Include="Settings.cpp" />
     <ClCompile Include="Settings\AdvancedPane.cpp" />
     <ClCompile Include="Settings\AudioPane.cpp" />
-    <ClCompile Include="Settings\BroadbandAdapterSettingsDialog.cpp" />
     <ClCompile Include="Settings\GameCubePane.cpp" />
     <ClCompile Include="Settings\GeneralPane.cpp" />
     <ClCompile Include="Settings\InterfacePane.cpp" />
@@ -347,7 +346,6 @@
     <QtMoc Include="Settings.h" />
     <QtMoc Include="Settings\AdvancedPane.h" />
     <QtMoc Include="Settings\AudioPane.h" />
-    <QtMoc Include="Settings\BroadbandAdapterSettingsDialog.h" />
     <QtMoc Include="Settings\GameCubePane.h" />
     <QtMoc Include="Settings\GeneralPane.h" />
     <QtMoc Include="Settings\InterfacePane.h" />

Source/Core/DolphinQt/Settings/AdvancedPane.cpp

@@ -46,27 +46,26 @@ void AdvancedPane::CreateLayout()
   auto* main_layout = new QVBoxLayout();
   setLayout(main_layout);
 
-  auto* cpu_options_group = new QGroupBox(tr("CPU Options"));
-  auto* cpu_options_group_layout = new QVBoxLayout();
-  cpu_options_group->setLayout(cpu_options_group_layout);
-  main_layout->addWidget(cpu_options_group);
-
-  auto* cpu_emulation_engine_layout = new QFormLayout;
-  cpu_emulation_engine_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
-  cpu_emulation_engine_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
-  cpu_options_group_layout->addLayout(cpu_emulation_engine_layout);
+  auto* cpu_options = new QGroupBox(tr("CPU Options"));
+  auto* cpu_options_layout = new QVBoxLayout();
+  cpu_options->setLayout(cpu_options_layout);
+  main_layout->addWidget(cpu_options);
 
+  QGridLayout* cpu_emulation_layout = new QGridLayout();
+  QLabel* cpu_emulation_engine_label = new QLabel(tr("CPU Emulation Engine:"));
   m_cpu_emulation_engine_combobox = new QComboBox(this);
-  cpu_emulation_engine_layout->addRow(tr("CPU Emulation Engine:"), m_cpu_emulation_engine_combobox);
   for (PowerPC::CPUCore cpu_core : PowerPC::AvailableCPUCores())
   {
     m_cpu_emulation_engine_combobox->addItem(tr(CPU_CORE_NAMES.at(cpu_core)));
   }
+  cpu_emulation_layout->addWidget(cpu_emulation_engine_label, 0, 0);
+  cpu_emulation_layout->addWidget(m_cpu_emulation_engine_combobox, 0, 1, Qt::AlignLeft);
+  cpu_options_layout->addLayout(cpu_emulation_layout);
 
   m_enable_mmu_checkbox = new QCheckBox(tr("Enable MMU"));
   m_enable_mmu_checkbox->setToolTip(tr(
       "Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
-  cpu_options_group_layout->addWidget(m_enable_mmu_checkbox);
+  cpu_options_layout->addWidget(m_enable_mmu_checkbox);
 
   auto* clock_override = new QGroupBox(tr("Clock Override"));
   auto* clock_override_layout = new QVBoxLayout();
@@ -266,7 +265,7 @@ void AdvancedPane::Update()
     int core_clock = SystemTimers::GetTicksPerSecond() / std::pow(10, 6);
     int percent = static_cast<int>(std::round(SConfig::GetInstance().m_OCFactor * 100.f));
     int clock = static_cast<int>(std::round(SConfig::GetInstance().m_OCFactor * core_clock));
-    return tr("%1% (%2 MHz)").arg(QString::number(percent), QString::number(clock));
+    return tr("%1 % (%2 MHz)").arg(QString::number(percent), QString::number(clock));
   }());
 
   m_ram_override_checkbox->setEnabled(!running);
@@ -282,7 +281,7 @@ void AdvancedPane::Update()
 
   m_mem1_override_slider_label->setText([] {
     const u32 mem1_size = Config::Get(Config::MAIN_MEM1_SIZE) / 0x100000;
-    return tr("%1 MB (MEM1)").arg(QString::number(mem1_size));
+    return tr("%1MB (MEM1)").arg(QString::number(mem1_size));
   }());
 
   m_mem2_override_slider->setEnabled(enable_ram_override_widgets && !running);
@@ -296,7 +295,7 @@ void AdvancedPane::Update()
 
   m_mem2_override_slider_label->setText([] {
     const u32 mem2_size = Config::Get(Config::MAIN_MEM2_SIZE) / 0x100000;
-    return tr("%1 MB (MEM2)").arg(QString::number(mem2_size));
+    return tr("%1MB (MEM2)").arg(QString::number(mem2_size));
   }());
 
   m_custom_rtc_checkbox->setEnabled(!running);

Source/Core/DolphinQt/Settings/AudioPane.cpp

@@ -87,9 +87,8 @@ void AudioPane::CreateWidgets()
     m_latency_spin = new QSpinBox();
     m_latency_spin->setMinimum(0);
     m_latency_spin->setMaximum(200);
-    m_latency_spin->setToolTip(
-        tr("Sets the latency in milliseconds. Higher values may reduce audio "
-           "crackling. Certain backends only."));
+    m_latency_spin->setToolTip(tr("Sets the latency (in ms). Higher values may reduce audio "
+                                  "crackling. Certain backends only."));
   }
 
   m_dolby_pro_logic->setToolTip(
@@ -402,7 +401,7 @@ void AudioPane::OnEmulationStateChanged(bool running)
 void AudioPane::OnVolumeChanged(int volume)
 {
   m_volume_slider->setValue(volume);
-  m_volume_indicator->setText(tr("%1%").arg(volume));
+  m_volume_indicator->setText(tr("%1 %").arg(volume));
 }
 
 void AudioPane::CheckNeedForLatencyControl()
@@ -432,13 +431,13 @@ QString AudioPane::GetDPL2ApproximateLatencyLabel(AudioCommon::DPL2Quality value
   switch (value)
   {
   case AudioCommon::DPL2Quality::Lowest:
-    return tr("Latency: ~10 ms");
+    return tr("Latency: ~10ms");
   case AudioCommon::DPL2Quality::Low:
-    return tr("Latency: ~20 ms");
+    return tr("Latency: ~20ms");
   case AudioCommon::DPL2Quality::Highest:
-    return tr("Latency: ~80 ms");
+    return tr("Latency: ~80ms");
   default:
-    return tr("Latency: ~40 ms");
+    return tr("Latency: ~40ms");
   }
 }
 

Source/Core/DolphinQt/Settings/GameCubePane.cpp

@@ -7,7 +7,6 @@
 #include <QComboBox>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <QFormLayout>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QInputDialog>
@@ -34,7 +33,6 @@
 #include "DolphinQt/GCMemcardManager.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/Settings.h"
-#include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h"
 
 enum
 {
@@ -57,20 +55,12 @@ void GameCubePane::CreateWidgets()
 
   // IPL Settings
   QGroupBox* ipl_box = new QGroupBox(tr("IPL Settings"), this);
-  QVBoxLayout* ipl_box_layout = new QVBoxLayout(ipl_box);
-  ipl_box->setLayout(ipl_box_layout);
+  QGridLayout* ipl_layout = new QGridLayout(ipl_box);
+  ipl_box->setLayout(ipl_layout);
 
   m_skip_main_menu = new QCheckBox(tr("Skip Main Menu"), ipl_box);
-  ipl_box_layout->addWidget(m_skip_main_menu);
-
-  QFormLayout* ipl_language_layout = new QFormLayout;
-  ipl_language_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
-  ipl_language_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
-  ipl_box_layout->addLayout(ipl_language_layout);
-
   m_language_combo = new QComboBox(ipl_box);
   m_language_combo->setCurrentIndex(-1);
-  ipl_language_layout->addRow(tr("System Language:"), m_language_combo);
 
   // Add languages
   for (const auto& entry : {std::make_pair(tr("English"), 0), std::make_pair(tr("German"), 1),
@@ -80,6 +70,10 @@ void GameCubePane::CreateWidgets()
     m_language_combo->addItem(entry.first, entry.second);
   }
 
+  ipl_layout->addWidget(m_skip_main_menu, 0, 0);
+  ipl_layout->addWidget(new QLabel(tr("System Language:")), 1, 0);
+  ipl_layout->addWidget(m_language_combo, 1, 1);
+
   // Device Settings
   QGroupBox* device_box = new QGroupBox(tr("Device Settings"), this);
   QGridLayout* device_layout = new QGridLayout(device_box);
@@ -88,12 +82,12 @@ void GameCubePane::CreateWidgets()
   for (int i = 0; i < SLOT_COUNT; i++)
   {
     m_slot_combos[i] = new QComboBox(device_box);
-    m_slot_combos[i]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
     m_slot_buttons[i] = new QPushButton(tr("..."), device_box);
     m_slot_buttons[i]->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
   }
 
   // Add slot devices
+
   for (const auto& entry :
        {std::make_pair(tr("<Nothing>"), ExpansionInterface::EXIDEVICE_NONE),
         std::make_pair(tr("Dummy"), ExpansionInterface::EXIDEVICE_DUMMY),
@@ -108,6 +102,7 @@ void GameCubePane::CreateWidgets()
   }
 
   // Add SP1 devices
+
   std::vector<std::pair<QString, ExpansionInterface::TEXIDevices>> sp1Entries{
       std::make_pair(tr("<Nothing>"), ExpansionInterface::EXIDEVICE_NONE),
       std::make_pair(tr("Dummy"), ExpansionInterface::EXIDEVICE_DUMMY),
@@ -280,12 +275,26 @@ void GameCubePane::OnConfigPressed(int slot)
     return;
   case ExpansionInterface::EXIDEVICE_ETH:
   {
-    BroadbandAdapterSettingsDialog(this, BroadbandAdapterSettingsDialog::Type::Ethernet).exec();
+    bool ok;
+    const auto new_mac = QInputDialog::getText(
+        // i18n: MAC stands for Media Access Control. A MAC address uniquely identifies a network
+        // interface (physical) like a serial number. "MAC" should be kept in translations.
+        this, tr("Broadband Adapter MAC address"), tr("Enter new Broadband Adapter MAC address:"),
+        QLineEdit::Normal, QString::fromStdString(SConfig::GetInstance().m_bba_mac), &ok);
+    if (ok)
+      SConfig::GetInstance().m_bba_mac = new_mac.toStdString();
     return;
   }
   case ExpansionInterface::EXIDEVICE_ETHXLINK:
   {
-    BroadbandAdapterSettingsDialog(this, BroadbandAdapterSettingsDialog::Type::XLinkKai).exec();
+    bool ok;
+    const auto new_dest = QInputDialog::getText(
+        this, tr("Broadband Adapter (XLink Kai) Destination Address"),
+        tr("Enter IP address of device running the XLink Kai Client.\nFor more information see"
+           " https://www.teamxlink.co.uk/wiki/Dolphin"),
+        QLineEdit::Normal, QString::fromStdString(SConfig::GetInstance().m_bba_xlink_ip), &ok);
+    if (ok)
+      SConfig::GetInstance().m_bba_xlink_ip = new_dest.toStdString();
     return;
   }
   default:
@@ -451,9 +460,11 @@ void GameCubePane::LoadSettings()
   }
 
   m_skip_main_menu->setEnabled(have_menu);
-  m_skip_main_menu->setToolTip(have_menu ? QString{} : tr("Put IPL ROMs in User/GC/<region>."));
+  m_skip_main_menu->setToolTip(have_menu ? QString{} :
+                                           tr("Put Main Menu roms in User/GC/{region}."));
 
   // Device Settings
+
   for (int i = 0; i < SLOT_COUNT; i++)
   {
     QSignalBlocker blocker(m_slot_combos[i]);