FCL/sf/mw/appinstall: comparison appinstaller/AppinstUi/sifuidevicedialogplugin/src/sifuidialogcontentwidget.cpp

equal deleted inserted replaced

-:d17dc5398051
+:329d304c1aa1
 iconAndAppLayout->addItem(mAppIcon);
 // Application name and version
 Q_ASSERT(mAppDetailsLayout == 0);
 mAppDetailsLayout = new QGraphicsLinearLayout(Qt::Vertical);
-Q_ASSERT(mAppName == 0);
+createAppName(applicationName(parameters));
-mAppName = new HbLabel(applicationName(parameters));
 mAppDetailsLayout->addItem(mAppName);
 // Application size
 Q_ASSERT(mAppSize == 0);
 updateAppSize(parameters);
 if (mAppName) {
 if (mAppName->plainText() != appNameStr) {
 mAppName->setPlainText(appNameStr);
 }
 } else {
-HbLabel *appName = new HbLabel(appNameStr);
+createAppName(appNameStr);
-mAppDetailsLayout->insertItem(KAppNameIndex, appName);
+mAppDetailsLayout->insertItem(KAppNameIndex, mAppName);
-mAppName = appName;
 }
 }
 // Application size
 updateAppSize(parameters);
 //
 void SifUiDialogContentWidget::addDetail(const QString &detailText)
 {
 Q_ASSERT(mAppDetailsLayout != 0);
 HbLabel *detailItem = new HbLabel(detailText);
+detailItem->setTextWrapping(Hb::TextWordWrap);
+detailItem->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
 mAppDetailsLayout->addItem(detailItem);
+}
+// ----------------------------------------------------------------------------
+// SifUiDialogContentWidget::createAppName()
+// ----------------------------------------------------------------------------
+//
+void SifUiDialogContentWidget::createAppName(const QString &appName)
+{
+Q_ASSERT(mAppName == 0);
+mAppName = new HbLabel(appName);
+mAppName->setTextWrapping(Hb::TextWordWrap);
+mAppName->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
 }
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::updateAppIcon()
 // ----------------------------------------------------------------------------
 if (mAppSize->plainText() != appSizeStr) {
 mAppSize->setPlainText(appSizeStr);
 }
 } else {
 HbLabel *appSize = new HbLabel(appSizeStr);
+appSize->setTextWrapping(Hb::TextWordWrap);
+appSize->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
 mAppDetailsLayout->insertItem(KAppSizeIndex, appSize);
 mAppSize = appSize;
 }
 }
 }
 case EPhoneMemory:
 if (size > KSifUiMega) {
 //: Drive name for internal phone memory with megabytes of free space.
 //: %1 is replaced with drive letter (usually 'C')
 //: %2 is replaced with available free space (in megabytes, MB)
-//TODO: use hbTrId("txt_sisxui_device_memory_mb") when available
+//TODO: enable when available
+//driveList.append(hbTrId("txt_installer_device_memory_mb")
+//    .arg(volume).arg(size/KSifUiMega));
 driveList.append(tr("%1: Device (%L2 MB free)"
 ).arg(volume).arg(size/KSifUiMega));
 } else {
 //: Drive name for internal phone memory with kilobytes of free space.
 //: %1 is replaced with drive letter (usually 'C')
 //: %2 is replaced with available free space (in kilobytes, kB)
-//TODO: use hbTrId("txt_sisxui_device_memory_kb") when available
+//TODO: enable when available
+//driveList.append(hbTrId("txt_installer_device_memory_kb")
+//    .arg(volume).arg(size/KSifUiKilo));
 driveList.append(tr("%1: Device (%L2 kB free)"
 ).arg(volume).arg(size/KSifUiKilo));
 }
 break;
 case EMassStorage:
 if (size > KSifUiMega) {
 //: Drive name for mass storage with megabytes of free space.
 //: %1 is replaced with drive letter (usually 'E')
 //: %2 is replaced with available free space (in megabytes, MB)
-// TODO: use hbTrId("txt_sisxui_mass_storage_mb") when available
+// TODO: enable when available
+//driveList.append(hbTrId("txt_installer_mass_storage_mb")
+//    .arg(volume).arg(size/KSifUiMega));
 driveList.append(tr("%1: Mass.mem (%L2 MB free)"
 ).arg(volume).arg(size/KSifUiMega));
 } else {
 //: Drive name for mass storage with kilobytes of free space.
 //: %1 is replaced with drive letter (usually 'E')
 //: %2 is replaced with available free space (in kilobytes, kB)
-// TODO: use hbTrId("txt_sisxui_mass_storage_kb") when available
+// TODO: enable when available
+//driveList.append(hbTrId("txt_installer_mass_storage_kb")
+//    .arg(volume).arg(size/KSifUiKilo));
 driveList.append(tr("%1: Mass.mem (%L2 kB free)"
 ).arg(volume).arg(size/KSifUiKilo));
 }
 break;
 case EMemoryCard:
 if (size > KSifUiMega) {
 //: Drive name for memory card with megabytes of free space.
 //: %1 is replaced with drive letter (usually 'F')
 //: %2 is replaced with available free space (in megabytes, MB)
-// TODO: use hbTrId("txt_sisxui_memory_card_mb") when available
+// TODO: enable when available
+//driveList.append(hbTrId("txt_installer_memory_card_mb")
+//    .arg(volume).arg(size/KSifUiMega));
 driveList.append(tr("%1: Mem.card (%L2 MB free)"
 ).arg(volume).arg(size/KSifUiMega));
 } else {
 //: Drive name for memory card with kilobytes of free space.
 //: %1 is replaced with drive letter (usually 'F')
 //: %2 is replaced with available free space (in kilobytes, kB)
-// TODO: use hbTrId("txt_sisxui_memory_card_kb") when available
+// TODO: enable when available
+//driveList.append(hbTrId("txt_installer_memory_card_kb")
+//    .arg(volume).arg(size/KSifUiKilo));
 driveList.append(tr("%1: Mem.card (%L2 kB free)"
 ).arg(volume).arg(size/KSifUiKilo));
 }
 break;
 default:

changeset 44	329d304c1aa1
parent 42	d17dc5398051
child 55	ac7f90a6ff4c
child 60	245df5276b97