Merge pull request #6732 from spycrab/qt_profile_fixes
Qt: Mapping fixes
This commit is contained in:
commit
a6b35ed600
|
@ -130,6 +130,7 @@ void MappingButton::OnButtonTimeout()
|
||||||
void MappingButton::Clear()
|
void MappingButton::Clear()
|
||||||
{
|
{
|
||||||
m_reference->SetExpression("");
|
m_reference->SetExpression("");
|
||||||
|
m_reference->range = 100;
|
||||||
m_parent->SaveSettings();
|
m_parent->SaveSettings();
|
||||||
Update();
|
Update();
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,7 @@ MappingWidget::MappingWidget(MappingWindow* window) : m_parent(window)
|
||||||
{
|
{
|
||||||
connect(window, &MappingWindow::ClearFields, this, &MappingWidget::OnClearFields);
|
connect(window, &MappingWindow::ClearFields, this, &MappingWidget::OnClearFields);
|
||||||
connect(window, &MappingWindow::Update, this, &MappingWidget::Update);
|
connect(window, &MappingWindow::Update, this, &MappingWidget::Update);
|
||||||
|
connect(window, &MappingWindow::Save, this, &MappingWidget::SaveSettings);
|
||||||
}
|
}
|
||||||
|
|
||||||
MappingWindow* MappingWidget::GetParent() const
|
MappingWindow* MappingWidget::GetParent() const
|
||||||
|
|
|
@ -24,7 +24,7 @@ namespace ControllerEmu
|
||||||
class Control;
|
class Control;
|
||||||
class ControlGroup;
|
class ControlGroup;
|
||||||
class EmulatedController;
|
class EmulatedController;
|
||||||
}
|
} // namespace ControllerEmu
|
||||||
|
|
||||||
namespace ciface
|
namespace ciface
|
||||||
{
|
{
|
||||||
|
@ -32,7 +32,7 @@ namespace Core
|
||||||
{
|
{
|
||||||
class Device;
|
class Device;
|
||||||
}
|
}
|
||||||
}
|
} // namespace ciface
|
||||||
|
|
||||||
class MappingWidget : public QWidget
|
class MappingWidget : public QWidget
|
||||||
{
|
{
|
||||||
|
|
|
@ -345,6 +345,7 @@ void MappingWindow::OnDefaultFieldsPressed()
|
||||||
m_controller->LoadDefaults(g_controller_interface);
|
m_controller->LoadDefaults(g_controller_interface);
|
||||||
m_controller->UpdateReferences(g_controller_interface);
|
m_controller->UpdateReferences(g_controller_interface);
|
||||||
emit Update();
|
emit Update();
|
||||||
|
emit Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MappingWindow::IsIterativeInput() const
|
bool MappingWindow::IsIterativeInput() const
|
||||||
|
|
|
@ -56,6 +56,7 @@ public:
|
||||||
signals:
|
signals:
|
||||||
void Update();
|
void Update();
|
||||||
void ClearFields();
|
void ClearFields();
|
||||||
|
void Save();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void SetMappingType(Type type);
|
void SetMappingType(Type type);
|
||||||
|
|
Loading…
Reference in New Issue