Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
Idented the code in frmNewAccount
authorSteve Brokenshire <sbrokenshire@xestia.co.uk>
Wed, 9 Mar 2016 08:29:56 +0000 (08:29 +0000)
committerSteve Brokenshire <sbrokenshire@xestia.co.uk>
Wed, 9 Mar 2016 08:29:56 +0000 (08:29 +0000)
source/frmNewAccount.cpp

index 211fb89..1e23c21 100644 (file)
@@ -30,129 +30,140 @@ frmNewAccount::frmNewAccount( wxWindow* parent )
 :
 frmNewAccountADT( parent )
 {
-    btnPrevious->Disable();
+
+       // Disable the previous button upon form creation.
+
+       btnPrevious->Disable();
+       
 }
 
 void frmNewAccount::CheckAccountName( wxCommandEvent& event )
 {
     
-    wxString CheckAccName = txtAccountName->GetValue();
+       // Check that the account name is valid.
+    
+       wxString CheckAccName = txtAccountName->GetValue();
     
-    if ((txtAccountName->IsEmpty() && PageSeek == 2) || CheckAccName.Len() < 4){
+       if ((txtAccountName->IsEmpty() && PageSeek == 2) || CheckAccName.Len() < 4){
         
-        btnNext->Disable();
+               btnNext->Disable();
         
-    } else {
+       } else {
         
-        btnNext->Enable();
+               btnNext->Enable();
         
-    }
+       }
     
 }
 
 void frmNewAccount::ProcessPrevious( wxCommandEvent& event )
 {
-    PageSeek--;
+
+       // Go to the previous page.
+
+       PageSeek--;
     
-    if (PageSeek == 0){
+       if (PageSeek == 0){
         
-        // Currently at the Connection test screen.
+               // Currently at the Connection test screen.
         
-        //tbkAccount->ChangeSelection(0);
-        tabConn->Hide();
-        tabFinish->Hide();
-        tabType->Show();
-        szrNewAccount->RecalcSizes();
+               tabConn->Hide();
+               tabFinish->Hide();
+               tabType->Show();
+               szrNewAccount->RecalcSizes();
         
-        btnPrevious->Disable();
-        btnNext->Enable();
+               btnPrevious->Disable();
+               btnNext->Enable();
         
-    } else if (PageSeek == 1){
+       } else if (PageSeek == 1){
         
-        if (cmbServerType->GetCurrentSelection() == 0){
+               if (cmbServerType->GetCurrentSelection() == 0){
             
-            tabConn->Hide();
-            tabFinish->Hide();
-            tabType->Show();
-            PageSeek = 0;
-            btnPrevious->Disable();
-            btnNext->Enable();
-            btnNext->SetLabel(_("Next >"));
-            return;
+                       tabConn->Hide();
+                       tabFinish->Hide();
+                       tabType->Show();
+                       PageSeek = 0;
+                       btnPrevious->Disable();
+                       btnNext->Enable();
+                       btnNext->SetLabel(_("Next >"));
+                       return;
             
-        }
+               }
         
-        // Currently at the Finish screen.
+               // Currently at the Finish screen.
         
-        tabType->Hide();
-        tabConn->Show();
-        tabFinish->Hide();
-        szrNewAccount->RecalcSizes();
+               tabType->Hide();
+               tabConn->Show();
+               tabFinish->Hide();
+               szrNewAccount->RecalcSizes();
         
-        btnNext->SetLabel(_("Next >"));
-        btnNext->Enable();
+               btnNext->SetLabel(_("Next >"));
+               btnNext->Enable();
         
-    }
+       }
     
 }
 
 void frmNewAccount::ProcessNext( wxCommandEvent& event )
 {
-    PageSeek++;
+
+       // Go to the next page or setup the new account.
+
+       PageSeek++;
     
-    if (PageSeek == 1){
+       if (PageSeek == 1){
         
-        if (cmbServerType->GetCurrentSelection() == 0){
+               if (cmbServerType->GetCurrentSelection() == 0){
             
-            tabType->Hide();
-            tabConn->Hide();
-            tabFinish->Show();
-            PageSeek = 2;
-            btnPrevious->Enable();
-            szrNewAccount->RecalcSizes();
-            btnNext->Disable();
-            btnNext->SetLabel(_("Finish"));
-            return;
+                       tabType->Hide();
+                       tabConn->Hide();
+                       tabFinish->Show();
+                       PageSeek = 2;
+                       btnPrevious->Enable();
+                       szrNewAccount->RecalcSizes();
+                       btnNext->Disable();
+                       btnNext->SetLabel(_("Finish"));
+                       return;
             
-        }
+               }
         
-        btnNext->Disable();
+               btnNext->Disable();
         
-        bool ServerResult = FALSE;
-        bool ServerAction = FALSE;
-        bool UseSSL = TRUE;
-        wxString ServerMessage;
+               bool ServerResult = FALSE;
+               bool ServerAction = FALSE;
+               bool UseSSL = TRUE;
+               wxString ServerMessage;
         
-        // Connection test screen.
+               // Connection test screen.
         
-        tabType->Hide();
-        tabConn->Show();
-        tabFinish->Hide();
-        szrNewAccount->RecalcSizes();
-        btnPrevious->Enable();
+               tabType->Hide();
+               tabConn->Show();
+               tabFinish->Hide();
+               szrNewAccount->RecalcSizes();
+               btnPrevious->Enable();
         
-        // Reset screen.
+               // Reset screen.
         
-        lblServerConnResult->SetLabel(wxT(""));
-        lblServerResponse->SetLabel(wxT(""));
-        lblServerSSLResult->SetLabel(wxT(""));
-        lblServerSSLValid->SetLabel(wxT(""));
-        lblAbleToLoginResult->SetLabel(wxT(""));
-        lblCardDAVSupportResult->SetLabel(wxT(""));
+               lblServerConnResult->SetLabel(wxT(""));
+               lblServerResponse->SetLabel(wxT(""));
+               lblServerSSLResult->SetLabel(wxT(""));
+               lblServerSSLValid->SetLabel(wxT(""));
+               lblAbleToLoginResult->SetLabel(wxT(""));
+               lblCardDAVSupportResult->SetLabel(wxT(""));
         
-        // Spawn a thread and check if server supports CardDAV.
+               // Spawn a thread and check if server supports CardDAV.
         
-        CardDAV CardDAVConn;
+               CardDAV CardDAVConn;
         
-        lblServerConnResult->SetLabel(_("Testing..."));
+               lblServerConnResult->SetLabel(_("Testing..."));
         
-        UseSSL = chkUseSSL->GetValue();
-        CardDAVConn.SetupConnection(txtServerAddress->GetValue(),
-                                    wxAtoi(txtServerPort->GetValue()),
-                                    txtUsername->GetValue(),
-                                    txtPassword->GetValue(),
-                                    UseSSL);
-        CardDAVConn.SetupResultBools(&ServerResult, &ServerAction);
+               UseSSL = chkUseSSL->GetValue();
+               CardDAVConn.SetupConnection(txtServerAddress->GetValue(),
+                       wxAtoi(txtServerPort->GetValue()),
+                       txtUsername->GetValue(),
+                       txtPassword->GetValue(),
+                       UseSSL);
+               CardDAVConn.SetupResultBools(&ServerResult, &ServerAction);
         
                // Verify SSL trust first before doing anything.
 
@@ -246,335 +257,346 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
 
                }
 
-        std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
+               std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
         
-        ConnTest.join();
+               ConnTest.join();
         
-        if (ServerResult == FALSE){
+               if (ServerResult == FALSE){
             
-            lblServerConnResult->SetLabel(_("Failed"));
-            return;
+                   lblServerConnResult->SetLabel(_("Failed"));
+                   return;
             
-        } else {
+               } else {
             
-            lblServerConnResult->SetLabel(_("Connected"));
+                   lblServerConnResult->SetLabel(_("Connected"));
             
-        }
+               }
         
-        if (CardDAVConn.CanDoSSL() == TRUE){
+               if (CardDAVConn.CanDoSSL() == TRUE){
             
-           lblServerSSLResult->SetLabel(_("Used"));
+                   lblServerSSLResult->SetLabel(_("Used"));
             
-        } else {
+               } else {
             
-            lblServerSSLResult->SetLabel(_("Not Used"));
-            lblServerSSLValid->SetLabel(_("Not Applicable"));
+                   lblServerSSLResult->SetLabel(_("Not Used"));
+                   lblServerSSLValid->SetLabel(_("Not Applicable"));
             
-        }
+               }
         
-        if (CardDAVConn.SSLVerify() == TRUE && CardDAVConn.CanDoSSL() == TRUE){
+               if (CardDAVConn.SSLVerify() == TRUE && CardDAVConn.CanDoSSL() == TRUE){
             
-            lblServerSSLValid->SetLabel(_("Verified"));
+                   lblServerSSLValid->SetLabel(_("Verified"));
             
-        } else if (CardDAVConn.SSLVerify() == FALSE && CardDAVConn.CanDoSSL() == TRUE && CardDAVConn.IsSelfSigned() == TRUE){
+               } else if (CardDAVConn.SSLVerify() == FALSE && CardDAVConn.CanDoSSL() == TRUE && CardDAVConn.IsSelfSigned() == TRUE){
        
-            lblServerSSLValid->SetLabel(_("Verified (user)"));
+                   lblServerSSLValid->SetLabel(_("Verified (user)"));
        
-       } else if (CardDAVConn.SSLVerify() == FALSE && CardDAVConn.CanDoSSL() == TRUE) {
+               } else if (CardDAVConn.SSLVerify() == FALSE && CardDAVConn.CanDoSSL() == TRUE) {
             
-            lblServerSSLValid->SetLabel(_("Unable to verify"));
+                   lblServerSSLValid->SetLabel(_("Unable to verify"));
             
-        }      
+               }       
         
-        if (CardDAVConn.CanDoCardDAV() == TRUE){
+               if (CardDAVConn.CanDoCardDAV() == TRUE){
             
-            lblCardDAVSupportResult->SetLabel(_("Supported"));
+                   lblCardDAVSupportResult->SetLabel(_("Supported"));
             
-        } else {
+               } else {
             
-            lblCardDAVSupportResult->SetLabel(_("Unsupported"));
+                   lblCardDAVSupportResult->SetLabel(_("Unsupported"));
             
-        }
+               }
         
-        if (CardDAVConn.AbleToLogin() == TRUE){
+               if (CardDAVConn.AbleToLogin() == TRUE){
             
-            lblAbleToLoginResult->SetLabel(_("Yes"));
+                   lblAbleToLoginResult->SetLabel(_("Yes"));
             
-        } else {
+               } else {
             
-            lblAbleToLoginResult->SetLabel(_("No"));
+                   lblAbleToLoginResult->SetLabel(_("No"));
             
-        }
+               }
         
-        // Get the address to process CardDAV requests.
+               // Get the address to process CardDAV requests.
         
-        ServerPrefix = CardDAVConn.GetDefaultAddressBookURL();
+               ServerPrefix = CardDAVConn.GetDefaultAddressBookURL();
         
-       if (CardDAVConn.HasValidResponse() == TRUE){
+               if (CardDAVConn.HasValidResponse() == TRUE){
             
-            lblServerResponse->SetLabel(_("Yes"));
+                   lblServerResponse->SetLabel(_("Yes"));
             
-        } else {
+               } else {
             
-            lblServerResponse->SetLabel(_("No"));
+                   lblServerResponse->SetLabel(_("No"));
             
-        }
+               }
         
-        if (ServerResult == TRUE && CardDAVConn.HasValidResponse() == TRUE &&
-            //CardDAVConn.CanDoSSL() == TRUE && CardDAVConn.SSLVerify() == TRUE &&
-            CardDAVConn.CanDoCardDAV() == TRUE && CardDAVConn.AbleToLogin() == TRUE){
+               if (ServerResult == TRUE && CardDAVConn.HasValidResponse() == TRUE &&
+                   //CardDAVConn.CanDoSSL() == TRUE && CardDAVConn.SSLVerify() == TRUE &&
+                   CardDAVConn.CanDoCardDAV() == TRUE && CardDAVConn.AbleToLogin() == TRUE){
             
-            btnNext->Enable();
+                   btnNext->Enable();
             
-            lblConnectionResultText->SetLabel(_("Click on Next to set the account name."));
+                   lblConnectionResultText->SetLabel(_("Click on Next to set the account name."));
             
-        } else {
+               } else {
             
-            lblConnectionResultText->SetLabel(_("A problem has occured whilst connecting to the CardDAV server.\nPlease review the above information and change the server details if needed.\nIf there are still problems, please speak to your system administrator(s)."));
+                   lblConnectionResultText->SetLabel(_("A problem has occured whilst connecting to the CardDAV server.\nPlease review the above information and change the server details if needed.\nIf there are still problems, please speak to your system administrator(s)."));
             
-        }
+               }
         
-    } else if (PageSeek == 2){
+       } else if (PageSeek == 2){
         
-        // Finish screen.
+               // Finish screen.
         
-        tabType->Hide();
-        tabConn->Hide();
-        tabFinish->Show();
-        szrNewAccount->RecalcSizes();
+               tabType->Hide();
+               tabConn->Hide();
+               tabFinish->Show();
+               szrNewAccount->RecalcSizes();
         
-        btnNext->Disable();
-        btnNext->SetLabel(_("Finish"));
-        if (txtAccountName->IsEmpty() && PageSeek == 2){
-            btnNext->Disable();
-        } else {
-            btnNext->Enable();
-        }
+               btnNext->Disable();
+               btnNext->SetLabel(_("Finish"));
+       
+               if (txtAccountName->IsEmpty() && PageSeek == 2){
+       
+                   btnNext->Disable();
+           
+               } else {
+       
+                   btnNext->Enable();
+           
+               }
         
-    } else if (PageSeek == 3){
+       } else if (PageSeek == 3){
         
-        // Finished.
+               // Finished.
         
-        wxString XestiaABPrefDirectory;
-       wxString XestiaABDirectory;
-        wxString AccountSettingsFile;
-        //wxFile ASFile;
-        wxString RandomNumberSuffix = wxString::Format(wxT("%i"), rand() % 32767);
-        bool DirectoryCreated = FALSE;
+               wxString XestiaABPrefDirectory;
+               wxString XestiaABDirectory;
+               wxString AccountSettingsFile;
+               //wxFile ASFile;
+               wxString RandomNumberSuffix = wxString::Format(wxT("%i"), rand() % 32767);
+               bool DirectoryCreated = FALSE;
         
 #if defined(__HAIKU__)
         
-        //preffilename = wxT("noo");
+               //preffilename = wxT("noo");
         
 #elif defined(__WIN32__)
         
-        XestiaABPrefDirectory = GetUserPrefDir();
-        XestiaABDirectory = GetUserDir();
+               XestiaABPrefDirectory = GetUserPrefDir();
+               XestiaABDirectory = GetUserDir();
        
-        AccountSettingsFile = XestiaABPrefDirectory + wxT("accounts");
+               AccountSettingsFile = XestiaABPrefDirectory + wxT("accounts");
         
-        // Open the file for writing.
+               // Open the file for writing.
         
-        wxFileConfig *cfgfile = new wxFileConfig("", "", AccountSettingsFile);
+               wxFileConfig *cfgfile = new wxFileConfig("", "", AccountSettingsFile);
         
-        // Check if account name already exists and return an error message
-        // if this is the case.
+               // Check if account name already exists and return an error message
+               // if this is the case.
         
-        wxString AccountName;
-        long itemindex = 0;
-        bool ContinueAcc;
-        ContinueAcc = cfgfile->GetFirstGroup(AccountName, itemindex);
+               wxString AccountName;
+               long itemindex = 0;
+               bool ContinueAcc;
+               ContinueAcc = cfgfile->GetFirstGroup(AccountName, itemindex);
         
-        while (ContinueAcc){
+               while (ContinueAcc){
             
-            if (txtAccountName->GetValue() == AccountName){
+                       if (txtAccountName->GetValue() == AccountName){
                 
-                wxMessageBox(_("The selected account name is already used, please use another account name."), _("Account name already used"), wxICON_ERROR);
-                return;
+                               wxMessageBox(_("The selected account name is already used, please use another account name."), _("Account name already used"), wxICON_ERROR);
+                               return;
                 
-            }
+                       }
             
-            cfgfile->SetPath(wxT("/"));
-            ContinueAcc = cfgfile->GetNextGroup(AccountName, itemindex);
+                       cfgfile->SetPath(wxT("/"));
+                       ContinueAcc = cfgfile->GetNextGroup(AccountName, itemindex);
             
-        }
+               }
         
-        if (cmbServerType->GetCurrentSelection() == 1){
+               if (cmbServerType->GetCurrentSelection() == 1){
             
-            // Create the account directory.
+                       // Create the account directory.
             
-            wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
+                       wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
             
-            if (wxMkdir(XestiaABDirectory + wxT("\\accounts\\") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
+                       if (wxMkdir(XestiaABDirectory + wxT("\\accounts\\") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
                 
-                DirectoryCreated = TRUE;
+                               DirectoryCreated = TRUE;
                 
-            }
+                       }
             
-            if (DirectoryCreated == TRUE){
+                       if (DirectoryCreated == TRUE){
                 
-                WriteAccountDetails(cfgfile, wxT("CardDAV"), DirectoryName);
+                               WriteAccountDetails(cfgfile, wxT("CardDAV"), DirectoryName);
                 
-            } else {
+                       } else {
                 
-                wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
-                return;
+                               wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
+                               return;
                 
-            }
+                       }
             
-        } else if (cmbServerType->GetCurrentSelection() == 0){
+               } else if (cmbServerType->GetCurrentSelection() == 0){
             
-            // Create the account directory.
+                       // Create the account directory.
             
-            wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
+                       wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
             
-            if (wxMkdir(XestiaABDirectory + wxT("\\accounts\\") + DirectoryName + wxT(".local"), 0740) == TRUE){
+                       if (wxMkdir(XestiaABDirectory + wxT("\\accounts\\") + DirectoryName + wxT(".local"), 0740) == TRUE){
                 
-                DirectoryCreated = TRUE;
+                               DirectoryCreated = TRUE;
                 
-            }
+                       }
             
-            if (DirectoryCreated == TRUE){
+                       if (DirectoryCreated == TRUE){
                 
-                WriteAccountDetails(cfgfile, wxT("Local"), DirectoryName);
+                               WriteAccountDetails(cfgfile, wxT("Local"), DirectoryName);
                 
-            } else {
+                       } else {
                 
-                wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
-                return;
+                               wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
+                               return;
                 
-            }
+                       }
             
-        }
+               }
         
-        delete cfgfile;
-        cfgfile = NULL;
+               delete cfgfile;
+               cfgfile = NULL;
         
-        *ReloadAccountConfig = TRUE;
+               *ReloadAccountConfig = TRUE;
         
 #else
         
-        XestiaABPrefDirectory = GetUserPrefDir();
-       XestiaABDirectory = GetUserDir();
+               XestiaABPrefDirectory = GetUserPrefDir();
+               XestiaABDirectory = GetUserDir();
         
-        AccountSettingsFile = XestiaABPrefDirectory + wxT("accounts");
+               AccountSettingsFile = XestiaABPrefDirectory + wxT("accounts");
         
-        // Open the file for writing.
+               // Open the file for writing.
         
-        wxFileConfig *cfgfile = new wxFileConfig("", "", AccountSettingsFile);
+               wxFileConfig *cfgfile = new wxFileConfig("", "", AccountSettingsFile);
         
-        // Check if account name already exists and return an error message
-        // if this is the case.
+               // Check if account name already exists and return an error message
+               // if this is the case.
         
-        wxString AccountName;
-        long itemindex = 0;
-        bool ContinueAcc;
-        ContinueAcc = cfgfile->GetFirstGroup(AccountName, itemindex);
+               wxString AccountName;
+               long itemindex = 0;
+               bool ContinueAcc;
+               ContinueAcc = cfgfile->GetFirstGroup(AccountName, itemindex);
         
-        while (ContinueAcc){
+               while (ContinueAcc){
             
-            if (txtAccountName->GetValue() == AccountName){
+                       if (txtAccountName->GetValue() == AccountName){
                 
-                wxMessageBox(_("The selected account name is already used, please use another account name."), _("Account name already used"), wxICON_ERROR);
-                return;
+                               wxMessageBox(_("The selected account name is already used, please use another account name."), _("Account name already used"), wxICON_ERROR);
+                               return;
                 
-            }
+                       }
             
-            cfgfile->SetPath(wxT("/"));
-            ContinueAcc = cfgfile->GetNextGroup(AccountName, itemindex);
+                       cfgfile->SetPath(wxT("/"));
+                       ContinueAcc = cfgfile->GetNextGroup(AccountName, itemindex);
             
-        }
+               }
         
-        if (cmbServerType->GetCurrentSelection() == 1){
+               if (cmbServerType->GetCurrentSelection() == 1){
             
-            // Create the account directory.
+                       // Create the account directory.
             
-            wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
+                       wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
             
-            if (wxMkdir(XestiaABDirectory + wxT("/accounts/") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
+                       if (wxMkdir(XestiaABDirectory + wxT("/accounts/") + DirectoryName + wxT(".carddav"), 0740) == TRUE){
                 
-                DirectoryCreated = TRUE;
+                               DirectoryCreated = TRUE;
                 
-            }
+                       }
             
-            if (DirectoryCreated == TRUE){
+                       if (DirectoryCreated == TRUE){
                 
-                WriteAccountDetails(cfgfile, wxT("CardDAV"), DirectoryName);
+                               WriteAccountDetails(cfgfile, wxT("CardDAV"), DirectoryName);
                 
-            } else {
+                       } else {
                 
-                wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
-                return;
+                               wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
+                               return;
                 
-            }
+                       }
             
-        } else if (cmbServerType->GetCurrentSelection() == 0){
+               } else if (cmbServerType->GetCurrentSelection() == 0){
             
-            // Create the account directory.
+                       // Create the account directory.
             
-            wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
+                       wxString DirectoryName = txtAccountName->GetValue().Mid(0, 30) + RandomNumberSuffix;
             
-            if (wxMkdir(XestiaABDirectory + wxT("/accounts/") + DirectoryName + wxT(".local"), 0740) == TRUE){
+                       if (wxMkdir(XestiaABDirectory + wxT("/accounts/") + DirectoryName + wxT(".local"), 0740) == TRUE){
                 
-                DirectoryCreated = TRUE;
+                               DirectoryCreated = TRUE;
                 
-            }
+                       }
             
-            if (DirectoryCreated == TRUE){
+                       if (DirectoryCreated == TRUE){
                 
-                WriteAccountDetails(cfgfile, wxT("Local"), DirectoryName);
+                               WriteAccountDetails(cfgfile, wxT("Local"), DirectoryName);
                 
-            } else {
+                       } else {
                 
-                wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
-                return;
+                               wxMessageBox(_("An error occured whilst creating the account directory."), _("Cannot create account directory"));
+                               return;
                 
-            }
+                       }
             
-        }
+               }
         
-        delete cfgfile;
-        cfgfile = NULL;
+               delete cfgfile;
+               cfgfile = NULL;
         
-        *ReloadAccountConfig = TRUE;
+               *ReloadAccountConfig = TRUE;
         
 #endif
         
-        this->Close();
+               this->Close();
         
-    }
+       }
     
 }
 
 void frmNewAccount::WriteAccountDetails(wxFileConfig *cfgfilein, wxString AccountType, wxString DirectoryName){
     
-    cfgfilein->SetPath(txtAccountName->GetValue());
-    cfgfilein->Write(wxT("address"), txtServerAddress->GetValue());
-    cfgfilein->Write(wxT("port"), txtServerPort->GetValue());
-    cfgfilein->Write(wxT("username"), txtUsername->GetValue());
-    cfgfilein->Write(wxT("password"), txtPassword->GetValue());
-    cfgfilein->Write(wxT("prefix"), ServerPrefix);
-    cfgfilein->Write(wxT("accountdir"), DirectoryName);
+       // Write the new account details.
     
-    if (chkUseSSL->GetValue() == TRUE){
+       cfgfilein->SetPath(txtAccountName->GetValue());
+       cfgfilein->Write(wxT("address"), txtServerAddress->GetValue());
+       cfgfilein->Write(wxT("port"), txtServerPort->GetValue());
+       cfgfilein->Write(wxT("username"), txtUsername->GetValue());
+       cfgfilein->Write(wxT("password"), txtPassword->GetValue());
+       cfgfilein->Write(wxT("prefix"), ServerPrefix);
+       cfgfilein->Write(wxT("accountdir"), DirectoryName);
+    
+       if (chkUseSSL->GetValue() == TRUE){
         
-        cfgfilein->Write(wxT("ssl"), wxT("true"));
+               cfgfilein->Write(wxT("ssl"), wxT("true"));
         
-    } else {
+       } else {
         
-        cfgfilein->Write(wxT("ssl"), wxT("false"));
+               cfgfilein->Write(wxT("ssl"), wxT("false"));
         
-    }
+       }
     
-    cfgfilein->Write(wxT("refresh"), wxT("1800"));
-    cfgfilein->Write(wxT("type"), AccountType);
+       cfgfilein->Write(wxT("refresh"), wxT("1800"));
+       cfgfilein->Write(wxT("type"), AccountType);
     
 }
 
 void frmNewAccount::CloseWindow( wxCommandEvent& event )
 {
-    *ReloadAccountConfig = FALSE;
-    this->Close();
+
+       // Close the window.
+
+       *ReloadAccountConfig = FALSE;
+       this->Close();
+       
 }
 
 void frmNewAccount::UpdateRequirements( wxCommandEvent& event )
@@ -582,28 +604,30 @@ void frmNewAccount::UpdateRequirements( wxCommandEvent& event )
     
     // Update the options.
     
-    if (cmbServerType->GetCurrentSelection() == 1){
+       if (cmbServerType->GetCurrentSelection() == 1){
         
-        txtServerAddress->Enable();
-        txtServerPort->Enable();
-        txtUsername->Enable();
-        txtPassword->Enable();
-        chkUseSSL->Enable();
+               txtServerAddress->Enable();
+               txtServerPort->Enable();
+               txtUsername->Enable();
+               txtPassword->Enable();
+               chkUseSSL->Enable();
         
-    } else if (cmbServerType->GetCurrentSelection() == 0){
+       } else if (cmbServerType->GetCurrentSelection() == 0){
         
-        txtServerAddress->Disable();
-        txtServerPort->Disable();
-        txtUsername->Disable();
-        txtPassword->Disable();
-        chkUseSSL->Disable();
+               txtServerAddress->Disable();
+               txtServerPort->Disable();
+               txtUsername->Disable();
+               txtPassword->Disable();
+               chkUseSSL->Disable();
         
-    }
+       }
     
 }
 
 void frmNewAccount::SetupPointers(bool *ReloadAccountInc){
-    
-    ReloadAccountConfig = ReloadAccountInc;
+
+       // Setup the pointers for the new account window.
+   
+       ReloadAccountConfig = ReloadAccountInc;
     
 }
\ No newline at end of file
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy