Qt: Add controller (overview) window #5377

spycrab · 2017-05-05T18:49:55Z

Mostly finished, but I want to get some Feedback before finishing this up.

TODO List:

Overview Interface
Load Settings
Save Settings
Bluetooth Passthrough Sync / Reset Buttons functional
Fix Windows build
Disable certain options while Emulation is running
~~Configuration Windows~~ (For Mapping etc.) Separate PR(s).

Helios747 · 2017-05-05T19:02:40Z

I don't really like how this is split.

You have GC controllers all by themselves on the left with a ton of empty space, with everything else on the right. And background input isn't really worthy of it's own visual section. I get what you were going for, but I feel the old design was better.

spycrab · 2017-05-05T19:05:47Z

Yeah, the split thing was more of an afterthought, but I can change this in one minute, so that's not really a problem.

The separate section is also present in the original Wx Dialog so I'm not sure what to do about that (As it's neither a GameCube nor a Wii option), I could slim it down a bit by not wrapping it in this "Advanced" box if that's preferable?

Helios747 · 2017-05-05T19:06:58Z

Ah, you're right, it looks fine in the old Wx UI because it isn't stretched across two sections

spycrab · 2017-05-05T19:07:43Z

Yeah, I'll just see how it looks when I use the classic "top-down" approach and see what to do afterwards.

Ryanel · 2017-05-05T19:32:46Z

Hmm, everyone has pretty valid points, so here's an outside the box view:

If two sections is a problem, and the advanced groupbox is a problem, then why not just make it one section?

Let me explain using an image:

The settings dialog is tabbed. There are sections on the left, content on the right. Copy this, except have sections for GameCube, Wii, and Advanced.

This solves the problem of having side by side options, with lots of whitespace.
This familiar layout will make the UI more consistant
The code for that kind of layout is already present

I'm not proposing that Controller settings should be merged into the Main Settings Dialog, just simply that they mimic it's structure.

Source/Core/DolphinQt2/Config/ControllersWindow.h

+
+#pragma once
+
+#include <QBoxLayout>


Source/Core/DolphinQt2/Config/ControllersWindow.h

+  QHBoxLayout* m_advanced_layout;
+  QCheckBox* m_advanced_bg_input;
+
+  static const std::unordered_map<SerialInterface::SIDevices, int> m_gc_types;


Source/Core/DolphinQt2/Config/ControllersWindow.h

+  static int ToGCMenuIndex(const SerialInterface::SIDevices&);
+  static SerialInterface::SIDevices FromGCMenuIndex(const int& menudevice);
+
+  static int ToWiimoteMenuIndex(const int& device);


Source/Core/DolphinQt2/Config/ControllersWindow.h

+  Q_OBJECT
+public:
+  explicit ControllersWindow(QWidget* parent);
+private slots:


Source/Core/DolphinQt2/Config/ControllersWindow.h

