diff --git a/src/frontend/qt_sdl/PathSettingsDialog.cpp b/src/frontend/qt_sdl/PathSettingsDialog.cpp
index 7fa517d3..286032e9 100644
--- a/src/frontend/qt_sdl/PathSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/PathSettingsDialog.cpp
@@ -22,6 +22,7 @@
#include "types.h"
#include "Config.h"
+#include "Platform.h"
#include "PathSettingsDialog.h"
#include "ui_PathSettingsDialog.h"
@@ -43,6 +44,12 @@ PathSettingsDialog::PathSettingsDialog(QWidget* parent) : QDialog(parent), ui(ne
ui->txtSaveFilePath->setText(QString::fromStdString(Config::SaveFilePath));
ui->txtSavestatePath->setText(QString::fromStdString(Config::SavestatePath));
ui->txtCheatFilePath->setText(QString::fromStdString(Config::CheatFilePath));
+
+ int inst = Platform::InstanceID();
+ if (inst > 0)
+ ui->lblInstanceNum->setText(QString("Configuring paths for instance %1").arg(inst+1));
+ else
+ ui->lblInstanceNum->hide();
}
PathSettingsDialog::~PathSettingsDialog()
diff --git a/src/frontend/qt_sdl/PathSettingsDialog.ui b/src/frontend/qt_sdl/PathSettingsDialog.ui
index 95f5acc9..295b1c44 100644
--- a/src/frontend/qt_sdl/PathSettingsDialog.ui
+++ b/src/frontend/qt_sdl/PathSettingsDialog.ui
@@ -7,49 +7,63 @@
0
0
439
- 166
+ 185
Path settings - melonDS
- -
-
-
- true
+
-
+
+
+ Cheat files path:
- -
+
-
Browse...
- -
+
-
Savestates path:
+ -
+
+
+
+
+
+
-
+
+
+ true
+
+
+
+ -
+
+
+ Browse...
+
+
+
+ -
true
- -
-
-
- Leave a path blank to use the current ROM's path.
-
-
-
- -
+
-
Qt::Horizontal
@@ -59,35 +73,14 @@
- -
-
-
- Cheat files path:
-
-
-
- -
-
-
- Browse...
-
-
-
- -
+
-
Browse...
- -
-
-
- true
-
-
-
- -
+
-
Save files path:
@@ -95,9 +88,23 @@
-
-
+
-
+ Leave a path blank to use the current ROM's path.
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Configuring paths for instance X
diff --git a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp
index 499c176a..89f74e5f 100644
--- a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp
+++ b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.cpp
@@ -23,6 +23,7 @@
#include "DSi_I2C.h"
#include "NDS.h"
#include "Config.h"
+#include "Platform.h"
#include "types.h"
@@ -65,6 +66,12 @@ PowerManagementDialog::PowerManagementDialog(QWidget* parent) : QDialog(parent),
}
ui->sliderDSiBatteryLevel->setValue(dsiBatterySliderPos);
+ int inst = Platform::InstanceID();
+ if (inst > 0)
+ ui->lblInstanceNum->setText(QString("Setting battery levels for instance %1").arg(inst+1));
+ else
+ ui->lblInstanceNum->hide();
+
inited = true;
}
diff --git a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.ui b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.ui
index e0e7c6e8..77af2254 100644
--- a/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.ui
+++ b/src/frontend/qt_sdl/PowerManagement/PowerManagementDialog.ui
@@ -7,7 +7,7 @@
0
0
562
- 279
+ 288
@@ -23,37 +23,7 @@
QLayout::SetFixedSize
- -
-
-
- DS Battery
-
-
-
-
-
-
- Low
-
-
-
- -
-
-
- Battery Level
-
-
-
- -
-
-
- Okay
-
-
-
-
-
-
- -
+
-
Qt::Horizontal
@@ -63,7 +33,7 @@
- -
+
-
DSi Battery
@@ -219,6 +189,49 @@
+ -
+
+
+ DS Battery
+
+
+
-
+
+
+ Low
+
+
+
+ -
+
+
+ Battery Level
+
+
+
+ -
+
+
+ Okay
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Configuring settings for instance X
+
+
+
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 47d59843..baf513d1 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -1796,6 +1796,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
actVideoSettings->setEnabled(false);
actMPSettings->setEnabled(false);
actWifiSettings->setEnabled(false);
+ actInterfaceSettings->setEnabled(false);
#ifdef __APPLE__
actPreferences->setEnabled(false);