0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1039 from budak7273/fix-world-safety-nag-title-text

Browse Source
This commit is contained in:
timoreo 2022-08-11 07:33:13 +02:00 committed by GitHub
commit 5d188c69ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/ui/pages/instance/WorldListPage.cpp
View File

@ -211,7 +211,7 @@ void WorldListPage::on_actionDatapacks_triggered()
return; return;
} }
if(!worldSafetyNagQuestion()) if(!worldSafetyNagQuestion(tr("Open World Datapacks Folder")))
return; return;
auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString(); auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString();
@ -269,7 +269,7 @@ void WorldListPage::on_actionMCEdit_triggered()
return; return;
} }
if(!worldSafetyNagQuestion()) if(!worldSafetyNagQuestion(tr("Open World in MCEdit")))
return; return;
auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString(); auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString();
@ -373,11 +373,11 @@ bool WorldListPage::isWorldSafe(QModelIndex)
return !m_inst->isRunning(); return !m_inst->isRunning();
} }
bool WorldListPage::worldSafetyNagQuestion() bool WorldListPage::worldSafetyNagQuestion(const QString &actionType)
{ {
if(!isWorldSafe(getSelectedWorld())) if(!isWorldSafe(getSelectedWorld()))
{ {
auto result = QMessageBox::question(this, tr("Copy World"), tr("Changing a world while Minecraft is running is potentially unsafe.\nDo you wish to proceed?")); auto result = QMessageBox::question(this, actionType, tr("Changing a world while Minecraft is running is potentially unsafe.\nDo you wish to proceed?"));
if(result == QMessageBox::No) if(result == QMessageBox::No)
{ {
return false; return false;
@ -395,7 +395,7 @@ void WorldListPage::on_actionCopy_triggered()
return; return;
} }
if(!worldSafetyNagQuestion()) if(!worldSafetyNagQuestion(tr("Copy World")))
return; return;
auto worldVariant = m_worlds->data(index, WorldList::ObjectRole); auto worldVariant = m_worlds->data(index, WorldList::ObjectRole);
@ -417,7 +417,7 @@ void WorldListPage::on_actionRename_triggered()
return; return;
} }
if(!worldSafetyNagQuestion()) if(!worldSafetyNagQuestion(tr("Rename World")))
return; return;
auto worldVariant = m_worlds->data(index, WorldList::ObjectRole); auto worldVariant = m_worlds->data(index, WorldList::ObjectRole);

2
launcher/ui/pages/instance/WorldListPage.h
View File

@ -93,7 +93,7 @@ protected:
private: private:
QModelIndex getSelectedWorld(); QModelIndex getSelectedWorld();
bool isWorldSafe(QModelIndex index); bool isWorldSafe(QModelIndex index);
bool worldSafetyNagQuestion(); bool worldSafetyNagQuestion(const QString &actionType);
void mceditError(); void mceditError();
private: private: