- bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
- bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
+ bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
+ bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
- wxTreeItemId RootNode = treAccounts->AddRoot(wxT("Root Item"));
-
- /*
- for (int i = (preferences.accounts.GetCount() - 1); i > 0; --i){
- treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i));
- }
- */
-
- wxString AccDir;
- wxString AccDirFull;
- wxString AccDirFullSfx;
- wxString AccName;
- wxString AccType;
- wxString AccDirFinal;
- wxTreeItemId AccountTreeId;
- wxTreeItemId GroupTreeId;
-
- for (int i = 0; i < preferences.accounts.GetCount(); i++){
+ wxTreeItemId RootNode = treAccounts->AddRoot(wxT("Root Item"));
+
+ wxString AccDir;
+ wxString AccDirFull;
+ wxString AccDirFullSfx;
+ wxString AccName;
+ wxString AccType;
+ wxString AccDirFinal;
+ wxTreeItemId AccountTreeId;
+ wxTreeItemId GroupTreeId;
+
+ for (int i = 0; i < preferences.accounts.GetCount(); i++){
- if ((preferences.accounts.GetAccountType(i) == wxT("Local") ||
- preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs == TRUE){
-
- continue;
+ if ((preferences.accounts.GetAccountType(i) == wxT("Local") ||
+ preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs == TRUE){
+ continue;
- AccDir = preferences.accounts.GetAccountDirectory(i);
- AccDirFull = preferences.accounts.GetAccountDirectory(i);
- AccDirFull.Trim();
- AccDirFull.Append(wxT("."));
- AccDirFullSfx.Append(preferences.accounts.GetAccountType(i));
- AccDirFullSfx.LowerCase();
- AccDirFullSfx.Trim();
- 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));
+ AccDir = preferences.accounts.GetAccountDirectory(i);
+ AccDirFull = preferences.accounts.GetAccountDirectory(i);
+ AccDirFull.Trim();
+ AccDirFull.Append(wxT("."));
+ AccDirFullSfx.Append(preferences.accounts.GetAccountType(i));
+ AccDirFullSfx.LowerCase();
+ AccDirFullSfx.Trim();
+ 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")){
+ if (preferences.accounts.GetAccountType(i) == wxT("CardDAV") ||
+ preferences.accounts.GetAccountType(i) == wxT("carddav")){
- AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountNetID, -1);
+ AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountNetID, -1);
- AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountID, -1);
+ AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountID, -1);
wxTreeItemId selectedChild = treAccounts->GetSelection();
wxTreeItemId nextChild;
for (int i = 0; i < preferences.accounts.GetCount(); i++){
if (!nextChild){
wxTreeItemId selectedChild = treAccounts->GetSelection();
wxTreeItemId nextChild;
for (int i = 0; i < preferences.accounts.GetCount(); i++){
if (!nextChild){