Qt: Fix Hotkey Controller Profile display with boxes for each Wiimote #8654

3t13nn3 · 2020-02-27T04:13:49Z

According to https://bugs.dolphin-emu.org/issues/11646 the Hotkey Controller Profile GUI needed to have an overhaul.
Then @imStudd and I decided to solve this issue by putting theses options over boxes for each Wiimote. Separating Wiimotes looks way better and is more intuitive than displaying all Wiimotes options into one column.

Here is the old display:

That is the new one:

MayImilae · 2020-02-27T09:02:32Z

Design wise, this is a nice little improvement!

jordan-woyak · 2020-02-27T21:03:06Z

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.cpp

+      0, 0);
+
+  m_main_layout->addWidget(
+      CreateGroupBox(tr("Wii Remote %2").arg(2), 


Perhaps this was a find/replace mistake. %2 is probably meant to be %1.
Same problem below with 3 and 4.

Then, I guess I have to switch 1 & 2, and 3 & 4 ?

Hmm? %1 is the format string placeholder for the first value supplied to the .arg function.

Oh sure.
Edit: Done.

jordan-woyak · 2020-02-27T21:08:14Z

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.h

@@ -22,5 +22,5 @@ class HotkeyControllerProfile final : public MappingWidget
  void CreateMainLayout();

  // Main
-  QHBoxLayout* m_main_layout;
+  QGridLayout* m_main_layout;


It looks like this doesn't need to be a member variable as it's only used in CreateMainLayout.
You can just declare a local variable there and completely kill the above forward-declaration ~~and include~~.
I realize you didn't add this member but now is a good time to fix it. :P

OK, will change it to a local variable.
Edit: Done.

AdmiralCurtiss · 2020-02-27T22:45:28Z

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.cpp

+      1, 0);
+
+  m_main_layout->addWidget(
+      CreateGroupBox(tr("Wii Remote %4").arg(4),


Are you sure this is the right way to format these? I'd assume the %1 is a placeholder for the argument and then the .arg() fills in the argument, so all of these should read "Wii Remote %1". Or just use literal strings and get rid of the .arg().

As @jordan-woyak said upper, it must be 1% for the string format. I will commit it soon.
Edit: Done.

AdmiralCurtiss · 2020-02-27T22:59:49Z

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.h

@@ -6,7 +6,7 @@

 #include "DolphinQt/Config/Mapping/MappingWidget.h"

-class QHBoxLayout;
+class QGridLayout;


You can remove this forward declaration now.

AdmiralCurtiss · 2020-02-27T23:05:39Z

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.cpp

+  QGridLayout* m_main_layout;
+  m_main_layout = new QGridLayout;


Suggested change

QGridLayout* m_main_layout;

m_main_layout = new QGridLayout;

QGridLayout* m_main_layout = new QGridLayout;

AdmiralCurtiss · 2020-02-27T23:47:56Z

Source/Core/Core/HotkeyManager.cpp

+    _trans("Next Profile "),
+    _trans("Previous Profile "),
+    _trans("Next Game Profile "),
+    _trans("Previous Game Profile "),


Just noticed one more thing, there's extra spaces at the end of these strings. You can even see that in your screenshot.

Maybe also clean up your commit message while you're at it, all those extra fix lines are really not necessary.

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.cpp

jordan-woyak · 2020-02-28T00:10:01Z

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.cpp

-
-  m_main_layout->addWidget(CreateGroupBox(
-      tr("Controller Profile"), HotkeyManagerEmu::GetHotkeyGroup(HKGP_CONTROLLER_PROFILE)));
+  QGridLayout* m_main_layout = new QGridLayout;


Please remove m_ from this variable name.
You can also declare the type as const auto.

3t13nn3 · 2020-02-28T01:38:10Z

So actually, my teammate and I have discover that naming many options with same names poses a conflict problem. In fact, assigned value are mixed once we quit and restart Dolphin.
Furthermore, we found in ~/.config/dolphin-emu/Hotkeys.ini (the file that stock our inputs) that stocking depends on the name of the option.
So to avoid this, it seems we have to name each option differently.

1303a85#diff-8d3cfd109d3bb0eeb1cd0e968d40d086

We were using Next Profile as the next profile string but we need to change it. For that, we thought about:

return to Next Profile for Wii Remote 1
change to Next Profile 1
change to 1 Next Profile

Give us your opinion, so we can change.

If you find an other solution to avoid renaming each options differently, tell us !

Edit: As you can see bellow, no needs to renames option. We need to solve the conflict name issue.

Techjar · 2020-02-28T01:51:02Z

The config key and the UI label being tied to the same string seems like a fundamental design flaw. Perhaps we should hold off on this change and fix that first?

Techjar · 2020-02-29T04:26:13Z

#8655 should address the name conflict issue.

3t13nn3 · 2020-02-29T15:44:44Z

Nice. We are waiting for you changes to be commited and we are done with this PR.

jordan-woyak · 2020-03-01T15:25:09Z

Do we care about breaking existing configs?
This change will of course affect the names in the ini-file.

Techjar · 2020-03-01T23:13:36Z

I don't think these hotkeys are that commonly used, and they don't have any default bindings, so in this case it's probably okay.

Techjar · 2020-03-26T09:07:21Z

This needs to be rebased now that #8655 is merged.

3t13nn3 · 2020-04-05T21:47:43Z

Update our PR, changes are ok.

BhaaLseN · 2020-04-06T15:39:22Z

Something went wrong there; you have a lot of changes in there that don't seem to belong. Can you please take a look?

3t13nn3 · 2020-04-15T15:49:53Z

Seems better now.

JMC47 · 2020-04-27T00:49:32Z

Seems to look fine to me.

AdmiralCurtiss · 2020-04-27T00:51:17Z

Commits should be squashed though.

3t13nn3 changed the title ~~Fix Hotkey Controller Profile display with boxes for each Wiimote~~ Qt: Fix Hotkey Controller Profile display with boxes for each Wiimote Feb 27, 2020

jordan-woyak requested changes Feb 27, 2020

View reviewed changes

3t13nn3 force-pushed the HotkeyControllerProfile branch from 5ad4e83 to 4fbebd6 Compare February 27, 2020 22:14

AdmiralCurtiss requested changes Feb 27, 2020

View reviewed changes

3t13nn3 force-pushed the HotkeyControllerProfile branch 2 times, most recently from 9fc0215 to 092349c Compare February 27, 2020 22:59

AdmiralCurtiss requested changes Feb 27, 2020

View reviewed changes

3t13nn3 force-pushed the HotkeyControllerProfile branch from 092349c to 9e936f1 Compare February 27, 2020 23:34

AdmiralCurtiss reviewed Feb 27, 2020

View reviewed changes

3t13nn3 force-pushed the HotkeyControllerProfile branch from 9e936f1 to 95850fc Compare February 28, 2020 00:02

Techjar reviewed Feb 28, 2020

View reviewed changes

Source/Core/DolphinQt/Config/Mapping/HotkeyControllerProfile.cpp Show resolved Hide resolved

jordan-woyak reviewed Feb 28, 2020

View reviewed changes

3t13nn3 force-pushed the HotkeyControllerProfile branch from 95850fc to 1303a85 Compare February 28, 2020 00:28

leoetlino added the WIP / do not merge Work in progress (do not merge) label Mar 15, 2020

3t13nn3 force-pushed the HotkeyControllerProfile branch from 1303a85 to 39c0709 Compare April 5, 2020 20:34

3t13nn3 force-pushed the HotkeyControllerProfile branch 2 times, most recently from aba04b9 to 22a66fb Compare April 5, 2020 22:23

3t13nn3 force-pushed the HotkeyControllerProfile branch 2 times, most recently from 2e963f2 to bf76386 Compare April 7, 2020 17:02

leoetlino removed the WIP / do not merge Work in progress (do not merge) label Apr 28, 2020

Fix Hotkey Controller Profile display with boxes for each Wiimote

8288bdc

leoetlino force-pushed the HotkeyControllerProfile branch from bf76386 to 8288bdc Compare April 28, 2020 13:56

leoetlino merged commit 58de3c5 into dolphin-emu:master Apr 28, 2020

Qt: Fix Hotkey Controller Profile display with boxes for each Wiimote #8654

Qt: Fix Hotkey Controller Profile display with boxes for each Wiimote #8654

3t13nn3 commented Feb 27, 2020 •

edited

MayImilae commented Feb 27, 2020

jordan-woyak Feb 27, 2020

3t13nn3 Feb 27, 2020

jordan-woyak Feb 27, 2020

3t13nn3 Feb 27, 2020 •

edited

jordan-woyak Feb 27, 2020 •

edited

3t13nn3 Feb 27, 2020 •

edited

AdmiralCurtiss Feb 27, 2020

3t13nn3 Feb 27, 2020 •

edited

AdmiralCurtiss Feb 27, 2020

3t13nn3 Feb 27, 2020

AdmiralCurtiss Feb 27, 2020

3t13nn3 Feb 27, 2020

AdmiralCurtiss Feb 27, 2020

3t13nn3 Feb 28, 2020

jordan-woyak Feb 28, 2020

3t13nn3 Feb 28, 2020

3t13nn3 commented Feb 28, 2020 •

edited

Techjar commented Feb 28, 2020 •

edited

Techjar commented Feb 29, 2020

3t13nn3 commented Feb 29, 2020

jordan-woyak commented Mar 1, 2020 •

edited

Techjar commented Mar 1, 2020

Techjar commented Mar 26, 2020

3t13nn3 commented Apr 5, 2020

BhaaLseN commented Apr 6, 2020

3t13nn3 commented Apr 15, 2020

JMC47 commented Apr 27, 2020

AdmiralCurtiss commented Apr 27, 2020

	QGridLayout* m_main_layout;
	m_main_layout = new QGridLayout;
	QGridLayout* m_main_layout = new QGridLayout;

Qt: Fix Hotkey Controller Profile display with boxes for each Wiimote #8654

Qt: Fix Hotkey Controller Profile display with boxes for each Wiimote #8654

Conversation

3t13nn3 commented Feb 27, 2020 • edited

MayImilae commented Feb 27, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

3t13nn3 Feb 27, 2020 • edited

Choose a reason for hiding this comment

jordan-woyak Feb 27, 2020 • edited

Choose a reason for hiding this comment

3t13nn3 Feb 27, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

3t13nn3 Feb 27, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

3t13nn3 commented Feb 28, 2020 • edited

Techjar commented Feb 28, 2020 • edited

Techjar commented Feb 29, 2020

3t13nn3 commented Feb 29, 2020

jordan-woyak commented Mar 1, 2020 • edited

Techjar commented Mar 1, 2020

Techjar commented Mar 26, 2020

3t13nn3 commented Apr 5, 2020

BhaaLseN commented Apr 6, 2020

3t13nn3 commented Apr 15, 2020

JMC47 commented Apr 27, 2020

AdmiralCurtiss commented Apr 27, 2020

3t13nn3 commented Feb 27, 2020 •

edited

3t13nn3 Feb 27, 2020 •

edited

jordan-woyak Feb 27, 2020 •

edited

3t13nn3 Feb 27, 2020 •

edited

3t13nn3 Feb 27, 2020 •

edited

3t13nn3 commented Feb 28, 2020 •

edited

Techjar commented Feb 28, 2020 •

edited

jordan-woyak commented Mar 1, 2020 •

edited