Qt/Mapping: Visual GCPad configuration

dolphin-emu · Feb 26, 2020 · 82f267e · 82f267e
1 parent 2a18e12
commit 82f267e
Show file tree

Hide file tree

Showing 35 changed files with 2,493 additions and 26 deletions.
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
@@ -6,13 +6,20 @@ if (NOT Qt5_DIR AND MSVC)
   endif()
 endif()
 
-find_package(Qt5 5.9 REQUIRED COMPONENTS Gui Widgets)
+find_package(Qt5 5.9 REQUIRED COMPONENTS Gui Widgets Quick QuickWidgets)
+find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
 
 set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES "")
 message(STATUS "Found Qt version ${Qt5Core_VERSION}")
 
 set(CMAKE_AUTOMOC ON)
 
+if (NOT Qt5QuickCompiler_DIR STREQUAL "Qt5QuickCompiler_DIR-NOTFOUND")
+  message(STATUS "Found Qt Quick Compiler")
+  qtquick_compiler_add_resources(RCC_SOURCES Resources/Resources.qrc)
+endif()
+set_property(SOURCE ${RCC_SOURCES} PROPERTY SKIP_AUTOMOC ON)
+
 add_executable(dolphin-emu
   AboutDialog.cpp
   AboutDialog.h
@@ -142,6 +149,7 @@ add_executable(dolphin-emu
   Config/Mapping/MappingWidget.h
   Config/Mapping/MappingWindow.cpp
   Config/Mapping/MappingWindow.h
+  Config/Mapping/Visual/GCMappingWidget.cpp
   Config/Mapping/WiimoteEmuExtension.cpp
   Config/Mapping/WiimoteEmuExtension.h
   Config/Mapping/WiimoteEmuExtensionMotionInput.cpp
@@ -266,6 +274,7 @@ add_executable(dolphin-emu
   TAS/IRWidget.h
   Updater.cpp
   Updater.h
+  ${RCC_SOURCES}
 )
 
 if (NOT WIN32)
@@ -286,12 +295,16 @@ target_include_directories(dolphin-emu
 PRIVATE
   ${CMAKE_CURRENT_BINARY_DIR}
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+  ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+  ${Qt5QuickWidgets_PRIVATE_INCLUDE_DIRS}
 )
 
 target_link_libraries(dolphin-emu
 PRIVATE
   core
   Qt5::Widgets
+  Qt5::Quick
+  Qt5::QuickWidgets
   uicommon
   imgui
 )
@@ -348,6 +361,7 @@ if(WIN32)
     COMMAND "${CMAKE_COMMAND}" -E env PATH="${QT_BINARY_DIRECTORY}"
             "${WINDEPLOYQT_EXE}" --libdir="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
                                  --plugindir="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/QtPlugins"
+                                 --qmldir="${CMAKE_CURRENT_SOURCE_DIR}/Resources"
                                  $<IF:$<CONFIG:Debug>,--debug,--release>
                                  --no-translations
                                  --no-compiler-runtime

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -93,6 +93,9 @@ void MappingButton::Clicked()
 
   QString expression;
 
+  const auto old_text = text();
+  setText(QStringLiteral("..."));
+
   if (m_parent->GetParent()->IsMappingAllDevices())
   {
     expression = MappingCommon::DetectExpression(this, g_controller_interface,
@@ -106,6 +109,8 @@ void MappingButton::Clicked()
                                                  default_device_qualifier);
   }
 
+  setText(old_text);
+
   if (expression.isEmpty())
     return;
 

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
@@ -13,6 +13,7 @@
 #include <QTimer>
 
 #include "DolphinQt/QtUtils/BlockUserInputFilter.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
@@ -49,18 +50,16 @@ QString GetExpressionForControl(const QString& control_name,
   return expr;
 }
 
-QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& device_container,
+QString DetectExpression(QWidget* widget, ciface::Core::DeviceContainer& device_container,
                          const std::vector<std::string>& device_strings,
                          const ciface::Core::DeviceQualifier& default_device, Quote quote)
 {
-  const auto filter = new BlockUserInputFilter(button);
-
-  button->installEventFilter(filter);
-  button->grabKeyboard();
-  button->grabMouse();
-
-  const auto old_text = button->text();
-  button->setText(QStringLiteral("..."));
+  const auto filter = new BlockUserInputFilter(widget);
+  QueueOnObject(widget, [widget, filter] {
+    widget->installEventFilter(filter);
+    widget->grabKeyboard();
+    widget->grabMouse();
+  });
 
   // The button text won't be updated if we don't process events here
   QApplication::processEvents();
@@ -70,19 +69,17 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
 
   const auto [device, input] = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
 
-  const auto timer = new QTimer(button);
+  const auto timer = new QTimer(widget);
 
-  button->connect(timer, &QTimer::timeout, [button, filter] {
-    button->releaseMouse();
-    button->releaseKeyboard();
-    button->removeEventFilter(filter);
+  widget->connect(timer, &QTimer::timeout, [widget, filter] {
+    widget->releaseMouse();
+    widget->releaseKeyboard();
+    widget->removeEventFilter(filter);
   });
 
   // Prevent mappings of "space", "return", or mouse clicks from re-activating detection.
   timer->start(500);
 
-  button->setText(old_text);
-
   if (!input)
     return {};
 

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
@@ -7,9 +7,12 @@
 #include <string>
 #include <vector>
 
-class QString;
 class OutputReference;
 class QPushButton;
+class QString;
+class QWidget;
+
+constexpr int INDICATOR_UPDATE_FREQ = 30;
 
 namespace ciface::Core
 {
@@ -30,7 +33,7 @@ QString GetExpressionForControl(const QString& control_name,
                                 const ciface::Core::DeviceQualifier& default_device,
                                 Quote quote = Quote::On);
 
-QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& device_container,
+QString DetectExpression(QWidget* widget, ciface::Core::DeviceContainer& device_container,
                          const std::vector<std::string>& device_strings,
                          const ciface::Core::DeviceQualifier& default_device,
                          Quote quote = Quote::On);

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -25,7 +25,7 @@
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
-#include "DolphinQt/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 
 namespace

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
@@ -12,6 +12,7 @@
 
 #include "DolphinQt/Config/Mapping/IOWindow.h"
 #include "DolphinQt/Config/Mapping/MappingButton.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
 #include "DolphinQt/Config/Mapping/MappingIndicator.h"
 #include "DolphinQt/Config/Mapping/MappingNumeric.h"
 #include "DolphinQt/Config/Mapping/MappingWindow.h"

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
@@ -28,8 +28,6 @@ class EmulatedController;
 class NumericSettingBase;
 }  // namespace ControllerEmu
 
-constexpr int INDICATOR_UPDATE_FREQ = 30;
-
 class MappingWidget : public QWidget
 {
   Q_OBJECT

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@@ -33,6 +33,7 @@
 #include "DolphinQt/Config/Mapping/HotkeyStatesOther.h"
 #include "DolphinQt/Config/Mapping/HotkeyTAS.h"
 #include "DolphinQt/Config/Mapping/HotkeyWii.h"
+#include "DolphinQt/Config/Mapping/Visual/GCMappingWidget.h"
 #include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
 #include "DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h"
 #include "DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h"
@@ -49,6 +50,7 @@
 #include "InputCommon/InputConfig.h"
 
 constexpr const char* PROFILES_DIR = "Profiles/";
+constexpr int INDICATOR_UPDATE_FREQ = 30;
 
 MappingWindow::MappingWindow(QWidget* parent, Type type, int port_num)
     : QDialog(parent), m_port(port_num)
@@ -346,10 +348,14 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
   case Type::MAPPING_GC_STEERINGWHEEL:
   case Type::MAPPING_GC_DANCEMAT:
   case Type::MAPPING_GCPAD:
+  {
     widget = new GCPadEmu(this);
+    auto* visual = new VisualGCMappingWidget(this, GetPort());
     setWindowTitle(tr("GameCube Controller at Port %1").arg(GetPort() + 1));
     AddWidget(tr("GameCube Controller"), widget);
+    AddWidget(tr("Visual Configuration"), visual);
     break;
+  }
   case Type::MAPPING_GC_MICROPHONE:
     widget = new GCMicrophone(this);
     setWindowTitle(tr("GameCube Microphone Slot %1")