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

equal deleted inserted replaced

-:ae54820ef82c
+:245df5276b97
 #include <hbpushbutton.h>
 #include <hbcombobox.h>
 #include <hbprogressbar.h>
 #include <QPixmap>
 #include <qsysteminfo.h>                    // QSystemStorageInfo
-QTM_USE_NAMESPACE
+#include <qvaluespacepublisher.h>           // QValueSpacePublisher
+#include <qvaluespacesubscriber.h>          // QValueSpaceSubscriber
 #if defined(Q_OS_SYMBIAN)
 #include <driveinfo.h>                      // DriveInfo
 #include <fbs.h>                            // CFbsBitmap
 #endif  // Q_OS_SYMBIAN
+QTM_USE_NAMESPACE
 const char KSifUiDefaultApplicationIcon[] = "qtg_large_application";
 const char KSifUiErrorIcon[] = "qtg_large_warning";
 const int KSifUiKilo = 1024;
 const int KSifUiMega = 1024*1024;
 const int KAppNameIndex = 0;
 const int KAppSizeIndex = 1;
 enum TSifUiDriveName {
-EUnknown,
 EPhoneMemory,
 EMassStorage,
-EMemoryCard
+EMemoryCard,
+EOtherDrive
 };
+const char KInitialDefaultDrive = 'C';
+// Path and value name for QValueSpacePublisher/QValueSpaceSubscriber.
+const QString KSifUiCenRepPath = "/KCRUIDSifUiDefaults";
+const QString KSifUiCenRepDefaultDrive = "KCRUIDSifUiDefaultDrive";
+// TODO: replace with proper logging
+#ifdef _DEBUG
+#define FLOG1(x)        qDebug() << (x)
+#define FLOG2(x,y)      qDebug() << (x) << (y)
+#define FLOG3(x,y,z)    qDebug() << (x) << (y) << (z)
+#else
+#define FLOG1(x)
+#define FLOG2(x,y)
+#define FLOG3(x,y,z)
+#endif
 // ======== LOCAL FUNCTIONS ========
 // ----------------------------------------------------------------------------
 err = DriveInfo::GetDefaultDrive(DriveInfo::EDefaultRemovableMassStorage, drive);
 if (!err && volume.toAscii() == drive) {
 return EMemoryCard;
 }
 #endif  // Q_OS_SYMBIAN
-return EUnknown;
+return EOtherDrive;
 }
 // ======== MEMBER FUNCTIONS ========
 SifUiDialogContentWidget::SifUiDialogContentWidget(QGraphicsItem *parent,
 Qt::WindowFlags flags) : HbWidget(parent, flags),
 mAppIcon(0), mAppName(0), mAppSize(0),
 mMainLayout(0), mAppDetailsLayout(0), mStackedWidget(0),
 mMemorySelection(0), mProgressBar(0), mErrorText(0),
