ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Camera UI fixes 

* Add camera permission on macOS
* Fix buttonClicked event for Qt 6 (it's now idClicked?)
This commit is contained in:
Nadia Holmquist Pedersen 2022-10-01 20:49:32 +02:00
parent 93dfcf8714
commit a1a342143b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/melon.plist.in
View File

@ -22,6 +22,8 @@
<true/> <true/>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>We need microphone access so you can use the emulated DS microphone</string> <string>We need microphone access so you can use the emulated DS microphone</string>
<key>NSCameraUsageDescription</key>
<string>Camera access is needed for emulation of the DSi's cameras</string>
<key>CFBundleDocumentTypes</key> <key>CFBundleDocumentTypes</key>
<array> <array>
<dict> <dict>

4
src/frontend/qt_sdl/CameraSettingsDialog.cpp
View File

@ -121,7 +121,11 @@ CameraSettingsDialog::CameraSettingsDialog(QWidget* parent) : QDialog(parent), u
grpInputType->addButton(ui->rbPictureNone, 0); grpInputType->addButton(ui->rbPictureNone, 0);
grpInputType->addButton(ui->rbPictureImg, 1); grpInputType->addButton(ui->rbPictureImg, 1);
grpInputType->addButton(ui->rbPictureCamera, 2); grpInputType->addButton(ui->rbPictureCamera, 2);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(grpInputType, SIGNAL(buttonClicked(int)), this, SLOT(onChangeInputType(int))); connect(grpInputType, SIGNAL(buttonClicked(int)), this, SLOT(onChangeInputType(int)));
#else
connect(grpInputType, SIGNAL(idClicked(int)), this, SLOT(onChangeInputType(int)));
#endif
previewPanel = new CameraPreviewPanel(this); previewPanel = new CameraPreviewPanel(this);
QVBoxLayout* previewLayout = new QVBoxLayout(); QVBoxLayout* previewLayout = new QVBoxLayout();