FCL/sf/app/organizer: comparison calendarui/agendaeventviewer/src/agendaeventview.cpp

equal deleted inserted replaced

-:5de72ea7a065
+:579cc610882e
 *
 */
 // System includes
 #include <QObject>
-#include <QDebug>
 #include <QDateTime>
-#include <qtranslator.h>
 #include <QGraphicsLinearLayout>
 #include <QFile>
 #include <QString>
 #include <QTimer>
 #include <QPluginLoader>
 #include <QDir>
 #include <HbInstance>
-#include <hbapplication.h>
 #include <HbMainWindow>
 #include <HbView>
 #include <HbMenu>
 #include <HbGroupBox>
 #include <HbScrollArea>
 #include <hbi18ndef.h>
 #include <HbRadioButtonList>
 #include <HbMessageBox>
 #include <HbDialog>
 #include <HbLabel>
+#include <HbTranslator>
 // User includes
 #include <maptileservice.h>//maptile service
 #include <agendautil.h>
 #include <NotesEditorInterface>
 #include <caleneditor.h>
 // Constants
 #define CHARACTER_HYPHEN    "-"
 #define CHARACTER_SPACE     " "
 #define CHARACTER_NEW_LINE  "\n"
-// This is used to set the maptile image height and width ,
-//because HbLabel by default not displaying the actual size of image
-const int height = 128;
-const int width =  330;
 //This Property is use for setting a primary left icon
 static const char *primaryLeftIconItem("leftPrimaryIconItem");
 /*!
 	\class AgendaEventView.
 	\param parent pointer to QGraphicsWidget.
 */
 AgendaEventView::AgendaEventView(
 		AgendaEventViewerPrivate *owner, QObject *parent):
 		QObject(parent),
+		mMainWindow(NULL),
 		mOwner(owner),
+		mTranslator(new HbTranslator("caleneventviewer")),
 		mReminderWidgetAdded(true),
-		mMainWindow(NULL),
 		mMaptilePath(NULL),
 		mMaptileService(NULL),
 		mProgressTimer(NULL),
 		mProgressIconCount(0),
 		mMaptileStatusReceived(false),
 		mMaptileStatus(-1),
 		mNotesPluginLoaded(false)
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::AgendaEventView -->";
-	// Load the translator based on locale
-	mTranslator = new QTranslator;
-	QString lang = QLocale::system().name();
-	QString path = "Z:/resource/qt/translations/";
-	mTranslator->load("caleneventviewer_en_GB",":/translations");
-	// TODO: Load the appropriate .qm file based on locale
-	//bool loaded = mTranslator->load("caleneventviewer_" + lang, path);
-	HbApplication::instance()->installTranslator(mTranslator);
 	mDocLoader = new AgendaEventViewerDocLoader;
 	// Load to-do viewer's docml.
 	bool loadSuccess;
 //timer to run progress indicator icon.
 mProgressTimer = new QTimer(this);
 mProgressTimer->setSingleShot(true);
 connect(mProgressTimer, SIGNAL(timeout()), this, SLOT(updateProgressIndicator()));
 }
-qDebug() << "AgendaEventViewer: AgendaEventView::AgendaEventView <--";
 }
 /*!
 	Destructor.
 */
 AgendaEventView::~AgendaEventView()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::~AgendaEventView -->";
 	// Remove the translator
-	HbApplication::instance()->removeTranslator(mTranslator);
 	if (mTranslator) {
 		delete mTranslator;
 		mTranslator = 0;
 	}
 	if (mProgressTimer) {
 delete mProgressTimer;
 mProgressTimer = NULL;
 }
-	qDebug() << "AgendaEventViewer: AgendaEventView::~AgendaEventView <--";
 }
 /*!
 	Displays the to-do viewer and populates the to-do entry attributes.
 	\param entry Agenda entry from which attributes have to be read.
 */
 void AgendaEventView::execute(AgendaEntry entry,
 											AgendaEventViewer::Actions action)
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::execute -->";
 	mOriginalAgendaEntry = entry;
 	mAgendaEntry = entry;
 	// Add the viewer data reading from the agenda entry.
 	// Add the menu items to event viewer.
 	addMenuItem();
 	// Add the toolbar items to event viewer
 	addToolBarItem(action);
