Cleanup warning handling

client/Application.cpp

@@ -940,7 +940,7 @@ void Application::showClient(QStringList files, bool crypto, bool sign, bool new
 	QMetaObject::invokeMethod(w, [&] {
 		using enum ria::qdigidoc4::Pages;
 		w->selectPage(crypto && !sign ? CryptoIntro : SignIntro);
-		w->openFiles(files, false, sign);
+		w->openFiles(std::move(files), false, sign);
 	});
 }
 

client/CMakeLists.txt

@@ -65,7 +65,6 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	LdapSearch.cpp
 	LdapSearch.h
 	MainWindow.cpp
-	MainWindow_MyEID.cpp
 	MainWindow.h
 	MainWindow.ui
 	PrintSheet.cpp

client/CryptoDoc.cpp

@@ -100,27 +100,16 @@ bool CDocumentModel::addFile(const QString &file, const QString &mime)
 		return false;
 
 	QFileInfo info(file);
-	if(info.size() == 0)
-	{
-		WarningDialog::show(DocumentModel::tr("Cannot add empty file to the container."));
+	if(!addFileCheck(d->fileName, info))
 		return false;
-	}
+
 	if(d->cdoc->version() == 1 && info.size() > 120*1024*1024)
 	{
 		WarningDialog::show(tr("Added file(s) exceeds the maximum size limit of the container (∼120MB). "
 			"<a href='https://www.id.ee/en/article/encrypting-large-120-mb-files/'>Read more about it</a>"));
 		return false;
 	}
 
-	QString fileName(info.fileName());
-	if(std::any_of(d->cdoc->files.cbegin(), d->cdoc->files.cend(),
-			[&fileName](const auto &containerFile) { return containerFile.name == fileName; }))
-	{
-		WarningDialog::show(DocumentModel::tr("Cannot add the file to the envelope. File '%1' is already in container.")
-			 .arg(FileDialog::normalized(fileName)));
-		return false;
-	}
-
 	auto data = std::make_unique<QFile>(file);
 	if(!data->open(QFile::ReadOnly))
 		return false;
@@ -196,7 +185,6 @@ bool CDocumentModel::removeRow(int row)
 	}
 
 	d->cdoc->files.erase(d->cdoc->files.cbegin() + row);
-	emit removed(row);
 	return true;
 }
 

client/DigiDoc.cpp

@@ -289,26 +289,14 @@ SDocumentModel::SDocumentModel(DigiDoc *container)
 bool SDocumentModel::addFile(const QString &file, const QString &mime)
 {
 	QFileInfo info(file);
-	if(info.size() == 0)
-	{
-		WarningDialog::show(DocumentModel::tr("Cannot add empty file to the container."));
+	if(!addFileCheck(doc->fileName(), info))
 		return false;
-	}
 	QString fileName(info.fileName());
 	if(fileName == QStringLiteral("mimetype"))
 	{
 		WarningDialog::show(DocumentModel::tr("Cannot add file with name 'mimetype' to the envelope."));
 		return false;
 	}
-	for(int row = 0; row < rowCount(); row++)
-	{
-		if(fileName == from(doc->b->dataFiles().at(size_t(row))->fileName()))
-		{
-			WarningDialog::show(DocumentModel::tr("Cannot add the file to the envelope. File '%1' is already in container.")
-				.arg(FileDialog::normalized(fileName)));
-			return false;
-		}
-	}
 	if(doc->addFile(file, mime))
 	{
 		emit added(FileDialog::normalized(fileName));
@@ -372,7 +360,6 @@ bool SDocumentModel::removeRow(int row)
 	{
 		doc->b->removeDataFile(unsigned(row));
 		doc->modified = true;
-		emit removed(row);
 		return true;
 	}
 	catch( const Exception &e ) { DigiDoc::setLastError(tr("Failed remove document from container"), e); }

client/DocumentModel.cpp

@@ -27,6 +27,37 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QProcessEnvironment>
 
+bool DocumentModel::addFileCheck(const QString &container, QFileInfo file)
+{
+	// Check that container is not dropped into itself
+	if(QFileInfo(container) == file)
+	{
+		auto *dlg = new WarningDialog(tr("Cannot add container to same container\n%1")
+			.arg(FileDialog::normalized(container)));
+		dlg->setCancelText(WarningDialog::Cancel);
+		dlg->open();
+		return false;
+	}
+
+	if(file.size() == 0)
+	{
+		WarningDialog::show(tr("Cannot add empty file to the container."));
+		return false;
+	}
+	QString fileName = file.fileName();
+	for(int row = 0; row < rowCount(); row++)
+	{
+		if(fileName == data(row))
+		{
+			WarningDialog::show(tr("Cannot add the file to the envelope. File '%1' is already in container.")
+				.arg(FileDialog::normalized(fileName)));
+			return false;
+		}
+	}
+
+	return true;
+}
+
 void DocumentModel::addTempFiles(const QStringList &files)
 {
 	for(const QString &file: files)

client/DocumentModel.h

@@ -20,6 +20,8 @@
 
 #include <QObject>
 
+class QFileInfo;
+
 class DocumentModel: public QObject
 {
 	Q_OBJECT
@@ -40,8 +42,8 @@ class DocumentModel: public QObject
 
 signals:
 	void added(const QString &file);
-	void removed(int row);
 
 protected:
+	bool addFileCheck(const QString &container, QFileInfo file);
 	static bool verifyFile(const QString &f);
 };