FCL/sf/app/homescreen: comparison idlehomescreen/nativeuicontroller/src/aitoolbarrenderer.cpp

equal deleted inserted replaced

-:c743ef5928ba
+:f966699dea19
 *
 * Description:  Touch Toolbar
 *
 */
+// System includes
+#include <centralrepository.h>
+#include <akntoolbar.h>
+#include <aknbutton.h>
+#include <AknsUtils.h>
+#include <gulicon.h>
+#include <e32property.h>
+#include <aknappui.h>
+// User includes
+#include <hscontentpublisher.h>
+#include <hspublisherinfo.h>
 #include "aitoolbarrenderer.h"
 #include "aifweventhandler.h"
 #include "aicontentobserver.h"
 #include "activeidle2domaincrkeys.h"
 #include "activeidle2domainpskeys.h"
 #include "aiscutplugindomaincrkeys.h"
-#include <aipropertyextension.h>
 #include "ainativeuiplugins.h"
 #include <AiNativeUi.rsg>
-#include <akntoolbar.h>
-#include <aknbutton.h>
-#include <AknsUtils.h>
-#include <gulicon.h>
-#include <e32property.h>
-#include <aknappui.h>
-#include "centralrepository.h"
 #include "debug.h"
 using namespace AiNativeUiController;
+// Constants
 // Action to send to framework
 _LIT( KOpenAppByIndex,              "Shortcut/LaunchByIndex(%d)" );
 _LIT( KOpenAppByIndexAlternate,     "Shortcut/LaunchByIndexAlternate(%d)");
 const TInt KOpenAppByIndexParameterLength = 2;
 const TInt KSecondButton = 1;
 const TInt KThirdButton  = 2;
 const TInt KRadix = 10;
+// ======== LOCAL FUNCTIONS ========
+// ----------------------------------------------------------------------------
+// IndexLength()
+//
+// ----------------------------------------------------------------------------
+//
 static TInt IndexLength( TInt aIndex )
 {
 TInt length = 0;
 if ( aIndex < 0 )
 while ( aIndex != 0 );
 return length;
 }
+// ----------------------------------------------------------------------------
+// CreateEventStringL()
+//
+// ----------------------------------------------------------------------------
+//
 static HBufC* CreateEventStringL( const TDesC& aFrom, TInt aEventIndex )
 {
 HBufC* buffer = NULL;
 TInt bufferLength = aFrom.Length() -
 bufferPtr.Format( aFrom, aEventIndex );
 return buffer;
 }
-// ========== MEMBER FUNCTIONS ================================================
+// ======== MEMBER FUNCTIONS ========
+// ----------------------------------------------------------------------------
-CAiToolbarRenderer::CAiToolbarRenderer( MAiFwEventHandler& aAiFwEventHandler, CAknToolbar& aToolbar )
+// CAiToolbarRenderer::CAiToolbarRenderer()
+//
+// ----------------------------------------------------------------------------
+//
+CAiToolbarRenderer::CAiToolbarRenderer( MAiFwEventHandler& aAiFwEventHandler,
+CAknToolbar& aToolbar )
 : iToolbar( aToolbar ),
 iAiFwEventHandler( aAiFwEventHandler )
 {
 // no implementation required
 }
