From bd08d7e7e8e6bb4d634033b0370d4ebf11ed29e1 Mon Sep 17 00:00:00 2001
From: Paolo Gallo <45040214+paolo257428@users.noreply.github.com>
Date: Sat, 30 Nov 2019 20:36:10 +0100
Subject: [PATCH] Fix dialogs having focus on the wrong element

---
 textedit/NewDocumentWindow.cpp |  6 ++++--
 textedit/OpenUriWindow.cpp     | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/textedit/NewDocumentWindow.cpp b/textedit/NewDocumentWindow.cpp
index 0d303d3..80cbfed 100644
--- a/textedit/NewDocumentWindow.cpp
+++ b/textedit/NewDocumentWindow.cpp
@@ -48,6 +48,9 @@ void NewDocumentWindow::resetFields()
 	//Reset all fields
 	ui->lineEdit_fileName->setText("");
 	ui->label_incorrectFilename->setText("");
+
+	//Reset the focus
+	ui->lineEdit_fileName->setFocus();
 }
 
 void NewDocumentWindow::acceptClicked()
@@ -64,7 +67,6 @@ void NewDocumentWindow::acceptClicked()
 
 void NewDocumentWindow::rejectClicked()
 {
-	//Reset fields and closes
-	resetFields();
+	//Close the window
 	this->close();
 }
diff --git a/textedit/OpenUriWindow.cpp b/textedit/OpenUriWindow.cpp
index 46df241..52c1be6 100644
--- a/textedit/OpenUriWindow.cpp
+++ b/textedit/OpenUriWindow.cpp
@@ -41,14 +41,17 @@ void OpenUriWindow::resetFields()
 	//Reset fields
 	ui->label_incorrectUri->setText("");
 	ui->lineEdit_uri->setText("");
+
+	//Reset focus
+	ui->lineEdit_uri->setFocus();
 }
 
 void OpenUriWindow::acceptClicked()
 {
-	//Gets uri
+	//Gets URI inserted by user
 	_uri = ui->lineEdit_uri->text();
 
-	//If filename is valid it closes and confirm operation else print an error
+	//If filename is valid it closes and confirms operation else print an error
 	if (!_uri.isEmpty())
 		this->done(QDialog::Accepted);
 	else
@@ -57,7 +60,6 @@ void OpenUriWindow::acceptClicked()
 
 void OpenUriWindow::rejectClicked()
 {
-	//Reset fields and closes
-	resetFields();
+	//Close the window
 	this->close();
 }