equal
deleted
inserted
replaced
41 #define LOC_FAILED_MULTIPLE_MESSAGES hbTrId("Failed Messages") |
41 #define LOC_FAILED_MULTIPLE_MESSAGES hbTrId("Failed Messages") |
42 #define LOC_OUTGOING_SINGLE_MESSAGE hbTrId("Outgoing Message") |
42 #define LOC_OUTGOING_SINGLE_MESSAGE hbTrId("Outgoing Message") |
43 #define LOC_OUTGOING_MULTIPLE_MESSAGES hbTrId("Outgoing Messages") |
43 #define LOC_OUTGOING_MULTIPLE_MESSAGES hbTrId("Outgoing Messages") |
44 #define STATUS_MONO_NEW_MESSAGE QString("qtg_status_new_message") |
44 #define STATUS_MONO_NEW_MESSAGE QString("qtg_status_new_message") |
45 #define LOC_BUSINESSCARD hbTrId("Business card") |
45 #define LOC_BUSINESSCARD hbTrId("Business card") |
|
46 #define LOC_MULTIMEDIA_MSG hbTrId("txt_messaging_list_indimenu_multimedia_message") |
46 /** |
47 /** |
47 * The number of indicators. |
48 * The number of indicators. |
48 */ |
49 */ |
49 static const int MsgIndicatorCount = 4; |
50 static const int MsgIndicatorCount = 4; |
50 |
51 |
119 MsgIndicator::MsgIndicator(const QString &indicatorType) : |
120 MsgIndicator::MsgIndicator(const QString &indicatorType) : |
120 HbIndicatorInterface(indicatorType, HbIndicatorInterface::NotificationCategory, |
121 HbIndicatorInterface(indicatorType, HbIndicatorInterface::NotificationCategory, |
121 InteractionActivated), |
122 InteractionActivated), |
122 mIndicatorType(NULL) |
123 mIndicatorType(NULL) |
123 { |
124 { |
124 d_ptr = new MsgIndicatorPrivate(this); |
125 d_ptr = q_check_ptr(new MsgIndicatorPrivate(this)); |
125 } |
126 } |
126 |
127 |
127 // ---------------------------------------------------------------------------- |
128 // ---------------------------------------------------------------------------- |
128 // MsgIndicator::~MsgIndicator |
129 // MsgIndicator::~MsgIndicator |
129 // @see msgindicator.h |
130 // @see msgindicator.h |
319 if (ECsBlueTooth == info.mMessageType) { |
320 if (ECsBlueTooth == info.mMessageType) { |
320 QFileInfo fname(secondaryText); |
321 QFileInfo fname(secondaryText); |
321 secondaryText = fname.fileName(); |
322 secondaryText = fname.fileName(); |
322 } |
323 } |
323 else if(ECsBioMsg_VCard == info.mMessageType) { |
324 else if(ECsBioMsg_VCard == info.mMessageType) { |
324 secondaryText = LOC_BUSINESSCARD; |
325 secondaryText = LOC_BUSINESSCARD; |
|
326 } |
|
327 else if (secondaryText.isEmpty() && |
|
328 (ECsMMS == info.mMessageType || ECsAudio == info.mMessageType)) { |
|
329 secondaryText = LOC_MULTIMEDIA_MSG; |
325 } |
330 } |
326 } |
331 } |
327 else { |
332 else { |
328 info.mConversationId = -100; |
333 info.mConversationId = -100; |
329 } |
334 } |