FCL/sf/app/contacts: comparison contactwidgethsplugin/contactwidgeths/src/contactwidgeths.cpp

equal deleted inserted replaced

-:7cbcb2896f0e
+:a642906a277a
 #include "contactwidgeths.h"
 #include "commlauncherwidget.h"
 #include "ihswidgetpreferenceservice.h"
+const QString translationsPath = "/resource/qt/translations/";
+const QString translationsFile = "contactwidgethsplugin";
 const QString defaultAvatar = "qtg_large_avatar";
 const QString addContactAvatar = "qtg_small_add";
 const QString normalFrameName = "qtg_fr_hsshortcut_normal";
 const QString normalTextColor = "qtc_hs_list_item_title_normal";
 const QString latchedFrameName = "qtg_fr_hsitems_latched";
 mThumbnailPixmap(QPixmap()),
 mThumbnailInProgress(false),
 mTranslator(0)
 {
 // Localization file loading
-	mTranslator = new HbTranslator();
+	mTranslator = new HbTranslator(translationsPath, translationsFile);
 	mTranslator->loadCommon();
 // UI creation done in onInitialize()
 if (mainWindow()) {
 mMainWindow = mainWindow();
 /*!
 Destructor
 */
 ContactWidgetHs::~ContactWidgetHs()
 {
-delete mLauncher;
+	if (mLauncher)
-delete mContactManager;
+		{
-delete mAppManager;
+		delete mLauncher;
-delete mAvatar;
+		}
-// Deleting request cancels all pending requests
+if (mContactManager)
-delete mContactSelectRequest;
+	{
-//,,first cancel?
+	delete mContactManager;
-delete mThumbnailManager;
+	}
-delete mTranslator;
+if (mAppManager)
+	{
+	delete mAppManager;
+	}
+if (mAvatar)
+	{
+	delete mAvatar;
+	}
+// Deleting request cancels all pending requests
+if (mContactSelectRequest)
+	{
+	delete mContactSelectRequest;
+	}
+if (mThumbnailManager)
+	{
+	delete mThumbnailManager;
+	}
+if (mTranslator)
+	{
+	delete mTranslator;
+	}
 }
 /*!
 Updates the UI based on data from current contact
 */
 QStyleOptionGraphicsItem *item = new QStyleOptionGraphicsItem;
 avatarDrawer->paint(&painter, QRectF(0, 0, contactIconSize, contactIconSize));
 painter.end();
 qDebug() << "setContactImage av 2"; //,,
+int maxSize = (inputPixmap.width() > inputPixmap.height() ? inputPixmap.width():inputPixmap.height());
+int minSize = (inputPixmap.width() < inputPixmap.height() ? inputPixmap.width():inputPixmap.height());
+int sizeFrom = maxSize - minSize;
 // We may draw the icon when thumnail processing is still in progress,
 // so can't show the thumbnail yet.
 	if (inputPixmap.width()>0) {
+		if (inputPixmap.width() < inputPixmap.height())
+		{
+		QPixmap pm3 = inputPixmap.copy(0,sizeFrom/2,minSize,minSize);
+		QPixmap pm2 = pm3.scaled( QSize(contactIconSize, contactIconSize), Qt::KeepAspectRatio );
+		qDebug() << "pm2 " << pm2.width() << " " << pm2.height();
+		avatarPixmap = pm2;
+		}
+		else if (inputPixmap.width() > inputPixmap.height())
+		{
+		QPixmap pm3 = inputPixmap.copy(sizeFrom/2,0,minSize,minSize);
+		QPixmap pm2 = pm3.scaled( QSize(contactIconSize, contactIconSize), Qt::KeepAspectRatio );
+		qDebug() << "pm2 " << pm2.width() << " " << pm2.height();
+		avatarPixmap = pm2;
+}else
+{
 		QPixmap pm2 = inputPixmap.scaled( QSize(contactIconSize, contactIconSize), Qt::IgnoreAspectRatio );
 		qDebug() << "pm2 " << pm2.width() << " " << pm2.height();
 		avatarPixmap = pm2; //
+}
 	}
 HbIcon *avatarIcon = new HbIcon(QIcon(avatarPixmap));
 mAvatarIconItem->setIcon(*avatarIcon);
+mAvatarIconItem->setSize(QSize(contactIconSize, contactIconSize));
+mAvatarIconItem->setAspectRatioMode(Qt::KeepAspectRatio);
 // Then display the new image
 update();
 qDebug() << "setContactImage av 3"; //,,
 Implemented to receive mouse press events.
 Otherwise these events will propagate to any topmost item beneath this item.
 */
 void ContactWidgetHs::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-if (event && event->type() == QEvent::GraphicsSceneMousePress) {
+	Q_UNUSED(event);
+}
+/*!
+\fn void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+Widget start is triggered from release \a event.
+\sa
+*/
+void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+{
+	qDebug() << "mouseReleaseEvent event->type() = " << (int)event->type();
+	//Q_UNUSED(event);
+if (event && event->type() == QEvent::GraphicsSceneMouseRelease) {
 // If the widget doesn't have contact yet and
 // there are contacts, select one.
 if (mContactLocalId == unUsedContactId) {
 if (contactsExist()) {
 launchSingleContactSelecting();
 qDebug() << "after exec rect() " << mLauncherRect;
 }
 }
 }
-/*!
-\fn void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
-Widget start is triggered from release \a event.
-\sa
-*/
-void ContactWidgetHs::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
-{
-Q_UNUSED(event);
-}
 // Store contact data to member variables and to UI
 void ContactWidgetHs::getContactData()
 {
 if (!mContactManager) {
 Called when the widget is hidden.
 This method is needed. Otherwise the widget cannot be added to HS.
 */
 void ContactWidgetHs::onHide()
 {
 qDebug() << "ContactWidgetHs::onHide()";
+// close the launcher if it's open
+if (mLauncher->isVisible()) {
+mLauncher->close();
+}
 }
 /*!
 Orientation changed slot
 qDebug() << "ContactWidgetHs::onContactsRemoved, removed count " << contactIds.count();
 int i;
 for(i=0; i<contactIds.count(); i++) {
 if (contactIds.at(i) == mContactLocalId) {
 qDebug() << "-deleting widget with removed contact " << mContactLocalId;
-// TODO this deletes the widget. Can we always delete the object immediately?
+mAvatarIconItem->deleteLater();
+mContactNameLabel->deleteLater();
+mAppManager->deleteLater();
+mLauncher->deleteLater();
+mContactLocalId = unUsedContactId;
+delete mAvatar;
+mContactHasAvatarDetail = false;
+mContactManager->deleteLater();
+mThumbnailManager->deleteLater();
 emit finished();
 break;
 }
 }
 }

changeset 59	a642906a277a
parent 47	7cbcb2896f0e
child 71	7cc7d74059f9