diff options
Diffstat (limited to 'src/realmwizard.cpp')
| -rw-r--r-- | src/realmwizard.cpp | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/realmwizard.cpp b/src/realmwizard.cpp index a0f4ced..1676ca5 100644 --- a/src/realmwizard.cpp +++ b/src/realmwizard.cpp @@ -29,6 +29,7 @@ #include <tqcursor.h> #include <tqspinbox.h> #include <tqcheckbox.h> +#include <tqradiobutton.h> #include <ksimpleconfig.h> #include <kglobal.h> @@ -51,6 +52,7 @@ #include "realmintropage.h" #include "realmconfigpage.h" +#include "certconfigpage.h" #include "realmfinishpage.h" #include "realmwizard.h" @@ -69,10 +71,14 @@ RealmWizard::RealmWizard(LDAPController* controller, TQString fqdn, TQWidget *pa addPage (realmpage, i18n( "Step 2: Set Up New Realm" ) ); setHelpEnabled(TQWizard::page(1), false); - finishpage = new RealmFinishPage(this); - addPage (finishpage, i18n( "Step 3: Initialize New Realm" ) ); + certpage = new CertConfigPage(this); + addPage (certpage, i18n( "Step 3: Set Up Certificates" ) ); setHelpEnabled(TQWizard::page(2), false); + finishpage = new RealmFinishPage(this); + addPage (finishpage, i18n( "Step 4: Initialize New Realm" ) ); + setHelpEnabled(TQWizard::page(3), false); + // Set up some defaults realmpage->txtKDCPort->setValue(88); realmpage->txtAdminServerPort->setValue(749); @@ -88,6 +94,7 @@ RealmWizard::RealmWizard(LDAPController* controller, TQString fqdn, TQWidget *pa realmpage->txtKDC->setText(m_fqdn); realmpage->txtAdminServer->setText(m_fqdn); realmpage->realmNameChanged(); + certpage->generateKeysEnabled->setChecked(true); finishpage->ldapAdminGroupname->setText("realmadmins"); finishpage->ldapMachineAdminGroupname->setText("machineadmins"); @@ -97,7 +104,7 @@ RealmWizard::RealmWizard(LDAPController* controller, TQString fqdn, TQWidget *pa // Kerberos won't work unless the DNS suffix matches the realm name realmpage->txtRealmName->setEnabled(false); - setFinishEnabled(TQWizard::page(2), true); + setFinishEnabled(TQWizard::page(3), true); setPosition(); } @@ -129,6 +136,14 @@ void RealmWizard::next() { finishpage->ldapAdminRealm->setText(realmpage->txtRealmName->text()); TQWizard::next(); + certpage->processLockouts(); + certpage->validateEntries(); + } + else if (currentPage()==certpage) { + // RAJA FIXME + // What to do with the certificate information? + + TQWizard::next(); finishpage->validateEntries(); } if (currentPage()==finishpage) { @@ -150,17 +165,11 @@ bool RealmWizard::askClose(){ return true; } else { - if (currentPage()==realmpage) { + if ((currentPage()==certpage) || (currentPage()==finishpage)) { text = i18n("<p>Are you sure you want to quit the LDAP Realm Wizard?</p>" "<p>If yes, click <b>Quit</b> and all changes will be lost." "<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"); } - else if (currentPage()==finishpage) { - // RAJA FIXME - text = i18n("<p>Are you sure you want to quit the LDAP Realm Wizard?</p>" - "<p>If yes, click <b>Quit</b> and the new realm will remain deactivated pending bonding." - "<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"); - } else { text = i18n("<p>Are you sure you want to quit the LDAP Realm Wizard?</p>" "<p>If not, click <b>Cancel</b> to return and finish setup.</p>"); |