-	// Add the title to event viewer.
-	addGroupBoxData();
 	// Connect for the entry updation and addtion signal to refresh the view
 	// when the same is edited in editor.
 	connect(mOwner->mAgendaUtil, SIGNAL(entryUpdated(ulong)),
 				this, SLOT(handleEntryUpdation(ulong)));
 		// Might be some non-ui based app called us
 		// so create mainwindow now
 		mMainWindow = new HbMainWindow();
 		mMainWindow->addView(mViewer);
 		mMainWindow->setCurrentView(mViewer);
+	    connect(mMainWindow,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
 	} else {
 		window->addView(mViewer);
 		window->setCurrentView(mViewer);
+		connect(window,SIGNAL(orientationChanged(Qt::Orientation)),this,SLOT(changedOrientation(Qt::Orientation)));
 	}
 	// Add softkey after adding view on window
 	mBackAction = new HbAction(Hb::BackNaviAction);
 	mViewer->setNavigationAction(mBackAction);
 	connect(mBackAction, SIGNAL(triggered()), this, SLOT(close()));
-	qDebug() << "AgendaEventViewer: AgendaEventView::execute <--";
 }
 /*!
 	Refreshes the to-do viewer after the to-do editor is closed.
 */
 void AgendaEventView::addViewerData()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addViewerData -->";
+	// Add the title to event viewer.
+	addGroupBoxData();
 	// Set the summary & priority to viewer.
 	addSubjectAndPriorityData();
 	// Set Date & Time to viewer.
 	}
 	// Set the description.
 	addDescriptionData();
-	qDebug() << "AgendaEventViewer: AgendaEventView::addViewerData <--";
 }
 /*!
 	Add the menu item depends up on entry type
 */
 void AgendaEventView::addMenuItem()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addMenuItem -->";
 	if (mAgendaEntry.type() == AgendaEntry::TypeTodo) {
 		HbMenu *menu = qobject_cast<HbMenu *> (
 				mDocLoader->findWidget(AGENDA_EVENT_VIEWER_MENU));
 		}
 		connect(mMarkTodoAction, SIGNAL(triggered()), this,
 		        SLOT(markTodoStatus()));
 		menu->addAction(mMarkTodoAction);
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::addMenuItem <--";
 }
 /*!
 	Add the toolbar item
 */
 void AgendaEventView::addToolBarItem(AgendaEventViewer::Actions action)
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addToolBarItem -->";
 	HbToolBar *toolBar = qobject_cast<HbToolBar *> (
 	                       mDocLoader->findWidget(AGENDA_EVENT_VIEWER_TOOLBAR));
 	// Load all the actions for event viewer
 		saveAction->setIcon(HbIcon("qtg_mono_add_to_calendar"));
 		connect(saveAction, SIGNAL(triggered()), this, SLOT(saveAgendaEntry()));
 		toolBar->addAction(saveAction);
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::addToolBarItem <--";
 }
 /*!
 	Add the groupbox data depends up on entry type
 */
 void AgendaEventView::addGroupBoxData()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addGroupBoxData -->";
 	HbGroupBox *groupBox = qobject_cast<HbGroupBox *> (
 			mDocLoader->findWidget(AGENDA_EVENT_VIEWER_GROUPBOX));
