equal
deleted
inserted
replaced
141 /* TBool inCall = EFalse; |
141 /* TBool inCall = EFalse; |
142 #if !defined(__WINS__) && !defined(__WINSCW__) |
142 #if !defined(__WINS__) && !defined(__WINSCW__) |
143 inCall = iSFIUtils->IsCLIValidL(); |
143 inCall = iSFIUtils->IsCLIValidL(); |
144 #endif */ |
144 #endif */ |
145 //use both inCall and InCallOrRinging() conditions to make sure if it is in call state |
145 //use both inCall and InCallOrRinging() conditions to make sure if it is in call state |
146 if ( /*inCall &&*/ iController.InCallOrRinging() ) |
146 // In-Call-Send no longer used |
147 { |
147 // if ( /*inCall &&*/ iController.InCallOrRinging() ) |
148 #ifndef __WINS__ |
148 // { |
149 DoInCallSendL(); |
149 //#ifndef __WINS__ |
150 #endif |
150 // DoInCallSendL(); |
151 } |
151 //#endif |
152 else |
152 // } |
153 { |
153 // else |
|
154 // { |
154 DoSendAsL(); |
155 DoSendAsL(); |
155 } |
156 // } |
156 } |
157 } |
157 break; |
158 break; |
158 |
159 |
159 case ECamCmdExitStandby: |
160 case ECamCmdExitStandby: |
160 { |
161 { |
210 } |
211 } |
211 else |
212 else |
212 { // Lint warnings |
213 { // Lint warnings |
213 }*/ |
214 }*/ |
214 StartAddToAlbumOperationL(); |
215 StartAddToAlbumOperationL(); |
|
216 } |
|
217 break; |
|
218 case KAiwCmdEdit: |
|
219 case ECamCmdEdit: |
|
220 { |
|
221 CAiwGenericParamList& inputParams = iAiwServiceHandler->InParamListL(); |
|
222 TPtrC currentFullFileName(iController.CurrentFullFileName()); |
|
223 TAiwGenericParam param( EGenericParamFile, TAiwVariant(currentFullFileName)); |
|
224 inputParams.AppendL( param ); |
|
225 |
|
226 |
|
227 TAiwVariant param2Variant; |
|
228 if(Id().iUid == ECamViewIdVideoPostCapture) |
|
229 { |
|
230 param2Variant.Set(_L("video/*")); |
|
231 } |
|
232 else |
|
233 { |
|
234 param2Variant.Set(_L("image/jpeg")); |
|
235 } |
|
236 TAiwGenericParam param2( EGenericParamMIMEType, param2Variant ); |
|
237 inputParams.AppendL( param2 ); |
|
238 |
|
239 iAiwServiceHandler->ExecuteServiceCmdL(KAiwCmdEdit, inputParams, iAiwServiceHandler->OutParamListL()); |
|
240 } |
|
241 break; |
|
242 case KAiwCmdView: // SHARE_AIW |
|
243 { |
|
244 iAiwServiceHandler->ExecuteServiceCmdL(KAiwCmdView, iAiwServiceHandler->InParamListL(), iAiwServiceHandler->OutParamListL()); |
215 } |
245 } |
216 break; |
246 break; |
217 default: |
247 default: |
218 { |
248 { |
219 CCamViewBase::HandleCommandL( aCommand ); |
249 CCamViewBase::HandleCommandL( aCommand ); |
322 if ( iController.IsTouchScreenSupported() ) |
352 if ( iController.IsTouchScreenSupported() ) |
323 { |
353 { |
324 CAknToolbar* fixedToolbar = Toolbar(); |
354 CAknToolbar* fixedToolbar = Toolbar(); |
325 if ( fixedToolbar ) |
355 if ( fixedToolbar ) |
326 { |
356 { |
327 fixedToolbar->SetItemDimmed( ECamCmdPhotos, EFalse, ETrue ); |
357 /*fixedToolbar->SetItemDimmed( ECamCmdPhotos, EFalse, ETrue ); |
|
358 fixedToolbar->SetItemDimmed( ECamCmdEdit, EFalse, ETrue ); |
328 fixedToolbar->SetItemDimmed( ECamCmdDelete, EFalse, ETrue ); |
359 fixedToolbar->SetItemDimmed( ECamCmdDelete, EFalse, ETrue ); |
329 fixedToolbar->SetItemDimmed( ECamCmdOneClickUpload, EFalse, ETrue ); |
360 fixedToolbar->SetItemDimmed( ECamCmdOneClickUpload, EFalse, ETrue ); |
330 fixedToolbar->SetItemDimmed( ECamCmdSend, EFalse, ETrue ); |
361 fixedToolbar->SetItemDimmed( ECamCmdSend, EFalse, ETrue );*/ |
|
362 fixedToolbar->SetDimmed(EFalse); |
|
363 fixedToolbar->DrawNow(); |
331 } |
364 } |
332 } |
365 } |
333 } |
366 } |
334 } |
367 } |
335 iWaitForImageSave = EFalse; |
368 iWaitForImageSave = EFalse; |
448 if ( iController.IsTouchScreenSupported() ) |
481 if ( iController.IsTouchScreenSupported() ) |
449 { |
482 { |
450 CAknToolbar* fixedToolbar = Toolbar(); |
483 CAknToolbar* fixedToolbar = Toolbar(); |
451 if ( fixedToolbar ) |
484 if ( fixedToolbar ) |
452 { |
485 { |
453 fixedToolbar->SetItemDimmed( ECamCmdPhotos, ETrue, ETrue ); |
486 /*fixedToolbar->SetItemDimmed( ECamCmdPhotos, ETrue, ETrue ); |
454 fixedToolbar->SetItemDimmed( ECamCmdDelete, ETrue, ETrue ); |
487 fixedToolbar->SetItemDimmed( ECamCmdDelete, ETrue, ETrue ); |
455 fixedToolbar->SetItemDimmed( ECamCmdOneClickUpload, ETrue, ETrue ); |
488 fixedToolbar->SetItemDimmed( ECamCmdOneClickUpload, ETrue, ETrue ); |
456 fixedToolbar->SetItemDimmed( ECamCmdSend, ETrue, ETrue ); |
489 fixedToolbar->SetItemDimmed( ECamCmdEdit, ETrue, ETrue ); |
|
490 fixedToolbar->SetItemDimmed( ECamCmdSend, ETrue, ETrue );*/ |
457 } |
491 } |
458 } |
492 } |
459 } |
493 } |
460 } |
494 } |
461 } |
495 } |
516 { |
550 { |
517 PRINT( _L( "Camera => CCamPostCaptureViewBase::DoActivateL" ) ); |
551 PRINT( _L( "Camera => CCamPostCaptureViewBase::DoActivateL" ) ); |
518 |
552 |
519 CCamAppUi* appui = static_cast<CCamAppUi*>( AppUi() ); |
553 CCamAppUi* appui = static_cast<CCamAppUi*>( AppUi() ); |
520 |
554 |
|
555 iAiwServiceHandler->AttachL(R_CAM_AIW_EDIT_INTEREST); |
|
556 |
521 CCamViewBase::DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage ); |
557 CCamViewBase::DoActivateL( aPrevViewId, aCustomMessageId, aCustomMessage ); |
522 |
558 |
523 // fixed toolbar is used only with touch devices |
559 // fixed toolbar is used only with touch devices |
524 if ( iController.IsTouchScreenSupported() ) |
560 if ( iController.IsTouchScreenSupported() ) |
525 { |
561 { |
532 fixedToolbar->SetToolbarVisibility( EFalse ); |
568 fixedToolbar->SetToolbarVisibility( EFalse ); |
533 } |
569 } |
534 else |
570 else |
535 { |
571 { |
536 fixedToolbar->SetToolbarObserver( this ); |
572 fixedToolbar->SetToolbarObserver( this ); |
537 fixedToolbar->SetToolbarVisibility( ETrue ); |
|
538 UpdateToolbarIconsL(); |
573 UpdateToolbarIconsL(); |
|
574 if(Id().iUid != ECamViewIdVideoPostCapture) |
|
575 { |
|
576 fixedToolbar->SetDimmed(ETrue); |
|
577 } |
|
578 fixedToolbar->SetToolbarVisibility( ETrue ); |
539 } |
579 } |
540 } |
580 } |
541 } |
581 } |
542 |
582 |
543 |
583 |
611 PRINT( _L( "Camera => CCamPostCaptureViewBase::DoDeactivate" ) ); |
651 PRINT( _L( "Camera => CCamPostCaptureViewBase::DoDeactivate" ) ); |
612 |
652 |
613 CCamViewBase::DoDeactivate(); |
653 CCamViewBase::DoDeactivate(); |
614 |
654 |
615 iController.RemoveControllerObserver( this ); |
655 iController.RemoveControllerObserver( this ); |
|
656 CAknToolbar* fixedToolbar = Toolbar(); |
|
657 if(fixedToolbar) |
|
658 { |
|
659 fixedToolbar->SetToolbarVisibility( EFalse ); |
|
660 } |
|
661 |
616 PRINT( _L( "Camera <= CCamPostCaptureViewBase::DoDeactivate" ) ); |
662 PRINT( _L( "Camera <= CCamPostCaptureViewBase::DoDeactivate" ) ); |
617 } |
663 } |
618 |
664 |
619 // --------------------------------------------------------------------------- |
665 // --------------------------------------------------------------------------- |
620 // CCamPostCaptureViewBase::DynInitMenuPaneL |
666 // CCamPostCaptureViewBase::DynInitMenuPaneL |
634 } |
680 } |
635 if( aMenuPane->MenuItemExists(ECamCmdAddToAlbum, itemPos) ) |
681 if( aMenuPane->MenuItemExists(ECamCmdAddToAlbum, itemPos) ) |
636 { |
682 { |
637 aMenuPane->SetItemDimmed( ECamCmdAddToAlbum, ETrue ); |
683 aMenuPane->SetItemDimmed( ECamCmdAddToAlbum, ETrue ); |
638 } |
684 } |
639 } |
685 } |
|
686 // Hide menu item, if Share not available |
|
687 if ( !iOneClickUploadUtility->OneClickUploadSupported() && |
|
688 aMenuPane->MenuItemExists( KAiwCmdView, itemPos ) ) |
|
689 { |
|
690 aMenuPane->SetItemDimmed( KAiwCmdView, ETrue ); |
|
691 } |
640 } |
692 } |
641 |
693 |
642 // --------------------------------------------------------------------------- |
694 // --------------------------------------------------------------------------- |
643 // CCamPostCaptureViewBase::CCamPostCaptureViewBase |
695 // CCamPostCaptureViewBase::CCamPostCaptureViewBase |
644 // C++ constructor |
696 // C++ constructor |
799 inCall = iSFIUtils->IsCLIValidL(); |
851 inCall = iSFIUtils->IsCLIValidL(); |
800 #endif */ |
852 #endif */ |
801 if ( aApHandler ) |
853 if ( aApHandler ) |
802 { |
854 { |
803 //use both inCall and InCallOrRinging() conditions to make sure if it is in call state |
855 //use both inCall and InCallOrRinging() conditions to make sure if it is in call state |
804 aApHandler->SetItemVisible( ECamCmdSend, !( /*inCall &&*/ iController.InCallOrRinging() ) ); |
856 |
805 aApHandler->SetItemVisible( ECamCmdSendToCallerMultimedia, ( /*inCall &&*/ iController.InCallOrRinging() ) ); |
857 // In-Call-Send no longer used. Always use ECamCmdSend regardless of phone call state. |
806 |
858 //aApHandler->SetItemVisible( ECamCmdSend, !( /*inCall &&*/ iController.InCallOrRinging() ) ); |
|
859 //aApHandler->SetItemVisible( ECamCmdSendToCallerMultimedia, ( /*inCall &&*/ iController.InCallOrRinging() ) ); |
|
860 aApHandler->SetItemVisible( ECamCmdSend, ETrue ); |
|
861 |
807 TBool uploadSupported = EFalse; |
862 TBool uploadSupported = EFalse; |
808 if ( iOneClickUploadUtility && |
863 if ( iOneClickUploadUtility && |
809 iOneClickUploadUtility->OneClickUploadSupported() ) |
864 iOneClickUploadUtility->OneClickUploadSupported() ) |
810 { |
865 { |
811 uploadSupported = ETrue; |
866 uploadSupported = ETrue; |
926 HBufC* tooltipText = |
981 HBufC* tooltipText = |
927 StringLoader::LoadLC( R_QTN_LCAM_TT_SEND ); |
982 StringLoader::LoadLC( R_QTN_LCAM_TT_SEND ); |
928 state->SetHelpTextL( *tooltipText ); |
983 state->SetHelpTextL( *tooltipText ); |
929 CleanupStack::PopAndDestroy( tooltipText ); |
984 CleanupStack::PopAndDestroy( tooltipText ); |
930 } |
985 } |
931 } |
986 } |
932 button = dynamic_cast<CAknButton*>( |
987 button = dynamic_cast<CAknButton*>( |
933 toolbar->ControlOrNull( ECamCmdOneClickUpload ) ); |
988 toolbar->ControlOrNull( ECamCmdOneClickUpload ) ); |
934 if ( button ) |
989 if ( button && iOneClickUploadUtility->OneClickUploadSupported()) |
935 { |
990 { |
936 CAknButtonState* state = button->State(); |
991 CAknButtonState* state = button->State(); |
937 if ( state ) |
992 if ( state ) |
938 { |
993 { |
939 state->SetHelpTextL( |
994 state->SetHelpTextL( |
940 iOneClickUploadUtility->ButtonTooltipL() ); |
995 iOneClickUploadUtility->ButtonTooltipL() ); |
|
996 |
941 } |
997 } |
942 } |
998 } |
|
999 button = dynamic_cast<CAknButton*>(toolbar->ControlOrNull( ECamCmdEdit )); |
|
1000 if( button ) |
|
1001 { |
|
1002 CAknButtonState* state = button->State(); |
|
1003 if( state ) |
|
1004 { |
|
1005 TInt resource = (Id().iUid == ECamViewIdStillPostCapture)? |
|
1006 R_QTN_LCAM_TT_IMAGE_EDITOR: |
|
1007 R_QTN_LCAM_TT_VIDEO_EDITOR; |
|
1008 HBufC* helpText = StringLoader::LoadLC( resource ); |
|
1009 state->SetHelpTextL(*helpText); |
|
1010 CleanupStack::PopAndDestroy(helpText); |
|
1011 } |
|
1012 } |
943 } |
1013 } |
944 } |
1014 } |
945 PRINT( _L("Camera <= CCamPostCaptureViewBase::UpdateToolbarIconsL") ); |
1015 PRINT( _L("Camera <= CCamPostCaptureViewBase::UpdateToolbarIconsL") ); |
946 } |
1016 } |
947 |
1017 |