mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Settings: fix cameraBox

Browse Source
This commit is contained in:
Megamouse 2017-07-13 17:33:13 +02:00 committed by Ivan
parent 821a8c6e65
commit d4c83e5dd2
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Json/tooltips.json
View File

@ -73,7 +73,7 @@
"padHandlerBox": "If you want to use the keyboard to control, select the Keyboard option.\nYou can change the button mappings in Configuration --> Controls.\nIf you have a DualShock 4, select DualShock 4.\nWindows: If you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with MMJoystick.\nCheck button mappings in the Windows control panel.\n\nLinux: evdev input is WIP.",
"keyboardHandlerBox": "Some games support native keyboard input.\nBasic will work in these cases.",
"mouseHandlerBox": "Some games support native mouse input.\nBasic will work in these cases.",
"useFakeCamera": "Camera support is not implemented, leave this on null.",
"cameraBox": "Camera support is not implemented, leave this on null.",
"cameraTypeBox": "Camera support is not implemented, leave this on unknown."
},
"network": {

6
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -583,10 +583,8 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
xemu_settings->EnhanceComboBox(ui->cameraTypeBox, emu_settings::CameraType);
ui->cameraTypeBox->setToolTip(json_input["cameraTypeBox"].toString());
// Checkboxes
xemu_settings->EnhanceCheckBox(ui->useFakeCamera, emu_settings::Camera);
ui->useFakeCamera->setToolTip(json_input["useFakeCamera"].toString());
xemu_settings->EnhanceComboBox(ui->cameraBox, emu_settings::Camera);
ui->cameraBox->setToolTip(json_input["cameraBox"].toString());
// _____ _ _______ _
// / ____| | | |__ __| | |

8
rpcs3/rpcs3qt/settings_dialog.ui
View File

@ -774,11 +774,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_31">
<item>
<widget class="QCheckBox" name="useFakeCamera">
<property name="text">
<string>Use Fake Camera</string>
</property>
</widget>
<widget class="QComboBox" name="cameraBox"/>
</item>
</layout>
</widget>
@ -1275,7 +1271,7 @@
</resources>
<connections/>
<buttongroups>
<buttongroup name="ppuBG"/>
<buttongroup name="spuBG"/>
<buttongroup name="ppuBG"/>
</buttongroups>
</ui>