Branching out Symbian^1 version. Default branch is henceforth Symbian^3.
--- a/application/data/PodcastQueueView.ra Wed Apr 28 13:20:05 2010 +0100
+++ b/application/data/PodcastQueueView.ra Wed Apr 28 13:57:49 2010 +0100
@@ -95,7 +95,6 @@
};
};
},
-#ifdef SYMBIAN1_UI
TBAR_CTRL
{
type = EAknCtButton;
@@ -114,7 +113,6 @@
};
};
},
-#endif
TBAR_CTRL
{
type = EAknCtButton;
--- a/application/data/PodcastShowsView.ra Wed Apr 28 13:20:05 2010 +0100
+++ b/application/data/PodcastShowsView.ra Wed Apr 28 13:57:49 2010 +0100
@@ -119,7 +119,6 @@
};
};
}
-#ifdef SYMBIAN1_UI
,
TBAR_CTRL
{
@@ -175,7 +174,6 @@
};
};
}
-#endif
};
}
@@ -188,28 +186,6 @@
txt = STRING_r_view_show_info_cmd;
command = EPodcastShowInfo;
}
-#ifndef SYMBIAN1_UI
- ,STYLUS_POPUP_MENU_ITEM
- {
- txt = STRING_r_view_mark_as_unplayed_cmd_short;
- command = EPodcastMarkAsUnplayed;
- },
- STYLUS_POPUP_MENU_ITEM
- {
- txt = STRING_r_view_mark_as_played_cmd_short;
- command = EPodcastMarkAsPlayed;
- },
- STYLUS_POPUP_MENU_ITEM
- {
- txt = STRING_r_view_download_show_cmd;
- command = EPodcastDownloadShow;
- },
- STYLUS_POPUP_MENU_ITEM
- {
- txt = STRING_r_view_delete_show_cmd;
- command = EPodcastDeleteShow;
- }
-#endif
};
}
--- a/application/group/Podcast.mmp Wed Apr 28 13:20:05 2010 +0100
+++ b/application/group/Podcast.mmp Wed Apr 28 13:57:49 2010 +0100
@@ -16,8 +16,6 @@
*
*/
-MACRO SYMBIAN1_UI
-
TARGET Podcast.exe
TARGETTYPE exe
UID 0x100039CE 0xA0009D00
@@ -29,18 +27,7 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\mmf\common
-#ifdef SYMBIAN_1
-SYSTEMINCLUDE \epoc32\include\domain\middleware
-#else
-SYSTEMINCLUDE \epoc32\include\mw // for Symbian^3
-SYSTEMINCLUDE \epoc32\include\platform\mw // for Symbian^3
-SYSTEMINCLUDE \epoc32\include\platform
-#endif
-#ifdef SQLITE_INCLUDED
SYSTEMINCLUDE ..\..\engine\sqlite\inc
-#else
-SYSTEMINCLUDE \epoc32\include\stdapis
-#endif
USERINCLUDE ..\..\engine\inc
USERINCLUDE .
@@ -77,7 +64,6 @@
#endif
END
-#ifdef SQLITE_INCLUDED
STATICLIBRARY PodCastEngine.lib
STATICLIBRARY sqlite_podcatcher.lib
LIBRARY mediaclientaudio.lib
@@ -92,10 +78,6 @@
LIBRARY libc.lib
LIBRARY imageconversion.lib
LIBRARY bitmaptransforms.lib
-#else
-LIBRARY PodCastEngine.lib
-LIBRARY sqlite3.lib
-#endif
LIBRARY euser.lib
LIBRARY apparc.lib
LIBRARY cone.lib
--- a/application/group/bld.inf Wed Apr 28 13:20:05 2010 +0100
+++ b/application/group/bld.inf Wed Apr 28 13:57:49 2010 +0100
@@ -21,40 +21,9 @@
PRJ_MMPFILES
-#ifdef SYMBIAN_1
gnumakefile icons.mk
-#endif
Podcast.mmp
PRJ_EXPORTS
..\help\podcatcher.hlp \epoc32\winscw\c\resource\help\podcatcher.hlp
-
-#ifndef SYMBIAN_1
-PRJ_EXTENSIONS
-
-START EXTENSION s60/mifconv
-OPTION TARGETFILE Podcast.mif
-OPTION HEADERFILE Podcast.mbg
-OPTION SOURCEDIR ../data/images
-OPTION SOURCES \
- -c16,1 podcatcher_64px\
- -c16,1 Audio\
- -c16,1 Audio_new\
- -c16,1 Audio_queued\
- -c16,1 Audio_downloading\
- -c16,1 Audio_downloaded\
- -c16,1 Audio_downloaded_new\
- -c16,1 Audio_failed\
- -c16,1 Audio_suspended\
- -c16,1 Video.svg\
- -c16,1 Video_new.svg\
- -c16,1 Video_queued.svg\
- -c16,1 Video_downloading.svg\
- -c16,1 Video_downloaded.svg\
- -c16,1 Video_downloaded_new.svg\
- -c16,1 Video_failed.svg\
- -c16,1 Video_suspended.svg\
- -c16,1 Feed
-END
-#endif
--- a/application/src/PodcastFeedView.cpp Wed Apr 28 13:20:05 2010 +0100
+++ b/application/src/PodcastFeedView.cpp Wed Apr 28 13:57:49 2010 +0100
@@ -203,9 +203,6 @@
switch(aEventType)
{
-#ifndef SYMBIAN1_UI
- case EEventItemClicked:
-#endif
case EEventEnterKeyPressed:
case EEventItemDoubleClicked:
case EEventItemActioned:
--- a/application/src/PodcastListView.cpp Wed Apr 28 13:20:05 2010 +0100
+++ b/application/src/PodcastListView.cpp Wed Apr 28 13:57:49 2010 +0100
@@ -75,12 +75,6 @@
iListbox->MakeVisible(ETrue);
MakeVisible(EFalse);
-//#ifndef SYMBIAN1_UI
-// TInt flags = iListbox->View()->ItemDrawer()->Flags();
-// flags |= CListItemDrawer::EDisableHighlight;
-// iListbox->ItemDrawer()->SetFlags(flags);
-//#endif
-
// Activate the window, which makes it ready to be drawn
ActivateL();
}
--- a/application/src/PodcastQueueView.cpp Wed Apr 28 13:20:05 2010 +0100
+++ b/application/src/PodcastQueueView.cpp Wed Apr 28 13:57:49 2010 +0100
@@ -67,15 +67,6 @@
iPodcastModel.FeedEngine().AddObserver(this);
iPodcastModel.ShowEngine().AddObserver(this);
-
- // no popup options apply to S^1
-#ifndef SYMBIAN1_UI
- iStylusPopupMenu = CAknStylusPopUpMenu::NewL( this , TPoint(0,0));
- TResourceReader reader;
- iCoeEnv->CreateResourceReaderLC(reader,R_QUEUEVIEW_POPUP_MENU);
- iStylusPopupMenu->ConstructFromResourceL(reader);
- CleanupStack::PopAndDestroy();
-#endif
SetEmptyTextL(R_PODCAST_EMPTY_QUEUE);
}
@@ -145,9 +136,6 @@
{
switch (aEventType)
{
-#ifndef SYMBIAN1_UI
- case EEventItemClicked:
-#endif
case EEventEnterKeyPressed:
case EEventItemActioned:
case EEventItemDoubleClicked:
--- a/application/src/PodcastShowsView.cpp Wed Apr 28 13:20:05 2010 +0100
+++ b/application/src/PodcastShowsView.cpp Wed Apr 28 13:57:49 2010 +0100
@@ -315,9 +315,6 @@
{
switch (aEventType)
{
-#ifndef SYMBIAN1_UI
- case EEventItemClicked:
-#endif
case EEventEnterKeyPressed:
case EEventItemActioned:
case EEventItemDoubleClicked:
@@ -670,12 +667,6 @@
toolbar->HideItem(EPodcastUpdateFeed, updatingState, ETrue );
toolbar->HideItem(EPodcastCancelUpdateAllFeeds, !updatingState, ETrue );
-#ifndef SYMBIAN1_UI
- // there seems to be drawing bugs in the toolbar if there is only
- // one or two buttons defined in the resource, so we have download
- // there but always hidden
- toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue );
-#else SYMBIAN1_UI
RShowInfoArray &fItems = iPodcastModel.ActiveShowList();
TInt itemCnt = fItems.Count();
@@ -731,7 +722,6 @@
toolbar->HideItem(EPodcastMarkAsUnplayed, ETrue, ETrue );
toolbar->SetItemDimmed(EPodcastMarkAsPlayed, updatingState, ETrue);
}
-#endif
}
}
--- a/engine/group/bld.inf Wed Apr 28 13:20:05 2010 +0100
+++ b/engine/group/bld.inf Wed Apr 28 13:57:49 2010 +0100
@@ -21,12 +21,7 @@
WINSCW
PRJ_MMPFILES
-
-#ifdef SQLITE_INCLUDED
..\sqlite\group\sqlite.mmp
-#endif
-
-PRJ_MMPFILES
engine.mmp
PRJ_EXPORTS
--- a/engine/group/engine.mmp Wed Apr 28 13:20:05 2010 +0100
+++ b/engine/group/engine.mmp Wed Apr 28 13:57:49 2010 +0100
@@ -16,28 +16,14 @@
*
*/
-#ifdef SQLITE_INCLUDED
// must build a .lib since sqlite uses "initialized writable data"
TARGET podcastengine.lib
TARGETTYPE LIB
-#else
-TARGET podcastengine.dll
-TARGETTYPE DLL
-UID 0x1000008d 0xA11F867F
-#endif
SOURCEPATH ..\src
USERINCLUDE ..\inc
SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\mw // needed for S^3
-SYSTEMINCLUDE \epoc32\include\platform
-SYSTEMINCLUDE \epoc32\include\platform\mw
-
-#ifdef SQLITE_INCLUDED
SYSTEMINCLUDE ..\..\engine\sqlite\inc
-#else
-SYSTEMINCLUDE \epoc32\include\stdapis
-#endif
// Engine
SOURCE HttpClient.cpp
@@ -55,32 +41,3 @@
SOURCE PodCastModel.cpp
SOURCE ImageHandler.cpp
SOURCE ConnectionEngine.cpp
-CAPABILITY NetworkServices UserEnvironment
-
-#ifndef SQLITE_INCLUDED
-LIBRARY sqlite3.lib
-#endif
-
-LIBRARY euser.lib
-LIBRARY bafl.lib
-LIBRARY efsrv.lib
-LIBRARY mediaclientaudio.lib
-LIBRARY inetprotutil.lib
-LIBRARY charconv.lib
-LIBRARY xmlframework.lib
-LIBRARY http.lib
-LIBRARY flogger.lib
-LIBRARY ezlib.lib
-LIBRARY estor.lib
-LIBRARY commdb.lib
-LIBRARY esock.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY apgrfx.lib
-LIBRARY cone.lib
-LIBRARY apmime.lib
-LIBRARY cmmanager.lib
-LIBRARY fbscli.lib
-LIBRARY imageconversion.lib
-LIBRARY bitmaptransforms.lib
-LIBRARY eikcore.lib
-//staticlibrary sqlite_podcatcher.lib
\ No newline at end of file