frmEventEditor: Set calendar ID when editing event

[xestiacalendar/.git] / source / forms / eventeditor / frmEventEditor.cpp

diff --git a/source/forms/eventeditor/frmEventEditor.cpp b/source/forms/eventeditor/frmEventEditor.cpp
index f262d6a..4c95dc3 100644 (file)
--- a/source/forms/eventeditor/frmEventEditor.cpp
+++ b/source/forms/eventeditor/frmEventEditor.cpp
@@ -66,13 +66,17 @@ void frmEventEditor::SetupForm(CalendarDataStorage *dataStorage, XCALPreferences
                
                CDSGetCalendarEntryInfo eventInfo = dataStorage->GetEvent(eventID);
                
+               // Set the calendar ID.
+               
+               calendarID = eventInfo.calendarID;
+               
                // Load the calendar info.
                
                cmbCalendar->Show(false);
                lblCalendar->Show(false);
                
                szrDetails->Layout();
-               szrList->Layout();              
+               szrList->Layout();      
                
                // Load the data into the form.
                
@@ -206,11 +210,11 @@ void frmEventEditor::SaveContact(){
        
        // Set the data into the calendar event object.
                
-       eventData.SummaryData = txtEventName->GetValue().ToStdString();
-       eventData.DescriptionList.push_back(txtEventDescription->GetValue().ToStdString());
-       eventData.DescriptionListAltRep.push_back("");
-       eventData.DescriptionListLanguage.push_back("");
-       eventData.DescriptionListTokens.push_back("");
+       eventData.summaryData = txtEventName->GetValue().ToStdString();
+       eventData.descriptionList.push_back(txtEventDescription->GetValue().ToStdString());
+       eventData.descriptionListAltRep.push_back("");
+       eventData.descriptionListLanguage.push_back("");
+       eventData.descriptionListTokens.push_back("");
                
        stringstream stringData;
                
@@ -222,8 +226,8 @@ void frmEventEditor::SaveContact(){
        stringData << txtStartTime->GetValue().ToStdString().substr(3, 2).c_str();
        stringData << "00Z";
 
-       eventData.DateTimeStartData = stringData.str();
-       eventData.DateTimeStampData = stringData.str();
+       eventData.dateTimeStartData = stringData.str();
+       eventData.dateTimeStampData = stringData.str();
                
        stringData.str("");
                
@@ -235,7 +239,7 @@ void frmEventEditor::SaveContact(){
        stringData << txtEndTime->GetValue().ToStdString().substr(3, 2).c_str();
        stringData << "00Z";    
 
-       eventData.DateTimeEndData = stringData.str();
+       eventData.dateTimeEndData = stringData.str();
        
        // TODO: Implement Duration.
        
@@ -264,7 +268,7 @@ void frmEventEditor::SaveContact(){
                eventFile += NewUUID;
                eventFile += ".ics";
 
-               eventData.UniqueID = NewUUID;
+               eventData.uniqueID = NewUUID;
 
                // Write the file.
 
@@ -295,6 +299,7 @@ void frmEventEditor::SaveContact(){
                
                eventFilePath = eventFile;
                editMode = true;
+               calendarID = eventInfo->calendarID;
                
                eventID = addEventResult.calendarEntryID;
                
@@ -325,7 +330,7 @@ void frmEventEditor::SaveContact(){
                
                EventProperties *eventInfo = new EventProperties;
                eventInfo->eventName = txtEventName->GetValue().ToStdString();
-               eventInfo->calendarID = calendarIDList[cmbCalendar->GetSelection()];
+               eventInfo->calendarID = calendarID;
                eventInfo->eventID = eventID;
                eventInfo->eventYear = dapStartDate->GetValue().GetYear();
                eventInfo->eventMonth = dapStartDate->GetValue().GetMonth();