FCL/sf/app/organizer: comparison calendarui/controller/src/calenicons.cpp

equal deleted inserted replaced

-:21239b3bcd78
+:9711e452b5e9
 #include "calendarui_debug.h"
 #include "calenicons.h"
 #include "calendar.hrh"
+#include <CalenUid.h>
 #include <aknconsts.h>
 #include <data_caging_path_literals.hrh>
 #include <AknIconArray.h>
 #include <AknsDrawUtils.h>
 #include <avkon.mbg>
 // CalenIcons::GetIcon
 // Gets an icon according to the icon index being passed in
 // (other items were commented in a header).
 // ---------------------------------------------------------
 //
-EXPORT_C CGulIcon* CCalenIcons::GetIconL( MCalenServices::TCalenIcons aIndex ) const
+EXPORT_C CGulIcon* CCalenIcons::GetIconL( MCalenServices::TCalenIcons aIndex, const TInt aViewId ) const
 {
 TRACE_ENTRY_POINT;
 CGulIcon* icon;
 // Alarm and repeat icon. Color skinned with day view icon color
 // FIXME: highlight coloring in lists doesn't work for icons.
 // When Avkon suplies some method to do that, change these
 TAknsItemID colorGroup = KAknsIIDQsnIconColors;
 TInt colorIndex = EAknsCIQsnIconColorsCG19;
+TInt colorIndexToDo = EAknsCIQsnIconColorsCG13;
 TRgb nonSkinColor = AKN_LAF_COLOR(215);
 CFbsBitmap* bitmap = NULL;
 CFbsBitmap* mask = NULL;
 switch( aIndex )
 EMbmCalendarQgn_indi_cdr_todo_mask );
 }
 break;
 case MCalenServices::ECalenAlarmIcon:
 {
-AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
+if(aViewId == KCalenTodoViewUidValue ||
-KAknsIIDQgnIndiAlarmAdd,
+aViewId == KCalenEventViewUidValue ||
-colorGroup,
+aViewId == KCalenMissedAlarmsViewUidValue ||
-colorIndex,
+aViewId == KCalenMissedEventViewUidValue )
-bitmap, mask,
+{
-AknIconUtils::AvkonIconFileName(),
+AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
-EMbmAvkonQgn_indi_alarm_add,
+KAknsIIDQgnIndiAlarmAdd,
-EMbmAvkonQgn_indi_alarm_add_mask,
+colorGroup,
-nonSkinColor);
+colorIndexToDo,
-icon = CGulIcon::NewL( bitmap, mask );
+bitmap, mask,
-CleanupStack::Pop( 2 ); // bitmap, mask
+AknIconUtils::AvkonIconFileName(),
-}
+EMbmAvkonQgn_indi_alarm_add,
-break;
+EMbmAvkonQgn_indi_alarm_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL( bitmap, mask );
+CleanupStack::Pop( 2 ); // bitmap, mask
+break;
+}
+else
+{
+AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
+KAknsIIDQgnIndiAlarmAdd,
+colorGroup,
+colorIndex,
+bitmap, mask,
+AknIconUtils::AvkonIconFileName(),
+EMbmAvkonQgn_indi_alarm_add,
+EMbmAvkonQgn_indi_alarm_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL( bitmap, mask );
+CleanupStack::Pop( 2 ); // bitmap, mask
+break;
+}
+}
 case MCalenServices::ECalenRepeatIcon:
 {
-AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
+if(aViewId == KCalenTodoViewUidValue ||
-KAknsIIDQgnIndiRepeatAdd,
+aViewId == KCalenEventViewUidValue ||
-colorGroup,
+aViewId == KCalenMissedAlarmsViewUidValue ||
-colorIndex,
+aViewId == KCalenMissedEventViewUidValue )
-bitmap, mask,
+{
-iIconFile,
+AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
-EMbmCalendarQgn_indi_repeat_add,
+KAknsIIDQgnIndiRepeatAdd,
-EMbmCalendarQgn_indi_repeat_add_mask,
+colorGroup,
-nonSkinColor);
+colorIndexToDo,
-icon = CGulIcon::NewL(bitmap, mask);
+bitmap, mask,
-CleanupStack::Pop( 2 );
+iIconFile,
-}
+EMbmCalendarQgn_indi_repeat_add,
-break;
+EMbmCalendarQgn_indi_repeat_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop( 2 );
+break;
+}
+else
+{
+AknsUtils::CreateColorIconLC( AknsUtils::SkinInstance(),
+KAknsIIDQgnIndiRepeatAdd,
+colorGroup,
+colorIndex,
+bitmap, mask,
+iIconFile,
+EMbmCalendarQgn_indi_repeat_add,
+EMbmCalendarQgn_indi_repeat_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop( 2 );
+break;
+}
+}
 case MCalenServices::ECalenRepeatExceptionIcon:
 {
-AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
+if(aViewId == KCalenTodoViewUidValue ||
-KAknsIIDQgnIndiRepeatExceptionAdd,
+aViewId == KCalenEventViewUidValue ||
-colorGroup,
+aViewId == KCalenMissedAlarmsViewUidValue ||
-colorIndex,
+aViewId == KCalenMissedEventViewUidValue )
-bitmap, mask,
+{
-iIconFile,
+AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
-EMbmCalendarQgn_indi_repeat_exception_add,
+KAknsIIDQgnIndiRepeatExceptionAdd,
-EMbmCalendarQgn_indi_repeat_exception_add_mask,
+colorGroup,
-nonSkinColor);
+colorIndexToDo,
-icon = CGulIcon::NewL(bitmap, mask);
+bitmap, mask,
-CleanupStack::Pop(2); // bitmap, mask;
+iIconFile,
-}
+EMbmCalendarQgn_indi_repeat_exception_add,
-break;
+EMbmCalendarQgn_indi_repeat_exception_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop(2); // bitmap, mask;
+break;
+}
+else
+{
+AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
+KAknsIIDQgnIndiRepeatExceptionAdd,
+colorGroup,
+colorIndex,
+bitmap, mask,
+iIconFile,
+EMbmCalendarQgn_indi_repeat_exception_add,
+EMbmCalendarQgn_indi_repeat_exception_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop(2); // bitmap, mask;
+break;
+}
+}
 case MCalenServices::ECalenNotePriorityLow:
 {
-AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
+if(aViewId == KCalenTodoViewUidValue ||
-KAknsIIDQgnIndiTodoLowAdd,
+aViewId == KCalenEventViewUidValue ||
-colorGroup,
+aViewId == KCalenMissedAlarmsViewUidValue ||
-colorIndex,
+aViewId == KCalenMissedEventViewUidValue )
-bitmap, mask,
+{
-iIconFile,
+AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
-EMbmCalendarQgn_indi_todo_low_add,
+KAknsIIDQgnIndiTodoLowAdd,
-EMbmCalendarQgn_indi_todo_low_add_mask,
+colorGroup,
-nonSkinColor);
+colorIndexToDo,
-icon = CGulIcon::NewL(bitmap, mask);
+bitmap, mask,
-CleanupStack::Pop(2); // bitmap, mask;
+iIconFile,
-}
+EMbmCalendarQgn_indi_todo_low_add,
-break;
+EMbmCalendarQgn_indi_todo_low_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop(2); // bitmap, mask;
+break;
+}
+else
+{
+AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
+KAknsIIDQgnIndiTodoLowAdd,
+colorGroup,
+colorIndex,
+bitmap, mask,
+iIconFile,
+EMbmCalendarQgn_indi_todo_low_add,
+EMbmCalendarQgn_indi_todo_low_add_mask,
+nonSkinColor);
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop(2); // bitmap, mask;
+break;
+}
+}
 case MCalenServices::ECalenNotePriorityHigh:
 {
-AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
+if(aViewId == KCalenTodoViewUidValue ||
-KAknsIIDQgnIndiTodoHighAdd,
+aViewId == KCalenEventViewUidValue ||
-colorGroup,
+aViewId == KCalenMissedAlarmsViewUidValue ||
-colorIndex,
+aViewId == KCalenMissedEventViewUidValue )
-bitmap, mask,
+{
-iIconFile,
+AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
-EMbmCalendarQgn_indi_todo_high_add,
+KAknsIIDQgnIndiTodoHighAdd,
-EMbmCalendarQgn_indi_todo_high_add_mask,
+colorGroup,
-nonSkinColor );
+colorIndexToDo,
-icon = CGulIcon::NewL(bitmap, mask);
+bitmap, mask,
-CleanupStack::Pop(2); // bitmap, mask;
+iIconFile,
-}
+EMbmCalendarQgn_indi_todo_high_add,
-break;
+EMbmCalendarQgn_indi_todo_high_add_mask,
+nonSkinColor );
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop(2); // bitmap, mask;
+break;
+}
+else
+{
+AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(),
+KAknsIIDQgnIndiTodoHighAdd,
+colorGroup,
+colorIndex,
+bitmap, mask,
+iIconFile,
+EMbmCalendarQgn_indi_todo_high_add,
+EMbmCalendarQgn_indi_todo_high_add_mask,
+nonSkinColor );
+icon = CGulIcon::NewL(bitmap, mask);
+CleanupStack::Pop(2); // bitmap, mask;
+break;
+}
+}
 case MCalenServices::ECalenTodoIconUndone:
 {
 icon = CreateBitmapSkinnedIconL( KAknsIIDQgnPropTodoUndone,
 iIconFile,
 EMbmCalendarQgn_prop_todo_undone,

branch	RCL_3
changeset 21	9711e452b5e9
parent 5	42814f902fe6
child 67	1539a383d7b6