Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:28:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

User-friendly SDL2 controller name

Browse source
This commit is contained in:
David Rowe 2017-06-29 10:03:58 +12:00
parent 88ed69a4a1
commit be0e1a75a4
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
View file

@ -17,7 +17,7 @@ PreferencesDialog {
id: root id: root
objectName: "GeneralPreferencesDialog" objectName: "GeneralPreferencesDialog"
title: "General Settings" title: "General Settings"
showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "SDL2 Joystick", "Sixense Controllers", "Perception Neuron", "Kinect"] showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Game Controller", "Sixense Controllers", "Perception Neuron", "Kinect"]
property var settings: Settings { property var settings: Settings {
category: root.objectName category: root.objectName
property alias x: root.x property alias x: root.x

2
interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
View file

@ -32,6 +32,6 @@ StackView {
TabletPreferencesDialog { TabletPreferencesDialog {
id: root id: root
objectName: "TabletGeneralPreferences" objectName: "TabletGeneralPreferences"
showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "SDL2 Joystick", "Sixense Controllers", "Perception Neuron", "Kinect", "Vive Pucks Configuration"] showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Game Controller", "Sixense Controllers", "Perception Neuron", "Kinect", "Vive Pucks Configuration"]
} }
} }

2
plugins/hifiSdl2/src/SDL2Manager.cpp
View file

@ -57,7 +57,7 @@ void SDL2Manager::init() {
loadSettings(); loadSettings();
auto preferences = DependencyManager::get<Preferences>(); auto preferences = DependencyManager::get<Preferences>();
static const QString SDL2_PLUGIN { "SDL2 Joystick" }; static const QString SDL2_PLUGIN { "Game Controller" };
{ {
auto getter = [this]()->bool { return _isEnabled; }; auto getter = [this]()->bool { return _isEnabled; };
auto setter = [this](bool value) { auto setter = [this](bool value) {