-mBitmap(0), mMask(0)
+mBitmap(0), mMask(0), mPublisher(0), mSubscriber(0)
 {
 }
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::~SifUiDialogContentWidget()
 // SifUiDialogContentWidget::constructFromParameters()
 // ----------------------------------------------------------------------------
 //
 void SifUiDialogContentWidget::constructFromParameters(const QVariantMap &parameters)
 {
+FLOG1("SifUiDialogContentWidget::constructFromParameters");
 Q_ASSERT(mMainLayout == 0);
 mMainLayout = new QGraphicsLinearLayout(Qt::Vertical);
 // Application icon
 QGraphicsLinearLayout *iconAndAppLayout = new QGraphicsLinearLayout(Qt::Horizontal);
 Q_ASSERT(mStackedWidget == 0);
 mStackedWidget = new HbStackedWidget;
 Q_ASSERT(mMemorySelection == 0);
 mMemorySelection = new HbComboBox;
-connect(mMemorySelection, SIGNAL(currentIndexChanged(int)),
-this, SLOT(handleMemorySelectionChange(int)));
 mStackedWidget->addWidget(mMemorySelection);
 Q_ASSERT(mProgressBar == 0);
 mProgressBar = new HbProgressBar;
 mProgressBar->setRange(0,0);    // busy indicator by default
 // SifUiDialogContentWidget::updateFromParameters()
 // ----------------------------------------------------------------------------
 //
 void SifUiDialogContentWidget::updateFromParameters(const QVariantMap &parameters)
 {
+FLOG1("SifUiDialogContentWidget::updateFromParameters");
 // Application icon
 updateAppIcon(parameters);
 // Application name and version
 if (parameters.contains(KSifUiApplicationName)) {
 // SifUiDialogContentWidget::changeType()
 // ----------------------------------------------------------------------------
 //
 void SifUiDialogContentWidget::changeType(SifUiDeviceDialogType type)
 {
+FLOG2("SifUiDialogContentWidget::changeType", type);
 switch (type) {
 case SifUiConfirmationQuery:
 mStackedWidget->setCurrentWidget(mMemorySelection);
 break;
 case SifUiProgressNote:
 mStackedWidget->setCurrentWidget(mProgressBar);
 break;
 case SifUiCompleteNote:
-// TODO: remove mStackedWidget?
 break;
 case SifUiErrorNote:
 mStackedWidget->setCurrentWidget(mErrorText);
 break;
 default:
 break;
 }
 }
 // ----------------------------------------------------------------------------
+// SifUiDialogContentWidget::applicationName()
+// ----------------------------------------------------------------------------
+//
+QString SifUiDialogContentWidget::applicationName() const
+{
+if (mAppName) {
+return mAppName->plainText();
+}
+return QString();
+}
+// ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::handleMemorySelectionChange()
 // ----------------------------------------------------------------------------
 //
 void SifUiDialogContentWidget::handleMemorySelectionChange(int selectedIndex)
 {
+FLOG2("SifUiDialogContentWidget::handleMemorySelectionChange", selectedIndex);
 QChar selectedDrive = mDriveLetterList[selectedIndex][0];
+saveSelectedDriveAsDefault( selectedDrive );
-// TODO: save selected drive to cenrep
 emit memorySelectionChanged( selectedDrive );
 }
 // ----------------------------------------------------------------------------
 // SifUiDialogContentWidget::applicationName()
 QString versionParam = parameters.value(KSifUiApplicationVersion).toString();
 //: Custom layout ID parent. Template for application name and version in SW install
 //: confirmation query. %1 is the application name and %2 is the version number.
 //: Version number consist of major, minor, and build numbers.
 //: For example: "Chess (v 1.01(123))".
-appName = hbTrId("txt_installer_list_appname_version").arg(nameParam, versionParam);
+// TODO: use hbTrId when arg() starts to work with limited length arguments like "%[99]1"
+//appName = hbTrId("txt_installer_list_appname_version").arg(nameParam, versionParam);
+appName = QString("%1 (v %2)").arg(nameParam, versionParam);
 } else {
 appName = nameParam;
 }
 }
 return appName;
 //
 QString SifUiDialogContentWidget::applicationSize(const QVariantMap &parameters)
 {
 QString appSize = "";
 if (parameters.contains(KSifUiApplicationSize)) {
-uint size = parameters.value(KSifUiApplicationSize).toUInt();
+bool ok = false;
-if (size > 0) {
+uint size = parameters.value(KSifUiApplicationSize).toUInt(&ok);
+if (ok) {
 if (size > KSifUiMega) {
 //: Application size in SW install confirmation query, %1 is in megabytes
 appSize = hbTrId("txt_installer_list_appsize_mb").arg(size/KSifUiMega);
 } else if(size > KSifUiKilo) {
 //: Application size in SW install confirmation query, %1 is in kilobytes
 //
 void SifUiDialogContentWidget::updateAppIcon(const QVariantMap &parameters)
 {
 Q_ASSERT(mAppIcon != 0);
+// TODO: proper icon handling
 if (parameters.contains(KSifUiDialogType) &&
 (parameters.value(KSifUiDialogType).toInt() == SifUiErrorNote)) {
 mAppIcon->setIcon(HbIcon(KSifUiErrorIcon));
 } else if (parameters.contains(KSifUiApplicationIconHandle) &&
 parameters.contains(KSifUiApplicationIconMaskHandle)) {
 {
 if (parameters.contains(KSifUiMemorySelection)) {
 QString drives = parameters.value(KSifUiMemorySelection).toString();
 mDriveLetterList = drives.split(",");
+QChar defaultDrive = readDefaultSelectedDrive();
+int defaultDriveIndex = 0;
 QStringList driveList;
 QSystemStorageInfo info;
 QStringList volumeList = info.logicalDrives();
 foreach (QString volume, volumeList) {
 if (mDriveLetterList.contains(volume)) {
 qlonglong size = info.availableDiskSpace(volume);
-switch (driveName(volume[0])) {
+QChar driveLetter(volume[0]);
+switch (driveName(driveLetter)) {
 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: enable when available
 //driveList.append(hbTrId("txt_installer_device_memory_mb")
 //    .arg(volume).arg(size/KSifUiMega));
-driveList.append(tr("%1: Device (%L2 MB free)"
+driveList.append(tr("%1: Phone mem. (%L2 MB)"
 ).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: enable when available
 //driveList.append(hbTrId("txt_installer_device_memory_kb")
 //    .arg(volume).arg(size/KSifUiKilo));
-driveList.append(tr("%1: Device (%L2 kB free)"
+driveList.append(tr("%1: Phone mem. (%L2 kB)"
 ).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: 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)"
+driveList.append(tr("%1: Mass.mem (%L2 MB)"
 ).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: 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)"
+driveList.append(tr("%1: Mass.mem (%L2 kB)"
 ).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: 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)"
+driveList.append(tr("%1: Mem.card (%L2 MB)"
 ).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: 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)"
+driveList.append(tr("%1: Mem.card (%L2 kB)"
 ).arg(volume).arg(size/KSifUiKilo));
 }
 break;
+case EOtherDrive:
 default:
+if (size > KSifUiMega) {
+//: Generic drive name for other removable drives, like
+//: USB memories attached via USB OTG adapter.
+// TODO: proper localisation needed
+driveList.append(tr("%1: Drive (%L2 MB)"
+).arg(volume).arg(size/KSifUiMega));
+} else {
+//: Generic drive name for other removable drives, like
+//: USB memories attached via USB OTG adapter.
+// TODO: proper localisation needed
+driveList.append(tr("%1: Drive (%L2 kB)"
+).arg(volume).arg(size/KSifUiKilo));
+}
 break;
 }
+if (driveLetter == defaultDrive) {
+defaultDriveIndex = driveList.count() - 1;
+}
 }
 }
+disconnect(mMemorySelection, SIGNAL(currentIndexChanged(int)),
+this, SLOT(handleMemorySelectionChange(int)));
 mMemorySelection->setItems(driveList);
+if (defaultDriveIndex) {
+FLOG2("SifUiDialogContentWidget::updateMemorySelection, setCurrentIndex",
+defaultDriveIndex);
+mMemorySelection->setCurrentIndex(defaultDriveIndex);
+}
+connect(mMemorySelection, SIGNAL(currentIndexChanged(int)),
+this, SLOT(handleMemorySelectionChange(int)));
 mStackedWidget->setCurrentWidget(mMemorySelection);
-// TODO: set selected item, read the default from cenrep
 return true;
 }
 return false;
 }
 mProgressBar->setMaximum(parameters.value(KSifUiProgressNoteFinalValue).toInt());
 progressBarChanged = true;
 }
 if (parameters.contains(KSifUiProgressNoteValue)) {
 int newValue = mProgressBar->progressValue();
-newValue += parameters.value(KSifUiProgressNoteValue).toInt();
+bool ok = false;
-mProgressBar->setProgressValue(newValue);
+newValue += parameters.value(KSifUiProgressNoteValue).toInt(&ok);
-progressBarChanged = true;
+if (ok) {
+mProgressBar->setProgressValue(newValue);
+progressBarChanged = true;
+}
 }
 if (progressBarChanged) {
 mStackedWidget->setCurrentWidget(mProgressBar);
 }
 return progressBarChanged;
 // SifUiDialogContentWidget::updateErrorText()
 // ----------------------------------------------------------------------------
 //
 bool SifUiDialogContentWidget::updateErrorText(const QVariantMap &parameters)
 {
-if (parameters.contains(KSifUiErrorCode)) {
+// TODO: move default error messages (category based) here
-// TODO: proper error texts
+if (parameters.contains(KSifUiErrorMessage)) {
-bool ok = false;
+QString errorText = parameters.value(KSifUiErrorMessage).toString();
-int errorCode = parameters.value(KSifUiErrorCode).toInt(&ok);
-QString errorText;
-if (ok) {
-errorText = tr("Error %1").arg(errorCode);
-} else {
-errorText = tr("No error code.");
-}
 mErrorText->setPlainText(errorText);
 mStackedWidget->setCurrentWidget(mErrorText);
 return true;
 }
 return false;
 }
+// ----------------------------------------------------------------------------
+// SifUiDialogContentWidget::saveSelectedDriveAsDefault()
+// ----------------------------------------------------------------------------
+//
+void SifUiDialogContentWidget::saveSelectedDriveAsDefault(const QChar& drive)
+{
+if (drive != readDefaultSelectedDrive()) {
+if (!mPublisher) {
+mPublisher = new QValueSpacePublisher(KSifUiCenRepPath, this);
+}
+FLOG2("SifUiDialogContentWidget::saveSelectedDriveAsDefault", drive);
+// QValueSpacePublisher supports integer and byte array types in Symbian
+int asciiValue = drive.toAscii();
+mPublisher->setValue(KSifUiCenRepDefaultDrive, asciiValue);
+mPublisher->sync();
+}
+}
+// ----------------------------------------------------------------------------
+// SifUiDialogContentWidget::readDefaultSelectedDrive()
+// ----------------------------------------------------------------------------
+//
+QChar SifUiDialogContentWidget::readDefaultSelectedDrive()
+{
+QChar selectedDrive = KInitialDefaultDrive;
+if (!mSubscriber) {
+mSubscriber = new QValueSpaceSubscriber(KSifUiCenRepPath, this);
+}
+QVariant variant = mSubscriber->value(KSifUiCenRepDefaultDrive);
+if (variant.isValid() && !variant.isNull()) {
+bool ok = false;
+int asciiValue = variant.toInt(&ok);
+if (ok) {
+selectedDrive = QChar(asciiValue);
+}
+}
+FLOG2("SifUiDialogContentWidget::readDefaultSelectedDrive", selectedDrive);
+return selectedDrive;
+}

changeset 60	245df5276b97
parent 52	92f864ef0288