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

equal deleted inserted replaced

-:6e7b00453237
+:d17dc5398051
 #include "sifuidialog.h"
 #include "sifuidialogtitlewidget.h"
 #include "sifuidialogcontentwidget.h"
 #include "sifuiinstallindicatorparams.h"
+#include <QFile>
 #include <hblabel.h>
 #include <hbaction.h>
 #include <hbindicator.h>
-#include <QTranslator>
+#include <hbtranslator.h>
-#include <QApplication>                     // qApp()
-#include <QFile>
 #include <hbmessagebox.h>
 #include <qvaluespacesubscriber.h>
 #include <xqappmgr.h>                       // XQApplicationManager
 QTM_USE_NAMESPACE
-const QString KTranslationsPath = "resource/qt/translations/";
+const QString KTranslationsPath = "/resource/qt/translations/";
-const QString KTranslationsFile = "sifuidevicedialogplugin";
+const QString KSifUiTranslationsFile = "sifuidevicedialogplugin";
+const QString KCommonTranslationsFile = "common";
 const QString KSwiErrorsFile = "c:\\temp\\swierrors.txt";
 const QString KSwiErrorFormat = " (%1)";
 // ----------------------------------------------------------------------------
 // SifUiDialog::SifUiDialog()
 // ----------------------------------------------------------------------------
 //
 SifUiDialog::SifUiDialog(const QVariantMap &parameters) : HbDialog(),
-mLastDialogError(KErrNone), mShowEventReceived(false),
+mCommonTranslator(0), mSifUITranslator(0), mLastDialogError(KErrNone),
-mDialogType(SifUiUnspecifiedDialog),
+mShowEventReceived(false), mDialogType(SifUiUnspecifiedDialog),
 mTitle(0), mContent(0), mResultMap(),
