X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarList.cpp;h=4ee85acc802d5f53ebbdc473943c3e354a23c633;hb=c5716d0f27f0f917282df9121aa97eab7a1bf6b8;hp=62efb9c7899c9b026ac9b2ffb2f990d440b5297d;hpb=339434b90a0a03c3102b82a5dc45334b338bc59c;p=xestiacalendar%2F.git

diff --git a/source/widgets/XCCalendarList.cpp b/source/widgets/XCCalendarList.cpp
index 62efb9c..4ee85ac 100644
--- a/source/widgets/XCCalendarList.cpp
+++ b/source/widgets/XCCalendarList.cpp
@@ -44,7 +44,31 @@ XCCalendarList::~XCCalendarList(){
 
 void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 	
-	// TODO: Verify if the generated code has changed.
+	// Verify if the generated code has changed. Return if not.
+
+	CDSGetChecksumResult currentChecksum = dataStorage->GetChecksum("internal_updatedata");
+	
+	if (checksumUpdate == currentChecksum.checksumValue){
+		
+		// Checksum matches so return.
+		return;
+		
+	}
+	
+	// Delete the old controls. Remember which setting the checkboxes were hidden so they
+	// can be restored later on.
+
+	vector<int> calendarHiddenAccountsList = GetHiddenAccountsList();	
+	vector<int> calendarHiddenCalendarsList = GetHiddenCalendarsList();
+	
+	for (vector<XCCalendarListAccountCtrl*>::iterator accountCtrlIter = accountControlList.begin();
+		accountCtrlIter != accountControlList.end(); accountCtrlIter++){
+		
+		delete *accountCtrlIter;
+			
+	}
+	
+	accountControlList.clear();
 	
 	// Get the list of accounts and create them one by one.
 	
@@ -55,9 +79,17 @@ void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 		// Create the control and add it to the list.
 		
 		XCCalendarListAccountCtrl *newAccountCtrl = new XCCalendarListAccountCtrl(this, accountListData.accountList[AccountSeek].accountName);
+		newAccountCtrl->SetAccountID(accountListData.accountList[AccountSeek].accountID);
+		newAccountCtrl->SetAccountPreferencesID(accountListData.accountList[AccountSeek].accountPreferencesID);
 		
 		szrMain->Add(newAccountCtrl, 0, wxEXPAND, 5);
 		
+		if (find(calendarHiddenAccountsList.begin(), calendarHiddenAccountsList.end(), accountListData.accountList[AccountSeek].accountID) != calendarHiddenAccountsList.end()){
+			
+			newAccountCtrl->SetCheckBoxValue(wxCHK_UNCHECKED);
+			
+		}
+		
 		accountControlList.push_back(newAccountCtrl);
 		
 		// Get the list of calendars and create controls.
@@ -69,6 +101,15 @@ void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 			CDSGetCalendarInfo calendarInfo = dataStorage->GetCalendar(accountListData.accountList[AccountSeek].accountName, accountCalendarList.calendarListTextID[calendarSeek]);
 			
 			XCCalendarListCalendarCtrl *newCalendarCtrl = new XCCalendarListCalendarCtrl(this, calendarInfo.calendarName, calendarInfo.calendarColour);
+			newCalendarCtrl->SetCalendarID(accountCalendarList.calendarList[calendarSeek]);
+			
+			newCalendarCtrl->SetAccountPreferencesID(accountListData.accountList[AccountSeek].accountPreferencesID);
+
+			if (find(calendarHiddenCalendarsList.begin(), calendarHiddenCalendarsList.end(), accountCalendarList.calendarList[calendarSeek]) != calendarHiddenCalendarsList.end()){
+			
+				newCalendarCtrl->SetCheckBoxValue(wxCHK_UNCHECKED);
+			
+			}
 			
 			newAccountCtrl->AddCalendar(newCalendarCtrl);
 
@@ -78,4 +119,64 @@ void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 		
 	}
 	
+	// Set the updated checksum.
+	
+	checksumUpdate = currentChecksum.checksumValue;
+	
+}
+
+std::vector<int> XCCalendarList::GetHiddenAccountsList(){
+	
+	std::vector<int> accountList;
+	
+	// Go through each of the account controls and work
+	// out which entries should be hidden based on account.
+	
+	for (std::vector<XCCalendarListAccountCtrl*>::iterator accountListIter = accountControlList.begin();
+		accountListIter != accountControlList.end(); accountListIter++){
+	
+		if ((*accountListIter)->GetShowCheckboxState() == wxCHK_UNCHECKED){
+			
+			accountList.push_back((*accountListIter)->GetAccountID());
+			
+		}
+			
+	}
+	
+	return accountList;
+	
+}
+
+std::vector<int> XCCalendarList::GetHiddenCalendarsList(){
+
+	std::vector<int> calendarList;
+	
+	// Go through each of the calendar controls and
+	// work out which entries should be hidden based on
+	// calendar.
+
+	for (std::vector<XCCalendarListAccountCtrl*>::iterator accountListIter = accountControlList.begin();
+		accountListIter != accountControlList.end(); accountListIter++){
+	
+		// Get the list of hidden calendars.
+		
+		vector<int> calendarHiddenList = (*accountListIter)->GetHiddenCalendarList();
+			
+		for (vector<int>::iterator calendarHiddenIter = calendarHiddenList.begin();
+			calendarHiddenIter != calendarHiddenList.end(); calendarHiddenIter++){
+		
+			vector<int>::iterator calendarHiddenFind = find(calendarList.begin(), calendarList.end(), *calendarHiddenIter);
+			
+			if (calendarHiddenFind == calendarList.end()){
+
+				calendarList.push_back(*calendarHiddenIter);
+				
+			}
+				
+		}
+			
+	}
+	
+	return calendarList;
+	
 }
\ No newline at end of file