1 files changed, 16 insertions, 1 deletions

diff --git a/src/primaryrealmwizard/primaryrealmwizard.cpp b/src/primaryrealmwizard/primaryrealmwizard.cpp
index 6dbf9bc..3177afa 100644
--- a/src/primaryrealmwizard/primaryrealmwizard.cpp
+++ b/src/primaryrealmwizard/primaryrealmwizard.cpp
@@ -129,6 +129,10 @@ void PrimaryRealmWizard::next() {
 	if (currentPage()==intropage) {
 		TQWizard::next();
 		realmpage->validateEntries();
+
+		// Focus the first entry field on the new wizard page
+		realmpage->txtKDC->setFocus();
+		realmpage->txtKDC->selectAll();
 	}
 	else if (currentPage()==realmpage) {
 		// Save realm information
@@ -150,6 +154,10 @@ void PrimaryRealmWizard::next() {
 		TQWizard::next();
 		certpage->processLockouts();
 		certpage->validateEntries();
+
+		// Focus the first entry field on the new wizard page
+		certpage->organizationName->setFocus();
+		certpage->organizationName->selectAll();
 	}
 	else if (currentPage()==certpage) {
 		// Save certificate information
@@ -216,9 +224,13 @@ void PrimaryRealmWizard::next() {
 
 		TQWizard::next();
 		finishpage->validateEntries();
+
+		// Focus the first entry field on the new wizard page
+		finishpage->ldapAdminUsername->setFocus();
+		finishpage->ldapAdminUsername->selectAll();
 	}
 	if (currentPage()==finishpage) {
-		finishButton()->setFocus();
+		//
 	}
 }
 
@@ -293,6 +305,8 @@ void PrimaryRealmWizard::accept() {
 	nextButton()->setEnabled(false);
 	finishButton()->setEnabled(false);
 	cancelButton()->setEnabled(false);
+	finishpage->setEnabled(false);
+
 	if (m_controller->createNewLDAPRealm(this, m_realmconfig, finishpage->ldapAdminUsername->text(), finishpage->ldapAdminGroupname->text(), finishpage->ldapMachineAdminGroupname->text(), finishpage->ldapStandardUserGroupname->text(), finishpage->ldapAdminPassword->password(), "admin", finishpage->ldapAdminPassword->password(), finishpage->ldapAdminRealm->text(), m_certconfig, &errorString) == 0) {
 		done(0);
 	}
@@ -300,6 +314,7 @@ void PrimaryRealmWizard::accept() {
 		KMessageBox::error(this, i18n("<qt><b>Unable to create new realm!</b><p>Details: %1</qt>").arg(errorString), i18n("Unable to create new realm"));
 	}
 
+	finishpage->setEnabled(true);
 	backButton()->setEnabled(true);
 	finishButton()->setEnabled(true);
 	cancelButton()->setEnabled(true);