FCL/sf/app/organizer: comparison clock/clockui/clocksettingsview/src/clockregionalsettingsview.cpp

equal deleted inserted replaced

-:579cc610882e
+:ef813d54df51
 #include <HbPushButton>
 #include <HbListWidget>
 #include <HbComboBox>
 #include <HbListWidgetItem>
 #include <HbTranslator>
+#include <QLocale>
 // User includes
 #include "clockregionalsettingsview.h"
 #include "clocksettingsdocloader.h"
 #include "clocksettingsdefines.h"
 #include "settingsdatatypes.h"
 #include "settingscustomitem.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockregionalsettingsviewTraces.h"
+#endif
 /*!
 	\class ClockRegionalSettingsView
 	The view for regional setting items in clock applications settings.
 ClockRegionalSettingsView::ClockRegionalSettingsView(QObject *parent)
 :QObject(parent),
 mView(0),
 mLoader(0)
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY );
 	// Construct the document loader.
 	mLoader = new ClockSettingsDocLoader;
 	// Construct the settignsutility.
 	mSettingsUtility = new SettingsUtility();
 mTranslator = new HbTranslator("clocksettingsview");
 mTranslator->loadCommon();
 	// Create the custom prototype.
 	mCustomPrototype = new SettingsCustomItem();
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT );
 }
 /*!
 	Destructor.
 */
 ClockRegionalSettingsView::~ClockRegionalSettingsView()
 {
+	OstTraceFunctionEntry0( DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_ENTRY );
 	if (mLoader) {
 		delete mLoader;
 		mLoader = 0;
 	}
 // Remove the translator
 if (mTranslator) {
 delete mTranslator;
 mTranslator = 0;
 }
+OstTraceFunctionExit0( DUP1_CLOCKREGIONALSETTINGSVIEW_CLOCKREGIONALSETTINGSVIEW_EXIT );
 }
 /*!
 	Shows the regional settings view.
 */
 void ClockRegionalSettingsView::showView()
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_ENTRY );
 	bool success;
 	// Load the application xml.
 	mLoader->load(CLOCK_REG_SETTINGS_VIEW_DOCML, &success);
 	if (!success) {
 	HbAction *backAction = new HbAction(Hb::BackNaviAction);
 	mView->setNavigationAction(backAction);
 	connect(
 			backAction, SIGNAL(triggered()),
 			this, SLOT(handleBackAction()));
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_SHOWVIEW_EXIT );
 }
 /*!
 	The view is removed from main window and a deleteLater is called on `this'.
 */
 void ClockRegionalSettingsView::handleBackAction()
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_ENTRY );
 	HbExtendedLocale locale = HbExtendedLocale::system();
 	HbExtendedLocale::WeekDay startOfWeekIndex =
 				HbExtendedLocale::system().startOfWeek();
-	// TODO: Save workdays settings.
+	// Save workdays settings.
 	QItemSelectionModel *model = 0;
 	model = mWorkdaysItem->selectionModel();
 	QModelIndexList selectedModelIndex = model->selectedIndexes();
 	int count = selectedModelIndex.count();
 	QModelIndex index;
 	HbMainWindow *window = hbInstance->allMainWindows().first();
 	// Cleanup.
 	window->removeView(mView);
 	deleteLater();
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEBACKACTION_EXIT );
 }
 /*!
 	Called when each of the form items are displayed. Using this slot, we
 	connect to SIGNALS of the items that have been added to the form.
 	\param index QModelIndex of the row that was just displayed.
 */
 void ClockRegionalSettingsView::handleItemDisplayed(const QModelIndex &index)
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_ENTRY );
 	if (!index.isValid()) {
+		OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT );
 		return;
 	}
 	HbDataFormViewItem *item =
 			static_cast<HbDataFormViewItem*>(mForm->itemByIndex(index));
 			mStartOfWeekItem = static_cast<HbComboBox *> (widget);
 			break;
 		default:
 			break;
 	}
