Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -270,7 +270,7 @@ void ToolbarCustomizationDialog::NewToolbar(const QString &initialName)
QString name = QInputDialog::getText(this, tr("New Toolbar"), tr("Toolbar name:"), QLineEdit::Normal, initialName);
for (const AmazonToolbar &t : m_toolbarManager->GetToolbars()) {
if (name == t.GetTranslatedName()) {
QMessageBox::StandardButton button = QMessageBox::warning(this, tr("Warning"),
QMessageBox::warning(this, tr("Warning"),
tr("A toolbar with this name already exists. Please choose a different name."),
QMessageBox::Ok);
NewToolbar(name);