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

equal deleted inserted replaced

-:98b66e4fb0be
+:26b6f0522fd8
 #include <hblabel.h>
 #include <hbpushbutton.h>
 #include <hbcombobox.h>
 #include <hbprogressbar.h>
 #include <QPixmap>
-#include <QDir>
+#include <qsysteminfo.h>                    // QSystemStorageInfo
-#include <QFileInfoList>
+QTM_USE_NAMESPACE
 #if defined(Q_OS_SYMBIAN)
+#include <driveinfo.h>                      // DriveInfo
 #include <fbs.h>                            // CFbsBitmap
 #endif  // Q_OS_SYMBIAN
-// See definitions in sifuidevicedialogplugin.qrc
+const char KSifUiDefaultApplicationIcon[] = "qtg_large_application.svg";
-const char KSifUiDialogIconAppDefault[] = ":/default_app_icon.svg";
+const int KSifUiKilo = 1024;
+const int KSifUiMega = 1024*1024;
 const int KAppNameIndex = 0;
 const int KAppSizeIndex = 1;
+enum TSifUiDriveName {
+EUnknown,
+EPhoneMemory,
+EMassStorage,
+EMemoryCard
+};
 // ======== LOCAL FUNCTIONS ========
 // ----------------------------------------------------------------------------
 }
 #endif // Q_OS_SYMBIAN
 return bitmap;
 }
+// ----------------------------------------------------------------------------
+// driveName()
+// ----------------------------------------------------------------------------
+//
+TSifUiDriveName driveName(const QChar& volume)
+{
+#if defined(Q_OS_SYMBIAN)
+int err = 0;
+TChar drive;
+err = DriveInfo::GetDefaultDrive(DriveInfo::EDefaultPhoneMemory, drive);
+if (!err && volume.toAscii() == drive) {
+return EPhoneMemory;
+}
+err = DriveInfo::GetDefaultDrive(DriveInfo::EDefaultMassStorage, drive);
+if (!err && volume.toAscii() == drive) {
+return EMassStorage;
+}
+err = DriveInfo::GetDefaultDrive(DriveInfo::EDefaultRemovableMassStorage, drive);
+if (!err && volume.toAscii() == drive) {
+return EMemoryCard;
+}
+#endif  // Q_OS_SYMBIAN
+return EUnknown;
+}
 // ======== MEMBER FUNCTIONS ========
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::SifUiDialogContentWidget()
 Q_ASSERT(mStackedWidget == 0);
 mStackedWidget = new HbStackedWidget;
 Q_ASSERT(mMemorySelection == 0);
 mMemorySelection = new HbComboBox;
-connect(mMemorySelection, SIGNAL(currentIndexChanged(const QString &)),
+connect(mMemorySelection, SIGNAL(currentIndexChanged(int)),
-this, SIGNAL(memorySelectionChanged(const QString &)));
+this, SIGNAL(handleMemorySelectionChange(int)));
 mStackedWidget->addWidget(mMemorySelection);
 Q_ASSERT(mProgressBar == 0);
 mProgressBar = new HbProgressBar;
 mProgressBar->setRange(0,0);    // busy indicator by default
 Q_ASSERT(mErrorText == 0);
 mErrorText = new HbLabel;
 mStackedWidget->addWidget(mErrorText);
 mMainLayout->addItem(mStackedWidget);
-updateMemorySelection(parameters);
+if (!updateErrorText(parameters) &&
-updateProgressBar(parameters);
+!updateProgressBar(parameters) &&
-updateErrorText(parameters);
+!updateMemorySelection(parameters)) {
+mStackedWidget->hide();
+}
 setLayout(mMainLayout);
 }
 // ----------------------------------------------------------------------------
 removeDetails();
 addDetails(parameters.value(KSifUiApplicationDetails).toStringList());
 }
 // Stacked widgets: memory selection, progress bar and error text
-updateMemorySelection(parameters);
+if (updateErrorText(parameters) ||
-updateProgressBar(parameters);
+updateProgressBar(parameters) ||
-updateErrorText(parameters);
+updateMemorySelection(parameters)) {
+if (!mStackedWidget->isVisible()) {
+mStackedWidget->show();
+}
+} else {
+if (mStackedWidget->isVisible()) {
+mStackedWidget->hide();
+}
+}
 }
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::changeType()
 // ----------------------------------------------------------------------------
 currentValue = mProgressBar->progressValue();
 }
 }
 // ----------------------------------------------------------------------------