+// ----------------------------------------------------------------------------
+// CAiToolbarRenderer::ConstructL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiToolbarRenderer::ConstructL( )
 {
 iToolbarEnabled = EFalse;
 TInt err = KErrNone;
 else
 {
 iToolbar.SetToolbarObserver( this );
 iToolbar.SetToolbarVisibility( ETrue, EFalse );
 }
+}
-}
+// ----------------------------------------------------------------------------
-CAiToolbarRenderer* CAiToolbarRenderer::NewLC( MAiFwEventHandler& aAiFwEventHandler, CAknToolbar& aToolbar )
+// CAiToolbarRenderer::NewLC()
-{
+//
-CAiToolbarRenderer* self = new (ELeave) CAiToolbarRenderer( aAiFwEventHandler, aToolbar );
+// ----------------------------------------------------------------------------
+//
+CAiToolbarRenderer* CAiToolbarRenderer::NewLC(
+MAiFwEventHandler& aAiFwEventHandler, CAknToolbar& aToolbar )
+{
+CAiToolbarRenderer* self =
+new ( ELeave ) CAiToolbarRenderer( aAiFwEventHandler, aToolbar );
 CleanupStack::PushL( self );
-self->ConstructL( );
+self->ConstructL();
 return self;
 }
-CAiToolbarRenderer* CAiToolbarRenderer::NewL( MAiFwEventHandler& aAiFwEventHandler, CAknToolbar& aToolbar )
+// ----------------------------------------------------------------------------
-{
+// CAiToolbarRenderer::NewL()
-CAiToolbarRenderer* self = CAiToolbarRenderer::NewLC( aAiFwEventHandler, aToolbar );
+//
+// ----------------------------------------------------------------------------
+//
+CAiToolbarRenderer* CAiToolbarRenderer::NewL(
+MAiFwEventHandler& aAiFwEventHandler, CAknToolbar& aToolbar )
+{
+CAiToolbarRenderer* self =
+CAiToolbarRenderer::NewLC( aAiFwEventHandler, aToolbar );
 CleanupStack::Pop(); // self
 return self;
 }
+// ----------------------------------------------------------------------------
+// CAiToolbarRenderer::~CAiToolbarRenderer()
+//
+// ----------------------------------------------------------------------------
+//
 CAiToolbarRenderer::~CAiToolbarRenderer()
 {
 // We don't want anymore events from toolbar
 iToolbar.SetToolbarObserver( NULL );
 iButtons.ResetAndDestroy();
 }
-void CAiToolbarRenderer::DynInitToolbarL( TInt /*aResourceId*/, CAknToolbar* /*aToolbar*/ )
+// ----------------------------------------------------------------------------
+// CAiToolbarRenderer::DynInitToolbarL()
+//
+// ----------------------------------------------------------------------------
+//
+void CAiToolbarRenderer::DynInitToolbarL( TInt /*aResourceId*/,
+CAknToolbar* /*aToolbar*/ )
 {
 // do nothing
 }
+// ----------------------------------------------------------------------------
+// CAiToolbarRenderer::OfferToolbarEventL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiToolbarRenderer::OfferToolbarEventL( TInt aCommand )
 {
 TInt modifiers = iToolbar.EventModifiers();
 if ( aCommand >= 0 && aCommand < iButtons.Count())
 {
 CAiToolbarButton* button = iButtons[aCommand];
 if ( button )
 {
 HBufC *event = NULL;
 if ( modifiers == CAknToolbar::ELongPress )
 {
-event = CreateEventStringL( KOpenAppByIndexAlternate, button->ShortcutId() );
+event = CreateEventStringL(
+KOpenAppByIndexAlternate, button->ShortcutId() );
 CleanupStack::PushL( event );
 }
 else
 {
-event = CreateEventStringL( KOpenAppByIndex, button->ShortcutId() );
+event = CreateEventStringL(
+KOpenAppByIndex, button->ShortcutId() );
 CleanupStack::PushL( event );
 }
 iAiFwEventHandler.HandlePluginEvent( *event );
 CleanupStack::PopAndDestroy( event );
 }
 }
 }
-void CAiToolbarRenderer::DoPublishL( MAiPropertyExtension& aPlugin,
+// ----------------------------------------------------------------------------
-TInt aContent,
+// CAiToolbarRenderer::DoPublishL()
-const TDesC16& aText,
+//
-TInt aIndex )
+// ----------------------------------------------------------------------------
-{
+//
+void CAiToolbarRenderer::DoPublishL( CHsContentPublisher& aPlugin,
+TInt aContent, const TDesC16& aText, TInt aIndex )
+{
+const THsPublisherInfo& info( aPlugin.PublisherInfo() );
 // Only interested on certain publish events
-if (  aPlugin.PublisherInfoL()->iUid == KShortcutPluginUid &&
+if ( info.Uid() == KShortcutPluginUid &&
 aContent == EAiScutContentShortcutToolbarCaption &&
 ( aIndex == EAiScutToolbarFirst ||
 aIndex == EAiScutToolbarSecond ||
 aIndex == EAiScutToolbarThird )
 )
 iCommitted = EFalse;
 }
 }
 }
-void CAiToolbarRenderer::DoPublishL( MAiPropertyExtension& aPlugin,
+// ----------------------------------------------------------------------------
-TInt aContent,
+// CAiToolbarRenderer::DoPublishL()
-const TDesC8& aBuf,
+//
-TInt aIndex )
+// ----------------------------------------------------------------------------
-{
+//
+void CAiToolbarRenderer::DoPublishL( CHsContentPublisher& aPlugin,
+TInt aContent, const TDesC8& aBuf, TInt aIndex )
+{
+const THsPublisherInfo& info( aPlugin.PublisherInfo() );
 // Only interested on certain publish events
-if (  aPlugin.PublisherInfoL()->iUid == KShortcutPluginUid &&
+if ( info.Uid() == KShortcutPluginUid &&
 aContent == EAiScutContentShortcutToolbarIcon &&
 ( aIndex == EAiScutToolbarFirst ||
 aIndex == EAiScutToolbarSecond ||
 aIndex == EAiScutToolbarThird )
 )
 // We have received stuff we cannot publish.
 User::Leave(KErrNotFound);
 }
 }
+// ----------------------------------------------------------------------------
+// CAiToolbarRenderer::ButtonL()
+//
+// ----------------------------------------------------------------------------
+//
 CAiToolbarButton* CAiToolbarRenderer::ButtonL( TInt aShortcutId )
 {
 TInt index = KErrNotFound;
 CAiToolbarButton *button = NULL;
 switch ( aShortcutId )
 button->SetShortcutId( aShortcutId );
 }
 return button;
 }
+// ----------------------------------------------------------------------------
+// CAiToolbarRenderer::TransactionCommittedL()
+//
+// ----------------------------------------------------------------------------
+//
 void CAiToolbarRenderer::TransactionCommittedL()
 {
 if ( !iCommitted )
 {
-for(TInt i = 0; i < iButtons.Count(); i++)
+for ( TInt i = 0; i < iButtons.Count(); i++ )
 {
 CAiToolbarButton *button = iButtons[i];
 if ( button && button->Icon())
 {
 // remove the old button
 }
 iCommitted = ETrue;
 }
 }
 // End of File.

branch	RCL_3
changeset 9	f966699dea19
parent 0	f72a12da539e