FCL/sf/app/organizer: comparison alarmui/alarmalertwidget/alarmalertplugin/src/alarmalertwidget

equal deleted inserted replaced

-:fd30d51f876b
+:b6db4fd4947b
 // System includes
 #include <QApplication>
 #include <QGesture>
 #include <QGestureEvent>
-#include <QDebug>
 #include <QGraphicsSceneMouseEvent>
-#include <QTranslator>
 #include <hbdocumentloader.h>
 #include <hbpushbutton.h>
 #include <hblabel.h>
 #include <hbinstance.h>
 #include <hbextendedlocale.h>
 #include <hbi18ndef.h>
-#include <hbapplication.h>
 #include <hbaction.h>
+#include <hbtranslator.h>
 // User includes
 #include "alarmalertwidget_p.h"
 #include "alarmalert.h"
 #include "alarmalertdocloader.h"
 // AlarmAlertDialogPrivate::AlarmAlertDialogPrivate
 // rest of the details are commented in the header
 // ---------------------------------------------------------
 //
 AlarmAlertDialogPrivate::AlarmAlertDialogPrivate(const QVariantMap &parameters):
+	mTranslator(new HbTranslator("alarmui")),
 	mClosedByClient(false),
 	mIsSilenceKey(false)
 	{
 	// Extract all the parameters sent by the client
 	parseAndFetchParams(parameters);
 	// Set the dismiss policy and timeout property
 	setDismissPolicy(HbPopup::NoDismiss);
 	setTimeout(HbPopup::NoTimeout);
+	// Listen the signal when alarmui is about to display so that we can start playing the alarm tone.
+	connect(this, SIGNAL(aboutToShow()), this, SLOT(aboutToDisplay()) );
 	// Initialize the user response
 	mUserResponse = Other;
-	// Load the translation file and install the editor specific translator
-	mTranslator = new QTranslator;
-	QString lang = QLocale::system().name();
-	QString path = "Z:/resource/qt/translations/";
-	bool loaded = mTranslator->load("alarmui_en_GB",":/translations");
-	// TODO: Load the appropriate .qm file based on locale
-	//bool loaded = mTranslator->load("alarmui_" + lang, path);
-	HbApplication::instance()->installTranslator(mTranslator);
 	// TODO: Gestures not working. Integrate once support is available from Qt
 	grabGesture(Qt::SwipeGesture);
 }
 // Remove the effect
 HbEffect::remove(mSlider);
 	// Remove the translator
-	HbApplication::instance()->removeTranslator(mTranslator);
 	if (mTranslator) {
 		delete mTranslator;
 		mTranslator = 0;
 	}
 }
 void AlarmAlertDialogPrivate::showEvent(QShowEvent *event)
 {
 	HbDialog::showEvent(event);
 	QVariantMap param;
 	param.insert(alarmCommand, mUserResponse);
-	//emit deviceDialogData(param);
+	emit deviceDialogData(param);
 }
 // ---------------------------------------------------------
 // AlarmAlertDialogPrivate::closeEvent
 // rest of the details are commented in the header
 // ---------------------------------------------------------
 //
 void AlarmAlertDialogPrivate::closeEvent(QCloseEvent *event)
 {
-// Forward the call to the base class
-	HbDialog::closeEvent(event);
 	// Do not notify the client back if the close was initiated by client itself
 	if(!mClosedByClient) {
 		// Package the user response and send it
 		QVariantMap param;
 		param.insert(alarmCommand, mUserResponse);
 		emit deviceDialogData(param);
 	}
 	// This signal has to be emitted so that the dialog can be cleaned up later
 	emit deviceDialogClosed();
+	// Forward the call to the base class
+	HbDialog::closeEvent(event);
 }
 // ---------------------------------------------------------
 // AlarmAlertDialogPrivate::handleOrientationChange
 // rest of the details are commented in the header
 	}else {
 		mUserResponse = Snooze;
 		close();
 	}
 }
