--- a/application/data/PodcastClient_common.rls Mon Nov 15 22:54:58 2010 +0000
+++ b/application/data/PodcastClient_common.rls Mon Nov 15 23:37:25 2010 +0000
@@ -23,4 +23,4 @@
rls_string STRING_r_caption "Podcatcher"
rls_string STRING_r_short_caption "Podcatcher"
-rls_string STRING_r_about_text_s60 "Podcatcher 1.00(%d)\nŠ 2007-2010 Sebastian Brannstrom, Lars Persson, Anders Fridlund, EmbedDev AB"
+rls_string STRING_r_about_text_s60 "Podcatcher 1.10(%d)\nŠ 2007-2010 Sebastian Brannstrom, Lars Persson, Anders Fridlund, EmbedDev AB"
--- a/application/inc/PodcastListView.h Mon Nov 15 22:54:58 2010 +0000
+++ b/application/inc/PodcastListView.h Mon Nov 15 23:37:25 2010 +0000
@@ -77,7 +77,6 @@
TBool iLongTapDetected;
CEikColumnListBox * iListbox;
TBool iLandscape;
-
};
--- a/application/inc/buildno.h Mon Nov 15 22:54:58 2010 +0000
+++ b/application/inc/buildno.h Mon Nov 15 23:37:25 2010 +0000
@@ -1,2 +1,2 @@
// Build number generated by increment_buildno.py, do not edit manually
-#define BUILD_NO 1
\ No newline at end of file
+#define BUILD_NO 1
\ No newline at end of file
--- a/application/sis/increment_buildno.py Mon Nov 15 22:54:58 2010 +0000
+++ b/application/sis/increment_buildno.py Mon Nov 15 23:37:25 2010 +0000
@@ -40,7 +40,7 @@
def update_header(header_file, buildno):
print 'Writing %s' % header_file
- buildno_str = '// Build number generated by increment_buildno.py, do not edit manually\r\n#define BUILD_NO %d' % buildno
+ buildno_str = '// Build number generated by increment_buildno.py, do not edit manually\r\n#define BUILD_NO %d\r\n' % buildno
f = open(header_file, 'w')
f.write(buildno_str)
--- a/application/src/PodcastFeedView.cpp Mon Nov 15 22:54:58 2010 +0000
+++ b/application/src/PodcastFeedView.cpp Mon Nov 15 23:37:25 2010 +0000
@@ -119,12 +119,14 @@
CPodcastFeedView::~CPodcastFeedView()
{
+ DP("CPodcastFeedView::~CPodcastFeedView BEGIN");
iPodcastModel.FeedEngine().RemoveObserver(this);
delete iFeedsFormat;
delete iNeverUpdated;
delete iStylusPopupMenu;
delete iUpdater;
iFeedIdForIconArray.Close();
+ DP("CPodcastFeedView::~CPodcastFeedView END");
}
void CPodcastFeedView::UpdateItemL(TInt aIndex)
@@ -637,7 +639,7 @@
void CPodcastFeedView::ShowItem(TUint aUid)
{
TInt listIndex = -1;
- for (TUint i=0;i<iItemIdArray.Count();i++)
+ for (TInt i=0;i<iItemIdArray.Count();i++)
{
if (iItemIdArray[i] == aUid)
{
--- a/application/src/PodcastListView.cpp Mon Nov 15 22:54:58 2010 +0000
+++ b/application/src/PodcastListView.cpp Mon Nov 15 23:37:25 2010 +0000
@@ -73,7 +73,8 @@
iListboxLandscape->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto );
iListboxLandscape->SetSize(aRect.Size());
iListboxLandscape->MakeVisible(EFalse);
-
+ iListboxLandscape->ItemDrawer()->ColumnData()->EnableMarqueeL(ETrue);
+
iListboxPortrait = new (ELeave) CAknDoubleLargeStyleListBox;
iListboxPortrait->ConstructL(this, aListboxFlags);
iListboxPortrait->SetMopParent( this );
@@ -82,6 +83,7 @@
iListboxPortrait->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto );
iListboxPortrait->SetSize(aRect.Size());
iListboxPortrait->MakeVisible(EFalse);
+ iListboxPortrait->ItemDrawer()->ColumnData()->EnableMarqueeL(ETrue);
if (aRect.Width() > aRect.Height())
{
@@ -170,9 +172,16 @@
iListboxPortrait->UpdateScrollBarsL();
iListboxPortrait->MakeVisible(EFalse);
+
iListboxLandscape->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto );
iListboxLandscape->MakeVisible(ETrue);
iListboxLandscape->SetFocus(ETrue, EDrawNow);
+
+ TInt index = iListboxPortrait->CurrentItemIndex();
+
+ if (IsVisible())
+ iListboxLandscape->SetCurrentItemIndex(index);
+
iListbox = iListboxLandscape;
}
else
@@ -184,9 +193,15 @@
iListboxPortrait->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto );
iListboxPortrait->MakeVisible(ETrue);
iListboxPortrait->SetFocus(ETrue, EDrawNow);
+
+ TInt index = iListboxLandscape->CurrentItemIndex();
+
+ if (IsVisible())
+ iListboxPortrait->SetCurrentItemIndex(index);
+
iListbox = (CEikColumnListBox*) iListboxPortrait;
}
-
+
iListbox->SetSize(Size());
ActivateL();
DrawNow();
@@ -307,8 +322,6 @@
void CPodcastListView::HandleViewRectChange()
{
- TBool wasVisible = iListContainer->IsVisible();
-
if ( iListContainer )
{
iListContainer->SetRect( ClientRect() );
--- a/application/src/PodcastQueueView.cpp Mon Nov 15 22:54:58 2010 +0000
+++ b/application/src/PodcastQueueView.cpp Mon Nov 15 23:37:25 2010 +0000
@@ -106,11 +106,13 @@
CPodcastQueueView::~CPodcastQueueView()
{
+ DP("CPodcastQueueView::~CPodcastQueueView BEGIN");
iPodcastModel.ShowEngine().RemoveObserver(this);
iPodcastModel.FeedEngine().RemoveObserver(this);
if(iStylusPopupMenu)
delete iStylusPopupMenu, iStylusPopupMenu = NULL;
+ DP("CPodcastQueueView::~CPodcastQueueView END");
}
@@ -385,9 +387,9 @@
if(iStylusPopupMenu && aPenEventLocation.iY < lbHeight)
{
TBool dimDown = (iListContainer->Listbox()->CurrentItemIndex() >= iPodcastModel.ActiveShowList().Count() - 1 ?
- ETrue : EFalse);
+ (TBool)ETrue : (TBool)EFalse);
TBool dimUp = (iListContainer->Listbox()->CurrentItemIndex() <= 0 ?
- ETrue : EFalse);
+ (TBool)ETrue : (TBool)EFalse);
iStylusPopupMenu->SetItemDimmed(EPodcastMoveDownloadDown, dimDown);
iStylusPopupMenu->SetItemDimmed(EPodcastMoveDownloadUp, dimUp);
--- a/application/src/PodcastShowsView.cpp Mon Nov 15 22:54:58 2010 +0000
+++ b/application/src/PodcastShowsView.cpp Mon Nov 15 23:37:25 2010 +0000
@@ -236,11 +236,14 @@
CPodcastShowsView::~CPodcastShowsView()
{
+ DP("CPodcastShowsView::~CPodcastShowsView BEGIN");
iPodcastModel.ShowEngine().RemoveObserver(this);
iPodcastModel.FeedEngine().RemoveObserver(this);
if(iStylusPopupMenu)
delete iStylusPopupMenu, iStylusPopupMenu = NULL;
+
+ DP("CPodcastShowsView::~CPodcastShowsView END");
}
@@ -475,7 +478,7 @@
{
if (aShowInfo.ShowSize() > 0)
{
- TUint showSize = aShowInfo.ShowSize() >= aSizeDownloaded ? aShowInfo.ShowSize() : aSizeDownloaded;
+ TInt showSize = aShowInfo.ShowSize() >= aSizeDownloaded ? aShowInfo.ShowSize() : aSizeDownloaded;
infoSize.Format(KSizeDownloadingOf(), ((float) aSizeDownloaded / (float) KSizeMb),
((float) showSize / (float)KSizeMb));
}
--- a/engine/src/ShowEngine.cpp Mon Nov 15 22:54:58 2010 +0000
+++ b/engine/src/ShowEngine.cpp Mon Nov 15 23:37:25 2010 +0000
@@ -38,11 +38,13 @@
EXPORT_C CShowEngine::~CShowEngine()
{
+ DP("CShowEngine::~CShowEngine BEGIN");
delete iShowClient;
iObservers.Close();
delete iShowDownloading;
delete iMetaDataReader;
iApaSession.Close();
+ DP("CShowEngine::~CShowEngine END");
}
EXPORT_C CShowEngine* CShowEngine::NewL(CPodcastModel& aPodcastModel)