X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fimport%2FfrmImportContacts.cpp;h=c71341e9a4aa0df5b4684e4a6da42daa7971c81d;hb=461309b2fb2fa0dd8c5d9c53c9584d756da67afe;hp=2c2e19e78ae38051cb80908e84569e1fe0c55c95;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git
diff --git a/source/import/frmImportContacts.cpp b/source/import/frmImportContacts.cpp
index 2c2e19e..c71341e 100644
--- a/source/import/frmImportContacts.cpp
+++ b/source/import/frmImportContacts.cpp
@@ -1,3 +1,21 @@
+// frmImportContacts.cpp - frmImportContacts 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
+
#include
#include
@@ -77,10 +95,10 @@ frmImportContactsADT( parent )
wxString AccDirFull;
wxString AccDirFullSfx;
wxString AccName;
+ wxString AccType;
wxString AccDirFinal;
wxTreeItemId AccountTreeId;
wxTreeItemId GroupTreeId;
- int intGroupID = 0;
for (int i = 0; i < preferences.accounts.GetCount(); i++){
@@ -101,7 +119,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")){
@@ -123,7 +144,21 @@ frmImportContactsADT( parent )
AccName.clear();
}
+
+ DialogResult = FALSE;
+
+}
+frmImportContacts::~frmImportContacts()
+{
+
+ /*delete AccControl;
+ AccControl = NULL;
+ delete treAccounts;
+ treAccounts = NULL;
+ delete AccImgList;
+ AccImgList = NULL;*/
+
}
void frmImportContacts::GetResult()
@@ -138,11 +173,13 @@ void frmImportContacts::GetContacts()
void frmImportContacts::CloseWindow( wxCommandEvent& event )
{
+ DialogResult = FALSE;
this->Close();
}
void frmImportContacts::ImportContacts( wxCommandEvent& event )
{
+ DialogResult = TRUE;
this->Close();
}
@@ -238,4 +275,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::iterator AccTypeIter = AccountAccTypeList.find(i);
+
+ AccountType = AccTypeIter->second;
+
+ }
+
+
+ }
+
+ return AccountType;
+
+}
+
+bool frmImportContacts::GetDialogResult(){
+
+ return DialogResult;
+
}
\ No newline at end of file