+// ---------------------------------------------------------
+// AlarmAlertDialogPrivate::aboutToDisplay
+// rest of the details are commented in the header
+// ---------------------------------------------------------
+//
+void AlarmAlertDialogPrivate::aboutToDisplay()
+{
+mUserResponse = Shown;
+QVariantMap param;
+param.insert(alarmCommand, mUserResponse);
+emit deviceDialogData(param);
+}
 // ---------------------------------------------------------
 // AlarmAlertDialogPrivate::dismissed
 // rest of the details are commented in the header
 // ---------------------------------------------------------
 //
 QString key(iter.key());
 if (alarmSubject == key) {
 mSubject = iter.value().toString();
 } else if (alarmLocation == key) {
 mLocation = iter.value().toString();
-} else if (alarmDateTime == key) {
+} else if (alarmTime == key) {
-mAlarmTime = iter.value().toDateTime();
+mAlarmTime = iter.value().toString();
+} else if (alarmDate == key) {
+mAlarmDate = iter.value().toString();
 } else if (alarmType == key) {
 mAlarmAlertType = static_cast <AlarmType> (iter.value().toInt());
 } else if (alarmCanSnooze == key) {
 mCanSnooze = iter.value().toBool();
 } else if (alarmRingingType == key) {
 	if (!mAlarmDateTime) {
 		qFatal("Unable to load the alarmTime label");
 	}
 	HbExtendedLocale locale = HbExtendedLocale::system();
 	mAlarmDateTime->setPlainText(
-			hbTrId("txt_calendar_info_alarm_start_time").arg(
+			hbTrId("txt_calendar_info_alarm_start_time").arg(mAlarmTime));
-					locale.format(mAlarmTime.time(), r_qtn_time_usual)));
 	mAlarmDescription = qobject_cast<HbLabel*> (
 			mAlertDocLoader->findWidget("alarmDescription"));
 	if (!mAlarmDescription) {
 		qFatal("Unable to load the alarmDescription label");
 				mAlertDocLoader->findWidget("alarmTime"));
 		if (!mAlarmDateTime) {
 			qFatal("Unable to find the alarmTime label");
 		}
 		mAlarmDateTime->setPlainText(
-				hbTrId("txt_calendar_info_alarm_start_time").arg(
+				hbTrId("txt_calendar_info_alarm_start_time").arg(mAlarmTime));
-						locale.format(mAlarmTime.time(), r_qtn_time_usual)));
 		HbLabel *alarmDate = qobject_cast<HbLabel*> (
 				mAlertDocLoader->findWidget("alarmDate"));
 		if (!alarmDate) {
 			qFatal("Unable to find the alarmDate label");
 		}
 		alarmDate->setPlainText(
-				hbTrId("txt_calendar_info_alarm_start_date").arg(
+				hbTrId("txt_calendar_info_alarm_start_date").arg(mAlarmDate));
-				locale.format(mAlarmTime.date(), r_qtn_date_usual_with_zero)));
 		HbLabel *alarmDateNonTimed = qobject_cast<HbLabel*> (
 				mAlertDocLoader->findWidget("nonTimedAlarmDate"));
 		if (!alarmDateNonTimed) {
 			qFatal("Unable to find the nonTimedAlarmDate label");
 		}
 				mAlertDocLoader->findWidget("nonTimedAlarmDate"));
 		if (!alarmDateNonTimed) {
 			qFatal("Unable to find the alarmDateNonTimed label");
 		}
 		alarmDateNonTimed->setPlainText(
-				hbTrId("txt_calendar_info_alarm_start_date").arg(
+				hbTrId("txt_calendar_info_alarm_start_date").arg(mAlarmDate));
-				locale.format(mAlarmTime.date(), r_qtn_date_usual_with_zero)));
 	}
 	QGraphicsWidget *headingWidget = mAlertDocLoader->findWidget("heading");
 	if (!headingWidget) {
 		qFatal("Unable to find the heading widget");
 							mAlertDocLoader->findWidget("alarmDate"));
 	if (!alarmDate) {
 		qFatal("Unable to load the alarmDate label");
 	}
 	alarmDate->setPlainText(
-			hbTrId("txt_calendar_info_alarm_start_date").arg(
+			hbTrId("txt_calendar_info_alarm_start_date").arg(mAlarmDate));
-					locale.format(mAlarmTime.date(), r_qtn_date_usual_with_zero)));
 	mAlarmDescription = qobject_cast<HbLabel*> (
 							mAlertDocLoader->findWidget("alarmDescription"));
 	if (!mAlarmDescription) {
 		qFatal("Unable to load the alarmDescription label");

changeset 45	b6db4fd4947b
parent 23	fd30d51f876b
child 55	2c54b51f39c4
child 58	ef813d54df51