|
|
@ -238,15 +238,13 @@ void GMainWindow::ProfileSelectorSelectProfile() {
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.exec();
|
|
|
|
if (dialog.exec() == QDialog::Rejected) {
|
|
|
|
|
|
|
|
|
|
|
|
if (!dialog.GetStatus()) {
|
|
|
|
|
|
|
|
emit ProfileSelectorFinishedSelection(std::nullopt);
|
|
|
|
emit ProfileSelectorFinishedSelection(std::nullopt);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Service::Account::ProfileManager manager;
|
|
|
|
Service::Account::ProfileManager manager;
|
|
|
|
const auto uuid = manager.GetUser(dialog.GetIndex());
|
|
|
|
const auto uuid = manager.GetUser(static_cast<std::size_t>(dialog.GetIndex()));
|
|
|
|
if (!uuid.has_value()) {
|
|
|
|
if (!uuid.has_value()) {
|
|
|
|
emit ProfileSelectorFinishedSelection(std::nullopt);
|
|
|
|
emit ProfileSelectorFinishedSelection(std::nullopt);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
@ -261,9 +259,8 @@ void GMainWindow::SoftwareKeyboardGetText(
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.exec();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!dialog.GetStatus()) {
|
|
|
|
if (dialog.exec() == QDialog::Rejected) {
|
|
|
|
emit SoftwareKeyboardFinishedText(std::nullopt);
|
|
|
|
emit SoftwareKeyboardFinishedText(std::nullopt);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -901,11 +898,12 @@ void GMainWindow::SelectAndSetCurrentUser() {
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.exec();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (dialog.GetStatus()) {
|
|
|
|
if (dialog.exec() == QDialog::Rejected) {
|
|
|
|
Settings::values.current_user = static_cast<s32>(dialog.GetIndex());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Settings::values.current_user = dialog.GetIndex();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void GMainWindow::BootGame(const QString& filename) {
|
|
|
|
void GMainWindow::BootGame(const QString& filename) {
|
|
|
@ -1055,14 +1053,13 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target
|
|
|
|
const std::string nand_dir = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir);
|
|
|
|
const std::string nand_dir = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir);
|
|
|
|
ASSERT(program_id != 0);
|
|
|
|
ASSERT(program_id != 0);
|
|
|
|
|
|
|
|
|
|
|
|
const auto select_profile = [this]() -> s32 {
|
|
|
|
const auto select_profile = [this] {
|
|
|
|
QtProfileSelectionDialog dialog(this);
|
|
|
|
QtProfileSelectionDialog dialog(this);
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.setWindowModality(Qt::WindowModal);
|
|
|
|
dialog.exec();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!dialog.GetStatus()) {
|
|
|
|
if (dialog.exec() == QDialog::Rejected) {
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -1070,11 +1067,12 @@ void GMainWindow::OnGameListOpenFolder(u64 program_id, GameListOpenTarget target
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
const auto index = select_profile();
|
|
|
|
const auto index = select_profile();
|
|
|
|
if (index == -1)
|
|
|
|
if (index == -1) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Service::Account::ProfileManager manager;
|
|
|
|
Service::Account::ProfileManager manager;
|
|
|
|
const auto user_id = manager.GetUser(index);
|
|
|
|
const auto user_id = manager.GetUser(static_cast<std::size_t>(index));
|
|
|
|
ASSERT(user_id);
|
|
|
|
ASSERT(user_id);
|
|
|
|
path = nand_dir + FileSys::SaveDataFactory::GetFullPath(FileSys::SaveDataSpaceId::NandUser,
|
|
|
|
path = nand_dir + FileSys::SaveDataFactory::GetFullPath(FileSys::SaveDataSpaceId::NandUser,
|
|
|
|
FileSys::SaveDataType::SaveData,
|
|
|
|
FileSys::SaveDataType::SaveData,
|
|
|
|