# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276064837 -10800 # Node ID 6b620215f837e5726b428f06846f063c987300ac # Parent 76f25fb7a6a19ba5080f1c8bb93cce762f4cb548 Revision: 201021 Kit: 2010123 diff -r 76f25fb7a6a1 -r 6b620215f837 imstutils/imconversationview/imcvuiapp/group/imcvuiapp.mmp --- a/imstutils/imconversationview/imcvuiapp/group/imcvuiapp.mmp Tue May 25 12:27:36 2010 +0300 +++ b/imstutils/imconversationview/imcvuiapp/group/imcvuiapp.mmp Wed Jun 09 09:27:17 2010 +0300 @@ -81,6 +81,7 @@ USERINCLUDE ../inc USERINCLUDE ../rss USERINCLUDE ../../inc +USERINCLUDE ../../../../inc USERINCLUDE ../../imcvuiengine/inc USERINCLUDE ../../../../group USERINCLUDE ../../../../uiservicetab/vimpstdetailsviewplugin/inc diff -r 76f25fb7a6a1 -r 6b620215f837 imstutils/imconversationview/imcvuiapp/inc/cimcvappsmileicondialog.h --- a/imstutils/imconversationview/imcvuiapp/inc/cimcvappsmileicondialog.h Tue May 25 12:27:36 2010 +0300 +++ b/imstutils/imconversationview/imcvuiapp/inc/cimcvappsmileicondialog.h Wed Jun 09 09:27:17 2010 +0300 @@ -138,6 +138,8 @@ TBool iSmileyPointed; TBool iIsMirrored; + + TBool iLayoutChanged; }; #endif // CIMCVAPPSMILEICONDIALOG_H diff -r 76f25fb7a6a1 -r 6b620215f837 imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicondialog.cpp --- a/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicondialog.cpp Tue May 25 12:27:36 2010 +0300 +++ b/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicondialog.cpp Wed Jun 09 09:27:17 2010 +0300 @@ -82,7 +82,7 @@ CIMCVAppSmileIconDialog::CIMCVAppSmileIconDialog( const RPointerArray& aIconArray, TInt& aSelectedIconId ) -:iIconArray( aIconArray ), iIconId( aSelectedIconId ) +:iIconArray( aIconArray ), iIconId( aSelectedIconId ), iLayoutChanged(EFalse) { } @@ -141,8 +141,9 @@ IM_CV_LOGS(TXT("CIMCVAppSmileIconDialog::HandleResourceChange() start") ); if( aType == KEikDynamicLayoutVariantSwitch ) { - SetLayout(); - } + iLayoutChanged = ETrue; + SetLayout(); + } CAknDialog::HandleResourceChange( aType ); IM_CV_LOGS(TXT("CIMCVAppSmileIconDialog::HandleResourceChange() end") ); } @@ -391,8 +392,17 @@ } else { - vWidth = dialogRect.iBr.iX - dialogRect.iTl.iX + 2*aRect.iBr.iX; - } + // Patch fix for mirrored layout when mode changes from portrait to + // landscape or vice versa the width calculation differs to adjust the correct width + if (iLayoutChanged) // mode change like portrait to landscape or vice versa + { + vWidth = (2*aRect.iBr.iX) - (dialogRect.iBr.iX - dialogRect.iTl.iX); + } + else + { + vWidth = dialogRect.iBr.iX - dialogRect.iTl.iX + 2*aRect.iBr.iX; + } + } vArea = vWidth*vheight; TInt iconCount = iIconArray.Count(); diff -r 76f25fb7a6a1 -r 6b620215f837 imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicongrid.cpp --- a/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicongrid.cpp Tue May 25 12:27:36 2010 +0300 +++ b/imstutils/imconversationview/imcvuiapp/src/cimcvappsmileicongrid.cpp Wed Jun 09 09:27:17 2010 +0300 @@ -469,15 +469,7 @@ myRect.SetRect( cellLeftTop, cellBottomRight ); TPoint offset; - if(!iIsMirrored) - { - offset.iX = ( aIndex % iMaxColumns ) * iCellWidth; - } - else - { - offset.iX = ( aIndex % iMaxColumns ) * iCellWidth; - } - + offset.iX = ( aIndex % iMaxColumns ) * iCellWidth; offset.iY = aIndex / iMaxColumns * iCellHeight; myRect.Move( offset ); diff -r 76f25fb7a6a1 -r 6b620215f837 imstutils/imconversationview/imcvuiapp/src/cimcvmenuextensionmanager.cpp --- a/imstutils/imconversationview/imcvuiapp/src/cimcvmenuextensionmanager.cpp Tue May 25 12:27:36 2010 +0300 +++ b/imstutils/imconversationview/imcvuiapp/src/cimcvmenuextensionmanager.cpp Wed Jun 09 09:27:17 2010 +0300 @@ -29,6 +29,7 @@ #include "cimcvcommandinfo.h" #include "cvmenucommandinfo.hrh" +#include "vimpstcustomcleanupapi.h" // ================= MEMBER FUNCTIONS ======================= @@ -103,6 +104,7 @@ { // plugininfo array, Owned RImplInfoPtrArray pluginInfo; + CustomCleanupResetAndDestroyPushL(pluginInfo); iPlugins.ResetAndDestroy(); REComSession::ListImplementationsL( KMenuCustomisationInterfaceUid,pluginInfo ); TInt pluginCount = pluginInfo.Count(); @@ -139,8 +141,9 @@ } } - pluginInfo.ResetAndDestroy(); - pluginInfo.Close(); + + CleanupStack::PopAndDestroy(); + } diff -r 76f25fb7a6a1 -r 6b620215f837 servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/00/servicewidget.css --- a/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/00/servicewidget.css Tue May 25 12:27:36 2010 +0300 +++ b/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/00/servicewidget.css Wed Jun 09 09:27:17 2010 +0300 @@ -5,7 +5,7 @@ padding-top: 5px; padding-bottom: 5px; padding-left: 3px; - background-color: "SKIN(268458534 9886)"; + } @@ -80,7 +80,7 @@ { margin-top: 10%; margin-left: 10%; - width: 80%; + width: 60%; height: 80%; visibility: visible; position: static; @@ -90,7 +90,7 @@ image.second_image { margin-top: 20%; - width: 100%; + width: 60%; height: 60%; visibility: visible; position: static; diff -r 76f25fb7a6a1 -r 6b620215f837 servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/37/servicewidget.css --- a/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/37/servicewidget.css Tue May 25 12:27:36 2010 +0300 +++ b/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/37/servicewidget.css Wed Jun 09 09:27:17 2010 +0300 @@ -5,7 +5,7 @@ padding-top: 5px; padding-bottom: 5px; padding-left: 3px; - background-color: "SKIN(268458534 9886)"; + } @@ -79,7 +79,7 @@ { margin-top: 10%; margin-left: 10%; - width: 80%; + width: 60%; height: 80%; visibility: visible; position: static; @@ -89,7 +89,7 @@ image.second_image { margin-top: 20%; - width: 100%; + width: 60%; height: 60%; visibility: visible; position: static; diff -r 76f25fb7a6a1 -r 6b620215f837 servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/50/servicewidget.css --- a/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/50/servicewidget.css Tue May 25 12:27:36 2010 +0300 +++ b/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/50/servicewidget.css Wed Jun 09 09:27:17 2010 +0300 @@ -5,7 +5,7 @@ padding-top: 5px; padding-bottom: 5px; padding-left: 3px; - background-color: "SKIN(268458534 9886)"; + } @@ -79,7 +79,7 @@ { margin-top: 10%; margin-left: 10%; - width: 80%; + width: 60%; height: 80%; visibility: visible; position: static; @@ -89,7 +89,7 @@ image.second_image { margin-top: 20%; - width: 100%; + width: 60%; height: 60%; visibility: visible; position: static; diff -r 76f25fb7a6a1 -r 6b620215f837 servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/57/servicewidget.css --- a/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/57/servicewidget.css Tue May 25 12:27:36 2010 +0300 +++ b/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/57/servicewidget.css Wed Jun 09 09:27:17 2010 +0300 @@ -5,7 +5,7 @@ padding-top: 5px; padding-bottom: 5px; padding-left: 3px; - background-color: "SKIN(268458534 9886)"; + } @@ -79,7 +79,7 @@ { margin-top: 10%; margin-left: 10%; - width: 80%; + width: 60%; height: 80%; visibility: visible; position: static; @@ -89,7 +89,7 @@ image.second_image { margin-top: 20%; - width: 100%; + width: 60%; height: 60%; visibility: visible; position: static; diff -r 76f25fb7a6a1 -r 6b620215f837 servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/94/servicewidget.css --- a/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/94/servicewidget.css Tue May 25 12:27:36 2010 +0300 +++ b/servicewidget/themes/install-themes/install/servicewidget_20021383/xuikon/94/servicewidget.css Wed Jun 09 09:27:17 2010 +0300 @@ -5,7 +5,7 @@ padding-top: 5px; padding-bottom: 5px; padding-left: 3px; - background-color: "SKIN(268458534 9886)"; + } @@ -79,7 +79,7 @@ { margin-top: 10%; margin-left: 10%; - width: 80%; + width: 60%; height: 80%; visibility: visible; position: static; @@ -89,7 +89,7 @@ image.second_image { margin-top: 20%; - width: 100%; + width: 60%; height: 60%; visibility: visible; position: static; diff -r 76f25fb7a6a1 -r 6b620215f837 uiservicetab/inc/uiservicetabtracer.h --- a/uiservicetab/inc/uiservicetabtracer.h Tue May 25 12:27:36 2010 +0300 +++ b/uiservicetab/inc/uiservicetabtracer.h Wed Jun 09 09:27:17 2010 +0300 @@ -39,7 +39,11 @@ #define TRACER_LOG_METHOD 0 // for WINS UREL #endif #else - #define TRACER_LOG_METHOD 2 // for device + #ifdef _DEBUG + #define TRACER_LOG_METHOD 2 // for Armv5 UDEB + #else + #define TRACER_LOG_METHOD 0 // for Armv5 UREL + #endif #endif #endif diff -r 76f25fb7a6a1 -r 6b620215f837 uiservicetab/vimpstui/group/vimpstui.mmp --- a/uiservicetab/vimpstui/group/vimpstui.mmp Tue May 25 12:27:36 2010 +0300 +++ b/uiservicetab/vimpstui/group/vimpstui.mmp Wed Jun 09 09:27:17 2010 +0300 @@ -35,7 +35,7 @@ USERINCLUDE ../inc USERINCLUDE ../src USERINCLUDE ../rss - +USERINCLUDE ../../../inc USERINCLUDE ../../vimpstutils/inc USERINCLUDE ../../vimpstengine/inc USERINCLUDE ../../vimpstcmdprocess/inc diff -r 76f25fb7a6a1 -r 6b620215f837 uiservicetab/vimpstui/rss/vimpstuires.rss --- a/uiservicetab/vimpstui/rss/vimpstuires.rss Tue May 25 12:27:36 2010 +0300 +++ b/uiservicetab/vimpstui/rss/vimpstuires.rss Wed Jun 09 09:27:17 2010 +0300 @@ -137,6 +137,12 @@ { items = { + MENU_ITEM // Open conversation + { + command = ECmdOpenConversation; + txt = qtn_servtab_open_conversation; + flags = EEikMenuItemSpecific; + }, MENU_ITEM { command = ECmdContactAddAsFriend; diff -r 76f25fb7a6a1 -r 6b620215f837 uiservicetab/vimpstui/src/cvimpstuiblockview.cpp --- a/uiservicetab/vimpstui/src/cvimpstuiblockview.cpp Tue May 25 12:27:36 2010 +0300 +++ b/uiservicetab/vimpstui/src/cvimpstuiblockview.cpp Wed Jun 09 09:27:17 2010 +0300 @@ -193,6 +193,7 @@ { //add search view menu items aMenuPane->AddMenuItemsL( R_SERVTAB_TABBED_VIEW_MENU ); + aMenuPane->SetItemDimmed(ECmdOpenConversation, ETrue); aMenuPane->SetItemDimmed(ECmdContactAddAsFriend,ETrue); aMenuPane->SetItemDimmed(KAiwCmdCall,ETrue); aMenuPane->SetItemDimmed(ECmdCloseConversation,ETrue); diff -r 76f25fb7a6a1 -r 6b620215f837 uiservicetab/vimpstui/src/cvimpstuimenuextension.cpp --- a/uiservicetab/vimpstui/src/cvimpstuimenuextension.cpp Tue May 25 12:27:36 2010 +0300 +++ b/uiservicetab/vimpstui/src/cvimpstuimenuextension.cpp Wed Jun 09 09:27:17 2010 +0300 @@ -28,6 +28,7 @@ #include "ccommandinfo.h" #include "servicetabmenucommandinfo.hrh" +#include "vimpstcustomcleanupapi.h" // ================= MEMBER FUNCTIONS ======================= @@ -114,6 +115,7 @@ TRACER_AUTO; // plugininfo array, Owned RImplInfoPtrArray pluginInfo; + CustomCleanupResetAndDestroyPushL(pluginInfo); iPlugins.ResetAndDestroy(); REComSession::ListImplementationsL( KMenuCustomisationInterfaceUid,pluginInfo ); TInt pluginCount = pluginInfo.Count(); @@ -157,8 +159,8 @@ } } - pluginInfo.ResetAndDestroy(); - pluginInfo.Close(); + CleanupStack::PopAndDestroy(); + } diff -r 76f25fb7a6a1 -r 6b620215f837 uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp --- a/uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp Tue May 25 12:27:36 2010 +0300 +++ b/uiservicetab/vimpstui/src/cvimpstuitabbedview.cpp Wed Jun 09 09:27:17 2010 +0300 @@ -474,6 +474,7 @@ } } // common to all + aMenuPane->SetItemDimmed(ECmdOpenConversation, ETrue); aMenuPane->SetItemDimmed(ECmdContactAddAsFriend, ETrue); aMenuPane->SetItemDimmed(KAiwCmdCall, ETrue); aMenuPane->SetItemDimmed(ECmdCloseConversation, ETrue); @@ -514,6 +515,11 @@ if ( iCommandHandler.GetProcessInterface().IsConversationExist( itemIndex ) ) { aMenuPane->SetItemDimmed(ECmdCloseConversation, EFalse); + aMenuPane->SetItemDimmed(ECmdOpenConversation, ETrue); + } + else + { + aMenuPane->SetItemDimmed(ECmdOpenConversation, EFalse); } } } @@ -606,7 +612,12 @@ { if (iCommandHandler.GetProcessInterface().IsConversationExist( itemIndex )) { - aMenuPane->SetItemDimmed(ECmdCloseConversation, EFalse); + aMenuPane->SetItemDimmed(ECmdCloseConversation, EFalse); + aMenuPane->SetItemDimmed(ECmdOpenConversation, ETrue); + } + else + { + aMenuPane->SetItemDimmed(ECmdOpenConversation, EFalse); } } if(voipService)