#include <wx/stdpaths.h>
#include <wx/fileconf.h>
#include <wx/gdicmn.h>
-//#include <boost/filesystem/fstream.hpp>
// Include the forms.
#include "frmAbout.h"
#include "frmPreferences.h"
#include "frmNewAccount.h"
-#include "frmActivityMgr.h"
+#include "actmgr/frmActivityMgr.h"
#include "frmContact.h"
#include "frmConflictResolution.h"
#include "frmInvalidSSLCertificate.h"
-#include "frmSearch.h"
+#include "search/frmSearch.h"
#include "frmSSLCertificate.h"
#include "frmUpdate.h"
#include "import/frmImportResults.h"
wxString setname, setvalue;
vCard Person;
wxString nextchar;
- //std::fstream vcardfile;
Person.LoadFile(uc->ContactFilename);
AccountSyncTimers.clear();
- /*
- for (int i = (preferences.accounts.GetCount() - 1); i > 0; --i){
- treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i));
- }
- */
-
wxString AccDir;
wxString AccDirFull;
wxString AccDirFullSfx;
if (preferences.accounts.GetAccountType(i) == wxT("CardDAV") ||
preferences.accounts.GetAccountType(i) == wxT("carddav")){
- // Check if the directory exists before doing anything.
+ // TODO: Check if the directory exists before doing anything.
wxString vCardFilename;
wxString vCardDataString;
wxString vCardFilenameFull;
- //bool ProcFiles = FALSE;
-
+
bool ProcFiles = vcardaccdir.GetFirst(&vCardFilename, wxEmptyString, wxDIR_FILES);
while(ProcFiles){
vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
vCard *ServerDataPtr = vCardConfObj->vCardServerData;
- //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
- //wxString Moo = ClientDataPtr->WriteString();
- //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList);
- //frameCR->LoadData(vCardConfObj->vCardLocalData, vCardConfObj->vCardServerData, &MemoryFileList);
frameCR->ShowModal();
int FinalConflictResult = frameCR->GetResult();
void frmMain::RemoveContactsWindowPointer(wxCommandEvent& event){
- //frmSearch *frameSCH = static_cast<frmSearch*>(ActMgrPtr);
void *frameSCH = (void*)event.GetClientData();
SearchWindowList.erase(frameSCH);
}
-void frmMain::UpdateWindowList(wxCommandEvent& event){
-
- // Update the Window List.
-
- // Delete the existing items in the window menu.
-
- // Get the list of contacts.
-
- // Insert a separator.
-
- // Get the list of search windows.
-
-}
-
void frmMain::RevealContact(wxCommandEvent& event){
UCNotif *uc = (UCNotif*)event.GetClientData();
std::map<int, wxMenuItem*>::iterator MenuIter = WindowListPointersMenu.find(WData->WindowID);
MenuIter->second->SetItemLabel(WindowTitle);
-
- //mnuWindow->FindChildItem(intID, &pos);
- //wxMenuItem *mnuNewItem = new wxMenuItem(NULL, WData->WindowID, WindowTitle, WData->WindowID), wxEmptyString, wxITEM_NORMAL, NULL);
- //mnuNewItem->SetId(WData->WindowID);
- //ContactWindowListPointersMenu.insert(std::make_pair(WData->WindowID, mnuNewItem));
- //ContactWindowListPointers.insert(std::make_pair(WData->WindowID, WData->WindowPointer));
- //mnuWindow->Insert((pos + 1), mnuNewItem);
- //this->Connect(mnuNewItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(frmMain::ShowContactWindow));
-
+
} else if (WData->DataType == 1){
// Get the window title and use that.
}
- //mnuWindow->FindChildItem(intID, &pos);
- //wxMenuItem *mnuNewItem = new wxMenuItem(NULL, WData->WindowID, WindowTitle, WData->WindowID), wxEmptyString, wxITEM_NORMAL, NULL);
- //mnuNewItem->SetId(WData->WindowID);
- //ContactEditorWindowListPointersMenu.insert(std::make_pair(WData->WindowID, mnuNewItem));
- //ContactEditorWindowListPointers.insert(std::make_pair(WData->WindowID, WData->WindowPointer));
- //mnuWindow->Insert((pos + 1), mnuNewItem);
- //this->Connect(mnuNewItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(frmMain::ShowContactEditorWindow));
-
}
delete WData;