FCL/sf/app/organizer: comparison clock/clockui/clockviews/src/clockworldview.cpp

equal deleted inserted replaced

-:579cc610882e
+:ef813d54df51
 #include "clockcommon.h"
 #include "settingsutility.h"
 #include "timezoneclient.h"
 #include "clockcityselectionlist.h"
 #include "clockhomecityitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockworldviewTraces.h"
+#endif
 /*!
 	\class ClockWorldView
 	The world clock view of the clock application.
 */
 ClockWorldView::ClockWorldView(QGraphicsItem *parent)
 :HbView(parent),
 mSelectedItem(-1)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY );
 	// Timer for updating list data upon time change/update.
 	mRefreshTimer = new QTimer();
 	connect(
 			mRefreshTimer, SIGNAL(timeout()),
 			this, SLOT(refreshCityList()));
 	// Create the model.
 	mCityListModel = new QStandardItemModel();
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT );
 }
 /*!
 	Destructor.
 */
 ClockWorldView::~ClockWorldView()
 {
+	OstTraceFunctionEntry0( DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_ENTRY );
 	if (mDocLoader) {
 		delete mDocLoader;
 		mDocLoader = 0;
 	}
 	if(mCityListModel){
 	}
 	HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.css");
 	HbStyleLoader::unregisterFilePath(":/style/hblistviewitem.widgetml");
 	HbStyleLoader::unregisterFilePath(":/style/hblistviewitem_color.css");
+	OstTraceFunctionExit0( DUP1_CLOCKWORLDVIEW_CLOCKWORLDVIEW_EXIT );
 }
 /*!
 	Called by the ClockViewManager after loading the view from the docml.
 	The initializaion/setup of the view is done here.
 */
 void ClockWorldView::setupView(
 		ClockAppControllerIf &controllerIf,
 		ClockDocLoader *docLoader)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_SETUPVIEW_ENTRY );
 	mDocLoader = docLoader;
 	mAppControllerIf = &controllerIf;
 	mTimezoneClient = controllerIf.timezoneClient();
 	mSettingsUtility = controllerIf.settingsUtility();
 	mCityListView = qobject_cast<HbListView *> (
 			mDocLoader->findWidget(CLOCK_WORLD_CITYLIST));
 	HbStyleLoader::registerFilePath(":/style/hblistviewitem.css");
 	HbStyleLoader::registerFilePath(":/style/hblistviewitem.widgetml");
 	HbStyleLoader::registerFilePath(":/style/hblistviewitem_color.css");
-	mCityListView->setLayoutName("citylist-portrait");
+	mCityListView->setLayoutName("citylist");
 	mCityListView->setModel(mCityListModel);
 	// Get the toolbar/menu actions.
 	mAddCityAction = static_cast<HbAction *> (
 			mDocLoader->findObject("addCityAction"));
 	// Check for disabling of addCityAction in view toolbar.
 	if ((KMaximumCityListCount-1) == mCityInfoList.count()) {
 		mAddCityAction->setEnabled(false);
 		mAddCityMenuAction->setVisible(false);
 	}
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_SETUPVIEW_EXIT );
 }
 /*!
 	Refreshes the data in the city list.
 */
 void ClockWorldView::refreshCityList()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_REFRESHCITYLIST_ENTRY );
 	updateCurrentLocationInfo(mTimezoneClient->timeUpdateOn());
 	int cityInfoCount = mCityInfoList.count();
 	if (cityInfoCount) {
 		QStandardItem *item = 0;
 		}
 		// Start the timer again for one minute.
 		QTimer::singleShot(60 * 1000, this, SLOT(refreshCityList()));
 	}
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_REFRESHCITYLIST_EXIT );
 }
 /*!
 	Updates the current location info.
 */
 void ClockWorldView::updateCurrentLocationInfo(int networkTime)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_ENTRY );
 	HbMainWindow *window = hbInstance->allMainWindows().first();
 	Qt::Orientation currentOrienation = window->orientation();
 	loadSection(currentOrienation);
 	if (!networkTime) {
 		QMap<QString, QVariant> itemList;
 		QString value;
 		QDateTime dateTime = QDateTime::currentDateTime();
-		// Show the date. If date is current date then show 'today'.
+		// Show the date.
 		QString dateInfo = dateTime.toString(
 				mSettingsUtility->dateFormatString());
 		itemList.insert(value.setNum(ClockHomeCityItem::Date), dateInfo);
 		// Show the city and country name.
 		}
 		itemList.insert(value.setNum(
 				ClockHomeCityItem::DayNightIndicator), dayNightIconPath);
 		// Show dst icon when needed.
+		QString dstIconPath = " ";
 		if (homeCity.dstOn) {
-			QString dstIconPath = "qtg_mono_day_light_saving_time";
+			dstIconPath = "qtg_mono_day_light_saving_time";
-			itemList.insert(value.setNum(ClockHomeCityItem::Dst), dstIconPath);
+		}
-		}
+		itemList.insert(value.setNum(ClockHomeCityItem::Dst), dstIconPath);
 		mHomeCityWidget->setHomeCityItemData(itemList);
 	}
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATECURRENTLOCATIONINFO_EXIT );
 }
 /*!
 	Handles the long press on each item in the citylist.
 	Displays a list item specific context menu.
 	\param coords The position where mouse was pressed.
 */
 void ClockWorldView::handleItemLongPressed(
 		HbAbstractViewItem *item, const QPointF &coords)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_ENTRY );
 	// Get the ndex of the selected item.
 	mSelectedItem = item->modelIndex().row();
 	// On long press we display item specific context menu.
 	HbMenu *itemContextMenu = new HbMenu();
 	// Show the menu.
 	itemContextMenu->open(this, SLOT(selectedMenuAction(HbAction*)));
 	itemContextMenu->setPreferredPos(coords);
 	itemContextMenu->setAttribute( Qt::WA_DeleteOnClose,true);
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEITEMLONGPRESSED_EXIT );
 }
 /*!
 	This slot is called when Add location action is triggered. It is responsible
 	for launching the city selection list.
 */
 void ClockWorldView::handleAddLocation()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEADDLOCATION_ENTRY );
 	// Construct the city selection list and show the same.
 	mCitySelectionList = new ClockCitySelectionList(mTimezoneClient, this);
 	connect(
 			mCitySelectionList, SIGNAL(citySelected(LocationInfo)),
 			this, SLOT(handleCitySelected(LocationInfo)));
 	// Show the city list.
 	mCitySelectionList->showCityList();
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEADDLOCATION_EXIT );
 }
 /*!
 	This slot handles delete action on the city list. It removes the item from
 	the view.
 */
 void ClockWorldView::handleDeleteAction()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLEDELETEACTION_ENTRY );
 	if (-1 != mSelectedItem) {
 		QStandardItem *item = mCityListModel->takeItem(mSelectedItem);
 		mCityListModel->removeRow(mSelectedItem);
 		delete item;
 				!mAddCityAction->isEnabled()) {
 			mAddCityAction->setEnabled(true);
 			mAddCityMenuAction->setVisible(true);
 		}
 	}
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLEDELETEACTION_EXIT );
 }
 /*!
 	This slot sets the selected city as the current location.
 */
 void ClockWorldView::handleSetAsCurrentLocationAction()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_ENTRY );
 	// Get the info of the selected item.
 	LocationInfo newHomeCity = mCityInfoList[mSelectedItem];
 	// Check if time update is set to ON.
 	// If yes, reset it to OFF and change the home location.
 	refreshCityList();
 	// Update the data file.
 	mTimezoneClient->saveLocations(mCityInfoList);
 	mSelectedItem = -1;
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLESETASCURRENTLOCATIONACTION_EXIT );
 }
 /*!
 	Slot to handle the case when a city has been selected in from the city
 	selection list.
 	\param info of type LocationInfo which contains the city selected.
 */
 void ClockWorldView::handleCitySelected(LocationInfo info)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_HANDLECITYSELECTED_ENTRY );
 	// Info is invalid if the timezoneId is set to -1. We don't do anything in
 	// that case.
 	if (-1 != info.timezoneId) {
 		// Now we check if the city is already added in the list.
 		bool proceed = true;
 		mAddCityAction->setEnabled(false);
 		mAddCityMenuAction->setVisible(false);
 	}
 	// Cleanup.
 	mCitySelectionList->deleteLater();
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_HANDLECITYSELECTED_EXIT );
 }
 /*!
 	Navigates to the clock alarms view.
 */
 void ClockWorldView::showAlarmsView()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_SHOWALARMSVIEW_ENTRY );
 	mAppControllerIf->switchToView(MainView);
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_SHOWALARMSVIEW_EXIT );
 }
 /*!
 	Slot which gets called when `World Clock' action is triggered from the view
 	toolbar. This is responsible for reloading the content of worldclock view.
 */
 void ClockWorldView::refreshWorldView()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_REFRESHWORLDVIEW_ENTRY );
 	mDisplayWorldClockView->setChecked(true);
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_REFRESHWORLDVIEW_EXIT );
 }
 /*!
 	Loads the appropriate section based on window orientaion.
 */
 void ClockWorldView::loadSection(Qt::Orientation orientation)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_LOADSECTION_ENTRY );
 	bool networkTime = mTimezoneClient->timeUpdateOn();
 	bool loadSuccess;
 	if (Qt::Horizontal == orientation) {
 		if (networkTime) {
 			// Do not show home city.
 					&loadSuccess);
 			mHomeCityWidget->show();
 		}
 	}
 	mCityListView->update();
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_LOADSECTION_EXIT );
 }
 /*!
 	Slot which gets called for timeChanged signal of timezone client.
 	Refreshes both homecity & city list.
 */
 void ClockWorldView::updateAllLocationInfo()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_ENTRY );
 	updateCurrentLocationInfo(mTimezoneClient->timeUpdateOn());
 	updateCityList();
 	refreshCityList();
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATEALLLOCATIONINFO_EXIT );
 }
 /*!
 	Slot to handle the selected context menu actions
 */
 void ClockWorldView::selectedMenuAction(HbAction *action)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_SELECTEDMENUACTION_ENTRY );
 	if (action == mSetCurrentLocationAction) {
 		handleSetAsCurrentLocationAction();
 	} else if (action == mRemoveCityAction) {
 		handleDeleteAction();
 	}
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_SELECTEDMENUACTION_EXIT );
 }
 /*!
 	Adds the location info to the city list.
 	\param locationInfo Details of the city to be added to the list.
 */
 QModelIndex ClockWorldView::addCityToList(const LocationInfo& locationInfo)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_ADDCITYTOLIST_ENTRY );
 	// Here we construct a model item and add it to the list model.
 	QStandardItem *modelItem = new QStandardItem();
 	// Add the item to the model.
 	mCityListModel->appendRow(modelItem);
 			index, getCityListDisplayString(locationInfo), Qt::DisplayRole);
 	mCityListModel->setData(
 			index, getCityListDecorationString(locationInfo),
 			Qt::DecorationRole);
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_ADDCITYTOLIST_EXIT );
 	return index;
 }
 /*!
 	Checks if the given time is day or night.
 	\param dateTime Time for which check has to be performed.
 	\return bool True if it is day otherwise false.
 */
 bool ClockWorldView::isDay(QDateTime dateTime)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_ISDAY_ENTRY );
 	// It is day between 6:00 AM and 6:00 PM. Otherwise night.
 	if (17 < dateTime.time().hour() || 6 > dateTime.time().hour()) {
+		OstTraceFunctionExit0( CLOCKWORLDVIEW_ISDAY_EXIT );
 		return false;
 	}
+	OstTraceFunctionExit0( DUP1_CLOCKWORLDVIEW_ISDAY_EXIT );
 	return true;
 }
 /*!
 	Returns the QVariantList for citylist to be set for DisplayRole.
 	/param locationInfo Details of the city to be added to the list.
 */
 QVariantList ClockWorldView::getCityListDisplayString(
 		const LocationInfo& locationInfo)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_ENTRY );
 	QVariantList displayString;
 	QDateTime dateTime = QDateTime::currentDateTime();
 	dateTime = dateTime.toUTC();
 	dateTime = dateTime.addSecs(locationInfo.zoneOffset * 60);
 			offsetDifference += offsetString;
 		}
 	}
 	else if ( hours ){
 		if(hours == 1 ) {
-			displayFormat = hbTrId("txt_clock_dblist_val_1_hr");
+			displayFormat = hbTrId("txt_clock_dblist_daily_val_ln_hr");
 			offsetString = displayFormat.arg(hours);
 			offsetDifference += offsetString;
 		}
 		else {
 			displayFormat = hbTrId("txt_clock_dblist_val_1_hrs");
 			offsetString = displayFormat.arg(hours);
 			offsetDifference += offsetString;
 		}
 	}
 	else if (minutes){
-		displayFormat = hbTrId("txt_clock_dblist_val_1_mins");
+		displayFormat = hbTrId("txt_clock_dblist_daily_val_ln_mins");
 		offsetString = displayFormat.arg(minutes);
 		offsetDifference += offsetString;
 	} else {
 		displayFormat = hbTrId("txt_clock_dblist_val_1_hrs");
 		offsetString = displayFormat.arg(0);
 	// Show the time at that location.
 	QString timeInfo = dateTime.toString(mSettingsUtility->timeFormatString());
 	displayString.append(timeInfo);
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_GETCITYLISTDISPLAYSTRING_EXIT );
 	return displayString;
 }
 /*!
 	Returns the QVariantList for citylist to be set for DecorationRole.
 	/param locationInfo Details of the city to be added to the list.
 */
 QVariantList ClockWorldView::getCityListDecorationString(
 		const LocationInfo& locationInfo)
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_ENTRY );
 	QVariantList decorationString;
 	QDateTime dateTime = QDateTime::currentDateTime();
 	dateTime = dateTime.toUTC();
 	dateTime = dateTime.addSecs(locationInfo.zoneOffset * 60);
 	// Display day/night indicators.
-	// TODO: change the icon name for night when available.
 	QString dayNightIconPath = "";
 	if (isDay(dateTime)) {
 		dayNightIconPath = "qtg_large_clock";
 	} else {
 		dayNightIconPath = "qtg_large_clock_night";
 	}
 	decorationString.append(HbIcon(dayNightIconPath));
 	// Show dst icon when needed.
+	QString dstIconPath = "";
 	if (locationInfo.dstOn) {
-		QString dstIconPath = "qtg_mono_day_light_saving_time";
+		dstIconPath = "qtg_mono_day_light_saving_time";
-		decorationString.append(HbIcon(dstIconPath));
+	}
-	}
+	decorationString.append(HbIcon(dstIconPath));
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_GETCITYLISTDECORATIONSTRING_EXIT );
 	return decorationString;
 }
 /*!
 	Updates the city list according to the home city.
 */
 void ClockWorldView::updateCityList()
 {
+	OstTraceFunctionEntry0( CLOCKWORLDVIEW_UPDATECITYLIST_ENTRY );
 	int cityInfoCount = mCityInfoList.count();
 	if (cityInfoCount) {
 		bool deletion = false;
+		bool valueUpdated = false;
 		int index;
 		LocationInfo currentCity = mTimezoneClient->getCurrentZoneInfoL();
+		// Remove the new home city if it is already added to the list.
 		for (index = 0; index < cityInfoCount; index++) {
 			if (currentCity.timezoneId == mCityInfoList.at(index).timezoneId
 					&& (currentCity.cityName ==
 							mCityInfoList.at(index).cityName)
 					&& (currentCity.countryName ==
 				mAddCityAction->setEnabled(true);
 				mAddCityMenuAction->setVisible(true);
 			}
 		}
-	}
+		for (int index = 0; index < cityInfoCount; ++index) {
+			int tzid = mCityInfoList[index].timezoneId;
+			bool dst = mTimezoneClient->isDSTOnL(tzid);
+			if (dst != mCityInfoList[index].dstOn) {
+				mCityInfoList[index].dstOn = dst;
+				valueUpdated = true;
+			}
+		}
+		if (valueUpdated) {
+			// Update the data file.
+			mTimezoneClient->saveLocations(mCityInfoList);
+}
+	}
+	OstTraceFunctionExit0( CLOCKWORLDVIEW_UPDATECITYLIST_EXIT );
 }
 // End of file-- Don't delete.

changeset 58	ef813d54df51
parent 49	5de72ea7a065
child 68	a5a1242fd2e8