+	OstTraceFunctionExit0( DUP1_CLOCKREGIONALSETTINGSVIEW_HANDLEITEMDISPLAYED_EXIT );
 }
 /*!
 	Called when the time format toggle item is clicked. Here we update the
 	value in the locale.
 */
 void ClockRegionalSettingsView::handleTimeFormatChange()
 {
-//	mSettingsUtility->setTimeFormat(mTimeFormatItem->text());
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_ENTRY );
 	mSettingsUtility->setTimeFormat(
 			mTimeFormatItem->contentWidgetData("text").toString());
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMEFORMATCHANGE_EXIT );
 }
 /*!
 	Called when the time separator toggle item is clicked. Here we update the
 	value in the locale.
 */
 void ClockRegionalSettingsView::handleTimeSeparatorChange()
 {
-//	mSettingsUtility->setTimeSeparator(mTimeSeparatorItem->text());
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_ENTRY );
 	mSettingsUtility->setTimeSeparator(
 			mTimeSeparatorItem->contentWidgetData("text").toString());
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLETIMESEPARATORCHANGE_EXIT );
 }
 /*!
 */
 void ClockRegionalSettingsView::handleDateFormatChange(QString text)
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_ENTRY );
 	mSettingsUtility->setDateFormat(text);
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATEFORMATCHANGE_EXIT );
 }
 /*!
 Called when the date separator item is changed. Here we update the
 value in the locale.
 */
 void ClockRegionalSettingsView::handleDateSeparatorChange(QString text)
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_ENTRY );
 	mSettingsUtility->setDateSeparator(text);
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATESEPARATORCHANGE_EXIT );
 }
 /*!
 	This slot is called any item in the data form is changed.
 */
 void ClockRegionalSettingsView::handleDataChanged(
 		const QModelIndex& topLeft, const QModelIndex& bottomRight)
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_ENTRY );
 	Q_UNUSED(bottomRight)
 	switch (topLeft.row()) {
 		case 5:
 		break;
 		default:
 		break;
 	}
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_HANDLEDATACHANGED_EXIT );
 }
 /*!
 	Here we create the form model.
 */
 void ClockRegionalSettingsView::createModel()
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_ENTRY );
 	if (mForm->model()) {
 		delete mForm->model();
 		mForm->setModel(0);
 	}
 	connect(
 			mFormModel,
 			SIGNAL(dataChanged(const QModelIndex, const QModelIndex)),
 			this,
 			SLOT(handleDataChanged(const QModelIndex, const QModelIndex)));
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_CREATEMODEL_EXIT );
 }
 /*!
 	Function in which we populate the form model.
 */
 void ClockRegionalSettingsView::populateFormModel()
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_ENTRY );
 	if (!mFormModel) {
 		createModel();
 	}
 	// Get the locale.
 		mTimeFormatItem->setContentWidgetData("additionalText", mTimeFormatStringList[1]);
 	} else {
 		mTimeFormatItem->setContentWidgetData("text", mTimeFormatStringList[1]);
 		mTimeFormatItem->setContentWidgetData("additionalText", mTimeFormatStringList[0]);
 	}
+	mTimeFormatItem->setContentWidgetData("objectName", "timeFormat");
 	mForm->addConnection(
 			mTimeFormatItem, SIGNAL(clicked()),
 			this, SLOT(handleTimeFormatChange()));
 	// Time separator item.
 	} else {
 		mTimeSeparatorItem->setContentWidgetData("text", mTimeSeparatorStringList[1]);
 		mTimeSeparatorItem->setContentWidgetData(
 				"additionalText", mTimeSeparatorStringList[0]);
 	}
