N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check input profile name for duplicates in New/Rename (#4779)

Browse source 
* Check input profile name for duplicates in New/Rename

* DRY + separation of concerns

* simplify return branching

* make readonly function const
This commit is contained in:
Martin Pecánek 2019-05-24 23:28:59 +02:00 committed by James Rowe
parent 5727e1b43d
commit 186ffc235f
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/citra_qt/configuration/configure_input.cpp
View file

@ -437,6 +437,11 @@ void ConfigureInput::NewProfile() {
if (name.isEmpty()) {
return;
}
if (IsProfileNameDuplicate(name)) {
WarnProposedProfileNameIsDuplicate();
return;
}
applyConfiguration();
Settings::SaveProfile(ui->profile->currentIndex());
Settings::CreateProfile(name.toStdString());
@ -465,6 +470,20 @@ void ConfigureInput::RenameProfile() {
if (new_name.isEmpty()) {
return;
}
if (IsProfileNameDuplicate(new_name)) {
WarnProposedProfileNameIsDuplicate();
return;
}
ui->profile->setItemText(ui->profile->currentIndex(), new_name);
Settings::RenameCurrentProfile(new_name.toStdString());
}
bool ConfigureInput::IsProfileNameDuplicate(const QString& name) const {
return ui->profile->findText(name, Qt::MatchFixedString | Qt::MatchCaseSensitive) != -1;
}
void ConfigureInput::WarnProposedProfileNameIsDuplicate() {
QMessageBox::warning(this, tr("Duplicate profile name"),
tr("Profile name already exists. Please choose a different name."));
}

3
src/citra_qt/configuration/configure_input.h
View file

@ -119,4 +119,7 @@ private:
void NewProfile();
void DeleteProfile();
void RenameProfile();
bool IsProfileNameDuplicate(const QString& name) const;
void WarnProposedProfileNameIsDuplicate();
};