# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274779718 -10800
# Node ID 1882882c7f9c7b86ec4b7037dfafd67532cc8e2b
# Parent  2ad88260662089768c41618d54283738819eb74d
Revision: 201019
Kit: 2010121

diff -r 2ad882606620 -r 1882882c7f9c svgtviewer/SvgtViewerPlugin/AppObserverUtilSrc/SVGTAppObserverUtil.cpp
--- a/svgtviewer/SvgtViewerPlugin/AppObserverUtilSrc/SVGTAppObserverUtil.cpp	Wed Mar 31 21:16:02 2010 +0300
+++ b/svgtviewer/SvgtViewerPlugin/AppObserverUtilSrc/SVGTAppObserverUtil.cpp	Tue May 25 12:28:38 2010 +0300
@@ -55,7 +55,7 @@
 #include <bautils.h>
 #include <eikprogi.h>
 #include <e32svr.h>
-#include <SVGTAppObserverUtil.rsg>
+#include <svgtappobserverutil.rsg>
 #include <SVGTAppObserverUtil.h>
 #include <pathinfo.h>
 #include <sysutil.h>
diff -r 2ad882606620 -r 1882882c7f9c svgtviewer/SvgtViewerPlugin/AppSrc/SVGTViewerAppAppUi.cpp
--- a/svgtviewer/SvgtViewerPlugin/AppSrc/SVGTViewerAppAppUi.cpp	Wed Mar 31 21:16:02 2010 +0300
+++ b/svgtviewer/SvgtViewerPlugin/AppSrc/SVGTViewerAppAppUi.cpp	Tue May 25 12:28:38 2010 +0300
@@ -25,7 +25,7 @@
 #include <e32property.h>
 #include <StringLoader.h>
 #include <coeutils.h>
-#include <SVGTViewerApp.rsg>
+#include <svgtviewerapp.rsg>
 #include <SVGTAppObserverUtil.h>
 #include "SVGTViewerAppDbgFlags.hrh"
 #include "SVGTViewerAppAppUi.h"
diff -r 2ad882606620 -r 1882882c7f9c svgtviewer/SvgtViewerPlugin/SVGCodecSrc/SVGConvert.cpp
--- a/svgtviewer/SvgtViewerPlugin/SVGCodecSrc/SVGConvert.cpp	Wed Mar 31 21:16:02 2010 +0300
+++ b/svgtviewer/SvgtViewerPlugin/SVGCodecSrc/SVGConvert.cpp	Tue May 25 12:28:38 2010 +0300
@@ -20,7 +20,7 @@
 #include <coemain.h>
 #include <imageconversion.h>
 #include <icl_uids.hrh>
-#include <102073D7_extra.rsg>
+#include <102073d7_extra.rsg>
 #include <SvgCodecImageConstants.hrh>
 #include "SVGCodec.h"
 
diff -r 2ad882606620 -r 1882882c7f9c svgtviewer/SvgtViewerPlugin/UIControlSrc/SVGTCustControl.cpp
--- a/svgtviewer/SvgtViewerPlugin/UIControlSrc/SVGTCustControl.cpp	Wed Mar 31 21:16:02 2010 +0300
+++ b/svgtviewer/SvgtViewerPlugin/UIControlSrc/SVGTCustControl.cpp	Tue May 25 12:28:38 2010 +0300
@@ -36,7 +36,7 @@
 #include <ctsydomainpskeys.h> // for call handling
 #include <data_caging_path_literals.hrh>
 #include <gdi.h>
-#include <SVGTUIControl.rsg>
+#include <svgtuicontrol.rsg>
 #include <svgtuicontrol.mbg>
 // User Includes
 #include "SVGTUIControlDbgFlags.hrh"
diff -r 2ad882606620 -r 1882882c7f9c svgtviewer/SvgtViewerPlugin/UIControlSrc/SVGTUIDialog.cpp
--- a/svgtviewer/SvgtViewerPlugin/UIControlSrc/SVGTUIDialog.cpp	Wed Mar 31 21:16:02 2010 +0300
+++ b/svgtviewer/SvgtViewerPlugin/UIControlSrc/SVGTUIDialog.cpp	Tue May 25 12:28:38 2010 +0300
@@ -42,7 +42,7 @@
 #include <akntitle.h>
 #include <data_caging_path_literals.hrh>
 #include <StringLoader.h>
-#include <SVGTUIControl.rsg>
+#include <svgtuicontrol.rsg>
 #include <csxhelp/svgt.hlp.hrh>
 //-----------
 
@@ -1169,17 +1169,21 @@
 void CSVGTUIDialog::HandleResourceChange( TInt aType )
     {
     CAknDialog::HandleResourceChange( aType );
-    if( iQuietExitWhenOrientationChange )
-        {
-           TryExitL( EAknCmdExit );  
-           return;
-        }
+
+    
     if ( aType == KAknsMessageSkinChange )
         {
         // No skin related action performed.
         }
         else if ( aType == KEikDynamicLayoutVariantSwitch )
             {
+        
+            if( iQuietExitWhenOrientationChange )
+                {
+                   TryExitL( EAknCmdExit );  
+                   return;
+                }
+            
             if ( iCustControl )
                 {
                 TBool isFullScreenOn;
@@ -1189,14 +1193,16 @@
                 // Change the layout to reflect layout switch
                 TRAP_IGNORE( SwitchDialogLayoutL( isFullScreenOn ) );
                 }
+            
+            // If it is a Layout switch, need to do a redraw
+            if ( aType == KEikDynamicLayoutVariantSwitch )
+                {
+                // Redraw the dialog
+                DrawDeferred();
+                }
+            
             }
 
-    // If it is a Layout switch, need to do a redraw
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        // Redraw the dialog
-        DrawDeferred();
-        }
     }
 // -----------------------------------------------------------------------------
 // CSVGTUIDialog::DrawProgressBarL
diff -r 2ad882606620 -r 1882882c7f9c svgtviewer/SvgtViewerPlugin/data/SVGTViewerApp_reg.rss
--- a/svgtviewer/SvgtViewerPlugin/data/SVGTViewerApp_reg.rss	Wed Mar 31 21:16:02 2010 +0300
+++ b/svgtviewer/SvgtViewerPlugin/data/SVGTViewerApp_reg.rss	Tue May 25 12:28:38 2010 +0300
@@ -20,7 +20,7 @@
 //  INCLUDES
 
 #include <appinfo.rh>
-#include <SVGTViewerApp.rsg>
+#include <svgtviewerapp.rsg>
 #include <data_caging_paths_strings.hrh>
 
 #include "SVGTViewerAppDbgFlags.hrh"