equal
deleted
inserted
replaced
809 { |
809 { |
810 // Set previous skin ID as NULL |
810 // Set previous skin ID as NULL |
811 iOldSkin = KAknsNullPkgID; |
811 iOldSkin = KAknsNullPkgID; |
812 } |
812 } |
813 // Wallpaper was on removable drive and it is no longer accessible. |
813 // Wallpaper was on removable drive and it is no longer accessible. |
814 if ( iWPOnRemovableDrive && iWPFilename ) |
814 /*if ( iWPOnRemovableDrive && iWPFilename ) |
815 { |
815 { |
816 if ( !AknsSrvUtils::IsFile( iFsSession, *iWPFilename ) ) |
816 if ( !AknsSrvUtils::IsFile( iFsSession, *iWPFilename ) ) |
817 { |
817 { |
818 iWPOnRemovableDrive = EFalse; |
818 iWPOnRemovableDrive = EFalse; |
819 WallpaperLost(); |
819 WallpaperLost(); |
820 } |
820 } |
821 } |
821 }*/ |
822 } |
822 } |
823 } |
823 } |
824 |
824 |
825 // ----------------------------------------------------------------------------- |
825 // ----------------------------------------------------------------------------- |
826 // CAknsSrv::NotifyBackupOperationBegin |
826 // CAknsSrv::NotifyBackupOperationBegin |
1419 !aIsSlide) |
1419 !aIsSlide) |
1420 { |
1420 { |
1421 iCurrentSlide = 0; |
1421 iCurrentSlide = 0; |
1422 WallpaperTimerL()->Stop(); |
1422 WallpaperTimerL()->Stop(); |
1423 } |
1423 } |
1424 if (!aIsSlide && iSlideSetNameArray) |
1424 if (!aIsSlide && iSlideSetNameArray) |
1425 { |
1425 { |
1426 delete iSlideSetNameArray; |
1426 delete iSlideSetNameArray; |
1427 iSlideSetNameArray = NULL; |
1427 iSlideSetNameArray = NULL; |
1428 } |
1428 } |
1429 |
1429 |
1524 CleanupStack::PopAndDestroy(contenturi); |
1524 CleanupStack::PopAndDestroy(contenturi); |
1525 } |
1525 } |
1526 |
1526 |
1527 iChunkMaintainer->SetWallpaper( aIID, aFilename, 0); |
1527 iChunkMaintainer->SetWallpaper( aIID, aFilename, 0); |
1528 |
1528 |
1529 // Set the wallpaper type as correct. |
1529 // Set the wallpaper type as correct. |
1530 if ( aFilename != KNullDesC && !aIsSlide ) |
1530 if ( !aIsSlide ) |
1531 { |
1531 { |
1532 iWallpaperType = KAknsSkinSrvImageWallpaper; |
1532 if ( aFilename != KNullDesC ) |
1533 } |
1533 { |
1534 else if ( aFilename == KNullDesC && !aIsSlide ) |
1534 iWallpaperType = KAknsSkinSrvImageWallpaper; |
1535 { |
1535 } |
1536 iWallpaperType = KAknsSkinSrvNoWallpaper; |
1536 else |
|
1537 { |
|
1538 iWallpaperType = KAknsSkinSrvNoWallpaper; |
|
1539 } |
|
1540 |
|
1541 iSettings->WriteWallpaperType( iWallpaperType ); |
|
1542 iSettings->WriteWallpaperPath( aFilename ); |
1537 } |
1543 } |
1538 |
1544 |
1539 iContentChanged = ETrue; |
1545 iContentChanged = ETrue; |
1540 if ( aFilename.Length() >0 ) |
1546 if ( aFilename.Length() >0 ) |
1541 { |
1547 { |
1749 ContentAccess::EView, |
1755 ContentAccess::EView, |
1750 CDRMHelper::EFinish ); |
1756 CDRMHelper::EFinish ); |
1751 } |
1757 } |
1752 } |
1758 } |
1753 |
1759 |
1754 CRepository* skinsrep = CRepository::NewL(KCRUidPersonalisation); |
|
1755 CleanupStack::PushL(skinsrep); |
|
1756 |
|
1757 if ( slideCount > 1 ) |
1760 if ( slideCount > 1 ) |
1758 { |
1761 { |
1759 SetWallpaperL( iSlideSetNameArray->MdcaPoint(iCurrentSlide),KAknsIIDWallpaper, ETrue ); |
1762 SetWallpaperL( iSlideSetNameArray->MdcaPoint(iCurrentSlide),KAknsIIDWallpaper, ETrue ); |
1760 skinsrep->Set(KPslnIdleBackgroundImagePath, iSlideSetNameArray->MdcaPoint(iCurrentSlide)); |
1763 iSettings->WriteWallpaperPath( iSlideSetNameArray->MdcaPoint(iCurrentSlide) ); |
1761 iMergeType = (TAknsSkinSrvMergeType)(iMergeType | EAknsSkinSrvIdleWp); |
1764 iMergeType = (TAknsSkinSrvMergeType)(iMergeType | EAknsSkinSrvIdleWp); |
1762 iContentChanged = ETrue; |
1765 iContentChanged = ETrue; |
1763 BroadcastUpdate(); |
1766 BroadcastUpdate(); |
1764 iCurrentSlide++; |
1767 iCurrentSlide++; |
1765 if ( iCurrentSlide >= slideCount ) |
1768 if ( iCurrentSlide >= slideCount ) |
1781 |
1784 |
1782 if ( slideCount && BaflUtils::FileExists(iFsSession, fname) ) |
1785 if ( slideCount && BaflUtils::FileExists(iFsSession, fname) ) |
1783 { |
1786 { |
1784 SetWallpaperL( fname,KAknsIIDWallpaper ); |
1787 SetWallpaperL( fname,KAknsIIDWallpaper ); |
1785 iWallpaperType = KAknsSkinSrvImageWallpaper; |
1788 iWallpaperType = KAknsSkinSrvImageWallpaper; |
1786 User::LeaveIfError(skinsrep->Set(KPslnIdleBackgroundImagePath, fname)); |
1789 iSettings->WriteWallpaperPath( fname ); |
1787 User::LeaveIfError(skinsrep->Set(KPslnWallpaperType, iWallpaperType)); |
1790 iSettings->WriteWallpaperType( iWallpaperType ); |
1788 } |
1791 } |
1789 else |
1792 else |
1790 { |
1793 { |
1791 SetWallpaperL( KNullDesC,KAknsIIDWallpaper ); |
1794 SetWallpaperL( KNullDesC,KAknsIIDWallpaper ); |
1792 iSettings->WriteIdleBackgroundToDefault(); |
1795 iSettings->WriteIdleBackgroundToDefault(); |
1801 |
1804 |
1802 iMergeType = (TAknsSkinSrvMergeType)(iMergeType | EAknsSkinSrvIdleWp); |
1805 iMergeType = (TAknsSkinSrvMergeType)(iMergeType | EAknsSkinSrvIdleWp); |
1803 iContentChanged = ETrue; |
1806 iContentChanged = ETrue; |
1804 BroadcastUpdate(); |
1807 BroadcastUpdate(); |
1805 } |
1808 } |
1806 CleanupStack::PopAndDestroy( skinsrep ); |
|
1807 } |
1809 } |
1808 |
1810 |
1809 // ----------------------------------------------------------------------------- |
1811 // ----------------------------------------------------------------------------- |
1810 // Sets slide set wallpaper. |
1812 // Sets slide set wallpaper. |
1811 // ----------------------------------------------------------------------------- |
1813 // ----------------------------------------------------------------------------- |
1813 void CAknsSrv::SetSlidesetWallpaperL( ) |
1815 void CAknsSrv::SetSlidesetWallpaperL( ) |
1814 { |
1816 { |
1815 ReadSlideSetImageFilesL(); |
1817 ReadSlideSetImageFilesL(); |
1816 |
1818 |
1817 iWallpaperType = KAknsSkinSrvSlidesetWallpaper; |
1819 iWallpaperType = KAknsSkinSrvSlidesetWallpaper; |
|
1820 iSettings->WriteWallpaperType( iWallpaperType ); |
1818 |
1821 |
1819 SetSlideSetTimerActiveL(); |
1822 SetSlideSetTimerActiveL(); |
1820 |
1823 |
1821 StopSlidesetIniFileObserver(); |
1824 StopSlidesetIniFileObserver(); |
1822 TFileName fileName; |
1825 TFileName fileName; |