piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 09:59:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinQ: Mapping UI cleanups.

Browse Source
This commit is contained in:
Jordan Woyak
2019-03-14 20:27:49 -05:00
parent 011ecd92e8
commit 9cb17b062c
16 changed files with 185 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
View File

@ -40,7 +40,7 @@ IOWindow::IOWindow(QWidget* parent, ControllerEmu::EmulatedController* controlle
setWindowTitle(type == IOWindow::Type::Input ? tr("Configure Input") : tr("Configure Output"));
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
Update();
ConfigChanged();
}
void IOWindow::CreateMainLayout()
@ -115,8 +115,10 @@ void IOWindow::CreateMainLayout()
setLayout(m_main_layout);
}
void IOWindow::Update()
void IOWindow::ConfigChanged()
{
const auto old_state = blockSignals(true);
m_expression_text->setPlainText(QString::fromStdString(m_reference->GetExpression()));
m_expression_text->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
m_range_spinbox->setValue(m_reference->range * SLIDER_TICK_COUNT);
@ -126,6 +128,8 @@ void IOWindow::Update()
UpdateDeviceList();
UpdateOptionList();
blockSignals(old_state);
}
void IOWindow::ConnectWidgets()
@ -173,6 +177,7 @@ void IOWindow::OnDialogButtonPressed(QAbstractButton* button)
}
m_reference->SetExpression(m_expression_text->toPlainText().toStdString());
m_controller->UpdateReferences(g_controller_interface);
if (button != m_apply_button)
accept();
@ -234,21 +239,9 @@ void IOWindow::UpdateDeviceList()
{
m_devices_combo->clear();
Core::RunAsCPUThread([&] {
g_controller_interface.RefreshDevices();
m_controller->UpdateReferences(g_controller_interface);
for (const auto& name : g_controller_interface.GetAllDeviceStrings())
m_devices_combo->addItem(QString::fromStdString(name));
// Adding default device regardless if it's currently connected or not
const auto default_device = m_controller->GetDefaultDevice().ToString();
m_devices_combo->addItem(QString::fromStdString(default_device));
for (const auto& name : g_controller_interface.GetAllDeviceStrings())
{
if (name != default_device)
m_devices_combo->addItem(QString::fromStdString(name));
}
m_devices_combo->setCurrentIndex(0);
});
m_devices_combo->setCurrentText(
QString::fromStdString(m_controller->GetDefaultDevice().ToString()));
}