--- a/camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp	Wed Aug 18 09:37:18 2010 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-#include <coemain.h>
 #include <QProcess>
 #include <QApplication>
 #include <hbmainwindow.h>
@@ -53,15 +52,19 @@
 #include "cxuisettingradiobuttonlist.h"
 #include "cxuisettingslider.h"
 #include "cxuisettingsinfo.h"
+
+#ifdef Q_OS_SYMBIAN
 #include "OstTraceDefinitions.h"
-#include "cxuiserviceprovider.h"
-#include "cxuizoomslider.h"
-#include "cxuifullscreenpopup.h"
 
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cxuiprecaptureviewTraces.h"
 #endif
-#include "cxegeotaggingtrail.h"
+
+#endif //Q_OS_SYMBIAN
+
+#include "cxuifullscreenpopup.h"
+#include "cxuiserviceprovider.h"
+#include "cxuizoomslider.h"
 
 using namespace CxUiLayout;
 using namespace CxUiSettings;
@@ -120,7 +123,7 @@
                                    HbActivityManager *activityManager)
 {
     CX_DEBUG_ENTER_FUNCTION();
-    OstTrace0( camerax_performance, CXUIPRECAPTUREVIEW_CONSTRUCT, "msg: e_CX_PRECAPVIEW_CONST 1" );
+    OstTrace0(camerax_performance, CXUIPRECAPTUREVIEW_CONSTRUCT_1, "msg: e_CX_PRECAPVIEW_CONSTRUCT 1");
 
     CxuiView::construct(mainWindow, engine, documentLoader, keyHandler, activityManager);
 
@@ -160,7 +163,7 @@
         setNavigationAction(exitAction);
     }
 
-    OstTrace0( camerax_performance, DUP1_CXUIPRECAPTUREVIEW_CONSTRUCT, "msg: e_CX_PRECAPVIEW_CONST 0" );
+    OstTrace0(camerax_performance, CXUIPRECAPTUREVIEW_CONSTRUCT_2, "msg: e_CX_PRECAPVIEW_CONSTRUCT 0");
 
     QCoreApplication::instance()->installEventFilter(this);
     CX_DEBUG_EXIT_FUNCTION();
@@ -511,8 +514,8 @@
         }
         // disable geotagging disclaimer after geotagging setting is triggered from FirstTimeUse dialog
         QString settingId = action->property(PROPERTY_KEY_SETTING_ID).toString();
-        int value = Cxe::GeoTaggingDisclaimerDisabled;
-        mEngine->settings().get(CxeSettingIds::GEOTAGGING_DISCLAIMER, value);
+        CX_DEBUG(("settingsKey=%s", settingId.toAscii().constData()));
+        Cxe::GeoTaggingDisclaimer value = mEngine->settings().get<Cxe::GeoTaggingDisclaimer>(CxeSettingIds::GEOTAGGING_DISCLAIMER, Cxe::GeoTaggingDisclaimerDisabled);
         if (settingId == CxeSettingIds::GEOTAGGING && value == Cxe::GeoTaggingDisclaimerEnabled) {
             // disable geotagging first-time-use dialog
             disableGeotaggingDisclaimer();
@@ -886,25 +889,11 @@
 {
     CX_DEBUG_ENTER_FUNCTION();
 
-    QString ftuMsg = hbTrId("txt_cam_info_captured_photos_and_videos_will_be_ta");
-    QString actionOkTxt = hbTrId("txt_common_button_ok");
-    QString actionSettingsTxt = hbTrId("txt_cam_opt_general_settings");
-
-    HbDialog *dialog = new HbDialog();
-    HbLabel *label = new HbLabel();
+    HbMessageBox *ftuMessageBox = new HbMessageBox(hbTrId("txt_cam_info_captured_photos_and_videos_will_be_ta"),
+                                                   HbMessageBox::MessageTypeInformation);
 
-    // initializing dialog's content widget
-    label->setPlainText(ftuMsg);
-    label->setTextWrapping(Hb::TextWordWrap);
-    label->setElideMode(Qt::ElideNone);
-    label->setMaximumWidth(350);
-    dialog->setContentWidget(label);
-
-    // initializing dialog's actions
-    HbAction *okAction = new HbAction(actionOkTxt, dialog);
-    HbAction *settingsAction = new HbAction(actionSettingsTxt, dialog);
-    dialog->addAction(okAction);
-    dialog->addAction(settingsAction);
+    HbAction *okAction = new HbAction(hbTrId("txt_common_button_ok"));
+    HbAction *settingsAction = new HbAction(hbTrId("txt_cam_info_geotagging_ftu_note_settings_button"));
 
     // connecting signals for dialog's actions
     connect(okAction,
@@ -917,11 +906,13 @@
             this,
             SLOT(launchGeoTaggingSetting()));
 
-    // initializing dialog's properties
-    dialog->setTimeout(HbDialog::NoTimeout);
-    dialog->setDismissPolicy(HbPopup::NoDismiss);
-    dialog->setAttribute(Qt::WA_DeleteOnClose, true);
-    dialog->show();
+    // adding buttons to the information message
+    ftuMessageBox->setStandardButtons(HbMessageBox::NoButton);
+    ftuMessageBox->addAction(okAction);
+    ftuMessageBox->addAction(settingsAction);
+
+    ftuMessageBox->setAttribute(Qt::WA_DeleteOnClose, true);
+    ftuMessageBox->show();
 
     CX_DEBUG_EXIT_FUNCTION();
 }
@@ -941,7 +932,7 @@
 
 
 /*!
-* Slot that accepts "Geotagging first-time use" note and launches geotagging setting dialog.
+* Slot that launches geotagging setting dialog.
 */
 void CxuiPrecaptureView::launchGeoTaggingSetting()
 {