# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284541895 -10800
# Node ID 356f28cd5ca02c1e443a68e5cde86552136bcfc5
# Parent  97232defd20ef5c13f68e12767e900f73e3c7cd3
Revision: 201035
Kit: 201036

diff -r 97232defd20e -r 356f28cd5ca0 alarmui/group/alarmui_activate.rul
--- a/alarmui/group/alarmui_activate.rul	Tue Sep 14 21:17:03 2010 +0300
+++ b/alarmui/group/alarmui_activate.rul	Wed Sep 15 12:11:35 2010 +0300
@@ -22,12 +22,20 @@
     
     <!-- Enable sensor services -->
     <elseIf>
-		<!-- Alarm is active -->
-		<not>
+		 <!-- Alarm is active -->
+        <or>
+            <contextUpdated>
+                <contextRef source='AlarmUI' type='State' value='Clock'/>
+            </contextUpdated>
             <contextUpdated>
-                <contextRef source='AlarmUI' type='State' value='Inactive'/>
+                <contextRef source='AlarmUI' type='State' value='Calendar'/>
             </contextUpdated>
-		</not>
+            <contextUpdated>
+                <contextRef source='AlarmUI' type='State' value='Unknown'/>
+            </contextUpdated>
+        
+        </or>
+
 	    <actions>
 	            <!-- Activate orientation channel (0x01) from sensor source (0x10282DF0) -->
 	            <sourceCommand uid='0x10282DF0'>
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/commonutils/src/calencustomnavilabel.cpp
--- a/calendarui/commonutils/src/calencustomnavilabel.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/calendarui/commonutils/src/calencustomnavilabel.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -156,9 +156,8 @@
     // Set the text colour we found.
     charFormat.iFontPresentation.iTextColor = TLogicalRgb(textColourFromSkin);
     charFormatMask.SetAttrib(EAttColor);
-    gc.SetPenColor(charFormat.iFontPresentation.iTextColor);
-    gc.DrawText(*(iCalendarName),TPoint(headingTextLayout.TextRect().iTl.iX, 
-                                              headingTextLayout.TextRect().iBr.iY));
+
+	headingTextLayout.DrawText( gc, *iCalendarName, ETrue, charFormat.iFontPresentation.iTextColor );
     gc.DiscardFont();
     TRACE_EXIT_POINT;
     }
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/controller/src/calenalarmmanager.cpp
--- a/calendarui/controller/src/calenalarmmanager.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/calendarui/controller/src/calenalarmmanager.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -1060,7 +1060,7 @@
     TRACE_ENTRY_POINT;
 
     TTime currentTime = CalenDateUtils::Now();
-    TTime entryAlarmTime; 
+    TTime entryAlarmTime(Time::NullTTime()); 
     RArray<TCalLocalUid> foundlocalUids;
     RArray<TCalCollectionId> foundColIds;
     TCalLocalUid entryLocalUid;
@@ -1123,25 +1123,29 @@
     
     // FIXME: leaving!
     CCalAlarm* alarm = aEntry.AlarmL();
-    CleanupStack::PushL( alarm );
-
-    switch( aEntry.EntryTypeL() )
+    
+    if(alarm)
         {
-        case CCalEntry::ETodo:
-            aAlarmDateTime = aEntry.EndTimeL().TimeLocalL();
-            break;
+        CleanupStack::PushL( alarm );
+
+        switch( aEntry.EntryTypeL() )
+            {
+            case CCalEntry::ETodo:
+                aAlarmDateTime = aEntry.EndTimeL().TimeLocalL();
+                break;
 
-        case CCalEntry::EAppt:
-        case CCalEntry::EEvent:
-        case CCalEntry::EAnniv:
-        default:
-            aAlarmDateTime = aEntry.StartTimeL().TimeLocalL();
-            break;
+            case CCalEntry::EAppt:
+            case CCalEntry::EEvent:
+            case CCalEntry::EAnniv:
+            default:
+                aAlarmDateTime = aEntry.StartTimeL().TimeLocalL();
+                break;
+            }
+        aAlarmDateTime -= alarm->TimeOffset();
+
+        CleanupStack::PopAndDestroy( alarm );
         }
-    aAlarmDateTime -= alarm->TimeOffset();
-    
-    CleanupStack::PopAndDestroy( alarm );
-
+   
     TRACE_EXIT_POINT;
     }
 
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/controller/src/calenmultidbeditor.cpp
--- a/calendarui/controller/src/calenmultidbeditor.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/calendarui/controller/src/calenmultidbeditor.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -439,11 +439,34 @@
     {
     TRACE_ENTRY_POINT;
     TKeyResponse keyResponse(EKeyWasNotConsumed);
+    TInt ctrlid=IdOfFocusControl();
 
     if (aType == EEventKey)
        {
        switch (aKeyEvent.iCode)
         	{
+            case EKeyOK:
+                if( ctrlid == ECalenMultiDbColor)
+                    {
+                    GetColorL();
+                    }
+                else if ( ctrlid == ECalenMultiDbHiddenVisible )
+                    {
+                    iCalendarStatus = iCalendarInfo.Enabled();
+                    if( ECalenMultiDbHidden == iCalendarStatus )
+                        {
+                        SetVisiblityFieldL( ECalenMultiDbVisible ); 
+                        iCalendarStatus = ECalenMultiDbVisible;
+                        iCalendarInfo.SetEnabled(iCalendarStatus);
+                        }
+                    else
+                        {
+                        SetVisiblityFieldL( ECalenMultiDbHidden );
+                        iCalendarStatus = ECalenMultiDbHidden;
+                        iCalendarInfo.SetEnabled(iCalendarStatus);
+                        }
+                    }
+                break;
         	case EKeyEscape:
 			    TryExitL( EAknCmdExit );
         		keyResponse = EKeyWasConsumed;
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/controller/src/calennotifier.cpp
--- a/calendarui/controller/src/calennotifier.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/calendarui/controller/src/calennotifier.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -48,6 +48,7 @@
 const TInt KHashLength = 64;
 const TInt KBuffLength = 24;
 
+_LIT( KCalendarDatabaseFilePath, "c:calendar" );
 // ----------------------------------------------------------------------------
 // CCalenNotifier::CCalenNotifier
 // C++ default constructor.
@@ -803,9 +804,8 @@
                 CleanupStack::PopAndDestroy(calendarInfo);
 
                 //remove calendar except default calendar
-                if (err == KErrNone && markAsdelete
-                        && aCalendarInfoChangeEntries[index]->FileNameL().CompareF(
-                                iGlobalData->CalSessionL().DefaultFileNameL()))
+                if (err == KErrNone && markAsdelete && aCalendarInfoChangeEntries[index]->FileNameL().CompareF(
+                               KCalendarDatabaseFilePath))
                     {
                     iFilnameDeleted = aCalendarInfoChangeEntries[index]->FileNameL().AllocL();
                     BroadcastNotification(ECalenNotifyDeleteInstanceView);
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/editors/src/calenunifiededitor.cpp
--- a/calendarui/editors/src/calenunifiededitor.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/calendarui/editors/src/calenunifiededitor.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -731,6 +731,31 @@
                         iServices->IssueCommandL( ECalenAddAttachment );
                         }
                     }
+                else if ( ctrlid == ECalenEditorAllDayItem )
+                    {
+                    // Tap on AllDay field, Switch the status of AllDay field  
+                    iUnifiedEditorControl->SetAllDayEventL(
+                            !( iUnifiedEditorControl->IsAllDayEvent() ) );
+                    }
+                else if ( ctrlid == ECalenEditorReminder )
+                    {
+                    TBool active;
+                    if( iUnifiedEditorControl->IsAlarmActiveInForm() )
+                        { 
+                        SetAlarmFieldOnOffL( EFalse );           
+                        active = EFalse;
+                        } 
+                    else
+                        {
+                        SetAlarmFieldOnOffL( ETrue );                
+                        active = ETrue;
+                        }
+                    iUnifiedEditorControl->CheckAlarmActive( active );
+                    }
+                else
+                    {
+                        keyResponse = CAknForm::OfferKeyEventL( aKeyEvent, aType );    
+                    }
                 break;
             case EKeyEscape:
                 // Calendar relaunched from cmd line - close viewer
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/globaldata/src/calenglobaldata.cpp
--- a/calendarui/globaldata/src/calenglobaldata.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/calendarui/globaldata/src/calenglobaldata.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -1657,7 +1657,7 @@
             softDelete = pkgSoftDelete();
             }
         if( softDelete && 
-                calendarInfo->FileNameL().CompareF(CalSessionL().DefaultFileNameL()) )
+                calendarInfo->FileNameL().CompareF(KCalendarDatabaseFilePath) )
             {
             // delete caleninfo except for default calendar.
             delete calendarInfo;
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/group/bld.inf
--- a/calendarui/organizerplugin/data/group/bld.inf	Tue Sep 14 21:17:03 2010 +0300
+++ b/calendarui/organizerplugin/data/group/bld.inf	Wed Sep 15 12:11:35 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 
-#include "../vga/group/bld.inf"         // Buzzidle
+#include "../vga_tch/group/bld.inf"         // Buzzidle
 #include "../qhd_tch/group/bld.inf"     // Flashidle
 
 PRJ_PLATFORMS
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/group/bld.inf	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Homescreen's Buzzidle (vga) widgets
+*
+*/
+
+#include "../organizer_2001f48d/group/bld.inf"
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+
+
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/group/bld.inf	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,77 @@
+/*
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  The information required for building
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+// Support for productization and Carbide.Ui customization
+//********************************************************
+../hsps/00/manifest.dat /epoc32/data/z/resource/homescreen/organizer_2001f48d/hsps/manifest.dat
+../hsps/00/widgetconfiguration.xml /epoc32/data/z/resource/homescreen/organizer_2001f48d/hsps/widgetconfiguration.xml
+../hsps/00/organizerconfiguration.dtd /epoc32/data/z/resource/homescreen/organizer_2001f48d/hsps/organizerconfiguration.dtd
+
+../xuikon/00/organizer.dat /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/organizer_2001f48d.dat
+../xuikon/00/organizer.css /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/organizer.css
+../xuikon/00/organizer.xml /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/organizer.xml
+../xuikon/00/organizer.dtd /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/organizer.dtd
+
+// Arabic languages
+//*****************
+../xuikon/37/organizer.css /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/37/organizer.css
+../xuikon/50/organizer.css /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/50/organizer.css
+../xuikon/57/organizer.css /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/57/organizer.css
+../xuikon/94/organizer.css /epoc32/data/z/resource/homescreen/organizer_2001f48d/xuikon/94/organizer.css
+
+
+// Support for S60 localization
+//*****************************
+#ifndef __ORGANIZERCONFIGURATION_LOC__
+#define __ORGANIZERCONFIGURATION_LOC__
+../loc/organizerconfiguration.loc APP_LAYER_LOC_EXPORT_PATH(organizerconfiguration.loc)
+#endif // __ORGANIZERCONFIGURATION_LOC__
+
+#ifndef __ORGANIZER_LOC__
+#define __ORGANIZER_LOC__
+../loc/organizer.loc APP_LAYER_LOC_EXPORT_PATH(organizer.loc)
+#endif // __ORGANIZER_LOC__
+
+// Support for S60 builds
+//***********************
+../rom/organizer_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(organizer_2001f48d_resources.iby)
+../rom/organizer_customer.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(organizer_2001f48d_customer.iby)
+../rom/organizer_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(organizer_2001f48d_variant.iby)
+../rom/organizer.iby CORE_APP_LAYER_IBY_EXPORT_PATH(organizer_2001f48d.iby)
+
+
+// Dtd-localization
+//*****************
+PRJ_EXTENSIONS
+START EXTENSION tools/dtd
+OPTION SWITCH_LOC_FILE_NAME organizer_2001f48d
+OPTION DTD_TYPE widget
+END
+
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+//  End of File  
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/hsps/00/manifest.dat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/hsps/00/manifest.dat	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<package version="2.0">
+
+  <family>vga_tch</family>
+  
+  <type>widget</type>
+
+  <!-- interface uid -->
+	<interfaceuid>0x2001f48a</interfaceuid>
+
+	<!-- vendor uid  -->
+	<provideruid>0x101fb657</provideruid>
+
+	<!-- uid -->
+	<configurationuid>0x2001f48d</configurationuid>
+
+	<!-- description -->
+	<fullname>&amp;qtn_hs_large_cale;</fullname>
+	<shortname>org</shortname>
+	<version>1.0</version>
+	<description>&amp;qtn_organizer_widget_description;</description>
+	<filelogo>uid(0x10005901)</filelogo>
+
+	<!-- configuration -->
+	<filexml>widgetconfiguration.xml</filexml>
+	
+	<!-- Name of the localization files -->
+	<filedtd>organizerconfiguration.dtd</filedtd>
+	
+	<!-- Locale specific resources -->
+  <localization>
+	<fileresource tag="xuikon">orga.o0000</fileresource>     
+	</localization>
+
+
+</package>
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/hsps/00/organizerconfiguration.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/hsps/00/organizerconfiguration.dtd	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============================================================================
+<FileName: "organizerconfiguration.dtd">
+<PartOf  : "organizerconfiguration">
+
+<FileDescription: "Localization strings for the configuration">
+<FileVersion    : >
+
+<Copyright:
+"Copyright © 2007 Nokia Corporation.
+This material, including documentation and any related
+computer programs, is protected by copyright controlled by
+Nokia Corporation. All rights are reserved. Copying,
+including reproducing, storing,  adapting or translating, any
+or all of this material requires the prior written consent of
+Nokia Corporation. This material also contains confidential
+information which may not be disclosed to others without the
+prior written consent of Nokia Corporation.">
+============================================================================
+-->
+
+<!--  LOCALISATION STRINGS  -->
+
+<!--
+qtn_organizer_configuration_name.attributes
+qtn_organizer_configuration_name.layout "listrow_wgtman_pane_t1"
+qtn_organizer_configuration_name.release "TB9.2"
+qtn_organizer_configuration_name.description "Calendar"
+qtn_organizer_configuration_name.parents ""
+-->
+<!ENTITY qtn_hs_large_cale  "Calendar">
+
+<!--
+qtn_organizer_widget_description.attributes
+qtn_organizer_widget_description.layout "listrow_wgtman_pane_t2"
+qtn_organizer_widget_description.release "TB9.2"
+qtn_organizer_widget_description.description "Organizer Widget"
+qtn_organizer_widget_description.parents ""
+-->
+<!ENTITY qtn_organizer_widget_description  "Organizer Widget">
+
+<!-- End of File-->
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/hsps/00/widgetconfiguration.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/hsps/00/widgetconfiguration.xml	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,5 @@
+<configuration>
+    <control>
+        <settings/>
+    </control>
+</configuration>
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/loc/organizer.loc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/loc/organizer.loc	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,35 @@
+/*
+* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Localization strings for project Active Idle 3
+*
+*/
+
+
+// d: No cale events for today or next 7 days
+// l: ai2_gene_pane_t1/opt1
+// w: 
+// r: TB9.2
+#define qtn_ai_cale_no_eve_positive_short  "No calendar events within next 7 days"
+
+// d: No more cale events for today or next 7 days
+// l: ai2_gene_pane_t1/opt1
+// w:
+// r: TB9.2
+#define qtn_ai_cale_no_more_ev_positive_short  "No more calendar events within next 7 days"
+
+// d: Next event tomorrow
+// l: ai2_gene_pane_t1/opt1
+// w:
+// r: TB9.2
+#define qtn_hs_cale_next_tomorrow  "Next event tomorrow"
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/loc/organizerconfiguration.loc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/loc/organizerconfiguration.loc	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,28 @@
+/*
+* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Localization strings for project Active Idle 3
+*
+*/
+
+// d: Calendar widget
+// l: listrow_wgtman_pane_t1
+// w:
+// r: TB9.2
+#define qtn_hs_large_cale  "Calendar"
+
+// d: Calendar widget description
+// l: listrow_wgtman_pane_t2
+// w:
+// r: TB9.2
+#define qtn_organizer_widget_description  "Informs you of calendar events. Provides quick access to calendar."
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer.iby	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Organizer widget HSPS-plugin IBY file.
+*
+*/
+
+
+#ifndef __ORGANIZER_2001F48D_IBY__
+#define __ORGANIZER_2001F48D_IBY__
+
+#if defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+// Enabled by DTD-localization tools
+data=ZPRIVATE\200159c0\install\organizer_2001f48d\hsps\00\manifest.dat \private\200159c0\install\organizer_2001f48d\hsps\00\manifest.dat
+
+#endif // (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+#endif // __ORGANIZER_2001F48D_IBY__
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer_customer.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer_customer.iby	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Organizer widget HSPS-plugin language specific IBY file.
+*
+*/
+
+
+#ifndef __ORGANIZER_2001F48D_CUSTOMER_IBY__
+#define __ORGANIZER_2001F48D_CUSTOMER_IBY__
+
+#if defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+// Enabled by DTD-localization tools, language specific
+data=ZPRIVATE\200159c0\install\organizer_2001f48d\xuikon\00\orga.o0000 \private\200159c0\install\organizer_2001f48d\xuikon\00\orga.o0000
+data=ZPRIVATE\200159c0\install\organizer_2001f48d\hsps\00\organizerconfiguration.dtd \private\200159c0\install\organizer_2001f48d\hsps\00\organizerconfiguration.dtd
+
+#endif // (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+#endif // __ORGANIZER_2001F48D_CUSTOMER_IBY__
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer_resources.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer_resources.iby	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,30 @@
+/*
+* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Organizer widget HSPS-plugin language specific IBY file.
+*
+*/
+
+
+#ifndef __ORGANIZER_2001F48D_RESOURCES_IBY__
+#define __ORGANIZER_2001F48D_RESOURCES_IBY__
+
+#if defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+// Enabled by DTD-localization tools, language specific
+data=ZPRIVATE\200159c0\install\organizer_2001f48d\xuikon\00\orga.o0000 \private\200159c0\install\organizer_2001f48d\xuikon\00\orga.o0000
+data=ZPRIVATE\200159c0\install\organizer_2001f48d\hsps\00\organizerconfiguration.dtd \private\200159c0\install\organizer_2001f48d\hsps\00\organizerconfiguration.dtd
+
+#endif // (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+#endif // __ORGANIZER_2001F48D_RESOURCES_IBY__
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer_variant.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/rom/organizer_variant.iby	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,29 @@
+/*
+* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Organizer widget HSPS-plugin variant specific IBY file.
+*
+*/
+
+
+#ifndef __ORGANIZER_2001F48D_VARIANT_IBY__
+#define __ORGANIZER_2001F48D_VARIANT_IBY__
+
+#if defined (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+// Enabled by variation tools, variant specific
+data=ZPRIVATE\200159c0\install\organizer_2001f48d\hsps\00\widgetconfiguration.xml \private\200159c0\install\organizer_2001f48d\hsps\00\widgetconfiguration.xml
+
+#endif // (FF_LAYOUT_480_640_VGA3) || defined (FF_LAYOUT_640_480_VGA3)
+
+#endif  // __ORGANIZER_2001F48D_VARIANT_IBY__
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.css	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,75 @@
+widget#calendarPluginContainer {
+    display: block;
+    width: auto;
+    height: auto;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 2%;
+    padding-bottom: 2%;
+    nav-index: appearance;
+    block-progression: tb;
+}
+
+button.calendarEntryBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: 31%;
+    margin-top: auto;
+    margin-bottom: auto;
+    block-progression: lr;
+}
+
+image.calendarEntryIcon { /* ai_gene_pane_1_g1 */
+    display: block;
+    visibility: visible;
+    width: 24px;
+    height: 24px;
+}
+
+text.calendarEntryText1 { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: auto;
+    width: auto;
+    padding-left: 5px;
+    padding-right: 6px;
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+}
+
+button.calendarInfoBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: auto;
+    block-progression: rl;
+
+}
+
+text#calendarInfoText { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: adaptive;
+    width: auto;
+    padding-left: 5px;
+    padding-right: 5px;
+    margin-top: auto;
+    margin-bottom: auto;    
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    max-line-amount: 2;
+    text-overflow-mode: wrap;
+}
+
+image#calendarInfoIcon
+{
+    margin-top: auto;
+    margin-bottom: auto;    
+}
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.dat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.dat	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<data>
+    <AppUid>E029CF57</AppUid>
+    <Provideruid>101FB657</Provideruid>
+    <ThemeUid>110012D9</ThemeUid>
+    <ThemeFullName>Organizer</ThemeFullName>
+    <ThemeShortName>orga</ThemeShortName>
+    <ThemeVersion>1.0</ThemeVersion>
+    <FileXML>organizer.xml</FileXML>
+    <FileCSS>organizer.css</FileCSS>
+    <FileDTD>organizer.dtd</FileDTD>
+</data>
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.dtd	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============================================================================
+<FileName: "organizerconfiguration.dtd">
+<PartOf  : "organizerconfiguration">
+
+<FileDescription: "Localization strings for the configuration">
+<FileVersion    : >
+
+<Copyright:
+"Copyright © 2007 Nokia Corporation.
+This material, including documentation and any related
+computer programs, is protected by copyright controlled by
+Nokia Corporation. All rights are reserved. Copying,
+including reproducing, storing,  adapting or translating, any
+or all of this material requires the prior written consent of
+Nokia Corporation. This material also contains confidential
+information which may not be disclosed to others without the
+prior written consent of Nokia Corporation.">
+============================================================================
+-->
+
+
+<!--
+qtn_ai_cale_no_eve_positive_short.attributes
+qtn_ai_cale_no_eve_positive_short.layout "ai2_gene_pane_t1/opt1"
+qtn_ai_cale_no_eve_positive_short.release "TB9.2"
+qtn_ai_cale_no_eve_positive_short.description "Indicates that there are no upcoming events in calendar."
+qtn_ai_cale_no_eve_positive_short.parents "ai2_gene_pane_t1"
+-->
+<!ENTITY qtn_ai_cale_no_eve_positive_short  "No calendar events within next 7 days">
+
+<!--
+qtn_ai_cale_no_more_ev_positive_short.attributes
+qtn_ai_cale_no_more_ev_positive_short.layout "ai2_gene_pane_t1/opt1"
+qtn_ai_cale_no_more_ev_positive_short.release "TB9.2"
+qtn_ai_cale_no_more_ev_positive_short.description "Indicates that there are no more upcoming events in calendar."
+qtn_ai_cale_no_more_ev_positive_short.parents "ai2_gene_pane_t1"
+-->
+<!ENTITY qtn_ai_cale_no_more_ev_positive_short  "No more calendar events within next 7 days">
+
+<!--
+qtn_hs_cale_next_tomorrow.attributes
+qtn_hs_cale_next_tomorrow.layout "ai2_gene_pane_t1/opt1"
+qtn_hs_cale_next_tomorrow.release "TB9.2"
+qtn_hs_cale_next_tomorrow.description "Indicates that next calendar event is tomorrow"
+qtn_hs_cale_next_tomorrow.parents "ai2_gene_pane_t1"
+-->
+<!ENTITY qtn_hs_cale_next_tomorrow  "Next event tomorrow">
+
+
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/00/organizer.xml	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xmluiml SYSTEM "organizer.dtd">
+<xmluiml xmlns="http://www.series60.com/xml/xmluiml/1" version="1.0">
+  
+  <!--######################################
+      ####       Organizer plugin       ####
+      ######################################-->
+    <widget id="calendarPluginContainer" focusable="true" _s60-initial-focus="1">
+    
+	  <!-- UI resources for Organizer -->
+		<desc id="Organizer/NoEventsForToday">&qtn_ai_cale_no_eve_positive_short;</desc>
+	    <desc id="Organizer/NoMoreEventsForToday">&qtn_ai_cale_no_more_ev_positive_short;</desc>
+		<desc id="Organizer/IconAnniv" path="SKIN(268458241 2)"/>
+		<desc id="Organizer/IconAppt" path="SKIN(268458241 4)"/>
+		<desc id="Organizer/IconMemo" path="SKIN(268458241 6)"/>
+		<desc id="Organizer/IconTodo" path="SKIN(270501603 5126)"/>
+		<desc id="Organizer/IconMeetAccepted" path="SKIN(270501603 5508)"/>
+		<desc id="Organizer/IconMeetNotAnswered" path="SKIN(270501603 5511)"/>
+		<desc id="Organizer/IconMeetTentative" path="SKIN(270501603 5514)"/>
+	  
+	    <contentsource name="Organizer" value="0x102750FE"/>  
+	  
+		<!-- #################################
+	       ## Organizer plug-in settings  ##
+	       ################################# -->
+	
+		<!-- Item count and size settings -->
+		<!-- Total line count -->
+		<property class="Settings/Organizer" name="0x01" value="3"/>
+	
+		<!-- Timed item line count -->
+		<property class="Settings/Organizer" name="0x02" value="1"/>
+	
+		<!-- Non Timed item line count -->
+		<property class="Settings/Organizer" name="0x03" value="1"/>
+	
+		<!-- Line count reserved for non timed items -->
+		<property class="Settings/Organizer" name="0x04" value="0"/>
+	
+		<!-- Publish end time for upcoming timed items -->
+		<property class="Settings/Organizer" name="0x05" value="1"/>
+	
+		<!-- Use alternate publishing for upcoming and ongoing items -->
+		<property class="Settings/Organizer" name="0x06" value="0"/>
+	
+		<!-- Open event to viewer 0 / editor 1 -->
+		<property class="Settings/Organizer" name="0x07" value="0"/>
+	
+	    <!-- Days to handle as not today. After which "Next event on DAY DATE" is displayed.
+	         Here one means tomorrow only. So we display detailed info for not today events for
+	         tomorrow only. -->
+	    <property class="Settings/Organizer" name="0x08" value="0"/>
+	
+	    <!-- Open first valid event on launch event index 0 -->
+	    <property class="Settings/Organizer" name="0x09" value="1"/>
+	
+	    <!-- Publish info text (no more events...) using InfoText and InfoIcon ids -->
+	    <property class="Settings/Organizer" name="0x0A" value="1"/>
+		    
+    
+        <actions>
+            <action>
+                            
+                <trigger name="activate"/>
+                
+                <event name="Organizer/ItemSelected(0)"/>
+          </action>
+        </actions>
+      <!-- #1 -->
+        <button id="calendarEntryBox1" class="calendarEntryBox" >
+          <image id="calendarEntryIcon1" class="calendarEntryIcon" >
+            <property class="Organizer/EventIcon" name="ordinal" value="0x01"/>
+                <property class="policy/emptyContent" name="calendarEntryBox1" value="display: none;"/>
+                <property class="policy/Content" name="calendarEntryBox1" value="display: block;"/>
+				<!-- hide the infobox when we have some events to show -->
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoText" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoIcon" value="display: none;"/>
+          </image>
+          <text id="calendarEntryText1_1" class="calendarEntryText1" >
+            <property class="Organizer/StartTimeAndSubject" name="ordinal" value="0x01"/>
+            <!-- If there is no text, the entry box is not shown at all -->
+				<property class="policy/Content" name="calendarEntryText1_1" value="display: block;"/>
+				<property class="policy/emptyContent" name="calendarEntryText1_1" value="display: none;"/>
+				<!-- hide the infobox when we have some events to show -->
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoText" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoIcon" value="display: none;"/>
+
+			</text>
+        </button>
+
+        <!-- #2 -->
+        <button id="calendarEntryBox2" class="calendarEntryBox" >
+          <image id="calendarEntryIcon2" class="calendarEntryIcon" >
+            <property class="Organizer/EventIcon" name="ordinal" value="0x02"/>
+                <property class="policy/emptyContent" name="calendarEntryBox2" value="display: none;"/>
+                <property class="policy/Content" name="calendarEntryBox2" value="display: block;"/>
+								<!-- hide the infobox when we have some events to show -->
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoText" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoIcon" value="display: none;"/>
+
+          </image>
+          <text id="calendarEntryText2_1" class="calendarEntryText1" >
+            <property class="Organizer/StartTimeAndSubject" name="ordinal" value="0x02"/>
+            <!-- If there is no text, the entry box is not shown at all -->
+				<property class="policy/Content" name="calendarEntryText2_1" value="display: block;"/>
+				<property class="policy/emptyContent" name="calendarEntryText2_1" value="display: none;"/>
+								<!-- hide the infobox when we have some events to show -->
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoText" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoIcon" value="display: none;"/>
+
+
+          </text>         
+		</button>
+
+        <!-- #3 -->
+        <button id="calendarEntryBox3" class="calendarEntryBox" >
+          <image id="calendarEntryIcon3" class="calendarEntryIcon" >
+            <property class="Organizer/EventIcon" name="ordinal" value="0x03"/>
+                <property class="policy/emptyContent" name="calendarEntryBox3" value="display: none;"/>
+                <property class="policy/Content" name="calendarEntryBox3" value="display: block;"/>
+								<!-- hide the infobox when we have some events to show -->
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoText" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoIcon" value="display: none;"/>
+
+          </image>
+          <text id="calendarEntryText3_1" class="calendarEntryText1" >
+            <property class="Organizer/StartTimeAndSubject" name="ordinal" value="0x03"/>
+            <!-- If there is no text, the entry box is not shown at all -->
+				<property class="policy/Content" name="calendarEntryText3_1" value="display: block;"/>
+				<property class="policy/emptyContent" name="calendarEntryText3_1" value="display: none;"/>
+								<!-- hide the infobox when we have some events to show -->
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoText" value="display: none;"/>
+                <property class="policy/Content" name="calendarInfoIcon" value="display: none;"/>
+
+          </text>        
+        </button>
+		
+        <!-- Info text. Hidden by default, shown in case info text is shown. Then
+			 other buttons are hidden -->
+        <button id="calendarInfoTextBox" class="calendarInfoBox" >
+          <image id="calendarInfoIcon" class="calendarEntryIcon" >
+            <property class="Organizer/InfoIcon"/>
+			<!-- hide the above buttons and show just this info button -->
+                <property class="policy/Content" name="calendarEntryBox1" value="display: none;"/>
+                <property class="policy/Content" name="calendarEntryBox2" value="display: none;"/>
+                <property class="policy/Content" name="calendarEntryBox3" value="display: none;"/>
+
+                <property class="policy/Content" name="calendarInfoIcon" value="display: block;"/>								
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: block;"/>
+
+                <property class="policy/emptyContent" name="calendarInfoIcon" value="display: none;"/>												
+          </image>
+          <text id="calendarInfoText" >
+            <property class="Organizer/InfoText"/>
+ 			<!-- hide the above buttons and show just this info button -->
+                <property class="policy/Content" name="calendarEntryBox1" value="display: none;"/>
+                <property class="policy/Content" name="calendarEntryBox2" value="display: none;"/>
+                <property class="policy/Content" name="calendarEntryBox3" value="display: none;"/>
+				
+                <property class="policy/Content" name="calendarInfoText" value="display: block;"/>								
+                <property class="policy/Content" name="calendarInfoTextBox" value="display: block;"/>
+          </text>
+        </button>				
+      </widget> <!-- end calendarPluginContainer box -->	  
+</xmluiml>
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/37/organizer.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/37/organizer.css	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,80 @@
+widget#calendarPluginContainer {
+    display: block;
+    width: auto;
+    height: auto;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 2%;
+    padding-bottom: 2%;
+    nav-index: appearance;
+    block-progression: tb;
+}
+
+button.calendarEntryBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: 31%;
+    margin-top: auto;
+    margin-bottom: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+image.calendarEntryIcon { /* ai_gene_pane_1_g1 */
+    display: block;
+    visibility: visible;
+    width: 24px;
+    height: 24px;
+}
+
+text.calendarEntryText1 { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: auto;
+    width: auto;
+    padding-left: 6px;
+    padding-right: 5px;
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    text-align: right;
+    direction: ltr;
+}
+
+button.calendarInfoBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+text#calendarInfoText { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: adaptive;
+    width: auto;
+    padding-right: 5px;
+    padding-left: 5px;
+    margin-top: auto;
+    margin-bottom: auto;    
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    max-line-amount: 2;
+    text-overflow-mode: wrap;
+    direction: lr;
+    text-align: right;
+}
+
+image#calendarInfoIcon
+{
+    margin-top: auto;
+    margin-bottom: auto;    
+}
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/50/organizer.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/50/organizer.css	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,80 @@
+widget#calendarPluginContainer {
+    display: block;
+    width: auto;
+    height: auto;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 2%;
+    padding-bottom: 2%;
+    nav-index: appearance;
+    block-progression: tb;
+}
+
+button.calendarEntryBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: 31%;
+    margin-top: auto;
+    margin-bottom: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+image.calendarEntryIcon { /* ai_gene_pane_1_g1 */
+    display: block;
+    visibility: visible;
+    width: 24px;
+    height: 24px;
+}
+
+text.calendarEntryText1 { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: auto;
+    width: auto;
+    padding-left: 6px;
+    padding-right: 5px;
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    text-align: right;
+    direction: ltr;
+}
+
+button.calendarInfoBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+text#calendarInfoText { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: adaptive;
+    width: auto;
+    padding-right: 5px;
+    padding-left: 5px;
+    margin-top: auto;
+    margin-bottom: auto;    
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    max-line-amount: 2;
+    text-overflow-mode: wrap;
+    direction: lr;
+    text-align: right;
+}
+
+image#calendarInfoIcon
+{
+    margin-top: auto;
+    margin-bottom: auto;    
+}
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/57/organizer.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/57/organizer.css	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,80 @@
+widget#calendarPluginContainer {
+    display: block;
+    width: auto;
+    height: auto;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 2%;
+    padding-bottom: 2%;
+    nav-index: appearance;
+    block-progression: tb;
+}
+
+button.calendarEntryBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: 31%;
+    margin-top: auto;
+    margin-bottom: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+image.calendarEntryIcon { /* ai_gene_pane_1_g1 */
+    display: block;
+    visibility: visible;
+    width: 24px;
+    height: 24px;
+}
+
+text.calendarEntryText1 { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: auto;
+    width: auto;
+    padding-left: 6px;
+    padding-right: 5px;
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    text-align: right;
+    direction: ltr;
+}
+
+button.calendarInfoBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+text#calendarInfoText { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: adaptive;
+    width: auto;
+    padding-right: 5px;
+    padding-left: 5px;
+    margin-top: auto;
+    margin-bottom: auto;    
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    max-line-amount: 2;
+    text-overflow-mode: wrap;
+    direction: lr;
+    text-align: right;
+}
+
+image#calendarInfoIcon
+{
+    margin-top: auto;
+    margin-bottom: auto;    
+}
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/94/organizer.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/calendarui/organizerplugin/data/vga_tch/organizer_2001f48d/xuikon/94/organizer.css	Wed Sep 15 12:11:35 2010 +0300
@@ -0,0 +1,80 @@
+widget#calendarPluginContainer {
+    display: block;
+    width: auto;
+    height: auto;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 2%;
+    padding-bottom: 2%;
+    nav-index: appearance;
+    block-progression: tb;
+}
+
+button.calendarEntryBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: 31%;
+    margin-top: auto;
+    margin-bottom: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+image.calendarEntryIcon { /* ai_gene_pane_1_g1 */
+    display: block;
+    visibility: visible;
+    width: 24px;
+    height: 24px;
+}
+
+text.calendarEntryText1 { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: auto;
+    width: auto;
+    padding-left: 6px;
+    padding-right: 5px;
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    text-align: right;
+    direction: ltr;
+}
+
+button.calendarInfoBox {
+    display: none;
+    visibility: visible;
+    width: auto;
+    height: auto;
+    block-progression: rl;
+    direction: rtl;
+}
+
+text#calendarInfoText { /* ai_gene_pane_1_t1 */
+    display: block;
+    visibility: visible;
+    position: static;
+    height: adaptive;
+    width: auto;
+    padding-right: 5px;
+    padding-left: 5px;
+    margin-top: auto;
+    margin-bottom: auto;    
+    font-family: EAknLogicalFontSecondaryFont;
+    font-size: 23px;
+    _s60-text-valign: top;
+    color: "SKIN(268458534 13056 74)";
+    max-line-amount: 2;
+    text-overflow-mode: wrap;
+    direction: lr;
+    text-align: right;
+}
+
+image#calendarInfoIcon
+{
+    margin-top: auto;
+    margin-bottom: auto;    
+}
\ No newline at end of file
diff -r 97232defd20e -r 356f28cd5ca0 clock2/clockui/adtupdater/inc/adtupdaterappui.h
--- a/clock2/clockui/adtupdater/inc/adtupdaterappui.h	Tue Sep 14 21:17:03 2010 +0300
+++ b/clock2/clockui/adtupdater/inc/adtupdaterappui.h	Wed Sep 15 12:11:35 2010 +0300
@@ -69,6 +69,18 @@
 		void ToggleAppViewL( TBool aForeground );
 		
 		/**
+		 * @brief Checks whether adtupdater app is in background by window group id
+		 * @return ETrue if the application is in background and EFalse if it is in foreground.
+		 */
+		TBool IsAppInBackground();
+		
+		/**
+		 * @brief Checks whether any high priority window like call is active.
+		 * @return ETrue if the high priority window is active and EFalse otherwise.
+		 */
+		TBool IsHighPriorityWindowActive();
+		
+		/**
 		* @brief Hides the status pane of the application.
 		* @param aHide ETrue if status pane has to be hidden.
 		*/
@@ -88,6 +100,15 @@
 		* @brief The container object.
 		*/
 		CAdtUpdaterContainer*			iContainer;
+	
+	private:
+		 
+		/**
+		 * @var iAdtWgId
+		 * @brief The id of the application's window group.
+		 */
+		TInt iAdtWgId;
+
 	};
 
 #endif 		// __ADTUPDATER_APPUI_H__
diff -r 97232defd20e -r 356f28cd5ca0 clock2/clockui/adtupdater/inc/adtupdatercontainer.h
--- a/clock2/clockui/adtupdater/inc/adtupdatercontainer.h	Tue Sep 14 21:17:03 2010 +0300
+++ b/clock2/clockui/adtupdater/inc/adtupdatercontainer.h	Wed Sep 15 12:11:35 2010 +0300
@@ -440,6 +440,12 @@
 		TBool										iIsRTCInvalidAndHiddenReset;  
 		
 		CPsKeyObserver* iPSObserver;
+		/**
+		 * @var iNitzTimerActive
+		 * @brief ETrue if the 90sec KTimeout timer is started for Nitz, EFalse if 5 sec KCDTQueryTimer timer is started.
+		 */
+		TBool iNitzTimerActive;
+		
 	};	
 
 #endif 		// __ADTUPDATER_CONTAINER_H__
diff -r 97232defd20e -r 356f28cd5ca0 clock2/clockui/adtupdater/src/adtupdaterappui.cpp
--- a/clock2/clockui/adtupdater/src/adtupdaterappui.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/clock2/clockui/adtupdater/src/adtupdaterappui.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -28,6 +28,10 @@
 const TInt KOrdinalPosition( 0 );
 const TInt KOrdinalPriority( 0 );
 
+// Uid of phoneapp
+const TUid KPhoneUid  = {0x100058B3};
+
+
 // Literals
 
 // ---------------------------------------------------------
@@ -76,7 +80,8 @@
     BaseConstructL( EStandardApp | EAknEnableSkin | EAknEnableMSK |
             EAknSingleClickCompatible );
 
-	
+    iAdtWgId = iCoeEnv->RootWin().Identifier();
+
 	// Sets the priority for window group
 	CEikonEnv &eikEnv = *CEikonEnv::Static();	
 	eikEnv.RootWin().SetOrdinalPosition( KOrdinalPosition, KOrdinalPriority );
@@ -145,6 +150,48 @@
 	}
 
 // ---------------------------------------------------------
+// CAdtUpdaterAppUi::IsAppInBackground
+// rest of the details are commented in the header
+// ---------------------------------------------------------
+//
+TBool CAdtUpdaterAppUi::IsAppInBackground()
+    {
+	__PRINTS( "CAdtUpdaterAppUi::IsAppInBackground - Entry" );
+    // Gets the window group id of the app coming in foreground
+    TInt activeWgId = iCoeEnv->WsSession().GetFocusWindowGroup();
+    __PRINTS( "CAdtUpdaterAppUi::IsAppInBackground - Exit" );
+    if(activeWgId != iAdtWgId)
+        {
+        return ETrue;
+        }
+    return EFalse;
+    }
+
+// ---------------------------------------------------------
+// CAdtUpdaterAppUi::IsHighPriorityWindowActive
+// rest of the details are commented in the header
+// ---------------------------------------------------------
+//
+TBool CAdtUpdaterAppUi::IsHighPriorityWindowActive()
+    {
+    __PRINTS( "CCAdtUpdaterAppUi::IsHighPriorityWindowActive - Entry" );
+    // Gets the window group id of the app coming in foreground
+    TInt activeWgId = iCoeEnv->WsSession().GetFocusWindowGroup();
+    TApaTaskList taskList(iCoeEnv->WsSession());
+    
+    //In future, if any other high priority window will be there, then 
+    //add that particular UID in the below check.
+    //Note: Key Lock and alarm are not handled here as these windows already 
+    //have high priority than CDT. In callui window group, the window - when
+    //call is answered, has a low priority, that's why callui is handled here.
+    __PRINTS( "CCAdtUpdaterAppUi::IsHighPriorityWindowActive - Exit" );
+    if(activeWgId == taskList.FindApp(KPhoneUid).WgId())
+        {
+        return ETrue;
+        }
+    return EFalse;
+    }
+// ---------------------------------------------------------
 // CAdtUpdaterAppUi::ToggleAppViewL
 // rest of the details are commented in the header
 // ---------------------------------------------------------
diff -r 97232defd20e -r 356f28cd5ca0 clock2/clockui/adtupdater/src/adtupdatercontainer.cpp
--- a/clock2/clockui/adtupdater/src/adtupdatercontainer.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/clock2/clockui/adtupdater/src/adtupdatercontainer.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -59,7 +59,8 @@
 const TInt KFirstBootDone( 1 );
 const TInt KTimeFormatLength( 16 );				 // "20070000:090000."
 const TInt KMaxMobileCountryCode( 4 );
-
+const TInt KCDTQueryTimer( 2000000 );           // 2 seconds
+const TInt KAppBackgroundInterval( 2000000 );   // 2 seconds
 
 // Literals
 _LIT( KOneSpace, " " );
@@ -173,7 +174,11 @@
     
 	iIsRTCInvalidAndHiddenReset = EFalse;
 	
-    ActivateL();
+	iPeriodic = CPeriodic::NewL( EPriorityAbsoluteHigh );
+	
+	iNitzTimerActive = EFalse;
+	
+	ActivateL();
   
     __PRINTS( "CAdtUpdaterContainer::ConstructL - Exit" );
     }     
@@ -324,11 +329,11 @@
 		iListener = CAdtUpdaterListener::NewL( this );
 		iListener->WaitForNitzInfoL();
 		
-		// A 40 seconds call back timer.
+		// A 90 seconds call back timer.
 		TCallBack timerCallBack( CallBackL, this );
-		iPeriodic = CPeriodic::NewL( EPriorityAbsoluteHigh );
-		// Start the timer	
+		// Start the Nitz timer.
 		iPeriodic->Start( KTimeout, KInterval, timerCallBack );
+		iNitzTimerActive =ETrue;
 		}
 	else if( IsFirstBoot()&& PredictiveTimeEnabled())
 		{		
@@ -367,36 +372,54 @@
 	__PRINTS( "CAdtUpdaterContainer::CallBackL - Entry" );
 	
 	CAdtUpdaterContainer* selfObject = static_cast< CAdtUpdaterContainer* >( aPtr );
-	CAdtUpdaterListener* listenerObject = selfObject->Listener();
 	
-	// Callback after 40 seconds. If control reaches here, it means Nitz packet has
-	// not yet arrived and we can continue with normal bootup sequence.
-	
-	// Buf before we do that, we can do a final check with the server, just to ensure
-	// there weren't any missed notifications.
-	TBool dataAvailable = listenerObject->ConfirmDataAvailabilityL();
-	
-	if( dataAvailable )
+	if(selfObject->iNitzTimerActive)
 	    {
-	    __PRINTS( "NITZ info is available" );
-	    
-	    // Update the status to EDataAvailable
-	    selfObject->iDataAvailability = EDataAvailable;
-	    
-	    // We have data from server.
-	    listenerObject->NitzInfoAvailableL();
-	    }
-	else
+        CAdtUpdaterListener* listenerObject = selfObject->Listener();
+        
+        // Callback after 90 seconds. If control reaches here, it means Nitz packet has
+        // not yet arrived and we can continue with normal bootup sequence.
+        
+        // Buf before we do that, we can do a final check with the server, just to ensure
+        // there weren't any missed notifications.
+        TBool dataAvailable = listenerObject->ConfirmDataAvailabilityL();
+        
+        if( dataAvailable )
+            {
+            __PRINTS( "NITZ info is available" );
+            
+            // Update the status to EDataAvailable
+            selfObject->iDataAvailability = EDataAvailable;
+            
+            // We have data from server.
+            listenerObject->NitzInfoAvailableL();
+            }
+        else
+            {
+            __PRINTS( "NITZ info unavailable" );
+            
+            // Update the status to EDataNotAvailable
+            selfObject->iDataAvailability = EDataNotAvailable;
+            
+            // We don't have any data for sure.
+            selfObject->NitzInfoNotAvailableL();
+            }
+        }
+	else//CDT Query timer is active. 
 	    {
-	    __PRINTS( "NITZ info unavailable" );
-	    
-	    // Update the status to EDataNotAvailable
-	    selfObject->iDataAvailability = EDataNotAvailable;
-	    
-	    // We don't have any data for sure.
-	    selfObject->NitzInfoNotAvailableL();
-	    }
-		
+        if(selfObject->iAdtUpdaterAppUi->IsHighPriorityWindowActive())
+            {
+            //If any high priority window is active, we push the CDT to background.
+            selfObject->iAdtUpdaterAppUi->ToggleAppViewL(EFalse);
+            }
+        else if(selfObject->QueryDialogsInDisplay() && selfObject->iAdtUpdaterAppUi->IsAppInBackground()
+                && !selfObject->iAdtUpdaterAppUi->IsHighPriorityWindowActive())
+            {
+            //For every 2 sec, until ADTUpdater exits, we will check whether app is in background
+            //and bring to foreground.
+            selfObject->iAdtUpdaterAppUi->ToggleAppViewL(ETrue);
+            }
+         }
 	__PRINTS( "CAdtUpdaterContainer::CallBackL - Exit" );
 											
 	return KZero;
@@ -484,6 +507,7 @@
 		iPeriodic->Cancel();
 		}
 	
+	iNitzTimerActive = EFalse;
 	// Cancel the listener
 	if( iListener )
 		{
@@ -612,6 +636,16 @@
 	
     iPSObserver->Cancel();
     
+    if(iPeriodic->IsActive())
+        {
+        iPeriodic->Cancel();
+        }
+    TCallBack timerCallBack( CallBackL, this );
+    // Start the CDT Query timer.
+    iPeriodic->Start( KCDTQueryTimer, KAppBackgroundInterval, timerCallBack );
+
+    iNitzTimerActive = EFalse;
+    
     if(iIsRTCInvalidAndHiddenReset)
         {
         ShowDateAndTimeQueriesL();				
@@ -637,7 +671,10 @@
 	__PRINTS( "CAdtUpdaterContainer::DoContinueWithNormalBootL - Entry" );
 	
 	// First bring the application to the foreground.
-	iAdtUpdaterAppUi->ToggleAppViewL( ETrue );	
+	if(!iAdtUpdaterAppUi->IsHighPriorityWindowActive())
+	    {
+        iAdtUpdaterAppUi->ToggleAppViewL( ETrue );
+	    }
 	// Show in FSW.
     iAdtUpdaterAppUi->HideApplicationFromFSW( EFalse );
 	// Hide the status pane.
@@ -686,6 +723,7 @@
 	// Hide the status pane.
     iAdtUpdaterAppUi->HideStatusPane( ETrue );
 		
+    iQueryDialogsInDisplay = ETrue;
 	// No first boot but RTCStatus is corrupted. Ask time and date"
 		
 	// Showing Date query to user.
@@ -693,7 +731,7 @@
 		
 	// Showing Time query to user.
 	ShowTimeQueryL();
-		
+	iQueryDialogsInDisplay = EFalse;
 	//Deactivate the plug-in as we are setting the date/time manually
 	DeActivateNitzPlugin();
 		
diff -r 97232defd20e -r 356f28cd5ca0 clock2/clockui/uilayer/clockcityselectionlist/src/clockcityselectionlistimpl.cpp
--- a/clock2/clockui/uilayer/clockcityselectionlist/src/clockcityselectionlistimpl.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/clock2/clockui/uilayer/clockcityselectionlist/src/clockcityselectionlistimpl.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -344,7 +344,7 @@
         
         __PRINTS( "CClockCitySelectionListImpl::OkToExitL - Exit" );
         
-        return EFalse;
+        return ETrue;
         }
     
     __PRINTS( "CClockCitySelectionListImpl::OkToExitL - Exit" );
@@ -523,11 +523,7 @@
             // Cleanup.
             CleanupStack::PopAndDestroy( cityArray );
 
-            if( aTryExit )
-                {
-                // City is selected. We can exit the dialog now.
-                this->TryExitL( NULL );
-                }
+
             }
         // Cleanup.
         CleanupStack::PopAndDestroy( localizedCityArray );
diff -r 97232defd20e -r 356f28cd5ca0 notepad/notepad1/LibSrc/NpdListDialog.cpp
--- a/notepad/notepad1/LibSrc/NpdListDialog.cpp	Tue Sep 14 21:17:03 2010 +0300
+++ b/notepad/notepad1/LibSrc/NpdListDialog.cpp	Wed Sep 15 12:11:35 2010 +0300
@@ -107,6 +107,11 @@
 //
 EXPORT_C CNotepadListDialog::~CNotepadListDialog()
     {
+    if ( iServiceHandler )
+        {
+        delete iServiceHandler;
+        iServiceHandler = NULL;
+        }
     delete iIdle;
     delete iProgressDialog; // *1*
     delete iEditorDialog;
@@ -119,12 +124,6 @@
     iSavedSelectedKeys.Close();
     iSavedKeysAboveCurrent.Close();
     delete iEnvironmentChangeNotifier;
-    if ( iServiceHandler )
-    	{
-    	    	
-		delete iServiceHandler;
-		iServiceHandler = NULL;
-    	}
     }
 
 // -----------------------------------------------------------------------------