FCL/sf/mw/hb: comparison src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 _LIT(KDialogMinimum, "minimum");
 _LIT(KDialogValue, "value");
 _LIT(KDialogAutoClose, "autoClose");
 _LIT(KDialogText, "text");
 _LIT(KDialogIconName, "iconName");
-_LIT(KDialogTextAlign, "textAlignment");
+_LIT(KCancelAction, "cancelAction");
-_LIT(KDialogIconAlign, "iconAlignment");
-_LIT(KPrimaryActionText, "primaryActionText");
-_LIT(KPrimaryActionNull, "primaryActionNull");
 _LIT(KPluginIdentifier, "com.nokia.hb.deviceprogressdialog/1.0");
 _LIT(KAnimationDefinition, "animationDefinition");
-const TInt KAlignCenterLeft = 0x0080 | 0x0001;  //Qt::AlignVCenter | Qt::AlignLeft
-const TInt KAlignCenter = 0x0080 | 0x0004;      //Qt::AlignCenter
 NONSHARABLE_CLASS(CHbDeviceProgressDialogSymbianPrivate) : public CBase,
 public MHbDeviceDialogObserver
 {
 public:
 bool Visible() const;
 void AddVariantL(const TDesC& aKey, const TAny* aData,
 CHbSymbianVariant::TType aDataType, CHbSymbianVariantMap* map);
 const CHbSymbianVariant* Variant(const TDesC& aKey) const;
+static HBufC *CreateActionDataLC(TBool aNull, const TDesC &text);
 public: // MHbDeviceDialogObserver
 void DataReceived(CHbSymbianVariantMap& aData);
 void DeviceDialogClosed(TInt aCompletionCode);
 TInt iMinimum;
 TInt iMaximum;
 TBool iAutoClose;
 TInt iType;
 TInt iProgressValue;
-TInt iTextAlign;
-TInt iIconAlign;
-TBool iWrap;
 RBuf iText;
 RBuf iIconName;
 RBuf iAnimationDefinition;
 struct {
 RBuf iText;
 AddVariantL(KDialogType, &iType, CHbSymbianVariant::EInt, iVariantMap);
 AddVariantL(KDialogMaximum, &iMaximum, CHbSymbianVariant::EInt, iVariantMap);
 AddVariantL(KDialogMinimum, &iMinimum, CHbSymbianVariant::EInt, iVariantMap);
 AddVariantL(KDialogAutoClose, &iAutoClose, CHbSymbianVariant::EBool, iVariantMap);
 AddVariantL(KDialogValue, &iProgressValue, CHbSymbianVariant::EInt, iVariantMap);
-AddVariantL(KDialogTextAlign, &iTextAlign, CHbSymbianVariant::EInt, iVariantMap);
-AddVariantL(KDialogIconAlign, &iIconAlign, CHbSymbianVariant::EInt, iVariantMap);
 if (iText.Length() > 0)
 {
 AddVariantL(KDialogText, &iText, CHbSymbianVariant::EDes, iVariantMap);
 }
 }
 if (iButton.iFlags.iTextValid || iButton.iFlags.iIsNullValid)
 {
 iButton.iFlags.iTextModified = false;
 iButton.iFlags.iIsNullModified = false;
-TBool isNull = iButton.iFlags.iIsNull;
+HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText);
-if (isNull)
+AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap);
-{
+CleanupStack::PopAndDestroy(); // actionData
-AddVariantL(KPrimaryActionNull, &isNull, CHbSymbianVariant::EBool, iVariantMap);
-}
-else
-{
-AddVariantL(KPrimaryActionText, &iButton.iText, CHbSymbianVariant::EDes, iVariantMap);
-}
 }
 iButton.iFlags.iPressed = false;
 User::LeaveIfError(iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this));
 iVisible = ETrue;
 {
 AddVariantL(KDialogValue, &iProgressValue, CHbSymbianVariant::EInt, iVariantMap);
 AddVariantL(KDialogValue, &iProgressValue, CHbSymbianVariant::EInt, map);
 }