-	if (mAgendaEntry.type() == AgendaEntry::TypeTodo) {
+	AgendaEntry::Type entryType = mAgendaEntry.type();
+	if (entryType == AgendaEntry::TypeTodo) {
 		groupBox->setHeading(hbTrId("txt_calendar_subhead_to_do"));
-	} else if (mAgendaEntry.type() == AgendaEntry::TypeNote) {
+	} else if (entryType == AgendaEntry::TypeAppoinment) {
-		groupBox->setHeading(tr("Note"));
+		groupBox->setHeading(hbTrId("txt_calendar_subhead_meeting"));
-	} else {
+	}else if (entryType == AgendaEntry::TypeEvent) {
-		// TODO: Add the text id based on the entry type Anniversary or meeting
+		//TODO: Add text id once available
-		groupBox->setHeading(hbTrId("txt_calendar_subhead_event"));
+		groupBox->setHeading(hbTrId("All day event"));
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::addGroupBoxData <--";
 }
 /*!
 	Add subject and priority data to Event viewer
 */
 void AgendaEventView::addSubjectAndPriorityData()
 {
-	qDebug()
-	     << "AgendaEventViewer: AgendaEventView::addSubjectAndPriorityData -->";
 	QStringList itemList;
 	itemList.append(hbTrId("txt_calendar_dblist_subject"));
 	if (mAgendaEntry.summary().isEmpty()) {
 		itemList.append(hbTrId("txt_calendar_dblist_val_unnamed"));
 itemList.append(priorityIcon);
 itemList.append(QString::null);
 	mSubjectWidget->setEventViewerItemData(itemList, Qt::DecorationRole);
-	qDebug()
-	     << "AgendaEventViewer: AgendaEventView::addSubjectAndPriorityData <--";
 }
 /*!
 	Add date & time data to Event viewer
 */
 void AgendaEventView::addDateTimeData()
 {
-qDebug()
-<< "AgendaEventViewer: AgendaEventView::addDateTimeData -->";
 QStringList itemData;
 HbExtendedLocale systemLocale = HbExtendedLocale::system();
 QDateTime startDateTime = mAgendaEntry.startTime();
 QDateTime endDateTime = mAgendaEntry.endTime();
 		break;
 }
 	itemData.append(data);
 mDateTimeWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
-qDebug()
-<< "AgendaEventViewer: AgendaEventView::addDateTimeData <--";
 }
 /*!
 	Add location data to Event viewer
 */
 void AgendaEventView::addLocationData()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addLocationData -->";
 	QStringList itemData;
 	QString progressIcon(QString::null);
 	if ( mLocationFeatureEnabled ) {
 	    getProgressIndicatorstatus(progressIcon);
 	}
 	mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(mAgendaEntry.location());
 	mLocationWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
-	qDebug() << "AgendaEventViewer: AgendaEventView::addLocationData <--";
 }
 /*!
 Add maptile image to Event viewer
 */
 {
 if (mLocationFeatureEnabled && !mAgendaEntry.location().isEmpty() && !mMaptilePath.isEmpty()) {
 HbIcon maptile(mMaptilePath);
 mMaptileLabel->setIcon(maptile);
-mMaptileLabel->setPreferredSize(QSizeF(width, height));
+mMaptileLabel->setPreferredSize(QSizeF(maptile.width(), maptile.height()));
-mMaptileLabel->setMinimumSize(QSizeF(width, height));
-mMaptileLabel->setMaximumSize(QSizeF(width, height));
-mMaptileLabel->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 }
 }
 /*!
 	Add reminder data to Event viewer
 */
 void AgendaEventView::addReminderData()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addReminderData -->";
 	QStringList itemData;
 	itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_reminder");
 mReminderWidget->setProperty(primaryLeftIconItem, false);
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(alarmTimeText());
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
-	qDebug() << "AgendaEventViewer: AgendaEventView::addReminderData <--";
 }
 /*!
 	Add completed to-do data to Event viewer
 */
 void AgendaEventView::addCompletedTodoData()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addCompletedTodoData -->";
 	QStringList itemData;
 	QString     completedText;
 HbExtendedLocale systemLocale = HbExtendedLocale::system();;
 itemData.append(QString::null);
 	itemData.append(QString::null);
 	completedText = systemLocale.format(mAgendaEntry.completedDateTime().date(),
 					                    r_qtn_date_usual_with_zero);
 	itemData.append(hbTrId("txt_calendar_dblist_completed_date"));
 	itemData.append(completedText);
 	mReminderWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
-	qDebug() << "AgendaEventViewer: AgendaEventView::addCompletedTodoData <--";
 }
 /*!
 	Add repeat data to Event viewer
 */
 void AgendaEventView::addRepeatData()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addRepeatData -->";
 	QStringList itemData;
 	itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_repeat");
 mRepeatWidget->setProperty(primaryLeftIconItem, false);
 	mRepeatWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(QString::null);
 	itemData.append(repeatRule());
 	mRepeatWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
-	qDebug() << "AgendaEventViewer: AgendaEventView::addRepeatData <--";
 }
 /*!
 	Add description data to Event viewer
 */
 void AgendaEventView::addDescriptionData()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addDiscriptionData -->";
 	QStringList itemData;
 	itemData.append(QString::null);
 	itemData.append(QString::null);
 itemData.append(QString::null);
 mDescriptionWidget->setProperty(primaryLeftIconItem, false);
 	mDescriptionWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
 	itemData.clear();
 	itemData.append(hbTrId("txt_calendar_dblist_description"));
 	itemData.append(mAgendaEntry.description());
 	mDescriptionWidget->setEventViewerItemData(itemData, Qt::DisplayRole);
-	qDebug() << "AgendaEventViewer: AgendaEventView::addDiscriptionData <--";
 }
 /*!
 	Returns priority icon
 */
 void AgendaEventView::getPriorityIcon(int priority, QString &priorityIcon)
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::getPriorityIcon -->";
 	switch(priority) {
 		case 1:priorityIcon.append("qtg_small_priority_high");
 		break;
 		case 3:priorityIcon.append("qtg_small_priority_low");
 		break;
 		default:
 		break;
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::getPriorityIcon <--";
 }
 /*!
 	Returns repeat rule
 */
 QString AgendaEventView::repeatRule() const
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::repeatRule -->";
 	QString repeatRule;
 	AgendaRepeatRule agendaRepeatRule = mAgendaEntry.repeatRule();
 	if (agendaRepeatRule.type() != AgendaRepeatRule::InvalidRule)
 	{
 			case AgendaRepeatRule::DailyRule:
 				repeatRule.append(hbTrId("txt_calendar_dblist_repeats_daily"));
 			break;
 			case AgendaRepeatRule::WeeklyRule:
 				if (AgendaUtil::isWorkdaysRepeatingEntry(agendaRepeatRule)) {
-					//TODO: Add text id for workdays
+					repeatRule.append(hbTrId("txt_calendar_dblist_repeats_workdays"));
-					repeatRule.append(hbTrId("Workdays"));
 				} else {
 					if (agendaRepeatRule.interval() == 2) {
 						repeatRule.append(
 							hbTrId("txt_calendar_dblist_repeats_fortnightly"));
 					} else {
 				r_qtn_date_usual_with_zero);
 		repeatRule.append(
 			hbTrId("txt_calendar_dblist_repeats_daily_val_until_1").
 			arg(untilDateString));
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::repeatRule <--";
 	return repeatRule;
 }
 /*!
 	\return QString	Holds the alarm time text.
 */
 QString AgendaEventView::alarmTimeText() const
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::alarmTimeText -->";
 	QString alarmDateTimeText;
 	QDateTime startTime;
 	QDateTime alarmDateTime;
 						r_qtn_time_usual_with_zero)).arg(
 						systemLocale.format(alarmDateTime.date(),
 						r_qtn_date_usual_with_zero)));
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::alarmTimeText <--";
 	return alarmDateTimeText;
 }
 /*!
 	Remove unnecessary widget from layout.
 */
 void AgendaEventView::removeWidget()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::removeWidget -->";
 	if (mAgendaEntry.location().isEmpty()) {
 		mLocationWidget->hide();
 		mLinearLayout->removeItem(mLocationWidget);
 	}
 }
 file.close();
 	if (mAgendaEntry.alarm().isNull()) {
 		if (mAgendaEntry.type() == AgendaEntry::TypeTodo ) {
-				if (AgendaEntry::TodoNeedsAction == mAgendaEntry.status()) {
+				if (AgendaEntry::TodoCompleted != mAgendaEntry.status()) {
 					mReminderWidget->hide();
 					mLinearLayout->removeItem(mReminderWidget);
 					mReminderWidgetAdded = false;
 				}
 		} else {
 	}
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
-	qDebug() << "AgendaEventViewer: AgendaEventView::removeWidget <--";
 }
 /*!
 	Update the completed to-do or reminder data to event viewer.
 */
 void AgendaEventView::updateCompletedReminderData()
 {
-	qDebug()
-	   << "AgendaEventViewer: AgendaEventView::updateCompletedReminderData -->";
 	if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
 		addCompletedTodoData();
 		if (!mReminderWidgetAdded) {
 			mReminderWidget->show();
 	}
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
-	qDebug()
-	   << "AgendaEventViewer: AgendaEventView::updateCompletedReminderData <--";
 }
 /*!
 	Remove all widgets from layout.
 */
 void AgendaEventView::removeAllWidgets()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::removeAllWidgets -->";
 	for (int i = 2; i < mLinearLayout->count(); i++) {
 		mLinearLayout->removeAt(i);
 	}
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
-	qDebug() << "AgendaEventViewer: AgendaEventView::removeAllWidgets <--";
 }
 /*!
 	Add all widgets to layout.
 */
 void AgendaEventView::addAllWidgets()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::addAllWidgets -->";
 	mLinearLayout->addItem(mLocationWidget);
 	mLocationWidget->show();
 	mLinearLayout->addItem(mMaptileLabel);
 	mMaptileLabel->show();
 	mDescriptionWidget->show();
 	mLinearLayout->invalidate();
 	mLinearLayout->activate();
-	qDebug() << "AgendaEventViewer: AgendaEventView::addAllWidgets <--";
 }
 /*!
 	Queries user whether to delete whole series or just this single occurence
 */
 void AgendaEventView::showDeleteOccurencePopup()
 {
-	qDebug()
-		<< "AgendaEventViewer: AgendaEventView::showDeleteOccurencePopup -->";
 	HbDialog *popUp = new HbDialog();
 	popUp->setDismissPolicy(HbDialog::NoDismiss);
 	popUp->setTimeout(HbDialog::NoTimeout);
 	popUp->setAttribute( Qt::WA_DeleteOnClose, true );
 			hbTrId("txt_calendar_button_softkey1_cancel")));
 	// Show the popup
 	popUp->open();
-	qDebug()
-		<< "AgendaEventViewer: AgendaEventView::showDeleteOccurencePopup <--";
 }
 /*!
 	Show delete confirmation query
 */
 void AgendaEventView::showDeleteConfirmationQuery()
 {
-qDebug()
-		<< "AgendaEventViewer: AgendaEventView::showDeleteConfirmationQuery -->";
 HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
 popup->setDismissPolicy(HbDialog::NoDismiss);
 popup->setTimeout(HbDialog::NoTimeout);
 popup->setAttribute( Qt::WA_DeleteOnClose, true );
 popup->addAction(deleteAction);
 connect(deleteAction, SIGNAL(triggered()), this ,
 												SLOT(handleDeleteAction()));
 popup->addAction(new HbAction(hbTrId("txt_calendar_button_cancel"), popup));
 popup->open();
-qDebug()
-		<< "AgendaEventViewer: AgendaEventView::showDeleteConfirmationQuery <--";
 }
 /*!
 	Handles the delete action
 */
 /*!
 	Marks to-do entry as done or undone based on the completed value.
 */
 void AgendaEventView::markTodoStatus()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::markTodoStatus -->";
 	QDateTime currentDateTime = QDateTime::currentDateTime();
 	// Set the to-do status using the agenda util.
-	if (AgendaEntry::TodoNeedsAction == mAgendaEntry.status()) {
+	if (AgendaEntry::TodoCompleted != mAgendaEntry.status()) {
 		// Update the menu text to mark to-do as undone.
 		mMarkTodoAction->setText(hbTrId("txt_calendar_menu_mark_as_not_done"));
 		mAgendaEntry.setStatus(AgendaEntry::TodoCompleted);
 		mAgendaEntry.setCompletedDateTime(currentDateTime);
 		mOwner->mAgendaUtil->setCompleted(mAgendaEntry, true, currentDateTime);
+	} else {
-	} else if (AgendaEntry::TodoCompleted == mAgendaEntry.status()) {
 		// Update the menu text to mark to-do as done.
 		mMarkTodoAction->setText(hbTrId("txt_calendar_menu_mark_as_done"));
 		mAgendaEntry.setStatus(AgendaEntry::TodoNeedsAction);
 		mOwner->mAgendaUtil->setCompleted(mAgendaEntry, false, currentDateTime);
 	}
 	updateCompletedReminderData();
-	qDebug() << "AgendaEventViewer: AgendaEventView::markTodoStatus <--";
 }
 /*!
 	Edits the agenda entry by lanching the to-do viewer.
 */
 void AgendaEventView::edit()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::edit -->";
 	mOwner->editingStarted();
 	if (AgendaEntry::TypeTodo == mAgendaEntry.type()) {
 		// Load notes editor plugin if not loaded.
 		                        this, SLOT(handleCalendarEditorClosed()));
 		mCalenEditor->edit(mAgendaEntry, false);
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::edit <--";
 }
 /*!
 	Deletes the agenda entry.
 */
 void AgendaEventView::deleteAgendaEntry()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::deleteAgendaEntry -->";
 	// Before we do anything, check in the entry is repeating
 	// OR its a child item
 	bool isChild = !(mAgendaEntry.recurrenceId().isNull());
 	bool isRepeating = mAgendaEntry.isRepeating();
 		showDeleteOccurencePopup();
 	} else {
 showDeleteConfirmationQuery();
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::deleteAgendaEntry <--";
 }
 /*!
 	Save the agenda entry to calendar db.
 */
 void AgendaEventView::saveAgendaEntry()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::saveAgendaEntry -->";
 	// Save entry to calendar.
 	mOwner->mAgendaUtil->addEntry(mAgendaEntry);
 	// Close the agenda entry viewer
 	close();
-	qDebug() << "AgendaEventViewer: AgendaEventView::saveAgendaEntry <--";
 }
 /*!
 	Closes the event viewer
 */
 void AgendaEventView::close()
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::close -->";
 	// Remove the view from main window.
 	HbMainWindow *window = hbInstance->allMainWindows().first();
 	// Cleanup.
 			this, SLOT(close()));
 	window->removeView(mViewer);
 	mOwner->viewingCompleted(mAgendaEntry.startTime().date());
-	qDebug() << "AgendaEventViewer: AgendaEventView::close <--";
 }
 /*!
 	Handles entry updation of the event entry.
 */
 void AgendaEventView::handleEntryUpdation(ulong id)
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::handleEntryUpdation -->";
 	AgendaEntry updatedEntry = mOwner->mAgendaUtil->fetchById(id);
 	// Agenda entry is not null then refresh the view else close event viewer
 	if (!updatedEntry.isNull()) {
 	} else {
 		// Close the agenda entry viewer
 		close();
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::handleEntryUpdation <--";
 }
 /*!
 	Handles the entry deletion of the agenda entry
 */
 void AgendaEventView::handleEntryDeletion(ulong id)
 {
-	qDebug() <<"AgendaEventViewer: AgendaEventView::handleEntryDeletion -->";
 	if (id == mAgendaEntry.id()) {
 		// Close the agenda entry viewer
 		close();
 		mOwner->deletingCompleted();
 	}
-	qDebug() <<"AgendaEventViewer: AgendaEventView::handleEntryDeletion <--";
 }
 /*!
 	Handles the Note Editor editing completion of the agenda entry
 */
 void AgendaEventView::handleNoteEditorClosed(bool status)
 {
 	Q_UNUSED(status);
-	qDebug() <<"AgendaEventViewer: AgendaEventView::handleNoteEditorClosed -->";
 	// To avoid loading the plugin again for editing,
 	// Unload the plug-in while destruction.
 	mOwner->editingCompleted();
-	qDebug() <<"AgendaEventViewer: AgendaEventView::handleNoteEditorClosed <--";
 }
 /*!
 	Handles the Note Editor editing completion of the agenda entry
 */
 void AgendaEventView::handleCalendarEditorClosed()
 {
-	qDebug()
-		<<"AgendaEventViewer: AgendaEventView::handleCalendarEditorClosed -->";
 	// Cleanup.
 	mCalenEditor->deleteLater();
 	mOwner->editingCompleted();
-	qDebug()
-		<<"AgendaEventViewer: AgendaEventView::handleCalendarEditorClosed <--";
 }
 /*!
 	Slot to handle User selection for series deleting or single occurence popup
 */
 void AgendaEventView::handleDeleteOccurence(int index)
 {
-	qDebug() << "AgendaEventViewer: AgendaEventView::handleDeleteOccurence -->";
 	// To notify client that deleting Started
 	// Calendar Application changing state from viewing to deleting.
 	mOwner->deletingStarted();
 			mOwner->mAgendaUtil->deleteRepeatedEntry(mAgendaEntry,
 			                                         AgendaUtil::ThisAndAll);
 			break;
 	}
-	qDebug() << "AgendaEventViewer: AgendaEventView::handleDeleteOccurence <--";
 }
 /*!
 Returns subject icon
 */
 void AgendaEventView::getSubjectIcon(AgendaEntry::Type type, QString &subjectIcon)
 {
-qDebug() << "AgendaEventViewer: AgendaEventView::getSubjectIcon -->";
 switch(type) {
 case AgendaEntry::TypeAppoinment:
 {
-subjectIcon.append("qtg_small_favorite");//@to do add proper icon
+subjectIcon.append("qtg_small_meeting");
 }
 break;
 case AgendaEntry::TypeTodo:
 {
 subjectIcon.append("qtg_small_todo");
 break;
 default:
 break;
 }
-qDebug() << "AgendaEventViewer: AgendaEventView::getSubjectIcon <--";
 }
 /*!
 According to maptile fetching status , update the viewer screen.
 */
 itemData.append(QString::null);
 itemData.append(QString::null);
 itemData.append("qtg_small_location");
 mLocationWidget->setProperty(primaryLeftIconItem, false);
 mLocationWidget->setEventViewerItemData(itemData, Qt::DecorationRole);
-MapTileService::AddressType addressType;
+Qt::Orientations orientation=hbInstance->allMainWindows().first()->orientation();
-addressType = MapTileService::AddressPlain;
+mMaptilePath.clear();
-int eventId = mAgendaEntry.id();
+mMaptileStatus = mMaptileService->getMapTileImage(mAgendaEntry.id(), MapTileService::AddressPlain, mMaptilePath ,orientation);
-mMaptileService->getMapTileImage(eventId, addressType, mMaptilePath);
 addMapTileImage();
 QFile file(mMaptilePath);
 if (file.exists()) {
 //add to linear layout
-int indexMaptileLabel = 3;
+int indexMaptileLabel = 3;// index of maptile widget position
 mLinearLayout->insertItem(indexMaptileLabel, mMaptileLabel);
 mMaptileLabel->show();
 }
 file.close();
 {
 MapTileService::AddressType addressType;
 addressType = MapTileService::AddressPlain;
 int eventId = mAgendaEntry.id();
 mMaptilePath.clear();
-int status = 0;
+mMaptileStatus = -1;
 connect(mMaptileService, SIGNAL(maptileFetchingStatusUpdate(int,
 int ,int)), this, SLOT(receiveMapTileStatus(int,int,int)));
-status = mMaptileService->getMapTileImage(eventId, addressType, mMaptilePath);
+Qt::Orientations orientation=hbInstance->allMainWindows().first()->orientation();
-if (status == MapTileService::MapTileFetchingNetworkError || status
+mMaptileStatus = mMaptileService->getMapTileImage(eventId, addressType, mMaptilePath ,orientation);
+if (mMaptileStatus == MapTileService::MapTileFetchingNetworkError || mMaptileStatus
 == MapTileService::MapTileFetchingInProgress) {
 mMaptilePath.clear();
 mMaptileStatusReceived = false; //reseting receiving status value
-mMaptileStatus = -1;// reseting status value;
 progressIcon.append(QString("qtg_anim_small_loading_1"));
 mProgressTimer->start(100);
 }
-else if (status == MapTileService::MapTileFetchingInvalidAddress || status
+else if (mMaptileStatus == MapTileService::MapTileFetchingInvalidAddress || mMaptileStatus
 == MapTileService::MapTileFetchingUnknownError) {
 mMaptilePath.clear();
 //no further need of this coonnection
 disconnect(mMaptileService, SIGNAL(maptileFetchingStatusUpdate(int,
 int ,int)), this, SLOT(receiveMapTileStatus(int,int,int)));
 disconnect(mMaptileService, SIGNAL(maptileFetchingStatusUpdate(int,
 int ,int)), this, SLOT(receiveMapTileStatus(int,int,int)));
 progressIcon.append(QString::null);
 }
 }
+/*!
+Reload the maptile image on system orientation change.
+*/
+void AgendaEventView::changedOrientation(Qt::Orientation orientation)
+{
+if (mMaptileStatus == MapTileService::MapTileFetchingCompleted) {
+mMaptilePath.clear();
+mMaptileService->getMapTileImage(mAgendaEntry.id(), MapTileService::AddressPlain, mMaptilePath,orientation);
+addMapTileImage();
+}
+}
 // End of file

changeset 50	579cc610882e
parent 49	5de72ea7a065
child 58	ef813d54df51