+// SifUiDialogContentWidget::handleMemorySelectionChange()
+// ----------------------------------------------------------------------------
+//
+void SifUiDialogContentWidget::handleMemorySelectionChange(int selectedIndex)
+{
+QChar selectedDrive = mDriveLetterList[selectedIndex][0];
+// TODO: save selected drive to cenrep
+emit memorySelectionChanged( selectedDrive );
+}
+// ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::applicationName()
 // ----------------------------------------------------------------------------
 //
 QString SifUiDialogContentWidget::applicationName(const QVariantMap &parameters)
 {
 {
 QString appSize = "";
 if (parameters.contains(KSifUiApplicationSize)) {
 uint size = parameters.value(KSifUiApplicationSize).toUInt();
 if (size > 0) {
-if (size > KMega) {
+if (size > KSifUiMega) {
 //: Application size in SW install confirmation query, %1 is in megabytes
 // TODO: enable when translations ready
-//appSize = hbTrId("txt_sisxui_install_appsize_mb").arg(size/KMega);
+//appSize = hbTrId("txt_sisxui_install_appsize_mb").arg(size/KSifUiMega);
-appSize = tr("Size: %1 MB").arg(size/KMega);
+appSize = tr("%1 MB").arg(size/KSifUiMega);
-} else if(size > KKilo) {
+} else if(size > KSifUiKilo) {
 //: Application size in SW install confirmation query, %1 is in kilobytes
 // TODO: enable when translations ready
-//appSize = hbTrId("txt_sisxui_install_appsize_kb").arg(size/KKilo);
+//appSize = hbTrId("txt_sisxui_install_appsize_kb").arg(size/KSifUiKilo);
-appSize = tr("Size: %1 kB").arg(size/KKilo);
+appSize = tr("%1 kB").arg(size/KSifUiKilo);
 } else {
 //: Application size in SW install confirmation query, %1 is in bytes
 // TODO: enable when translations ready
 //appSize = hbTrId("txt_sisxui_install_appsize_b").arg(size);
-appSize = tr("Size: %1 B").arg(size);
+appSize = tr("%1 B").arg(size);
 }
 }
 }
 return appSize;
 }
 pixmap.setAlphaChannel(QPixmap::fromSymbianCFbsBitmap(mMask));
 }
 mAppIcon->setIcon(HbIcon(pixmap));
 } else {
 if (mAppIcon->icon().isNull()) {
-mAppIcon->setIcon(HbIcon(KSifUiDialogIconAppDefault));
+mAppIcon->setIcon(HbIcon(KSifUiDefaultApplicationIcon));
 }
 }
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::updateMemorySelection()
 // ----------------------------------------------------------------------------
 //
-void SifUiDialogContentWidget::updateMemorySelection(const QVariantMap &parameters)
+bool SifUiDialogContentWidget::updateMemorySelection(const QVariantMap &parameters)
 {
 if (parameters.contains(KSifUiMemorySelection)) {
+QString drives = parameters.value(KSifUiMemorySelection).toString();
-// TODO: get user visible drives, icons for them, and free sizes
+mDriveLetterList = drives.split(",");
-// it might be better to get this list from Symbian-side via SifUi API
 QStringList driveList;
-QFileInfoList driveInfoList = QDir::drives();
+QSystemStorageInfo info;
-foreach(const QFileInfo &driveInfo, driveInfoList) {
+QStringList volumeList = info.logicalDrives();
-const QChar driveName = driveInfo.absolutePath()[0];
+foreach (QString volume, volumeList) {
-switch (driveName.toAscii()) {
+if (mDriveLetterList.contains(volume)) {
-case 'C':
+qlonglong size = info.availableDiskSpace(volume);
-driveList << "C: Phone memory";
+switch (driveName(volume[0])) {
+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
+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
+driveList.append(tr("%1: Device (%L2 kB free)"
+).arg(volume).arg(size/KSifUiKilo));
+}
 break;
-case 'E':
+case EMassStorage:
-driveList << "E: Mass memory";
+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
+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
+driveList.append(tr("%1: Mass.mem (%L2 kB free)"
+).arg(volume).arg(size/KSifUiKilo));
+}
 break;
-case 'F':
+case EMemoryCard:
-driveList << "F: Memory card";
+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
+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
+driveList.append(tr("%1: Mem.card (%L2 kB free)"
+).arg(volume).arg(size/KSifUiKilo));
+}
 break;
 default:
 break;
+}
 }
 }
 mMemorySelection->setItems(driveList);
 mStackedWidget->setCurrentWidget(mMemorySelection);
 // TODO: set selected item, read the default from cenrep
-}
+return true;
+}
+return false;
 }
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::updateProgressBar()
 // ----------------------------------------------------------------------------
 //
-void SifUiDialogContentWidget::updateProgressBar(const QVariantMap &parameters)
+bool SifUiDialogContentWidget::updateProgressBar(const QVariantMap &parameters)
 {
 bool progressBarChanged = false;
 if (parameters.contains(KSifUiProgressNoteFinalValue)) {
 mProgressBar->setMaximum(parameters.value(KSifUiProgressNoteFinalValue).toInt());
 progressBarChanged = true;
 progressBarChanged = true;
 }
 if (progressBarChanged) {
 mStackedWidget->setCurrentWidget(mProgressBar);
 }
+return progressBarChanged;
 }
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::updateErrorText()
 // ----------------------------------------------------------------------------
 //
-void SifUiDialogContentWidget::updateErrorText(const QVariantMap &parameters)
+bool SifUiDialogContentWidget::updateErrorText(const QVariantMap &parameters)
 {
 if (parameters.contains(KSifUiErrorCode)) {
 // TODO: proper error texts
 QString errorText = tr("Error %1").arg(parameters.value(KSifUiErrorCode).toInt());
 mErrorText->setPlainText(errorText);
 mStackedWidget->setCurrentWidget(mErrorText);
-}
+return true;
 }
+return false;
+}

changeset 29	26b6f0522fd8
parent 25	98b66e4fb0be
child 37	6e7b00453237