X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fwidgets%2FXCCalendarList.cpp;h=84662bd386202074352863dde75194851ad05aaf;hp=6fc7f7abc637c4f68143d511789bacad5f1336ef;hb=baa27c175ee6111fd4b88a3c53614a9b6be3541e;hpb=e79afea4cd8930a1ebbdda0e3543dd0a89e45b34

diff --git a/source/widgets/XCCalendarList.cpp b/source/widgets/XCCalendarList.cpp
index 6fc7f7a..84662bd 100644
--- a/source/widgets/XCCalendarList.cpp
+++ b/source/widgets/XCCalendarList.cpp
@@ -75,6 +75,7 @@ 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);
 		
 		szrMain->Add(newAccountCtrl, 0, wxEXPAND, 5);
 		
@@ -89,6 +90,7 @@ 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]);
 			
 			newAccountCtrl->AddCalendar(newCalendarCtrl);
 
@@ -102,4 +104,60 @@ void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 	
 	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