Make requested changes

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
PrismLauncher · Dec 17, 2022 · a226cb0 · a226cb0
1 parent f7c5eb1
commit a226cb0
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 29 deletions.
diff --git a/launcher/ui/GuiUtil.cpp b/launcher/ui/GuiUtil.cpp
@@ -64,13 +64,12 @@ QString GuiUtil::uploadPaste(const QString &name, const QString &text, QWidget *
             baseUrl = pasteCustomAPIBaseSetting;
 
         if (baseUrl.isValid()) {
-            auto response = CustomMessageBox::selectable(parentWidget, "Confirm Upload",
+            auto response = CustomMessageBox::selectable(parentWidget, QObject::tr("Confirm Upload"),
                                                          QObject::tr("About to upload: %1\n"
                                                                      "Uploading to: %2\n"
                                                                      "You should double-check for personal information.\n\n"
                                                                      "Are you sure?")
-                                                             .arg(name)
-                                                             .arg(baseUrl.host()),
+                                                             .arg(name, baseUrl.host()),
                                                          QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
                                 ->exec();
 

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
@@ -2094,7 +2094,7 @@ void MainWindow::on_actionDeleteInstance_triggered()
 
     auto id = m_selectedInstance->id();
 
-    auto response = CustomMessageBox::selectable(this, tr("CAREFUL!"),
+    auto response = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
                                                  tr("About to delete: %1\n"
                                                     "This may be permanent and will completely delete the instance.\n\n"
                                                     "Are you sure?")

diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -162,7 +162,7 @@ void ExternalResourcesPage::removeItem()
 
     int count = 0;
     bool folder = false;
-    for (auto i : selection.indexes()) {
+    for (auto& i : selection.indexes()) {
         if (i.column() == 0) {
             count++;
 
@@ -172,23 +172,24 @@ void ExternalResourcesPage::removeItem()
         }
     }
 
-    bool enough = count > 1;
-
-    if (enough || folder) {
-        QString text;
-        if (enough)
-            text = tr("About to remove: %1 items\n"
-                      "This may be permanent and they will be gone from the folder.\n\n"
-                      "Are you sure?")
-                       .arg(count);
-        else
-            text = tr("About to remove: %1 (folder)\n"
-                      "This may be permanent and it will be gone from the parent folder.\n\n"
-                      "Are you sure?")
-                       .arg(m_model->at(selection.indexes().at(0).row()).fileinfo().fileName());
-
-        auto response = CustomMessageBox::selectable(this, tr("CAREFUL!"), text, QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No,
-                                                     QMessageBox::No)
+    QString text;
+    bool multiple = count > 1;
+
+    if (multiple) {
+        text = tr("About to remove: %1 items\n"
+                  "This may be permanent and they will be gone from the folder.\n\n"
+                  "Are you sure?")
+                   .arg(count);
+    } else if (folder) {
+        text = tr("About to remove: %1 (folder)\n"
+                  "This may be permanent and it will be gone from the parent folder.\n\n"
+                  "Are you sure?")
+                   .arg(m_model->at(selection.indexes().at(0).row()).fileinfo().fileName());
+    }
+
+    if (!text.isEmpty()) {
+        auto response = CustomMessageBox::selectable(this, tr("Confirm Removal"), text, QMessageBox::Warning,
+                                                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
                             ->exec();
 
         if (response != QMessageBox::Yes)

diff --git a/launcher/ui/pages/instance/OtherLogsPage.cpp b/launcher/ui/pages/instance/OtherLogsPage.cpp
@@ -220,7 +220,7 @@ void OtherLogsPage::on_btnDelete_clicked()
         setControlsEnabled(false);
         return;
     }
-    if (QMessageBox::question(this, tr("CAREFUL!"),
+    if (QMessageBox::question(this, tr("Confirm Deletion"),
                               tr("About to delete: %1\n"
                                  "This may be permanent and it will be gone from the logs folder.\n\n"
                                  "Are you sure?")
@@ -252,7 +252,7 @@ void OtherLogsPage::on_btnClean_clicked()
         return;
     }
     QMessageBox *messageBox = new QMessageBox(this);
-    messageBox->setWindowTitle(tr("CAREFUL!"));
+    messageBox->setWindowTitle(tr("Confirm Cleanup"));
     if(toDelete.size() > 5)
     {
         messageBox->setText(tr("Are you sure you want to delete all log files?"));

diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -526,7 +526,7 @@ void ScreenshotsPage::on_actionDelete_triggered()
                    .arg(count);
 
     auto response =
-        CustomMessageBox::selectable(this, tr("CAREFUL!"), text, QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No)->exec();
+        CustomMessageBox::selectable(this, tr("Confirm Deletion"), text, QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No)->exec();
 
     if (response != QMessageBox::Yes)
         return;

diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
@@ -801,7 +801,7 @@ void ServersPage::on_actionAdd_triggered()
 
 void ServersPage::on_actionRemove_triggered()
 {
-    auto response = CustomMessageBox::selectable(this, tr("CAREFUL!"),
+    auto response = CustomMessageBox::selectable(this, tr("Confirm Removal"),
                                                  tr("About to remove: %1\n"
                                                     "This is permanent and the server will be gone from your list forever (A LONG TIME).\n\n"
                                                     "Are you sure?")

diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
@@ -326,7 +326,7 @@ void VersionPage::on_actionRemove_triggered()
     auto component = m_profile->getComponent(index);
     if (component->isCustom())
     {
-        auto response = CustomMessageBox::selectable(this, tr("CAREFUL!"),
+        auto response = CustomMessageBox::selectable(this, tr("Confirm Removal"),
                                                      tr("About to remove: %1\n"
                                                         "This is permanent and will completely remove the custom component.\n\n"
                                                         "Are you sure?")
@@ -725,7 +725,7 @@ void VersionPage::on_actionRevert_triggered()
     }
     auto component = m_profile->getComponent(version);
 
-    auto response = CustomMessageBox::selectable(this, tr("CAREFUL!"),
+    auto response = CustomMessageBox::selectable(this, tr("Confirm Reversion"),
                                                  tr("About to revert: %1\n"
                                                     "This is permanent and will completely revert your customizations.\n\n"
                                                     "Are you sure?")

diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -194,7 +194,7 @@ void WorldListPage::on_actionRemove_triggered()
     if(!proxiedIndex.isValid())
         return;
 
-    auto result = CustomMessageBox::selectable(this, tr("CAREFUL!"),
+    auto result = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
                                                tr("About to delete: %1\n"
                                                   "The world may be gone forever (A LONG TIME).\n\n"
                                                   "Are you sure?")