Merge pull request #1333 from isanae/more-stuff-2

More stuff 2

1 files changed, 33 insertions, 2 deletions

diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp
index 14bf0da5..d71a4531 100644
--- a/src/profilesdialog.cpp
+++ b/src/profilesdialog.cpp
@@ -115,11 +115,29 @@ void ProfilesDialog::showEvent(QShowEvent *event)
   }

 }

 

-void ProfilesDialog::on_closeButton_clicked()

+void ProfilesDialog::on_close_clicked()

 {

   close();

 }

 

+void ProfilesDialog::on_select_clicked()

+{

+  const Profile::Ptr currentProfile = ui->profilesList->currentItem()

+    ->data(Qt::UserRole)

+    .value<Profile::Ptr>();

+

+  if (!currentProfile) {

+    return;

+  }

+

+  m_Selected = currentProfile->name();

+  close();

+}

+

+std::optional<QString> ProfilesDialog::selectedProfile() const

+{

+  return m_Selected;

+}

 

 QListWidgetItem *ProfilesDialog::addItem(const QString &name)

 {

@@ -142,6 +160,7 @@ void ProfilesDialog::createProfile(const QString &name, bool useDefaultSettings)
     newItem->setData(Qt::UserRole, QVariant::fromValue(profile));

     ui->profilesList->addItem(newItem);

     m_FailState = false;

+    ui->profilesList->setCurrentItem(newItem);

     emit profileCreated(profile.get());

   } catch (const std::exception&) {

     m_FailState = true;

@@ -157,6 +176,7 @@ void ProfilesDialog::createProfile(const QString &name, const Profile &reference
     newItem->setData(Qt::UserRole, QVariant::fromValue(profile));

     ui->profilesList->addItem(newItem);

     m_FailState = false;

+    ui->profilesList->setCurrentItem(newItem);

     emit profileCreated(profile.get());

   } catch (const std::exception&) {

     m_FailState = true;

@@ -250,6 +270,12 @@ void ProfilesDialog::on_renameButton_clicked()
 {

   Profile::Ptr currentProfile = ui->profilesList->currentItem()->data(Qt::UserRole).value<Profile::Ptr>();

 

+  if (currentProfile->name() == m_ActiveProfileName) {

+    QMessageBox::warning(this, tr("Renaming active profile"),

+      tr("The active profile cannot be renamed. Please change to a different profile first."));

+    return;

+  }

+

   bool valid = false;

   QString name;

 

@@ -265,7 +291,7 @@ void ProfilesDialog::on_renameButton_clicked()
   }

 

   ui->profilesList->currentItem()->setText(name);

-  

+

   QString oldName = currentProfile->name();

   currentProfile->rename(name);

 

@@ -342,6 +368,11 @@ void ProfilesDialog::on_profilesList_currentItemChanged(QListWidgetItem *current
   }

 }

 

+void ProfilesDialog::on_profilesList_itemActivated(QListWidgetItem* item)

+{

+  on_select_clicked();

+}

+

 void ProfilesDialog::on_localSavesBox_stateChanged(int state)

 {

   Profile::Ptr currentProfile = ui->profilesList->currentItem()->data(Qt::UserRole).value<Profile::Ptr>();