fix menubar not shown and wrong button mapping path

Author: Gin

SerialPrograms/Source/CommonFramework/Main.cpp

@@ -46,6 +46,11 @@ void set_working_directory(){
 
 int main(int argc, char *argv[]){
     setup_crash_handler();
+#if defined(__linux) || defined(__APPLE__)
+    // fix for menubar not showing in macOS and potentially on Linux
+    // we use menubar in our ButtonDiagram window to choose which controller's button mapping image to show
+    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+#endif
 
 //#if QT_VERSION_MAJOR == 5 // AA_EnableHighDpiScaling is deprecated in Qt6
 //    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);

SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp

@@ -11,13 +11,17 @@
 #include "WindowTracker.h"
 #include "ButtonDiagram.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 
 namespace PokemonAutomation{
 
+const char* PRO_CONTROLLER_MAPPING_PATH = "/NintendoSwitch/Layout-ProController.png";
+const char* JOYCON_VERTICAL_MAPPING_PATH = "/NintendoSwitch/Layout-JoyconVertical.png";
+const char* JOYCON_HORIZONTAL_MAPPING_PATH = "/NintendoSwitch/Layout-JoyconHorizontal.png";
+
 
 ButtonDiagram::ButtonDiagram(QWidget* parent)
     : QMainWindow(parent)
@@ -34,25 +38,22 @@ ButtonDiagram::ButtonDiagram(QWidget* parent)
     connect(
         pro_controller, &QMenu::aboutToShow,
         this, [this](){
-            set_image("/NintendoSwitch/Layout-ProController.png");
+            set_image(PRO_CONTROLLER_MAPPING_PATH);
         }
     );
     connect(
         joycon_vertical, &QMenu::aboutToShow,
         this, [this](){
-            set_image("/NintendoSwitch/Layout-JoyconVertical.png");
+            set_image(JOYCON_VERTICAL_MAPPING_PATH);
         }
     );
     connect(
         joycon_horizontal, &QMenu::aboutToShow,
         this, [this](){
-            set_image("/NintendoSwitch/Layout-JoyconHorizontal.png");
+            set_image(JOYCON_HORIZONTAL_MAPPING_PATH);
         }
     );
 
-
-//    m_image = QPixmap(QString::fromStdString(RESOURCE_PATH() + "/NintendoSwitch/Layout-ProController.jpg"));
-
     m_image_label = new QLabel(this);
     setCentralWidget(m_image_label);
     m_image_label->setAlignment(Qt::AlignCenter);
@@ -66,7 +67,7 @@ ButtonDiagram::ButtonDiagram(QWidget* parent)
 
     resize(800, 600 + menu->sizeHint().height());
 
-    set_image("/NintendoSwitch/Layout-ProController.jpg");
+    set_image(PRO_CONTROLLER_MAPPING_PATH);
 
     add_window(*this);
 }
@@ -75,7 +76,8 @@ ButtonDiagram::~ButtonDiagram(){
 }
 
 void ButtonDiagram::set_image(const std::string& resource_name){
-    m_image = QPixmap(QString::fromStdString(RESOURCE_PATH() + resource_name));
+    const std::string image_path = RESOURCE_PATH() + resource_name;
+    m_image = QPixmap(QString::fromStdString(image_path));
     ButtonDiagram::resizeEvent(nullptr);
 }
 void ButtonDiagram::resizeEvent(QResizeEvent*){

SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.h

@@ -9,6 +9,8 @@
 
 namespace PokemonAutomation{
 
+// The window that shows button mapping: which keyboard keys are mapped to which
+// Switch controller buttons.
 class ButtonDiagram : public QMainWindow{
 public:
     ButtonDiagram(QWidget* parent = nullptr);