Change KBM default to elden ring defaults, add note on remapping

Author: rainmakerv3

modules/bblauncher.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>730</width>
-    <height>669</height>
+    <height>683</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -46,7 +46,7 @@
     <property name="geometry">
      <rect>
       <x>40</x>
-      <y>350</y>
+      <y>370</y>
       <width>131</width>
       <height>20</height>
      </rect>
@@ -59,7 +59,7 @@
     <property name="geometry">
      <rect>
       <x>380</x>
-      <y>350</y>
+      <y>370</y>
       <width>131</width>
       <height>20</height>
      </rect>
@@ -71,8 +71,8 @@
    <widget class="QWidget" name="horizontalLayoutWidget_2">
     <property name="geometry">
      <rect>
-      <x>40</x>
-      <y>370</y>
+      <x>30</x>
+      <y>390</y>
       <width>671</width>
       <height>271</height>
      </rect>
@@ -392,6 +392,24 @@
      </item>
     </layout>
    </widget>
+   <widget class="QLabel" name="label_3">
+    <property name="geometry">
+     <rect>
+      <x>170</x>
+      <y>337</y>
+      <width>431</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Note: remapping only works on shadPS4 versions relased after Feb. 2, 2025</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
  </widget>

settings/LauncherSettings.cpp

@@ -290,46 +290,46 @@ void SetTheme(std::string theme) {
     qApp->setPalette(themePalette);
 }
 
-constexpr std::string_view GetDefaultKeyboardConfig() {
+std::string_view GetDefaultKeyboardConfig() {
     return R"(#Feeling lost? Check out the Help section!
 
-# Keyboard bindings
-
-triangle = kp8
-circle = kp6
-cross = kp2
-square = kp4
-# Alternatives for users without a keypad
-triangle = c
-circle = b
-cross = n
-square = v
-
-l1 = q
-r1 = u
-l2 = e
-r2 = o
+#Keyboard bindings
+
+triangle = f
+circle = space
+cross = e
+square = r
+
+pad_up = w, lalt
+pad_up = mousewheelup
+pad_down = s, lalt
+pad_down = mousewheeldown
+pad_left = a, lalt
+pad_left = mousewheelleft
+pad_right = d, lalt
+pad_right = mousewheelright
+
+l1 = rightbutton, lshift
+r1 = leftbutton
+l2 = rightbutton
+r2 = leftbutton, lshift
 l3 = x
-r3 = m
+r3 = q
+r3 = middlebutton
 
-options = enter
-touchpad = space
+options = escape
+touchpad = g
 
-pad_up = up
-pad_down = down
-pad_left = left
-pad_right = right
+key_toggle = i, lalt
+mouse_to_joystick = right
+mouse_movement_params = 0.5, 1, 0.125
+leftjoystick_halfmode = lctrl
 
 axis_left_x_minus = a
 axis_left_x_plus = d
 axis_left_y_minus = w
 axis_left_y_plus = s
 
-axis_right_x_minus = j
-axis_right_x_plus = l
-axis_right_y_minus = i
-axis_right_y_plus = k
-
 # Controller bindings
 
 triangle = triangle

settings/LauncherSettings.h

@@ -15,7 +15,7 @@ void LoadLauncherSettings();
 void CreateSettingsFile();
 void SetTheme(std::string theme);
 std::filesystem::path GetFoolproofKbmConfigFile(const std::string& game_id);
-constexpr std::string_view GetDefaultKeyboardConfig();
+std::string_view GetDefaultKeyboardConfig();
 void SaveUnifiedControl(bool setting);
 
 extern std::string theme;

settings/kbm_config_dialog.cpp

@@ -191,19 +191,15 @@ void EditorDialog::onHelpClicked() {
 }
 
 void EditorDialog::onResetToDefaultClicked() {
-    bool default_default = gameComboBox->currentText() == "default";
-    QString prompt =
-        default_default
-            ? "Do you want to reset your custom default config to the original default config?"
-            : "Do you want to reset this config to your custom default config?";
+
+    QString prompt = "Do you want to reset to default config?";
     QMessageBox::StandardButton reply =
         QMessageBox::question(this, "Reset to Default", prompt, QMessageBox::Yes | QMessageBox::No);
 
     if (reply == QMessageBox::Yes) {
-        if (default_default) {
-            const auto default_file = Config::GetFoolproofKbmConfigFile("default");
-            std::filesystem::remove(default_file);
-        }
+        const auto default_file = Config::GetFoolproofKbmConfigFile("default");
+        std::filesystem::remove(default_file);
+
         const auto config_file = Config::GetFoolproofKbmConfigFile("default");
         QFile file(config_file);
 
@@ -214,7 +210,6 @@ void EditorDialog::onResetToDefaultClicked() {
         } else {
             QMessageBox::warning(this, "Error", "Could not open the file for reading");
         }
-        // saveFile(gameComboBox->currentText());
     }
 }