equal
deleted
inserted
replaced
1240 { |
1240 { |
1241 ProcessCommandL( ECalenCmdAddAttachment ); |
1241 ProcessCommandL( ECalenCmdAddAttachment ); |
1242 } |
1242 } |
1243 break; |
1243 break; |
1244 } |
1244 } |
1245 case ECalenEditorDescription: |
1245 |
1246 { |
|
1247 CEikEdwin* edwin = static_cast<CEikEdwin*>( Control( focusControl ) ); |
|
1248 if ( edwin && edwin->Text()->DocumentLength() == 0 ) |
|
1249 { |
|
1250 ProcessCommandL( ECalenCmdAddDescription ); |
|
1251 } |
|
1252 else |
|
1253 { |
|
1254 ProcessCommandL( ECalenCmdShowDescription ); |
|
1255 } |
|
1256 break; |
|
1257 } |
|
1258 default: |
1246 default: |
1259 { |
1247 { |
1260 break; |
1248 break; |
1261 } |
1249 } |
1262 } |
1250 } |
2183 |
2171 |
2184 else |
2172 else |
2185 { |
2173 { |
2186 // If save error occurs, display error message. |
2174 // If save error occurs, display error message. |
2187 DisplayErrorMsgL( error ); |
2175 DisplayErrorMsgL( error ); |
2188 // HandleErrorL(error); |
2176 iUnifiedEditorControl->HandleErrorL(error); |
2189 TRACE_EXIT_POINT; |
2177 TRACE_EXIT_POINT; |
2190 return EFalse; |
2178 return EFalse; |
2191 } |
2179 } |
2192 } |
2180 } |
2193 |
2181 |
2246 rrule.SetInterval( 1 ); // once a year |
2234 rrule.SetInterval( 1 ); // once a year |
2247 entry->SetRRuleL( rrule ); |
2235 entry->SetRRuleL( rrule ); |
2248 } |
2236 } |
2249 } |
2237 } |
2250 |
2238 |
2251 if(!IsCreatingNewEntry()) |
2239 if(!IsCreatingNewEntry() && !iEditorDataHandler->IsCalendarEditedL()) |
2252 { |
2240 { |
2253 iServices->EntryViewL(iEditorDataHandler->PreviousDbCollectionId()) |
2241 iServices->EntryViewL(iEditorDataHandler->PreviousDbCollectionId()) |
2254 ->DeleteL(*iOriginalCalEntry); |
2242 ->DeleteL(*iOriginalCalEntry); |
2255 } |
2243 } |
2256 |
2244 |
2276 iRepeatType, |
2264 iRepeatType, |
2277 newInstanceStartDate, |
2265 newInstanceStartDate, |
2278 newInstanceEndDate, |
2266 newInstanceEndDate, |
2279 iUnifiedEditorControl->GetCalendarNameForEntryL() ) ); |
2267 iUnifiedEditorControl->GetCalendarNameForEntryL() ) ); |
2280 } |
2268 } |
2281 |
2269 if(!IsCreatingNewEntry() && iEditorDataHandler->IsCalendarEditedL()) |
|
2270 { |
|
2271 iServices->EntryViewL(iEditorDataHandler->PreviousDbCollectionId()) |
|
2272 ->DeleteL(*iOriginalCalEntry); |
|
2273 } |
2282 iEntryUiOutParams.iSpare = (TUint32) entry->LocalUidL(); |
2274 iEntryUiOutParams.iSpare = (TUint32) entry->LocalUidL(); |
2283 |
2275 |
2284 CleanupStack::PopAndDestroy(entry); |
2276 CleanupStack::PopAndDestroy(entry); |
2285 return saveErr; |
2277 return saveErr; |
2286 |
2278 |
2312 const TBool continueOnError = ETrue; |
2304 const TBool continueOnError = ETrue; |
2313 iUnifiedEditorControl->ReadDataFromEditorL( continueOnError ); |
2305 iUnifiedEditorControl->ReadDataFromEditorL( continueOnError ); |
2314 |
2306 |
2315 CCalenEditorDataHandler::TAction action = |
2307 CCalenEditorDataHandler::TAction action = |
2316 EditorDataHandler().ShouldSaveOrDeleteOrDoNothingL(); |
2308 EditorDataHandler().ShouldSaveOrDeleteOrDoNothingL(); |
2317 |
|
2318 if( iHasChosenRepeatType && iRepeatType == CalCommon::EThisAndAll ) |
2309 if( iHasChosenRepeatType && iRepeatType == CalCommon::EThisAndAll ) |
2319 { |
2310 { |
2320 // Check for the errors, with the entered data |
2311 // Check for the errors, with the entered data |
2321 if ( EditorDataHandler().CheckErrorsForThisAndAllL() != KErrNone ) |
2312 if ( EditorDataHandler().CheckErrorsForThisAndAllL() != KErrNone ) |
2322 return; |
2313 return; |