-mIgnoreCloseAction(0), mIndicator(0), mSubscriber(0)
+mIgnoreCloseAction(0), mPrimaryAction(0), mSecondaryAction(0),
-{
+mIndicator(0), mSubscriber(0)
-// TODO: enable when translations ready
+{
-//installTranslator();
+mCommonTranslator = new HbTranslator(KTranslationsPath, KCommonTranslationsFile);
+mSifUITranslator = new HbTranslator(KTranslationsPath, KSifUiTranslationsFile);
 constructDialog(parameters);
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::~SifUiDialog()
 // ----------------------------------------------------------------------------
 //
 SifUiDialog::~SifUiDialog()
 {
 delete mSubscriber;
+delete mPrimaryAction;
-// TODO: enable when translations ready
+delete mSecondaryAction;
-//removeTranslator();
+mIgnoreCloseAction = 0;
+delete mSifUITranslator;
+delete mCommonTranslator;
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::dialogType()
 // ----------------------------------------------------------------------------
 // SifUiDialog::setDeviceDialogParameters()
 // ----------------------------------------------------------------------------
 //
 bool SifUiDialog::setDeviceDialogParameters(const QVariantMap &parameters)
 {
-return updateFromParameters(parameters);
+setVisible(!isInstallIndicatorActive());
+return updateFromParameters(parameters);
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::deviceDialogError()
 // ----------------------------------------------------------------------------
 HbDialog::showEvent(event);
 mShowEventReceived = true;
 }
 // ----------------------------------------------------------------------------
-// SifUiDialog::installTranslator()
+// SifUiDialog::isInstallIndicatorActive()
 // ----------------------------------------------------------------------------
 //
-void SifUiDialog::installTranslator()
+bool SifUiDialog::isInstallIndicatorActive()
 {
-mTranslator = new QTranslator(this);
+bool isActive = false;
-QString lang = QLocale::system().name();
+if (!mSubscriber) {
-mTranslator->load(KTranslationsFile + lang, KTranslationsPath);
+mSubscriber = new QTM_PREPEND_NAMESPACE(QValueSpaceSubscriber(
-qApp->installTranslator(mTranslator);
+KSifUiInstallIndicatorStatusPath));
 }
+QVariant variant = mSubscriber->value();
-// ----------------------------------------------------------------------------
+bool valueOk = false;
-// SifUiDialog::removeTranslator()
+int intValue = variant.toInt(&valueOk);
-// ----------------------------------------------------------------------------
+if (valueOk && intValue) {
-//
+isActive = true;
-void SifUiDialog::removeTranslator()
+}
-{
+return isActive;
-QApplication *app = qApp;
-if (mTranslator && app) {
-app->removeTranslator(mTranslator);
-mTranslator = 0;
-}
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::constructDialog()
 // ----------------------------------------------------------------------------
 mContent->constructFromParameters(parameters);
 connect(mContent, SIGNAL(memorySelectionChanged(const QChar &)),
 this, SLOT(handleMemorySelectionChanged(const QChar &)));
 setContentWidget(mContent);
-updateButtons();
+updateButtons(parameters);
 return true;
 }
 // ----------------------------------------------------------------------------
 if (mContent)
 {
 mContent->updateFromParameters(parameters);
 }
 if (prevDialogType != mDialogType) {
-updateButtons();
+updateButtons(parameters);
 }
 if (parameters.contains(KSifUiErrorCode)) {
 mInstallError = parameters.value(KSifUiErrorCode).toInt();
 }
 return true;
 // ----------------------------------------------------------------------------
 // SifUiDialog::updateButtons()
 // ----------------------------------------------------------------------------
 //
-void SifUiDialog::updateButtons()
+void SifUiDialog::updateButtons(const QVariantMap &parameters)
 {
 mIgnoreCloseAction = 0;
-HbAction *primaryAction = 0;
+if (mPrimaryAction) {
+removeAction(mPrimaryAction);
+delete mPrimaryAction;
+mPrimaryAction = 0;
+}
 switch (mDialogType) {
 case SifUiConfirmationQuery:
 //: Accepts the SW install confirmation query and starts installation.
-// TODO: enable when translations ready
+mPrimaryAction = new HbAction(hbTrId("txt_common_button_ok"));
-//primaryAction = new HbAction(hbTrId("txt_sisxui_install_ok"), this);
+connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(handleAccepted()));
-primaryAction = new HbAction(tr("Ok"), this);
+mIgnoreCloseAction = mPrimaryAction;
-connect(primaryAction, SIGNAL(triggered()), this, SLOT(handleAccepted()));
-mIgnoreCloseAction = primaryAction;
 break;
 case SifUiProgressNote:
-//: Hides the progress dialog. Progress note moves into universal indicator.
+if (!parameters.contains(KSifUiProgressNoteIsHideButtonHidden)) {
-// TODO: enable when translations ready
+//: Hides the progress dialog. Progress note moves into universal indicator.
-//primaryAction = new HbAction(hbTrId("txt_sisxui_install_hide"), this);
+mPrimaryAction = new HbAction(hbTrId("txt_common_button_hide"));
-primaryAction = new HbAction(tr("Hide"), this);
+connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(handleHidePressed()));
-connect(primaryAction, SIGNAL(triggered()), this, SLOT(handleHide()));
+mIgnoreCloseAction = mPrimaryAction;
-mIgnoreCloseAction = primaryAction;
+}
 break;
 case SifUiCompleteNote:
-//: Opens Application Library to view the installed application.
+if (!parameters.contains(KSifUiCompleteNoteIsShowButtonHidden)) {
-// TODO: enable when translations ready
+//: Opens Application Library to view the installed application.
-//primaryAction = new HbAction(hbTrId("txt_sisxui_install_show"), this);
+mPrimaryAction = new HbAction(hbTrId("txt_installer_button_show"));
-primaryAction = new HbAction(tr("Show"), this);
+connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(handleShowInstalled()));
-connect(primaryAction, SIGNAL(triggered()), this, SLOT(handleShowInstalled()));
+}
-mIgnoreCloseAction = primaryAction;
 break;
 case SifUiErrorNote:
-//: Shows a dialog with further info about the failure (i.e. why installation failed).
+if (!parameters.contains(KSifUiErrorNoteIsDetailsButtonHidden)) {
-// TODO: enable when translations ready
+//: Shows a dialog with further info about the failure (i.e. why installation failed).
-//primaryAction = new HbAction(hbTrId("txt_sisxui_install_error_details"), this);
+mPrimaryAction = new HbAction(hbTrId("txt_installer_button_details"));
-primaryAction = new HbAction(tr("Details"), this);
+connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(handleErrorDetails()));
-connect(primaryAction, SIGNAL(triggered()), this, SLOT(handleErrorDetails()));
+mIgnoreCloseAction = mPrimaryAction;
-mIgnoreCloseAction = primaryAction;
+}
 break;
 default:
 break;
 }
-setPrimaryAction(primaryAction);
+if (mPrimaryAction) {
+addAction(mPrimaryAction);
-HbAction *secondaryAction = 0;
+}
+if (mSecondaryAction) {
+removeAction(mSecondaryAction);
+delete mSecondaryAction;
+mSecondaryAction = 0;
+}
 switch (mDialogType) {
 case SifUiConfirmationQuery:
 case SifUiProgressNote:
-//: Cancels the SW install confirmation query and closes the dialog.
+if (!parameters.contains(KSifUiProgressNoteIsCancelButtonHidden)) {
-// TODO: enable when translations ready
+//: Cancels the SW install confirmation query and closes the dialog.
-//secondaryAction = new HbAction(hbTrId("txt_sisxui_install_cancel"), this);
+mSecondaryAction = new HbAction(hbTrId("txt_common_button_cancel"));
-secondaryAction = new HbAction(tr("Cancel"), this);
+connect(mSecondaryAction, SIGNAL(triggered()), this, SLOT(handleCancelled()));
-connect(secondaryAction, SIGNAL(triggered()), this, SLOT(handleCancelled()));
+}
 break;
 case SifUiCompleteNote:
 case SifUiErrorNote:
 //: Closes the dialog. Control returns back to where the installation was started.
-// TODO: enable when translations ready
+mSecondaryAction = new HbAction(hbTrId("txt_common_button_close"));
-//secondaryAction = new HbAction(hbTrId("txt_sisxui_install_close"), this);
+connect(mSecondaryAction, SIGNAL(triggered()), this, SLOT(close()));
-secondaryAction = new HbAction(tr("Close"), this);
-connect(secondaryAction, SIGNAL(triggered()), this, SLOT(close()));
 break;
 default:
 break;
 }
-setSecondaryAction(secondaryAction);
+if (mSecondaryAction) {
+addAction(mSecondaryAction);
+}
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::sendResult()
 // ----------------------------------------------------------------------------
 //
-void SifUiDialog::sendResult(bool accepted)
+void SifUiDialog::sendResult(SifUiDeviceDialogReturnValue value)
 {
-QVariant acceptedValue(accepted);
+QVariant returnValue(value);
-mResultMap.insert(KSifUiQueryAccepted, acceptedValue);
+mResultMap.insert(KSifUiQueryReturnValue, returnValue);
 emit deviceDialogData(mResultMap);
 }
 // ----------------------------------------------------------------------------
-// SifUiDialog::monitorIndicatorActivity()
-// ----------------------------------------------------------------------------
-//
-void SifUiDialog::monitorIndicatorActivity()
-{
-if (!mSubscriber) {
-mSubscriber = new QValueSpaceSubscriber(KSifUiInstallIndicatorStatusPath);
-connect(mSubscriber, SIGNAL(contentsChanged()),
-this, SLOT(handleIndicatorActivityChanged()));
-}
-}
-// ----------------------------------------------------------------------------
 // SifUiDialog::handleAccepted()
 // ----------------------------------------------------------------------------
 //
 void SifUiDialog::handleAccepted()
 {
 mContent->changeType(SifUiProgressNote);
-sendResult(true);
+sendResult(SifUiContinue);
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::handleCancelled()
 // ----------------------------------------------------------------------------
 //
 void SifUiDialog::handleCancelled()
 {
-sendResult(false);
+sendResult(SifUiCancel);
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::handleMemorySelectionChanged()
 // ----------------------------------------------------------------------------
 // SifUiDialog::handleHidePressed()
 // ----------------------------------------------------------------------------
 //
 void SifUiDialog::handleHidePressed()
 {
-if (!mIndicator) {
+sendResult(SifUiIndicator);
-mIndicator = new HbIndicator(this);
+hide();
-QVariant applicationName(mContent->applicationName());
-if (!mContent->isDefaultIconUsed()) {
-// TODO: send icon to indicator
-}
-if (mIndicator->activate(KSifUiInstallIndicatorType, applicationName)) {
-hide();
-monitorIndicatorActivity();
-}
-}
-}
-// ----------------------------------------------------------------------------
-// SifUiDialog::handleIndicatorActivityChanged()
-// ----------------------------------------------------------------------------
-//
-void SifUiDialog::handleIndicatorActivityChanged()
-{
-QVariant variant = mSubscriber->value();
-if (variant.isValid() && (variant.type() == QVariant::Int)) {
-bool valueOk = false;
-int intValue = variant.toInt(&valueOk);
-if (valueOk && intValue) {
-show();
-}
-}
 }
 // ----------------------------------------------------------------------------
 // SifUiDialog::handleShowInstalled()
 // ----------------------------------------------------------------------------

changeset 42	d17dc5398051
parent 37	6e7b00453237
child 44	329d304c1aa1