preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-18 10:27:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Firmware install: Change dialog layout, remove warning when not needed

Browse Source
This commit is contained in:
Henrik Rydgård
2026-09-10 15:52:53 -06:00
parent e4d940604e
commit d6c0a7bbde
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/InstallUpdateScreen.cpp
+26 -15
View File
@@ -1,4 +1,4 @@
// Copyright (c) 2026- PPSSPP Project.
// Copyright (c) 2012- PPSSPP Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -37,7 +37,8 @@
#include "UI/EmuScreen.h"
InstallUpdateScreen::InstallUpdateScreen(const Path &path, std::string_view title, bool allowRun, u64 archiveSize)
: UISimpleBaseDialogScreen(Path(), SimpleDialogFlags::ContentsCanScroll), path_(path), title_(title), allowRun_(allowRun) {
: UITwoPaneBaseDialogScreen(Path(), TwoPaneFlags::SettingsToTheRight | TwoPaneFlags::ContentsCanScroll),
path_(path), title_(title), allowRun_(allowRun) {
destination_ = GetSysDirectory(DIRECTORY_NAND);
fileSize_ = archiveSize;
@@ -55,13 +56,12 @@ std::string_view InstallUpdateScreen::GetTitle() const {
return iz->T("PSP firmware update");
}
void InstallUpdateScreen::CreateDialogViews(UI::ViewGroup *parent) {
void InstallUpdateScreen::CreateContentViews(UI::ViewGroup *parent) {
using namespace UI;
auto di = GetI18NCategory(I18NCat::DIALOG);
auto iz = GetI18NCategory(I18NCat::INSTALLZIP);
auto st = GetI18NCategory(I18NCat::STORE); // Borrow "Size" from here, like GameScreen does.
auto dev = GetI18NCategory(I18NCat::DEVELOPER);
LinearLayout *container = parent->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(600, WRAP_CONTENT, 0.0f, UI::Gravity::G_HCENTER, Margins(10))));
@@ -81,23 +81,34 @@ void InstallUpdateScreen::CreateDialogViews(UI::ViewGroup *parent) {
container->Add(new TextView(iz->T("Install into folder")));
container->Add(new TextView(GetFriendlyPath(destination_)))->SetAlign(FLAG_WRAP_TEXT);
if (overwrites_) {
// The title is whatever the updater's SFO says, so only trust the tail of it if it came
// out looking like a version number rather than the last word of some other sentence.
// Show a warning in cases where the existing firmware seems valid (and not just fonts-only for example).
if (overwrites_ && !installed_.version.empty()) {
std::string newVersion = VersionFromUpdaterTitle(title_);
if (newVersion.find('.') == std::string::npos || newVersion[0] < '0' || newVersion[0] > '9') {
newVersion.clear();
}
const std::string_view unknown = "N/A";
container->Add(new NoticeView(NoticeLevel::WARN, di->T("Confirm Overwrite"),
ApplySafeSubstitutions(
iz->T("ReplaceFirmware", "Firmware %1 is installed. It will be erased and replaced with %2."),
installed_.version.empty() ? unknown : std::string_view(installed_.version),
newVersion.empty() ? unknown : std::string_view(newVersion))));
if (newVersion != installed_.version) {
const std::string_view unknown = "N/A";
container->Add(new NoticeView(NoticeLevel::WARN, di->T("Confirm Overwrite"),
ApplySafeSubstitutions(
iz->T("ReplaceFirmware", "Firmware %1 is installed. It will be erased and replaced with %2."),
installed_.version.empty() ? unknown : std::string_view(installed_.version),
newVersion.empty() ? unknown : std::string_view(newVersion))));
}
}
// leave space at the bottom so settings pane can contain actions and progress
container->Add(new Spacer(12.0f));
}
void InstallUpdateScreen::CreateSettingsViews(UI::ViewGroup *parent) {
using namespace UI;
auto iz = GetI18NCategory(I18NCat::INSTALLZIP);
auto dev = GetI18NCategory(I18NCat::DEVELOPER);
LinearLayout *container = parent->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 0.0f, UI::Gravity::G_HCENTER, Margins(10))));
installChoice_ = container->Add(new Choice(iz->T("Install"), ImageID("I_FOLDER_UPLOAD")));
installChoice_->OnClick.Add([this](UI::EventParams &e) {
StartInstall();
@@ -201,11 +212,11 @@ bool InstallUpdateScreen::key(const KeyInput &key) {
if (state_ && !state_->done) {
return false;
}
return UISimpleBaseDialogScreen::key(key);
return UITwoPaneBaseDialogScreen::key(key);
}
void InstallUpdateScreen::update() {
UISimpleBaseDialogScreen::update();
UITwoPaneBaseDialogScreen::update();
if (!state_) {
return;