X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorKey.cpp;h=fb6319b8591b73a289983382c78a99ccceee2c1b;hb=f7013e571b7f6e10351cea706c7e81f49fce0b49;hp=7234bbeb0821847ca6570dead178eb3d2802c34b;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorKey.cpp b/source/contacteditor/frmContactEditorKey.cpp
index 7234bbe..fb6319b 100644
--- a/source/contacteditor/frmContactEditorKey.cpp
+++ b/source/contacteditor/frmContactEditorKey.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorKey.cpp - frmContactEditorKey form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include "frmContactEditorKey.h"
 #include <wx/tokenzr.h>
 #include "../common/textprocessing.h"
@@ -7,6 +25,9 @@ frmContactEditorKey::frmContactEditorKey( wxWindow* parent )
 :
 frmContactEditorKeyADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
 	sliPriority->Disable();
 	
@@ -19,26 +40,36 @@ frmContactEditorKeyADT( parent )
 	cmbKeyMainType->Append(_("URL"));
 	cmbKeyMainType->Append(_("Key"));
 	
+	cmbType->Append("");
 	cmbType->Append(_("Home"));
 	cmbType->Append(_("Work"));
 	
 	cmbURL->Append(_("PGP Key"));
 	
 	cmbKeyType->Append(_("PGP Key"));
+	
+	cmbType->SetSelection(0);
 
 }
 
 void frmContactEditorKey::EnablePriority( wxCommandEvent& event )
 {
+	
+	// Enable/disable the priority setting.
+	
 	if (chkUsePref->IsChecked()){
 		sliPriority->Enable();
 	} else {
 		sliPriority->Disable();
 	}
+	
 }
 
 void frmContactEditorKey::SetEditorMode(bool EditMode)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -92,7 +123,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 			
 			striter = KeyListDataTypePtr->find(KeyListIndex);
 			
-			if (striter->first == KeyListIndex){
+			if (striter->first == KeyListIndex &&
+				striter != KeyListDataTypePtr->end()){
 			
 				strValue = striter->second;
 			
@@ -131,7 +163,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 			
 			striter = KeyListDataTypePtr->find(KeyListIndex);
 			
-			if (striter->first == KeyListIndex){
+			if (striter->first == KeyListIndex &&
+				striter != KeyListDataTypePtr->end()){
 			
 				strValue = striter->second;
 			
@@ -147,7 +180,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 		
 		striter = KeyListTypePtr->find(KeyListIndex);	
 		
-		if (striter->first == KeyListIndex){
+		if (striter->first == KeyListIndex &&
+			striter != KeyListTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -171,7 +205,8 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 		
 		intiter = KeyListPrefPtr->find(KeyListIndex);
 		
-		if (intiter->first == KeyListIndex && intiter->second > 0){
+		if (intiter->first == KeyListIndex && intiter->second > 0 &&
+			intiter != KeyListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -185,6 +220,9 @@ void frmContactEditorKey::SetEditorMode(bool EditMode)
 
 void frmContactEditorKey::ProcessAction( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	long ListCtrlIndex;
 	int intKeyType = 0;
 	
@@ -225,7 +263,7 @@ void frmContactEditorKey::ProcessAction( wxCommandEvent& event )
 			
 			wxString wxSb64orig = txtKeyData->GetValue();
 			std::string base64new = std::string(wxSb64orig.mb_str());
-			std::string base64enc = base64_encode(reinterpret_cast<const unsigned char*>(base64new.c_str()), base64new.length());
+			std::string base64enc = base64_encode(reinterpret_cast<const unsigned char*>(base64new.c_str()), (int)base64new.length());
 			wxString wxSb64key(base64enc.c_str(), wxConvUTF8);
 			
 			KeyListPtr->insert(std::make_pair(KeyListIndex, wxSb64key));
@@ -307,7 +345,7 @@ void frmContactEditorKey::ProcessAction( wxCommandEvent& event )
 			
 			wxString wxSb64orig = txtKeyData->GetValue();
 			std::string base64new = std::string(wxSb64orig.mb_str());
-			std::string base64enc = base64_encode(reinterpret_cast<const unsigned char*>(base64new.c_str()), base64new.length());
+			std::string base64enc = base64_encode(reinterpret_cast<const unsigned char*>(base64new.c_str()), (int)base64new.length());
 			wxString wxSb64key(base64enc.c_str(), wxConvUTF8);
 			
 			KeyListPtr->erase(KeyListIndex);			
@@ -369,27 +407,17 @@ void frmContactEditorKey::ProcessAction( wxCommandEvent& event )
 void frmContactEditorKey::ProcessKeyType( wxCommandEvent& event )
 {
 
-	int intKeyType = 0;
-	
-	intKeyType = cmbKeyMainType->GetCurrentSelection();
-	
-	if (intKeyType == 0){
-	
-		tabURL->Show();
-		tabKey->Hide();
-	
-	} else if (intKeyType == 1){
-	
-		tabURL->Hide();
-		tabKey->Show();
-	
-	}
+	// Process the key type (via wxCommandEvent).
 
+	ProcessKeyType();
+	
 }
 
 void frmContactEditorKey::ProcessKeyType()
 {
 
+	// Process the key type.
+	
 	int intKeyType = 0;
 	
 	intKeyType = cmbKeyMainType->GetCurrentSelection();
@@ -411,6 +439,8 @@ void frmContactEditorKey::ProcessKeyType()
 void frmContactEditorKey::ConvertURLType( wxCommandEvent& event )
 {
 
+	// Convert the URL type.
+	
 	wxString strValue;
 
 	strValue = cmbURL->GetString(cmbURL->GetCurrentSelection());
@@ -426,6 +456,8 @@ void frmContactEditorKey::ConvertURLType( wxCommandEvent& event )
 void frmContactEditorKey::ConvertKeyType( wxCommandEvent& event )
 {
 
+	// Convert the key type.
+	
 	wxString strValue;
 
 	strValue = cmbKeyType->GetString(cmbKeyType->GetCurrentSelection());
@@ -440,7 +472,11 @@ void frmContactEditorKey::ConvertKeyType( wxCommandEvent& event )
 
 void frmContactEditorKey::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorKey::SetupPointers(std::map<int, wxString> *KeyList,
@@ -455,6 +491,8 @@ void frmContactEditorKey::SetupPointers(std::map<int, wxString> *KeyList,
 	int KeyIndex )
 {
 
+	// Setup the pointers.
+	
 	KeyListPtr = KeyList;
 	KeyListAltIDPtr = KeyListAltID;
 	KeyListPIDPtr = KeyListPID;