diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp
index c30ce39..11fb951 100644
--- a/src/ui/MainWindow.cpp
+++ b/src/ui/MainWindow.cpp
@@ -174,8 +174,8 @@ MainWindow::openTable()
if (!checkStoredTableRules(m_tableFileHandler->getData())) {
const auto messageString = createRuleChangeMessageBoxText();
auto *const msgBox = new QMessageBox(QMessageBox::Warning, tr("Different Rulesets detected!"), messageString, QMessageBox::Cancel);
- auto* const applyButton = msgBox->addButton(tr("Apply Table Ruleset to Settings"), QMessageBox::ApplyRole);
- auto* const ignoreButton = msgBox->addButton(tr("Ignore stored Table Ruleset"), QMessageBox::AcceptRole);
+ auto* const ignoreButton = msgBox->addButton(tr("Use Settings Ruleset"), QMessageBox::AcceptRole);
+ auto* const applyButton = msgBox->addButton(tr("Use Table Ruleset (Apply to Settings)"), QMessageBox::ApplyRole);
msgBox->exec();
if (msgBox->clickedButton() == applyButton) {
@@ -360,12 +360,12 @@ MainWindow::createSaveMessageBox(const QString& tableMessage, bool isClosing)
QString
MainWindow::createRuleChangeMessageBoxText() const
{
- const auto message = tr("The Table you are trying to load uses another ruleset than you have stored in your rule settings!
"
- "Your ruleset: ") + Utils::General::getRulesetName(m_ruleSettings.ruleset) + ", " +
- "" + Utils::General::getAutoRollEnabled(m_ruleSettings.rollAutomatical) + "
" +
- tr("The stored table ruleset is: ") + Utils::General::getRulesetName(m_loadedTableRule) + ", " +
- "" + Utils::General::getAutoRollEnabled(m_loadedTableRollAutomatically) + "
" +
- tr("Do you want to apply the stored Table ruleset to your settings or ignore it?");
+ const auto message = tr("The loaded table uses a different ruleset from your settings!
"
+ "Settings ruleset: ") + Utils::General::getRulesetName(m_ruleSettings.ruleset) + ", " +
+ Utils::General::getAutoRollEnabled(m_ruleSettings.rollAutomatical) + "
" +
+ tr("Table ruleset: ") + Utils::General::getRulesetName(m_loadedTableRule) + ", " +
+ Utils::General::getAutoRollEnabled(m_loadedTableRollAutomatically) + "
" +
+ tr("Do you want to use your settings or the table ruleset?");
return message;
}
diff --git a/src/utils/UtilsGeneral.cpp b/src/utils/UtilsGeneral.cpp
index a408512..ef80d40 100644
--- a/src/utils/UtilsGeneral.cpp
+++ b/src/utils/UtilsGeneral.cpp
@@ -80,7 +80,7 @@ getRulesetName(unsigned int ruleset)
QString
getAutoRollEnabled(bool autoRollEnabled)
{
- return autoRollEnabled ? "automatic rolling enabled" : "automatic rolling disabled";
+ return autoRollEnabled ? "automatic rolling enabled" : "automatic rolling disabled";
}