+  QGroupBox* m_gc_box;
+  QLabel* m_gc_label;
+  QFormLayout* m_gc_layout;
+  QComboBox* m_gc_controller_boxes[4];


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+{
+  auto* box = static_cast<QComboBox*>(QObject::sender());
+
+  for (int i = 0; i < 4; i++)


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+#include <QLabel>
+#include <QMessageBox>
+#include <QPixmap>
+#include <iostream>


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+
+void ControllersWindow::ConnectWidgets()
+{
+  connect(m_wiimote_passthrough, SIGNAL(toggled(bool)), this, SLOT(OnWiimoteModeChanged(bool)));


Source/Core/DolphinQt2/Config/ControllersWindow.h

+
+  static int ToWiimoteMenuIndex(const int& device);
+  static int FromWiimoteMenuIndex(const int& menudevice);
+};


Source/Core/DolphinQt2/CMakeLists.txt

@@ -1,81 +1,100 @@
-find_package(Qt5Widgets REQUIRED)
-message(STATUS "Found Qt version ${Qt5Core_VERSION}")
+find_package(Qt5Widgets REQUIRED) message(STATUS "Found Qt version ${Qt5Core_VERSION}")


spycrab · 2017-05-05T20:03:45Z

Updated GUI as suggested by @Helios747.

Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+  auto device = ios->GetDeviceByName("/dev/usb/oh1/57e/305");
+  if (device != nullptr)
+  {
+    static_cast<IOS::HLE::Device::BluetoothBase*>(device.get())->TriggerSyncButtonHeldEvent();


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+
+  if (device != nullptr)
+  {
+    static_cast<IOS::HLE::Device::BluetoothBase*>(device.get())->TriggerSyncButtonPressedEvent();


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+
+  for (int i = 0; i < 4; i++)
+  {
+    if (m_gc_controller_boxes[i] == box)


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+{
+  auto* box = static_cast<QComboBox*>(QObject::sender());
+
+  for (int i = 0; i < 4; i++)


Source/Core/DolphinQt2/Settings.cpp

@@ -1,7 +1,8 @@
-// Copyright 2015 Dolphin Emulator Project


Source/Core/DolphinQt2/Settings.h

@@ -1,4 +1,4 @@
-// Copyright 2015 Dolphin Emulator Project
+// Copyright 2017 Dolphin Emulator Project


Source/Core/DolphinQt2/MainWindow.h

@@ -9,6 +9,7 @@
 #include <QString>
 #include <QToolBar>

+#include "DolphinQt2/Config/ControllersWindow.h"


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+{
+  auto it = std::find_if(gc_types.begin(), gc_types.end(),
+                         [=](auto pair) { return pair.second == menudevice; });
+  return (*it).first;


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+{
+  auto it = std::find_if(wiimote_types.begin(), wiimote_types.end(),
+                         [=](auto pair) { return pair.second == menudevice; });
+  return (*it).first;


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+#include "Core/IOS/USB/Bluetooth/BTReal.h"
+#include "DolphinQt2/Settings.h"
+
+#include "ControllersWindow.h"


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+
+#include "ControllersWindow.h"
+
+static const std::unordered_map<SerialInterface::SIDevices, int> gc_types = {


Source/Core/DolphinQt2/Config/ControllersWindow.h

+  QHBoxLayout* m_advanced_layout;
+  QCheckBox* m_advanced_bg_input;
+
+  static int ToGCMenuIndex(const SerialInterface::SIDevices);


MayImilae

Can you place sub-options offset under them, like below? It makes it a lot clearer when an option is specific to a mode being active! (this is something our WX GUI doesn't have, but it really should!)

lioncash · 2017-05-05T23:11:55Z

@MayImilae should the emulation settings come first, and then the passthrough ones? (I'm assuming most users would emulate it, so it would likely be better to place that first if so).

spycrab · 2017-05-06T00:42:44Z

@MayImilae Adjusted it.

MayImilae · 2017-05-06T00:52:17Z

@lioncash Honestly I'm totally fine with putting bluetooth passthrough up top. It makes it more apparent and encourages users to investigate it, instead of just using emulated forever.

@spycrab Much better! In the latest shot "Bluetooth Passthrough" is underlined. What does that mean?

spycrab · 2017-05-06T00:54:14Z

That shows up when you use the keyboard to switch between options, it shows what you have selected.

MayImilae · 2017-05-06T00:57:21Z

Hmm, interesting.

Oh btw, the config icons weren't meant to be the size you are displaying them there. That's not really something for this PR, but if you want size adjusted versions for any icons or new icons, please let me know!

Source/Core/DolphinQt2/Config/ControllersWindow.h

+
+#include <array>
+
+#include "Core/HW/SI/SI.h"


spycrab · 2017-05-06T17:42:22Z

@lioncash @JosJuice Should I create a separate PR for the configuration dialogs? I think the work could be split more efficiently if there was a base everyone can utilize.

spycrab · 2017-05-06T20:05:24Z

Added a Windows screenshot.

leoetlino · 2017-05-07T18:57:27Z

Really subjective opinion: I think the dialog would look a lot better if the controls were aligned. Right now, it's all very, very inconsistent :(

spycrab · 2017-05-07T19:25:16Z

@leoetlino Hm, I'll see what I can do about that.

Helios747

Other than the silly nitpicks, I think this looks fine to merge.

Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+{
+  m_gc_box = new QGroupBox(m_gc_label);
+  m_gc_layout = new QFormLayout();
+


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+  m_wiimote_pt_labels[0] = new QLabel(tr("Sync real Wii Remotes and pair them"));
+  m_wiimote_pt_labels[1] = new QLabel(tr("Reset all saved Wii Remote pairings"));
+  m_wiimote_emu = new QRadioButton(tr("Emulate the Wii Bluetooth Adapter"));
+


Source/Core/DolphinQt2/Config/ControllersWindow.h

+  QRadioButton* m_wiimote_passthrough;
+  QPushButton* m_wiimote_sync;
+  QPushButton* m_wiimote_reset;
+  QCheckBox* m_wiimote_continous_scanning;


Source/Core/DolphinQt2/Config/ControllersWindow.cpp

+  m_wiimote_pt_labels[1] = new QLabel(tr("Reset all saved Wii Remote pairings"));
+  m_wiimote_emu = new QRadioButton(tr("Emulate the Wii Bluetooth Adapter"));
+
+  m_wiimote_continous_scanning = new QCheckBox(tr("Continous Scanning"));


spycrab · 2017-05-09T11:25:32Z

@leoetlino Can this be merged now? I fixed the alignment and spelling mistakes (Can't update the screenshots ATM).

Helios747 · 2017-05-09T15:32:19Z

This has merge conflicts now.

spycrab · 2017-05-09T15:49:56Z

Should be rather easy to fix.

spycrab force-pushed the qt_controller branch from 6ebfd6b to 74de7ca Compare May 5, 2017 18:56

spycrab force-pushed the qt_controller branch 2 times, most recently from ba7393d to 3bd86f3 Compare May 5, 2017 19:54

lioncash reviewed May 5, 2017

View reviewed changes

spycrab force-pushed the qt_controller branch from 3bd86f3 to 5bfe6cf Compare May 5, 2017 20:01

lioncash reviewed May 5, 2017

View reviewed changes

spycrab force-pushed the qt_controller branch 3 times, most recently from aa9cdbb to 87f3934 Compare May 5, 2017 21:26

lioncash reviewed May 5, 2017

View reviewed changes

spycrab force-pushed the qt_controller branch from 87f3934 to 8f5d7ad Compare May 5, 2017 22:12

MayImilae suggested changes May 5, 2017

View reviewed changes

lioncash added RFC Request for comments WIP / do not merge Work in progress (do not merge) labels May 5, 2017

spycrab force-pushed the qt_controller branch from 8f5d7ad to 7d2cd60 Compare May 6, 2017 00:38

MayImilae approved these changes May 6, 2017

View reviewed changes

spycrab force-pushed the qt_controller branch 2 times, most recently from 234b416 to 3040084 Compare May 6, 2017 01:11

lioncash reviewed May 6, 2017

View reviewed changes

Source/Core/DolphinQt2/Config/ControllersWindow.h Outdated

#include <array>

#include "Core/HW/SI/SI.h"

This comment was marked as off-topic.

Sign in to view

spycrab force-pushed the qt_controller branch 6 times, most recently from 608f8e4 to f97cfc0 Compare May 6, 2017 12:23

spycrab changed the title ~~[RFC] [WIP] Qt: Add controller (overview) window~~ Qt: Add controller (overview) window May 6, 2017

spycrab force-pushed the qt_controller branch from f97cfc0 to ec482d4 Compare May 6, 2017 20:13

JosJuice removed RFC Request for comments WIP / do not merge Work in progress (do not merge) labels May 6, 2017

spycrab force-pushed the qt_controller branch from ec482d4 to fa4dc60 Compare May 8, 2017 11:14

Helios747 reviewed May 8, 2017

View reviewed changes

leoetlino reviewed May 8, 2017

View reviewed changes

Source/Core/DolphinQt2/Config/ControllersWindow.h Outdated

QRadioButton* m_wiimote_passthrough;

QPushButton* m_wiimote_sync;

QPushButton* m_wiimote_reset;

QCheckBox* m_wiimote_continous_scanning;

This comment was marked as off-topic.

Sign in to view

leoetlino reviewed May 8, 2017

View reviewed changes

spycrab force-pushed the qt_controller branch 2 times, most recently from 0602c5a to 7e3a4ba Compare May 8, 2017 19:34

Qt: Add controller (overview) window

c8d0b64

spycrab force-pushed the qt_controller branch from 7e3a4ba to c8d0b64 Compare May 9, 2017 16:49

Helios747 merged commit d21f1b2 into dolphin-emu:master May 9, 2017

spycrab deleted the qt_controller branch May 9, 2017 18:06

leoetlino modified the milestone: Qt Sep 13, 2017

		@@ -1,4 +1,4 @@
		// Copyright 2015 Dolphin Emulator Project
		// Copyright 2017 Dolphin Emulator Project


		#include "ControllersWindow.h"

		static const std::unordered_map<SerialInterface::SIDevices, int> gc_types = {

Qt: Add controller (overview) window #5377

Qt: Add controller (overview) window #5377

Conversation

spycrab commented May 5, 2017 • edited Loading

Helios747 commented May 5, 2017 • edited Loading

spycrab commented May 5, 2017

Helios747 commented May 5, 2017

spycrab commented May 5, 2017

Ryanel commented May 5, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

spycrab commented May 5, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

MayImilae left a comment

Choose a reason for hiding this comment

lioncash commented May 5, 2017

spycrab commented May 6, 2017

MayImilae commented May 6, 2017

spycrab commented May 6, 2017

MayImilae commented May 6, 2017

This comment was marked as off-topic.

spycrab commented May 6, 2017

spycrab commented May 6, 2017

leoetlino commented May 7, 2017

spycrab commented May 7, 2017

Helios747 left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

spycrab commented May 9, 2017 • edited Loading

Helios747 commented May 9, 2017

spycrab commented May 9, 2017

spycrab commented May 5, 2017 •

edited

Loading

Helios747 commented May 5, 2017 •

edited

Loading

spycrab commented May 9, 2017 •

edited

Loading