FCL/sf/app/commonemail: comparison emailuis/nmhswidget/src/nmhswidget.cpp

equal deleted inserted replaced

-:139d4b7b2938
+:99bcbff212ad
 * Contributors:
 *
 * Description:
 *
 */
-#include <QDebug>
 #include <QtGui>
 #include <QGraphicsLinearLayout>
 #include <hbcolorscheme.h>
 #include <QTranslator>
 #include <hbframedrawer.h>
 #include "nmmessageenvelope.h"
 #include "nmhswidgettitlerow.h"
 #include "nmhswidgetemailrow.h"
 #include "nmhswidgetconsts.h"
 #include "nmhswidgetdatetimeobserver.h"
+#include "emailtrace.h"
 NmHsWidget::NmHsWidget(QGraphicsItem *parent, Qt::WindowFlags flags)
 : HbWidget(parent, flags),
 mEngine(0),
 mRowLayout(0),
 mTitleRow(0),
 mAccountId(0),
-mAccountIconName(0),
+mAccountIconName(),
 mTranslator(0),
 mBackgroundFrameDrawer(0),
-mIsExpanded(true),
+mIsExpanded(false),
 mStaticWidget(true),
 mDateObserver(0)
 {
-qDebug() << "NmHsWidget::NmHsWidget IN -->>";
+NM_FUNCTION;
-qDebug() << "NmHsWidget::NmHsWidget OUT <<--";
 }
 /*!
 Destructor
 */
 NmHsWidget::~NmHsWidget()
 {
-qDebug() << "NmHsWidget::~NmHsWidget IN -->>";
+NM_FUNCTION;
-if(mTranslator){
 delete mTranslator;
 mTranslator = NULL;
-}
+delete mEngine;
-if(mEngine){
+mEngine = NULL;
-delete mEngine;
-mEngine = NULL;
+delete mBackgroundFrameDrawer;
-}
+mBackgroundFrameDrawer = NULL;
-if(mBackgroundFrameDrawer){
+delete mDateObserver;
-delete mBackgroundFrameDrawer;
+mDateObserver = NULL;
-mBackgroundFrameDrawer = NULL;
-}
-	if(mDateObserver){
-delete mDateObserver;
-mDateObserver = NULL;
-}
-qDebug() << "NmHsWidget::~NmHsWidget OUT <<--";
 }
 /*!
 \fn void NmHsWidget::onShow()
 called by home screen fw when widget gets visible
 */
 void NmHsWidget::onShow()
 {
-qDebug() << "NmHsWidget::onShow IN -->>";
+NM_FUNCTION;
 if (mEngine)
 {
 mEngine->activate();
 }
-qDebug() << "NmHsWidget::onShow OUT <<--";
 }
 /*!
 \fn void NmHsWidget::onHide()
 called by home screen fw when widget gets hidden
 */
 void NmHsWidget::onHide()
 {
-qDebug() << "NmHsWidget::onHide IN -->>";
+NM_FUNCTION;
 if (mEngine)
 {
 mEngine->suspend();
 }
-qDebug() << "NmHsWidget::onHide OUT <<--";
 }
 /*!
 Initializes Localization.
 /post mTranslator constructed & localization file loaded
 returns false in failure, otherwise true
 */
 bool NmHsWidget::setupLocalization()
 {
-qDebug() << "NmHsWidget::setupLocalization IN -->>";
+NM_FUNCTION;
 //Use correct localisation
 bool ret(false);
 mTranslator = new QTranslator();
 QString lang = QLocale::system().name();
 ret = mTranslator->load(KNmHsWidgetLocFileName + lang, KNmHsWidgetLocLocation);
-qDebug() << "NmHsWidget::setupLocalization mTranslator->load loadSucceed:"<<ret;
 QCoreApplication::installTranslator(mTranslator);
-qDebug() << "NmHsWidget::setupLocalization OUT <<--";
 return ret;
 }
 /*!
 Initializes UI. Everything that is not done in docml files should be here.
 return true if ok, in error false.
 */
 void NmHsWidget::setupUi()
 {
-qDebug() << "NmHsWidget::setupUi IN -->>";
+NM_FUNCTION;
 setContentsMargins( KNmHsWidgetContentsMargin, KNmHsWidgetContentsMargin,
 KNmHsWidgetContentsMargin, KNmHsWidgetContentsMargin);
 //Setup layout
 mRowLayout = new QGraphicsLinearLayout(Qt::Vertical);
 mBackgroundFrameDrawer = new HbFrameDrawer( KNmHsWidgetBackgroundImage, HbFrameDrawer::NinePieces );
 HbFrameItem* backgroundLayoutItem = new HbFrameItem( mBackgroundFrameDrawer );
 //set to NULL to indicate that ownership transferred
 mBackgroundFrameDrawer = NULL;
 setBackgroundItem( backgroundLayoutItem );
-qDebug() << "NmHsWidget::setupUi OUT -->>";
 }
 /*!
 Initializes the widget.
 called by home screen fw when widget is added to home screen
 */
 void NmHsWidget::onInitialize()
 {
-QT_TRY{
+NM_FUNCTION;
-qDebug() << "NmHsWidget::onInitialize IN -->>";
+QT_TRY{
 setupUi();
 //emit error if localization fails
 if(!setupLocalization()){
 emit error();
 return;
 	    mDateObserver = new NmHsWidgetDateTimeObserver();
 updateMailData();
 mTitleRow->updateUnreadCount(mEngine->unreadCount());
 mTitleRow->setAccountIcon(mAccountIconName);
+mTitleRow->setExpandCollapseIcon(mIsExpanded);
 //Get signals about changes in mail data
 connect(mEngine, SIGNAL( mailDataChanged() )
 ,this, SLOT( updateMailData() ) );
 	    setPreferredSize( mRowLayout->preferredSize() );
 	    if (parentWidget()) {
 	        //to place widget properly after adding to homescreen
 	        parentWidget()->resize(preferredSize());
 		}
-qDebug() << "NmHsWidget::onInitialize OUT <<--";
 }
 QT_CATCH(...){
 emit error();
 }
 called by home screen fw when widget is removed from home screen
 */
 void NmHsWidget::onUninitialize()
 {
-qDebug() << "NmHsWidget::onUninitialize IN -->>";
+NM_FUNCTION;
-qDebug() << "NmHsWidget::onUninitialize OUT <<--";
 }
 /*!
 updateMailData slot
 */
 void NmHsWidget::updateMailData()
 {
-qDebug() << "NmHsWidget::updateData IN -->>";
+NM_FUNCTION;
 QList<NmMessageEnvelope> envelopes;
 int count = 0;
 if (mIsExpanded) {
 count = mEngine->getEnvelopes(envelopes, KMaxNumberOfMailsShown);
 }
 for(int i=0; i<envelopes.count(); i++)
 {
 mMailRows[i]->updateMailData( envelopes[i] );
 }
-qDebug() << "NmHsWidget::updateData OUT <<--";
 }
 /*!
 Sets monitored account id from given string
 Needed for home screen framework which supports only QString type properties
 */
 void NmHsWidget::setAccountId(const QString &text)
 {
-qDebug() << "NmHsWidget::setAccountId IN -->>";
+NM_FUNCTION;
 bool ok;
 quint64 id = text.toULongLong(&ok);
 if (!ok)
 {
-qDebug() << "NmHsWidget::setAccountId: invalid account ID data, signal finished()!!!";
+NM_ERROR(1,"NmHsWidget::setAccountId: invalid account ID data, signal finished()!!!");
 //No valid account id so give up
 emit finished();
 }
 else
 {
 mAccountId.setId(id);
 }
-qDebug() << "NmHsWidget::setAccountId OUT <<--";
 }
 /*!
 Returns monitored account id as a string
 Needed for home screen framework which supports only QString type properties
 */
 QString NmHsWidget::accountId() const
 {
-qDebug() << "NmHsWidget::accountId()";
+NM_FUNCTION;
 return QString::number(mAccountId.id());
 }
 /*!
 Sets monitored account icon name from given string
 */
 void NmHsWidget::setAccountIconName(const QString &text)
 {
-qDebug() << "NmHsWidget::setAccountIconName IN -->>";
+NM_FUNCTION;
 mAccountIconName = text;
-qDebug() << "NmHsWidget::setAccountIconName OUT <<--";
 }
 /*!
 Returns monitored account icon name
 */
 QString NmHsWidget::accountIconName() const
 {
-qDebug() << "NmHsWidget::accountIconName()";
+NM_FUNCTION;
 return mAccountIconName;
 }
 /*!
 Slot to handle expand/collapse trigger event
 */
 void NmHsWidget::handleExpandCollapseEvent()
 {
-qDebug() << "NmHsWidget::handleExpandCollapseEvent IN -->>";
+NM_FUNCTION;
 toggleExpansionState();
-qDebug() << "NmHsWidget::handleExpandCollapseEvent OUT <<--";
 }
 /*!
 Sets widget expand/collapse state
 /post widget expansion state is changed
 */
 void NmHsWidget::toggleExpansionState()
 {
-qDebug() << "NmHsWidget::setExpanded IN -->>";
+NM_FUNCTION;
 mIsExpanded = !mIsExpanded;
 //save new state to home screen
 QStringList propertiesList;
 emit setPreferences(propertiesList);
 //handle state change drawing
 updateMailData();
-qDebug() << "NmHsWidget::setExpanded OUT <<--";
+mTitleRow->setExpandCollapseIcon(mIsExpanded);
 }
 /*!
 Sets expand/collapse state from given string (needed by homescreen)
 */
 void NmHsWidget::setWidgetStateProperty(QString value)
 {
-qDebug() << "NmHsWidget::setWidgetStateProperty IN -->>";
+NM_FUNCTION;
 if (value == KNmHsWidgetStateCollapsed)
 {
 mIsExpanded = false;
 }
 else
 {
 mIsExpanded = true;
 }
-qDebug() << "NmHsWidget::setWidgetStateProperty OUT <<--";
 }
 /*!
 Returns widget expand/collapse state as string (needed by homescreen)
 */
 QString NmHsWidget::widgetStateProperty()
 {
-qDebug() << "NmHsWidget::widgetStateProperty()";
+NM_FUNCTION;
 if (mIsExpanded)
 {
 return KNmHsWidgetStateExpanded;
 }
 else
 /param mailCount defines how many mail rows is needed
 /post mMailRows list includes NmHsWidgetEmailRow for each mail item
 */
 void NmHsWidget::updateMailRowsList(const int mailCount)
 {
-qDebug() << "NmHsWidget::updateMailRowsList IN -->>";
+NM_FUNCTION;
-qDebug() << "NmHsWidget - mMailRows.count() == " <<  mMailRows.count();
-qDebug() << "NmHsWidget - ordered count == " <<  mailCount;
 int neededRowsCount = mailCount;
 //force size when static and expanded
 if (mStaticWidget && mIsExpanded)
 {
 while (mMailRows.count() != neededRowsCount)
 {
 //more mails to show than rows
 if (mMailRows.count() < neededRowsCount)
 {
-qDebug() << "NmHsWidget - add new mail row";
 NmHsWidgetEmailRow *row = new NmHsWidgetEmailRow();
 if( !row->loadDocML()){
-qDebug() << "NmHsWidget::updateMailRowsList row->loadDocML() fails";
+NM_ERROR(1,"NmHsWidget::updateMailRowsList row->loadDocML() fails");
 //if docml loading fails no point to proceed
 //but memoryleak must be prevented
 delete row;
 row = NULL;
 emit error();
 mRowLayout->addItem(row);
 }
 //too many rows
 else if (mMailRows.count() > neededRowsCount)
 {
-qDebug() << "NmHsWidget - remove mail row";
 mRowLayout->removeItem(mMailRows.last());
 delete mMailRows.takeLast();
 }
 }
 __ASSERT_ALWAYS( mMailRows.count() == neededRowsCount, User::Panic(_L("Invalid"), 500) );
 if (mStaticWidget)
 {
 this->updateMailRowsVisibility(mailCount);
 }
-qDebug() << "NmHsWidget::updateMailRowsList OUT <<--";
 }
 /*!
 Updates mail row visibilities in static widget
 /param visibleCount defines how many items do have mail data
 /post all row items having mail data are visible, other rows are hidden
 */
 void NmHsWidget::updateMailRowsVisibility(const int visibleCount)
 {
-qDebug() << "NmHsWidget::updateMailRowsVisibility IN -->>";
+NM_FUNCTION;
 // set visible as many rows as requested by visibleCount param
 bool isVisible;
 for (int i=0; i < mMailRows.count(); i++)
 {
 {
 isVisible = true;
 }
 mMailRows.at(i)->setVisible(isVisible);
 }
-qDebug() << "NmHsWidget::updateMailRowsVisibility OUT <<--";
 }
 /*!
 onEngineException (NmHsWidgetEmailEngineExceptionCode exc)
 signals widget to be finalized
 /param exc exception type
 */
 void NmHsWidget::onEngineException(const int& exc)
 {
-qDebug() << "NmHsWidget:onEngineException IN -->>";
+NM_FUNCTION;
 switch (exc)
 {
 case (NmEngineExcAccountDeleted):
 emit finished(); //succesful ending
 break;

changeset 43	99bcbff212ad
parent 23	2dc6caa42ec3
child 47	f83bd4ae1fe3
child 54	997a02608b3a