chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved error handing for renaming profile name

Browse Source
This commit is contained in:
LoudSnorer 2023-12-02 09:23:56 -05:00
parent 9e87179c2a
commit b2156d64d6
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/profiles.cpp
View File

@ -1163,7 +1163,7 @@ void Scan()
// the other solution is to update userName with its new name. // the other solution is to update userName with its new name.
prof->user->setUserName(fname); prof->user->setUserName(fname);
QString message = QString("%1 %2 %3 %4").arg("Changing Profile Name").arg(dbname).arg("==>").arg(fname); QString message = QString("%1 %2 %3 %4").arg("Changing Profile Name").arg(dbname).arg("==>").arg(fname);
qWarning() << message; qDebug() << message;
} }
profiles[fi.fileName()] = prof; profiles[fi.fileName()] = prof;

10
oscar/newprofile.cpp
View File

@ -208,7 +208,7 @@ void NewProfile::on_nextButton_clicked()
ui->stackedWidget->setCurrentIndex(index); ui->stackedWidget->setCurrentIndex(index);
} else { } else {
// Finish button clicked. // Finish button clicked.
newProfileName = ui->userNameEdit->text().trimmed(); newProfileName = ui->userNameEdit->text().simplified();
QString profileName; QString profileName;
if (originalProfileName.isEmpty() ) { if (originalProfileName.isEmpty() ) {
profileName = newProfileName; profileName = newProfileName;
@ -285,14 +285,20 @@ void NewProfile::on_nextButton_clicked()
if (file.exists()) { if (file.exists()) {
bool status = file.rename(newProfileFullName); bool status = file.rename(newProfileFullName);
if (status) { // successful rename if (status) { // successful rename
Profiles::profiles[newProfileName] = p_profile;
AppSetting->setProfileName(newProfileName);
if (mainwin) mainwin->CloseProfile();
QCoreApplication::processEvents(); QCoreApplication::processEvents();
mainwin->RestartApplication(true,"-l"); mainwin->RestartApplication(true,"-l");
QCoreApplication::processEvents();
exit(0); exit(0);
} else { } else {
QMessageBox::question(this, tr("Invalid User Name"), tr("Please Update User without special characters"), QMessageBox::Ok); QMessageBox::question(this, tr("Duplicate or Invalid User Name"), tr("Please Change User Name "), QMessageBox::Ok);
ui->stackedWidget->setCurrentIndex(1); ui->stackedWidget->setCurrentIndex(1);
ui->userNameEdit->setText(newProfileName); ui->userNameEdit->setText(newProfileName);
} }
} else {
qWarning() << "Rename Profile failed";
} }
} else { } else {
if (mainwin) { if (mainwin) {