-variant = Variant(KDialogTextAlign);
-if (variant && *variant->Value<TInt>() != iTextAlign)
-{
-AddVariantL(KDialogTextAlign, &iTextAlign, CHbSymbianVariant::EInt, iVariantMap);
-AddVariantL(KDialogTextAlign, &iTextAlign, CHbSymbianVariant::EInt, map);
-}
-variant = Variant(KDialogIconAlign);
-if (variant && *variant->Value<TInt>() != iIconAlign)
-{
-AddVariantL(KDialogIconAlign, &iIconAlign, CHbSymbianVariant::EInt, iVariantMap);
-AddVariantL(KDialogIconAlign, &iIconAlign, CHbSymbianVariant::EInt, map);
-}
 variant = Variant(KDialogText);
 if (variant && iText == *variant->Value<TDesC>())
 {
 AddVariantL(KDialogText, &iText, CHbSymbianVariant::EDes, iVariantMap);
 AddVariantL(KDialogText, &iText, CHbSymbianVariant::EDes, map);
 if (iButton.iFlags.iTextModified || iButton.iFlags.iIsNullModified)
 {
 iButton.iFlags.iTextModified = false;
 iButton.iFlags.iIsNullModified = false;
-TBool isNull = iButton.iFlags.iIsNull;
+HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText);
-if (isNull)
+AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap);
-{
+CleanupStack::PopAndDestroy(); // actionData
-AddVariantL(KPrimaryActionNull, &isNull, CHbSymbianVariant::EBool, iVariantMap);
-}
-else
-{
-AddVariantL(KPrimaryActionText, &iButton.iText, CHbSymbianVariant::EDes, iVariantMap);
-}
 }
 User::LeaveIfError(iDeviceDialog->Update(*map));
 delete map;
 map = 0;
 _LIT(KKey, "act");
 const CHbSymbianVariant* variant = aData.Get(KKey);
 if (variant)
 {
 const TDesC *value = variant->Value<const TDesC>();
-_LIT(KPrimary, "p");
+_LIT(KCancel, "c");
-if (value && *value == KPrimary)
+if (value && *value == KCancel)
 {
 iButton.iFlags.iPressed = true;
 if (iObserver)
 {
 iObserver->ProgressDialogCancelled(q);
 const CHbSymbianVariant* CHbDeviceProgressDialogSymbianPrivate::Variant(const TDesC& aKey) const
 {
 return iVariantMap->Get(aKey);
 }
+// Pack into a string a data for cancel button
+HBufC *CHbDeviceProgressDialogSymbianPrivate::CreateActionDataLC(TBool aNull, const TDesC &text)
+{
+HBufC *actionData;
+if (aNull)
+{
+actionData = HBufC::NewL(0);
+}
+else
+{
+_LIT(KtextTag, "t:");
+actionData = HBufC::NewL(text.Length() + KtextTag().Length());
+TPtr ptr = actionData->Des();
+ptr.Append(KtextTag);
+ptr.Append(text);
+}
+CleanupStack::PushL(actionData);
+return actionData;
+}
 /*!
 \class MHbDeviceProgressDialogObserver
 \brief MHbDeviceProgressDialogObserver is an observer interface for observing CHbDeviceProgressDialogSymbian.
 */
 	\sa HbIconAnimationManager::addDefinitionFile
 	\note Animation definition files must be stored to a place where they
 	can be accessed.
 \sa HbDeviceProgressDialog, HbDeviceDialog
-\proto
+\stable
 \hbwidgets
 */
 /*!
 \enum CHbDeviceProgressDialogSymbian::TType
 Progress dialog types.
 {
 d->UpdateL();
 }
 /*!
-Cancels and closes the dialog.
-\deprecated CHbDeviceProgressDialogSymbian::Cancel()
-is deprecated. Replaced by CHbDeviceProgressDialogSymbian::Close().
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::Cancel()
-{
-d->Close();
-}
-/*!
 Closes the dialog.
 */
 EXPORT_C void CHbDeviceProgressDialogSymbian::Close()
 {
 d->Close();
 */
 EXPORT_C TPtrC CHbDeviceProgressDialogSymbian::AnimationDefinition() const
 	{
 	return d->iAnimationDefinition;
 	}
-/*!
-Sets the text alignment.
-\param aAlign Qt defined alignment options can used.
-\sa TextAlignment()
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::SetTextAlignment(TInt aAlign)
-{
-d->iTextAlign = aAlign;
-}
-/*!
-Returns the text alignment.
-The default value is Qt::AlignLeft|Qt::AlignVCenter.
-\sa SetTextAlignment()
-*/
-EXPORT_C TInt CHbDeviceProgressDialogSymbian::TextAlignment() const
-{
-return d->iTextAlign;
-}
-/*!
-Sets the icon alignment.
-\param aAlign Qt defined alignment options can used.
-\sa IconAlignment()
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::SetIconAlignment(TInt aAlign)
-{
-d->iIconAlign = aAlign;
-}
-/*!
-Returns the icon alignment.
-The default value is Qt::AlignCenter.
-\sa SetIconAlignment()
-*/
-EXPORT_C TInt CHbDeviceProgressDialogSymbian::IconAlignment() const
-{
-return d->iIconAlign;
-}
-/*!
-Sets the text wrapping.
-\param aWrap When set, the text is drawn with Qt::TextWordWrap enabled meaning that
-lines breaks are at appropriate point, e.g. at word boundaries.
-\sa TextWrapping()
-\deprecated CHbDeviceProgressDialogSymbian::SetTextWrapping(int)
-is deprecated. Will be removed.
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::SetTextWrapping(TBool aWrap)
-{
-d->iWrap = aWrap;
-}
-/*!
-Returns the text wrapping setting.
-The default value is true.
-\sa SetTextWrapping()
-\deprecated CHbDeviceProgressDialogSymbian::TextWrapping() const
-is deprecated. Will be removed.
-*/
-EXPORT_C TBool CHbDeviceProgressDialogSymbian::TextWrapping() const
-{
-return d->iWrap;
-}
 /*!
 Sets progress dialog box button text. The dialog gets updated next time ShowL() or UpdateL()
 is called.
 {
 d = new (ELeave) CHbDeviceProgressDialogSymbianPrivate;
 d->ConstructL(this);
 SetProgressType(aType);
 SetProgressValue(0);
-SetTextAlignment(KAlignCenterLeft);
+}
-SetIconAlignment(KAlignCenter);
-SetTextWrapping(ETrue);
-}

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 5	627c4a0fd0e7