From 113f9767dd4697f6949b90624946df17874c4ad8 Mon Sep 17 00:00:00 2001 From: spycrab Date: Tue, 19 Jun 2018 10:30:32 +0200 Subject: [PATCH 1/3] Qt/FilesystemWidget: Remove "Whats this?" button from extraction dialog --- Source/Core/DolphinQt2/Config/FilesystemWidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp b/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp index 165ef0fd09..b84a85eefd 100644 --- a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp +++ b/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp @@ -285,6 +285,7 @@ void FilesystemWidget::ExtractDirectory(const DiscIO::Partition& partition, cons u32 size = info->GetTotalChildren(); QProgressDialog* dialog = new QProgressDialog(this); + dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); dialog->setMinimum(0); dialog->setMaximum(size); dialog->show(); From ce126f1cfee542d0963466a9d0266dc13e49a1ea Mon Sep 17 00:00:00 2001 From: spycrab Date: Tue, 19 Jun 2018 10:47:18 +0200 Subject: [PATCH 2/3] Qt/Mapping: Remove "Iterative Input" everywhere --- .../Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp | 6 ------ Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp | 11 ++++++++--- .../DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp | 10 ++++++++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp b/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp index 70960d9269..e198936dd5 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp @@ -35,14 +35,8 @@ void GCKeyboardEmu::CreateMainLayout() CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb4x))); auto* vbox_layout = new QVBoxLayout(); - auto* options_box = - CreateGroupBox(tr("Options"), Keyboard::GetGroup(GetPort(), KeyboardGroup::Options)); - - options_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - vbox_layout->addWidget( CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb5x))); - vbox_layout->addWidget(options_box); m_main_layout->addLayout(vbox_layout); diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp b/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp index 61733f7d34..e041034a21 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp @@ -13,6 +13,7 @@ #include "Core/HW/GCPadEmu.h" #include "InputCommon/ControllerEmu/Setting/BooleanSetting.h" +#include "InputCommon/ControllerEmu/Setting/NumericSetting.h" #include "InputCommon/InputConfig.h" GCPadEmu::GCPadEmu(MappingWindow* window) : MappingWidget(window) @@ -43,10 +44,14 @@ void GCPadEmu::CreateMainLayout() // TODO: Get rid of this garbage once wx is removed // Remove "Iterative Input" auto* options_group = Pad::GetGroup(GetPort(), PadGroup::Options); - auto& bools = options_group->boolean_settings; - bools.erase(bools.end() - 1); - hbox_layout->addWidget(CreateGroupBox(tr("Options"), options_group)); + auto& bools = options_group->boolean_settings; + + if (bools.size() > 1 || !options_group->numeric_settings.empty()) + { + bools.pop_back(); + hbox_layout->addWidget(CreateGroupBox(tr("Options"), options_group)); + } setLayout(m_main_layout); } diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp index 34e142c344..9d0dcea2dd 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp @@ -16,6 +16,7 @@ #include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h" #include "InputCommon/ControllerEmu/ControlGroup/Extension.h" +#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h" #include "InputCommon/InputConfig.h" WiimoteEmuGeneral::WiimoteEmuGeneral(MappingWindow* window, WiimoteEmuExtension* extension) @@ -56,8 +57,13 @@ void WiimoteEmuGeneral::CreateMainLayout() vbox_layout->addWidget(extension); vbox_layout->addWidget(CreateGroupBox( tr("Rumble"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Rumble))); - vbox_layout->addWidget(CreateGroupBox( - tr("Options"), Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Options))); + + // TODO: Get rid of this garbage once wx is removed + // Remove "Iterative Input" + auto* options_group = Wiimote::GetWiimoteGroup(GetPort(), WiimoteEmu::WiimoteGroup::Options); + options_group->boolean_settings.pop_back(); + + vbox_layout->addWidget(CreateGroupBox(tr("Options"), options_group)); m_main_layout->addLayout(vbox_layout); From 583ddfa8f0e094ff4e912955f2fc5b14ba9ec95b Mon Sep 17 00:00:00 2001 From: spycrab Date: Tue, 19 Jun 2018 10:51:42 +0200 Subject: [PATCH 3/3] Qt/GCMemcardManager: Update free blocks when a memcard is changed --- Source/Core/DolphinQt2/GCMemcardManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/DolphinQt2/GCMemcardManager.cpp b/Source/Core/DolphinQt2/GCMemcardManager.cpp index 52ee8deddb..ce014d5b13 100644 --- a/Source/Core/DolphinQt2/GCMemcardManager.cpp +++ b/Source/Core/DolphinQt2/GCMemcardManager.cpp @@ -212,6 +212,10 @@ void GCMemcardManager::UpdateSlotTable(int slot) table->setItem(i, 5, create_item(block_count)); table->resizeRowToContents(i); } + + m_slot_stat_label[slot]->setText(tr("%1 Free Blocks; %2 Free Dir Entries") + .arg(memcard->GetFreeBlocks()) + .arg(DIRLEN - memcard->GetNumFiles())); } void GCMemcardManager::UpdateActions() @@ -236,10 +240,6 @@ void GCMemcardManager::SetSlotFile(int slot, QString path) if (!memcard->IsValid()) return; - m_slot_stat_label[slot]->setText(tr("%1 Free Blocks; %2 Free Dir Entries") - .arg(memcard->GetFreeBlocks()) - .arg(DIRLEN - memcard->GetNumFiles())); - m_slot_file_edit[slot]->setText(path); m_slot_memcard[slot] = std::move(memcard);