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

diff --git a/source/widgets/XCCalendarList.cpp b/source/widgets/XCCalendarList.cpp
index 84662bd..4ee85ac 100644
--- a/source/widgets/XCCalendarList.cpp
+++ b/source/widgets/XCCalendarList.cpp
@@ -55,7 +55,11 @@ void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 		
 	}
 	
-	// TODO: Delete the old controls.
+	// 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++){
@@ -76,9 +80,16 @@ void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 		
 		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.
@@ -92,6 +103,14 @@ void XCCalendarList::UpdateCalendarList(CalendarDataStorage *dataStorage){
 			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);
 
 			szrMain->Add(newCalendarCtrl, 0, wxEXPAND, 5);