+	mTimeSeparatorItem->setContentWidgetData("objectName", "timeSeparator");
 	mForm->addConnection(
 			mTimeSeparatorItem, SIGNAL(clicked()),
 			this, SLOT(handleTimeSeparatorChange()));
 	// Date format.
 			hbTrId("txt_clock_setlabel_date_format"));
 	index = mSettingsUtility->dateFormat(mDateFormatStringList);
 	mDateFormatItem->setContentWidgetData("items", mDateFormatStringList);
 	mDateFormatItem->setContentWidgetData("currentIndex",index);
+	mDateFormatItem->setContentWidgetData("objectName", "dateFormat");
 	mForm->addConnection(
 			mDateFormatItem, SIGNAL(currentIndexChanged(QString)),
 	 		this, SLOT(handleDateFormatChange(QString)));
 	// Date separator.
 			hbTrId("txt_clock_setlabel_date_separator"));
 	index = mSettingsUtility->dateSeparator(mDateSeparatorStringList);
 	mDateSeparatorItem->setContentWidgetData("items", mDateSeparatorStringList);
 	mDateSeparatorItem->setContentWidgetData("currentIndex",index);
+	mDateSeparatorItem->setContentWidgetData("objectName", "dateSeparator");
 	mForm->addConnection(
 			mDateSeparatorItem, SIGNAL(currentIndexChanged(QString)),
 			this, SLOT(handleDateSeparatorChange(QString)));
 	// Workdays.
 	HbDataFormModelItem *item = 0;
 	// Create the weekday list based on start of week.
 	QStringList weekdaysList;
+	QLocale qLocale;
 	weekdaysList
-			<< hbTrId("txt_clk_setlabel_val_monday")
+			<< qLocale.dayName(1)
-			<< hbTrId("txt_clk_setlabel_val_tuesday")
+			<< qLocale.dayName(2)
-			<< hbTrId("txt_clk_setlabel_val_wednesday")
+			<< qLocale.dayName(3)
-			<< hbTrId("txt_clk_setlabel_val_thursday")
+			<< qLocale.dayName(4)
-			<< hbTrId("txt_clk_setlabel_val_friday")
+			<< qLocale.dayName(5)
-			<< hbTrId("txt_clk_setlabel_val_saturday")
+			<< qLocale.dayName(6)
-			<< hbTrId("txt_clk_setlabel_val_sunday");
+			<< qLocale.dayName(7);
 	HbDataFormModelItem::DataItemType workdaysItemType =
 			static_cast<HbDataFormModelItem::DataItemType>
 			(HbDataFormModelItem::CustomItemBase + 50);
 	item = new HbDataFormModelItem(workdaysItemType,
 			hbTrId("txt_clock_setlabel_workdays"));
 	mFormModel->appendDataFormItem(item);
+	item->setContentWidgetData("objectName", "workdays");
 	// Start of week item.
 	item = 0;
 	item = mFormModel->appendDataFormItem(HbDataFormModelItem::ComboBoxItem,
 		hbTrId("txt_clock_setlabel_week_starts_on"));
 	HbExtendedLocale::WeekDay startOfWeek = locale.startOfWeek();
 	item->setContentWidgetData("items", weekdaysList);
 	item->setContentWidgetData("currentIndex", startOfWeek);
+	item->setContentWidgetData("objectName", "startOfWeek");
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_POPULATEFORMMODEL_EXIT );
 }
 /*!
 	Returns the weekday list ordered based on start of week.
 */
 QStringList ClockRegionalSettingsView::weekdayList()
 {
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_ENTRY );
 	QStringList weekDays;
 	QStringList daysList;
+	QLocale qLocale;
 	daysList
-			<< hbTrId("txt_clk_setlabel_val_monday")
+			<< qLocale.dayName(1)
-			<< hbTrId("txt_clk_setlabel_val_tuesday")
+			<< qLocale.dayName(2)
-			<< hbTrId("txt_clk_setlabel_val_wednesday")
+			<< qLocale.dayName(3)
-			<< hbTrId("txt_clk_setlabel_val_thursday")
+			<< qLocale.dayName(4)
-			<< hbTrId("txt_clk_setlabel_val_friday")
+			<< qLocale.dayName(5)
-			<< hbTrId("txt_clk_setlabel_val_saturday")
+			<< qLocale.dayName(6)
-			<< hbTrId("txt_clk_setlabel_val_sunday");
+			<< qLocale.dayName(7);
 	HbExtendedLocale::WeekDay startOfWeekIndex =
 			HbExtendedLocale::system().startOfWeek();
 	for (int i = 0, index = startOfWeekIndex; i < daysList.count(); ++i) {
 		} else {
 			index++;
 		}
 	}
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_WEEKDAYLIST_EXIT );
 	return weekDays;
 }
 /*!
 update the start week on .
 */
 void ClockRegionalSettingsView::updateWeekStartOn()
 {
-if (mStartOfWeekItem != 0)
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_ENTRY );
-{
+	if (mStartOfWeekItem != 0)
-HbExtendedLocale locale;
+	{
-HbExtendedLocale::WeekDay weekdDayStart = locale.startOfWeek();
+		HbExtendedLocale locale;
-int currentDay = mStartOfWeekItem->currentIndex();
+		HbExtendedLocale::WeekDay weekdDayStart = locale.startOfWeek();
-if(currentDay == weekdDayStart )
+		int currentDay = mStartOfWeekItem->currentIndex();
-{
+		if(currentDay == weekdDayStart )
-return;
+		{
-}
+			OstTraceFunctionExit0(
-else
+					CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT );
-{
+			return;
-mStartOfWeekItem->setCurrentIndex(weekdDayStart);
+		}
-updateWeekDays();
+		else
-}
+		{
-}
+			mStartOfWeekItem->setCurrentIndex(weekdDayStart);
+			updateWeekDays();
+		}
+	}
+	OstTraceFunctionExit0(
+			DUP1_CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKSTARTON_EXIT );
 }
 /*!
 update the  week days .
 */
 void ClockRegionalSettingsView::updateWeekDays()
 {
-QStringList weekdays = weekdayList();
+	OstTraceFunctionEntry0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_ENTRY );
-QString workdays = mCustomPrototype->workdaysSetting();
+	QStringList weekdays = weekdayList();
-QItemSelectionModel *model = 0;
+	QString workdays = mCustomPrototype->workdaysSetting();
-model = mWorkdaysItem->selectionModel();
+	QItemSelectionModel *model = 0;
+	model = mWorkdaysItem->selectionModel();
-for (int i = 0, index = workdays.size() - 1;
-i < mWorkdaysItem->count(); ++i, index--)
+	for (int i = 0, index = workdays.size() - 1;
-{
+			i < mWorkdaysItem->count(); ++i, index--)
-QString str = weekdays[i];
+	{
-mWorkdaysItem->item(i)->setText(str);
+		QString str = weekdays[i];
+		mWorkdaysItem->item(i)->setText(str);
-QChar ch = workdays.at(index);
-if ( ch == QChar('0'))
+		QChar ch = workdays.at(index);
-{
+		if ( ch == QChar('0'))
-// Not a workday.
+		{
-model->select(
+			// Not a workday.
-model->model()->index(i,0),
+			model->select(
-QItemSelectionModel::Deselect);
+					model->model()->index(i,0),
-}
+					QItemSelectionModel::Deselect);
-else
+		}
-{
+		else
-// Workday.
+		{
-model->select(
+			// Workday.
-model->model()->index(i,0),
+			model->select(
-QItemSelectionModel::Select);}
+					model->model()->index(i,0),
-}
+					QItemSelectionModel::Select);}
+	}
+	OstTraceFunctionExit0( CLOCKREGIONALSETTINGSVIEW_UPDATEWEEKDAYS_EXIT );
 }
 // End of file	--Don't remove this.

changeset 58	ef813d54df51
parent 50	579cc610882e
child 68	a5a1242fd2e8