X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fimport%2FfrmImportContacts.cpp;h=e37e5cdf58ce8bb207ef81ee3b9244ae50b078f4;hb=54ca9b53d5c442288b8104086348e5b0035625e9;hp=9031a3a96067ebdf32f08bbe2451811dc6408194;hpb=6e0015aee7d8f3ca7747c15157deb68a6f068271;p=xestiaab%2F.git

diff --git a/source/import/frmImportContacts.cpp b/source/import/frmImportContacts.cpp
index 9031a3a..e37e5cd 100644
--- a/source/import/frmImportContacts.cpp
+++ b/source/import/frmImportContacts.cpp
@@ -77,6 +77,7 @@ frmImportContactsADT( parent )
     wxString AccDirFull;
     wxString AccDirFullSfx;
     wxString AccName;
+    wxString AccType;
     wxString AccDirFinal;
     wxTreeItemId AccountTreeId;
     wxTreeItemId GroupTreeId;
@@ -100,7 +101,10 @@ frmImportContactsADT( parent )
 	AccDirFull.Append(AccDirFullSfx);
 	AccName = preferences.accounts.GetAccountName(i);
 	AccName.Trim();
+	AccType = preferences.accounts.GetAccountType(i);
+	AccType.Trim();
 	AccountAccDirList.insert(std::make_pair(i, AccDirFull));
+	AccountAccTypeList.insert(std::make_pair(i, AccType));
 	
 	if (preferences.accounts.GetAccountType(i) == wxT("CardDAV") ||
 	preferences.accounts.GetAccountType(i) == wxT("carddav")){
@@ -122,7 +126,21 @@ frmImportContactsADT( parent )
 	AccName.clear();
 	
     }
+    
+    DialogResult = FALSE;
+
+}
 
+frmImportContacts::~frmImportContacts()
+{
+	
+	/*delete AccControl;
+	AccControl = NULL;
+	delete treAccounts;
+	treAccounts = NULL;
+	delete AccImgList;
+	AccImgList = NULL;*/
+	
 }
 
 void frmImportContacts::GetResult()
@@ -137,11 +155,13 @@ void frmImportContacts::GetContacts()
 
 void frmImportContacts::CloseWindow( wxCommandEvent& event )
 {
+	DialogResult = FALSE;
 	this->Close();
 }
 
 void frmImportContacts::ImportContacts( wxCommandEvent& event )
 {
+	DialogResult = TRUE;
 	this->Close();
 }
 
@@ -237,4 +257,50 @@ wxString frmImportContacts::GetAccount()
 	
 	return AccountName;
 
+}
+
+wxString frmImportContacts::GetAccountType()
+{
+
+	wxString preffilename = GetUserPrefDir();
+
+	XABPreferences preferences(preffilename);
+
+	wxString AccountType;
+	
+	//XABPrefAccounts prefaccounts;
+	
+	wxTreeItemIdValue cookie;
+	wxTreeItemId next = treAccounts->GetRootItem();
+
+	wxTreeItemId selectedChild = treAccounts->GetSelection();
+	wxTreeItemId nextChild;
+
+	for (int i = 0; i < preferences.accounts.GetCount(); i++){
+
+		if (!nextChild){
+			nextChild = treAccounts->GetFirstChild(next, cookie);
+		} else {
+			nextChild = treAccounts->GetNextSibling(nextChild);
+		}
+		
+		if (nextChild == selectedChild){
+	
+			std::map<int, wxString>::iterator AccTypeIter = AccountAccTypeList.find(i);
+			
+			AccountType = AccTypeIter->second;
+	
+		}
+	
+
+	}
+	
+	return AccountType;
+
+}
+
+bool frmImportContacts::GetDialogResult(){
+
+	return DialogResult;
+
 }
\ No newline at end of file