X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=150e7f976c4d5e1d16fae6db882e7c26d36fcd58;hb=a45c3a46e4e37da415a8b8da2aaabe6a4abc4551;hp=a41a6295a2b8691efdfe9338864d8276ad6d2a39;hpb=7bab37a4219b657a5adc432e039075fc61345c61;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index a41a629..150e7f9 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -226,29 +226,6 @@ frmMainADT( parent )
     AccCtrl->SetPopupMaxHeight(175);
     AccCtrl->SetPopupMinWidth(250);
     treAccounts->AssignImageList(AccImgList);
-    //bmpIcon->Hide();
-    
-    /*wxStaticBitmap* BeepBoop = new wxStaticBitmap(AccCtrl, wxID_ANY, wxNullBitmap, wxPoint(AccTextCtrlSize.GetX() + 3, AccTextCtrlSize.GetY() + 2), wxDefaultSize, 0);
-     
-     icons_accgroup_png.SetMask(new wxMask(icons_accgroup_png, wxSystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND)));
-     
-     BeepBoop->SetBackgroundColour(AccCtrl->GetBackgroundColour());
-     BeepBoop->SetBitmap(icons_accgroup_png);*/
-    
-    //szrContactList->Insert(0, XABV2, 1, wxEXPAND | wxALL, 0);
-    
-    /*AccControl->UseAltPopupWindow();
-     AccControl->SetPopupControl(treAccounts);
-     AccControl->SetPopupMaxHeight(175);
-     
-     treAccounts->AssignImageList(AccImgList);
-     szrContactList->Insert(0, AccControl, 1, wxEXPAND|wxALL, 0);
-     szrAccList->Add(AccIcon, 0, wxLEFT|wxTOP|wxEXPAND, 3);
-     
-     */
-    
-    //szrContactList->Layout();
-    //szrContactList->RecalcSizes();
     
     wxListItem ColumnData;
     ColumnData.SetId(0);
@@ -256,14 +233,6 @@ frmMainADT( parent )
     ColumnData.SetWidth(320);
     lstContacts->InsertColumn(0, ColumnData);
     
-    //Connect(wxID_ANY, ContactConflictCmdEnv,
-    //	ContactConflictEventHandler(frmMain::ConflictResolution), NULL, this);
-    
-    //Connect(wxID_ANY, MyFooCommandEvent,
-    //	MyFooEventHandler(frmMain::DoSomething), NULL, this);
-    
-    //Bind(ContactConflictCmdEnv, ContactConflictEventHandler(frmMain::ConflictResolution), this, wxID_ANY);
-    
     treAccounts->Connect(wxEVT_LEFT_DCLICK, wxTreeEventHandler(frmMain::LoadContactList), NULL, this);
     treAccounts->Connect(wxEVT_TREE_SEL_CHANGED, wxTreeEventHandler(frmMain::LoadContactList), NULL, this);
     
@@ -643,14 +612,12 @@ void frmMain::LoadContactList( wxTreeEvent& event )
     
     ContactsFileIndex.Clear();
     
-    //wxString vcardfilenamewxs;
     wxString vCardFilename;
     wxString vCardFilenameFull;
     wxString vCardDataString;
     wxStringTokenizer vcardfileline;
     wxString lwxs;
     wxString setname, setvalue;
-    //vCardNames = new std::map<wxString, wxString, std::greater<wxString>>;
     std::multimap<wxString, wxString, std::greater<wxString>> vCardNamesAsc;
     std::multimap<wxString, wxString, std::less<wxString>> vCardNamesDsc;
     long ContactIndex = 1;
@@ -670,8 +637,7 @@ void frmMain::LoadContactList( wxTreeEvent& event )
         
         std::multimap<wxTreeItemId, int>::iterator AGTiter = AccountGroupTreeId.find(ActiveItemId);
         std::multimap<int, wxString>::iterator AGFiter = AccountGroupFilename.find(AGTiter->second);
-        //std::multimap<wxTreeItemId, int>::iterator AGFiter = AccountGroupTreeId.find(ActiveItemId);
-        
+       
         Group.LoadFile(AGFiter->second);
         
         ArrayvCardOutData vCardMember = Group.GetByPartial(wxT("MEMBER"));
@@ -909,8 +875,6 @@ void frmMain::ShowContactInfo( wxListEvent& event )
     long intSelected = -1;
     long ContactSeekNum = -1;
     
-    //    intSelected = lstContacts->GetSelection();
-    
     // Check if several contacts have been selected.
     
     int ContactTotal = 0;
@@ -1032,8 +996,6 @@ void frmMain::ShowContactInfo( wxListEvent& event )
             if (wxSPropertyNextLine.Mid(0, 1) == wxT(" ") || wxSPropertyNextLine.Mid(0, 1) == wxT("\t")){
                 
                 wxSPropertyNextLine.Remove(0, 1);
-                //wxSPropertyNextLine.Trim(FALSE);
-                //ContactLine.Trim();
                 ContactLine.Append(wxSPropertyNextLine);
                 
             } else {
@@ -1180,9 +1142,7 @@ void frmMain::ShowContactEditorEdit( wxCommandEvent& event )
     
     long intSelected = -1;
     long intContactSeekNum = -1;
-    
-    //    intSelected = lstContacts->GetSelection();
-    
+        
     intSelected = lstContacts->GetNextItem(intSelected,
                                            wxLIST_NEXT_ALL,
                                            wxLIST_STATE_SELECTED);
@@ -1349,7 +1309,6 @@ void frmMain::OpenContactInfo( wxCommandEvent& event )
     wxString setname, setvalue;
     vCard Person;
     wxString nextchar;
-    //std::fstream vcardfile;
     
     Person.LoadFile(uc->ContactFilename);