Commit 566b312c authored by Olli Werwolff's avatar Olli Werwolff
Browse files

Fixes: "Add anyway" button must not be shown, when a resource file shall be...

Fixes:    "Add anyway" button must not be shown, when a resource file shall be added and it is not located in the (sub-)directory of the qrc-file

Task:     -
RevBy:    thorbjorn
AutoTest: -
Details:  -
parent 86b6d571
......@@ -225,7 +225,6 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
QMessageBox message(this);
message.setWindowTitle(tr("Invalid file"));
message.setIcon(QMessageBox::Warning);
QPushButton * const continueButton = message.addButton(tr("Add anyway"), QMessageBox::AcceptRole);
QPushButton * const copyButton = message.addButton(tr("Copy"), QMessageBox::ActionRole);
QPushButton * const skipButton = message.addButton(tr("Don't add"), QMessageBox::DestructiveRole);
QPushButton * const abortButton = message.addButton(tr("Abort"), QMessageBox::RejectRole);
......@@ -234,9 +233,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
message.setText(tr("The file %1 is not in a subdirectory of the resource file. Continuing will result in an invalid resource file.")
.arg(QDir::toNativeSeparators(file)));
message.exec();
if (message.clickedButton() == continueButton) {
continue;
} else if (message.clickedButton() == skipButton) {
if (message.clickedButton() == skipButton) {
files.removeAt(i);
count--;
i--; // Compensate i++
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment