# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286140717 -10800
# Node ID 6952856dc2699c6a6136a8e6913e1abb49222a7a
# Parent  453d490c84a59833c53a805c05f700deacc9de76
Revision: 201037
Kit: 201039

diff -r 453d490c84a5 -r 6952856dc269 package_definition.xml
--- a/package_definition.xml	Fri Sep 17 08:58:49 2010 +0300
+++ b/package_definition.xml	Mon Oct 04 00:18:37 2010 +0300
@@ -16,7 +16,7 @@
 			<component id="stifui_qt" name="STIF UI for Qt" filter="s60" purpose="development" target="device" introduced="^4">
 				<!-- <unit bldFile="testfwuis/stifui/qt" qt:proFile="stifqtui.pro"/> -->
 			</component>
-			<component id="symbianunittestui" filter="s60,test" purpose="development" target="device" introduced="^4">
+			<component id="symbianunittestui" name="Symbian Unit Test UI" filter="s60,test" purpose="development" target="device" introduced="^4">
 				<unit bldFile="testfws/symbianunittestui/qt" qt:proFile="symbianunittestqt.pro"/>
 			</component>
 		</collection>
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/group/ReleaseNote.txt
--- a/testfwuis/stifui/avkon/group/ReleaseNote.txt	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/avkon/group/ReleaseNote.txt	Mon Oct 04 00:18:37 2010 +0300
@@ -1,5 +1,5 @@
 ========================================================================
-RELEASE NOTE FOR STIF UI - STIF_201030 (7.3.38)
+RELEASE NOTE FOR STIF UI - STIF_201036 (7.3.39)
 SUPPORTING SERIES 60 3.0 ->
 ========================================================================
 
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/sis/Stifui_31.sis
Binary file testfwuis/stifui/avkon/sis/Stifui_31.sis has changed
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/stifui/inc/UIStoreHandler.h
--- a/testfwuis/stifui/avkon/stifui/inc/UIStoreHandler.h	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/avkon/stifui/inc/UIStoreHandler.h	Mon Oct 04 00:18:37 2010 +0300
@@ -93,6 +93,11 @@
         void Update( CStartedTestCase* aTestCase, TInt aStatus );
 
     public:     // Functions from base classes
+	        virtual TInt PopupMsg( const TDesC&  aLine1, 
+                               const TDesC&  aLine2, 
+                               TInt  aTimeInSecs,
+                               TKeyCode&  aKey,
+                               TRequestStatus&  aStatus  );
 
     protected:  // New functions
 
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/stifui/inc/version.h
--- a/testfwuis/stifui/avkon/stifui/inc/version.h	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/avkon/stifui/inc/version.h	Mon Oct 04 00:18:37 2010 +0300
@@ -20,9 +20,9 @@
 
 #define STIFUI_MAJOR_VERSION 7
 #define STIFUI_MINOR_VERSION 3
-#define STIFUI_BUILD_VERSION 38
+#define STIFUI_BUILD_VERSION 39
 
-#define STIFUI_REL_DATE "27th July 2010"
+#define STIFUI_REL_DATE "07th Sep 2010"
 
 #define TO_UNICODE(text) _L(text) 
 
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/stifui/src/AppUIAppUi.cpp
--- a/testfwuis/stifui/avkon/stifui/src/AppUIAppUi.cpp	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/avkon/stifui/src/AppUIAppUi.cpp	Mon Oct 04 00:18:37 2010 +0300
@@ -667,13 +667,19 @@
  */
 void CAppUIAppUi::SaveFocusPosition(TAppUIViewNumber aViewId, TInt aPosition)
 	{
+    TInt err;
 	if(!iPreviousPositionListValid)
 		{
 		return;
 		}
 	for(TInt counter = iPreviousFocusPosition.Count(); counter <= aViewId; counter++)
 		{
-		iPreviousFocusPosition.Append(0);
+		err = iPreviousFocusPosition.Append(0);
+		if (err != KErrNone)
+		    {
+            iLogger->Log(_L("Previous position was not saved correctly"));
+		
+		    }
 		}
 	iPreviousFocusPosition[aViewId] = aPosition;
 	}
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/stifui/src/StartCasesView.cpp
--- a/testfwuis/stifui/avkon/stifui/src/StartCasesView.cpp	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/avkon/stifui/src/StartCasesView.cpp	Mon Oct 04 00:18:37 2010 +0300
@@ -333,7 +333,7 @@
 	{
 		for( i = 0; i < count; i++ )
 			{
-			selectedIndices.InsertInOrder( 
+			selectedIndices.InsertInOrderL( 
 			    (*aListBox->SelectionIndexes())[i] );
 			}
 	}
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/stifui/src/TestSetInsertMenuView.cpp
--- a/testfwuis/stifui/avkon/stifui/src/TestSetInsertMenuView.cpp	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/avkon/stifui/src/TestSetInsertMenuView.cpp	Mon Oct 04 00:18:37 2010 +0300
@@ -341,7 +341,7 @@
     			{
     			for( i = 0; i < newCount; i++ )
 	    			{
-    				selectedIndices.InsertInOrder( (*newListBox->SelectionIndexes())[i] );
+    				selectedIndices.InsertInOrderL( (*newListBox->SelectionIndexes())[i] );
 		    		}	
     				
 	    		AddCasesToTestSet( selectedIndices );
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/avkon/stifui/src/UIStoreHandler.cpp
--- a/testfwuis/stifui/avkon/stifui/src/UIStoreHandler.cpp	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/avkon/stifui/src/UIStoreHandler.cpp	Mon Oct 04 00:18:37 2010 +0300
@@ -134,6 +134,19 @@
 
     }
 
+TInt CUIStoreHandler::PopupMsg( const TDesC& /*aLine1*/, 
+                             const TDesC& /*aLine2*/, 
+                             TInt /*aTimeInSecs*/,
+                             TKeyCode& /*aKey*/,
+                             TRequestStatus& aStatus )
+    {
+    
+    TRequestStatus *status = &aStatus;
+    User::RequestComplete(status, 0);
+
+    return 0;
+    
+    }
 // ================= OTHER EXPORTED FUNCTIONS =================================
 // None
 
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/qt/ReleaseNote.txt
--- a/testfwuis/stifui/qt/ReleaseNote.txt	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/qt/ReleaseNote.txt	Mon Oct 04 00:18:37 2010 +0300
@@ -1,5 +1,5 @@
 ========================================================================
-RELEASE NOTE FOR STFUI_201028 (7.3.37)
+RELEASE NOTE FOR STFUI_201036 (7.3.39)
 ========================================================================
 
 Product Description:
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/qt/inc/version.h
--- a/testfwuis/stifui/qt/inc/version.h	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/qt/inc/version.h	Mon Oct 04 00:18:37 2010 +0300
@@ -20,9 +20,9 @@
 
 #define STIF_MAJOR_VERSION 7
 #define STIF_MINOR_VERSION 3
-#define STIF_BUILD_VERSION 36
+#define STIF_BUILD_VERSION 39
 
-#define STIF_REL_DATE "29th June 2010"
+#define STIF_REL_DATE "07th Sep 2010"
 
 #define TO_UNICODE(text) _L(text) 
 
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/qt/sis/stifqtui.sis
Binary file testfwuis/stifui/qt/sis/stifqtui.sis has changed
diff -r 453d490c84a5 -r 6952856dc269 testfwuis/stifui/qt/src/stifexecutor.cpp
--- a/testfwuis/stifui/qt/src/stifexecutor.cpp	Fri Sep 17 08:58:49 2010 +0300
+++ b/testfwuis/stifui/qt/src/stifexecutor.cpp	Mon Oct 04 00:18:37 2010 +0300
@@ -407,5 +407,7 @@
         }
 
     }
+	
+
 
 // End of File