--- a/mediasettings/mediasettingsapp/inc/MPSettingsVideoSettingItemList.h Fri Feb 19 22:52:52 2010 +0200
+++ b/mediasettings/mediasettingsapp/inc/MPSettingsVideoSettingItemList.h Fri Mar 12 15:43:00 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 7 %
@@ -25,23 +25,8 @@
// INCLUDES
#include <aknsettingitemlist.h>
-#include "videosettingsdrivemonitor.h"
-#include "mvideosettingsdrivemonitorobserver.h"
// CONSTANTS
-// VideoCenter SIS package UID
-const TUid KSisUid = { 0x200159B2 };
-
-// formatting string for version number
-_LIT( KVersionNumberFormat, "%d.%d(%d)" );
-
-// Max length of the above version number string, whose format is
-// major.minor(build). Header e32cmn.h states that their ranges are:
-// 1. the major version number, ranging from 0 to 127, inclusive
-// 2. the minor version number, ranging from 0 to 99 inclusive
-// 3. the build number, ranging from 0 to 32767 inclusive.
-// Which makes the total max length 3+1+2+1+5+1 = 13
-const TInt KMaxVersionNumberLength( 13 );
// When video contrast is not drawn, we know to shift the contents
@@ -50,7 +35,6 @@
// FORWARD DECLARATIONS
class CMPSettingsModelForROP;
class CVcxNsSettingsEngine;
-class TIptvDriveMonitorEvent;
// CLASS DECLARATION
@@ -61,8 +45,7 @@
* @lib MediaSettings.app
* @since 2.0
*/
-class CMPSettingsVideoSettingItemList : public CAknSettingItemList,
- public MIptvDriveMonitorObserver
+class CMPSettingsVideoSettingItemList : public CAknSettingItemList
{
public: // Constructors and destructor
@@ -91,31 +74,7 @@
virtual ~CMPSettingsVideoSettingItemList();
public:
-
- /**
- * Edits thumbnail setting item.
- *
- * @param itemIndex Setting list index.
- * @param aCalledFromMenu ETrue if started from menu.
- */
- void EditThumbnailItemL( TInt itemIndex, TBool aCalledFromMenu );
-
- /**
- * Edits parent control settting item.
- *
- * @param itemIndex Setting list index.
- * @param aCalledFromMenu ETrue if started from menu.
- */
- void EditParentControlItemL( TInt itemIndex, TBool aCalledFromMenu );
-
- /**
- * Edits preferred memory settting item.
- *
- * @param itemIndex Setting list index.
- * @param aCalledFromMenu ETrue if started from menu.
- */
- void EditPreferredMemoryItemL( TInt itemIndex, TBool aCalledFromMenu );
-
+
/**
* Check if specified item is currently selected.
*
@@ -123,6 +82,11 @@
*/
TBool IsCurrentItem( TInt aIndex );
+ /**
+ * Check wheter or not the Contrast settings item shold be drawn
+ */
+ TBool VideoContrastIsSupportedL();
+
public: // Functions from base classes
/**
@@ -142,16 +106,6 @@
*/
void LoadSettingsL();
- /**
- * Finishes construction of listbox. Should be called after the
- * listbox is otherwise fully constructed.
- */
- void FinishConstructionL();
-
- public: // From MIptvDriveMonitorObserver
-
- void HandleDriveMonitorEvent( TIptvDriveMonitorEvent& aEvent );
-
protected: // Functions from base classes
/**
@@ -182,96 +136,6 @@
void LoadAllL();
/**
- * Updates version number item to settings list.
- */
- void UpdateVersionNumberTextL();
-
- /**
- * Updates text of "parent control" setting item.
- */
- void UpdateParentControlTextL();
-
- /**
- * Fetch current parent control age and return corresponding index.
- *
- * @return Parent control age.
- */
- TInt GetCurrentParentControl();
-
- /**
- * Convert and save parent control index as age.
- *
- * @param aParentControlIndex Index of parent control selection.
- */
- void SetCurrentParentControl( TInt aParentControlIndex );
-
- /**
- * Updates text of "memory" setting item.
- */
- void UpdateMemoryItemTextL();
-
- /**
- * Adds phone memory descriptor to arrays.
- *
- * @param aIndex index in enumeration list.
- * @param aEnumeratedTextArray
- * @param aPoppedUpTextArray
- */
- void AddPhoneMemoryDesToArraysL( TInt aIndex,
- CArrayPtrFlat<CAknEnumeratedText>& aEnumeratedTextArray,
- CArrayPtr<HBufC>& aPoppedUpTextArray );
-
- /**
- * Adds memory card descriptor to arrays.
- *
- * @param aIndex index in enumeration list.
- * @param aEnumeratedTextArray
- * @param aPoppedUpTextArray
- */
- void AddMemoryCardDesToArraysL( TInt aIndex,
- CArrayPtrFlat<CAknEnumeratedText>& aEnumeratedTextArray,
- CArrayPtr<HBufC>& aPoppedUpTextArray );
- /**
- * Adds locked memory card descriptor to arrays.
- *
- * @param aIndex index in enumeration list.
- * @param aEnumeratedTextArray
- * @param aPoppedUpTextArray
- */
- void AddLockedMemoryCardDesToArraysL( TInt aIndex,
- CArrayPtrFlat<CAknEnumeratedText>& aEnumeratedTextArray,
- CArrayPtr<HBufC>& aPoppedUpTextArray );
-
- /**
- * Adds hard disk descriptor to arrays.
- *
- * @param aIndex index in enumeration list.
- * @param aEnumeratedTextArray
- * @param aPoppedUpTextArray
- */
- void AddHardDiskDesToArraysL( TInt aIndex,
- CArrayPtrFlat<CAknEnumeratedText>& aEnumeratedTextArray,
- CArrayPtr<HBufC>& aPoppedUpTextArray );
-
- /**
- * Adds descriptor to arrays.
- *
- * @param aIndex index in enumeration list.
- * @param aText Descriptor to add. Ownership moves.
- * @param aEnumeratedTextArray
- * @param aPoppedUpTextArray
- */
- void AddDesToArraysL( TInt aIndex,
- HBufC* aText,
- CArrayPtrFlat<CAknEnumeratedText>& aEnumeratedTextArray,
- CArrayPtr<HBufC>& aPoppedUpTextArray );
-
- /**
- * Check wheter or not the Contrast settings item shold be drawn
- */
- TBool VideoContrastIsSupportedL();
-
- /**
* Event handling section, from MEikListBoxObserver.
*/
void HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aListBoxEvent);
@@ -280,26 +144,6 @@
CMPSettingsModelForROP* iModel;
CVcxNsSettingsEngine& iVideoSettingsEngine; // Video settings engine
- CVideoSettingsDriveMonitor* iDriveMonitor; // Drive monitor
-
- TBuf< KMaxVersionNumberLength > iSettingVersionText; // version text
- CAknTextSettingItem* iSettingIadUpdateItem; // IAD update setting item
-
- CAknEnumeratedTextPopupSettingItem* iSettingThumbnailsItem; // Thumbnail setting item
- TInt iSettingThumbnails; // Selected thumbnail setting value
-
- CAknEnumeratedTextPopupSettingItem* iSettingParentControlItem; // Parent control setting item
- TInt iParentControlIndex; // Selected parent control setting value
- /**
- * Is the phone's lock code entered succesfully,
- * required for editing parent control settings.
- */
- TBool iLockCodeAccepted;
-
- CAknEnumeratedTextPopupSettingItem* iSettingMemoryItem; // Memory setting item
- TInt iSettingMemory; // Selected memory setting value
-
- CAknEnumeratedTextPopupSettingItem* iSettingServiceItem; // Service selection item
TInt iSettingTemp; // Dummy setting placeholder for settings sublist items
TInt iVideoContrast;