phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp
changeset 30 ebdbd102c78a
parent 27 2f8f8080a020
child 51 f39ed5e045e0
--- a/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp	Mon May 03 12:31:11 2010 +0300
+++ b/phoneapp/phoneuiqtviewadapter/src/phoneresourceadapter.cpp	Fri May 14 15:51:57 2010 +0300
@@ -286,7 +286,7 @@
         VA_LIST list;
         VA_START (list, symbianResourceId);
         int intValue = VA_ARG (list, int);
-        text->setText(hbTrId("txt_phone_other_call_ln", intValue));
+        text->setText(hbTrId("txt_phone_other_call_ln").arg(intValue));
         translatedActions [PhoneAction::Text] = text;
         VA_END (list);
         }
@@ -383,7 +383,32 @@
         VA_END (list);
         }
         break;
-        
+    case R_PHONE_IMEI_STRING:
+        {
+        QScopedPointer<PhoneAction> text(new PhoneAction);
+        VA_LIST list;
+        VA_START(list, symbianResourceId);
+        const TDesC *string = static_cast<TDesC*>(VA_ARG(list, TDesC*));
+        QString serialNumber = 
+            QString::fromUtf16(string->Ptr(), string->Length());
+        text->setText(hbTrId("txt_phone_info_serial_no").arg(serialNumber));
+        translatedActions[PhoneAction::Text] = text.take();
+        VA_END(list);
+        }
+        break;
+    case R_PHONEUI_LIFE_TIMER_STRING:
+        {
+        QScopedPointer<PhoneAction> text(new PhoneAction);
+        VA_LIST list;
+        VA_START(list, symbianResourceId);
+        const TDesC *string = static_cast<TDesC*>(VA_ARG(list, TDesC*));
+        QString lifeTimerText =
+            QString::fromUtf16(string->Ptr(), string->Length());
+        text->setText(hbTrId("txt_phone_info_life_timer").arg(lifeTimerText));
+        translatedActions[PhoneAction::Text] = text.take();
+        VA_END(list);
+        }
+        break;
     default:
         break;
     }
@@ -523,7 +548,7 @@
 
 int PhoneResourceAdapter::defaultToolbarResourceId() const
 {
-    return R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA;
+    return R_PHONEUI_INCALL_DIALER_CBA; //R_PHONEUI_CALLHANDLING_INCOMINGCALL_CBA;
 }
 
 QString PhoneResourceAdapter::convertCommandToString(