# HG changeset patch
# User hgs
# Date 1279878958 -10800
# Node ID a49bfe5190e43210d95da866c44c4121095b0314
# Parent  377c906a870129e6510df60b8b5f3599de3600a6
201029

diff -r 377c906a8701 -r a49bfe5190e4 phoneapp/phoneui2/src/phoneuihousehold_p.cpp
--- a/phoneapp/phoneui2/src/phoneuihousehold_p.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneapp/phoneui2/src/phoneuihousehold_p.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -181,10 +181,7 @@
 	if (translator) {
         translator->loadCommon();
         m_translators.append(translator);
-	} else {
-    delete translator;
-    translator = 0;
-}
+	}
     
 	HbTranslator *translator2 = new HbTranslator(QString("telephone_cp"));
     if (translator2) {
diff -r 377c906a8701 -r a49bfe5190e4 phoneapp/phoneuiutils/inc/tphonecmdparamglobalnote.h
--- a/phoneapp/phoneuiutils/inc/tphonecmdparamglobalnote.h	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneapp/phoneuiutils/inc/tphonecmdparamglobalnote.h	Fri Jul 23 12:55:58 2010 +0300
@@ -23,11 +23,25 @@
 //  INCLUDES
 
 #include <w32std.h>
-#include <AknGlobalNote.h> // for CAknGlobalNote
+// ##### QT CHANGE begin
+// #include <AknGlobalNote.h> // for CAknGlobalNote
+// ##### QT CHANGE end
 #include "tphonecommandparam.h"
 
 // DATA TYPES
 
+// ##### QT CHANGE begin
+// Note: as AknGlobalNote API is removed, the enumeration is temporarily copied here
+// to avoid compile break. The API needs to be changed though.
+enum TAknGlobalNoteType {
+    EAknGlobalInformationNote = 1,
+    EAknGlobalWarningNote,
+    EAknGlobalConfirmationNote,
+    EAknGlobalErrorNote,
+    EAknGlobalWaitNote
+    };
+// ##### QT CHANGE end
+
 // CLASS DECLARATION
 
 /**
diff -r 377c906a8701 -r a49bfe5190e4 phoneengine/phoneservices/src/urischemehandlerservice.cpp
--- a/phoneengine/phoneservices/src/urischemehandlerservice.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneengine/phoneservices/src/urischemehandlerservice.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -81,6 +81,7 @@
                 hbTrId("txt_phone_info_call_l1").arg(dialString),
                 HbMessageBox::MessageTypeQuestion, 
                 NULL);
+            confirmationNote.setStandardButtons(HbMessageBox::Yes | HbMessageBox::No);
             confirmationNote.setTimeout(0);
             
             const QAction *action = confirmationNote.exec();
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/dialerwidgetplugin/dialerwidgetpluging.qrc
--- a/phoneplugins/dialerwidgetplugin/dialerwidgetpluging.qrc	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/dialerwidgetpluging.qrc	Fri Jul 23 12:55:58 2010 +0300
@@ -1,13 +1,6 @@
 <RCC>
-    <qresource prefix="/icons">
-        <file>resource/qtg_fr_shortcut_badge_bg_r.png</file>
-        <file>resource/qtg_fr_shortcut_badge_bg_c.png</file>
-        <file>resource/qtg_fr_shortcut_badge_bg_l.png</file>
-        <file>resource/qtg_graf_hs_dialer.svg</file>
-    </qresource>
     <qresource prefix="/data">
     	<file>resource/dialerwidget.widgetml</file>
     	<file>resource/dialerwidget.css</file>
     </qresource>
-    
 </RCC>
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/dialerwidgetplugin/inc/dialerwidget.h
--- a/phoneplugins/dialerwidgetplugin/inc/dialerwidget.h	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/inc/dialerwidget.h	Fri Jul 23 12:55:58 2010 +0300
@@ -45,9 +45,6 @@
 public:
     DialerWidget(QGraphicsItem* parent = 0, Qt::WindowFlags flags = 0);
     ~DialerWidget();
-private:
-    
-    void createPrimitives();
     
 public slots:
     void startDialer();
@@ -68,12 +65,19 @@
 
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void handleMouseMoveEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    bool sceneEvent(QEvent *event);
     StartResult onStart();
     StopResult onStop();
     SuspendResult onSuspend();
     ResumeResult onResume();
-
+    
+private:    
+    void createPrimitives();
+    void setBackgroundToNormal();
+    void setBackgroundToPressed();    
+    
 private:
     
     HbFrameItem         *m_background;
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/dialerwidgetplugin/rom/dialerwidgetplugin.iby
--- a/phoneplugins/dialerwidgetplugin/rom/dialerwidgetplugin.iby	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/rom/dialerwidgetplugin.iby	Fri Jul 23 12:55:58 2010 +0300
@@ -21,10 +21,6 @@
 file=ABI_DIR\BUILD_DIR\dialerwidgetplugin.dll                                        	SHARED_LIB_DIR\dialerwidgetplugin.dll
 data=ZPRIVATE\20022f35\import\widgetregistry\20022F44\dialerwidgetplugin.qtplugin    	private\20022f35\import\widgetregistry\20022F44\dialerwidgetplugin.qtplugin
 data=ZPRIVATE\20022f35\import\widgetregistry\20022F44\dialerwidgetplugin.manifest    	private\20022f35\import\widgetregistry\20022F44\dialerwidgetplugin.manifest
-data=ZPRIVATE\20022f35\import\widgetregistry\20022F44\qtg_graf_hs_dialer.svg		   	private\20022f35\import\widgetregistry\20022F44\qtg_graf_hs_dialer.svg	
-data=ZPRIVATE\20022f35\import\widgetregistry\20022F44\qtg_fr_shortcut_badge_bg_r.png    private\20022f35\import\widgetregistry\20022F44\qtg_fr_shortcut_badge_bg_r.png
-data=ZPRIVATE\20022f35\import\widgetregistry\20022F44\qtg_fr_shortcut_badge_bg_l.png	private\20022f35\import\widgetregistry\20022F44\qtg_fr_shortcut_badge_bg_l.png
-data=ZPRIVATE\20022f35\import\widgetregistry\20022F44\qtg_fr_shortcut_badge_bg_c.png    private\20022f35\import\widgetregistry\20022F44\qtg_fr_shortcut_badge_bg_c.png       
 data=ZPRIVATE\20022f35\import\widgetregistry\20022F44\dialerwidgetplugin.xml          private\20022f35\import\widgetregistry\20022F44\dialerwidgetplugin.xml
 
 #endif //__DIALERWIDETPLUGIN_IBY__
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp
--- a/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/dialerwidgetplugin/src/dialerwidget.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -15,6 +15,8 @@
 *
 */
 
+#include <QGraphicsSceneMouseEvent>
+
 #include <HbStyle>
 #include <HbStyleLoader>
 #include <HbFrameItem>
@@ -39,7 +41,8 @@
 
 namespace
 {
-    const char KDialerWidgetIcon[] = "qtg_graf_hs_dialer_normal";
+    const char KDialerWidgetIconNormal[] = "qtg_graf_hs_dialer_normal";
+    const char KDialerWidgetIconPressed[] = "qtg_graf_hs_dialer_pressed";
     const char KMissedCallShortcutBadge[] = "qtg_fr_shortcut_badge_bg";
     const char KDialerWidgetWidgetml[] = ":/data/resource/dialerwidget.widgetml";
     const char KDialerWidgetCss[] = ":/data/resource/dialerwidget.css";
@@ -58,7 +61,8 @@
 */
 DialerWidget::DialerWidget(QGraphicsItem *parent, Qt::WindowFlags flags)
   : HsWidget(parent, flags),
-    m_background(0), m_badgeBackground(0), m_text(0), m_touchArea(0)
+    m_background(0), m_badgeBackground(0), m_text(0), m_touchArea(0),
+    m_engine(0)
 {   
     PHONE_TRACE 
 }
@@ -199,20 +203,34 @@
 {
     PHONE_TRACE;
     Q_UNUSED(event)
-    HbInstantFeedback::play(HbFeedback::Basic);
+    setBackgroundToPressed();
 }
 
-/*!
-    \fn void DialerWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
+void DialerWidget::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (contains(event->pos())) {
+        setBackgroundToPressed();
+    } else {
+        setBackgroundToNormal();
+    }
+}
 
-    Dialer widget start is triggered from release \a event.
-    \sa startDialer()
-*/
 void DialerWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
 {
     PHONE_TRACE;
     Q_UNUSED(event);
-    startDialer();
+    HbInstantFeedback::play(HbFeedback::Basic);
+    setBackgroundToNormal();
+    startDialer();    
+}
+
+bool DialerWidget::sceneEvent(QEvent *event)
+{
+    if (event->type() == QEvent::UngrabMouse) {
+        setBackgroundToNormal();
+    }
+
+    return HsWidget::sceneEvent(event);;
 }
 
 HsWidget::StartResult DialerWidget::onStart()
@@ -238,9 +256,9 @@
     // Background
     if (!m_background) {
         HbFrameDrawer *drawer = new HbFrameDrawer(
-            KDialerWidgetIcon, HbFrameDrawer::OnePiece);
+            KDialerWidgetIconNormal, HbFrameDrawer::OnePiece);
         m_background = new HbFrameItem(drawer, this);
-        style()->setItemName(m_background, /*QLatin1String(*/"background"/*)*/);
+        style()->setItemName(m_background, QLatin1String("background"));
         m_background->moveBy(0,10);
         m_background->resize(81,81);
     }
@@ -281,3 +299,19 @@
     }
 }
 
+void DialerWidget::setBackgroundToNormal()
+{
+    if (m_background) {
+        m_background->frameDrawer().
+            setFrameGraphicsName(KDialerWidgetIconNormal);
+    }
+}
+
+void DialerWidget::setBackgroundToPressed()
+{
+    if (m_background) {
+        m_background->frameDrawer().
+            setFrameGraphicsName(KDialerWidgetIconPressed);
+    }
+}
+
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/infowidget/inc/infowidget.h
--- a/phoneplugins/infowidgetplugin/infowidget/inc/infowidget.h	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/inc/infowidget.h	Fri Jul 23 12:55:58 2010 +0300
@@ -29,6 +29,7 @@
 class QGraphicsSceneMouseEvent;
 class QGraphicsLinearLayout;
 class QTranslator; 
+class QGestureEvent; 
 class HbDialog;
 class HbIconItem; 
 class HbMarqueeItem;
@@ -39,7 +40,8 @@
 class HbAction; 
 class InfoWidgetEngine; 
 class InfoWidgetPreferences;
- 
+
+
 // Class declaration
 class InfoWidget : public HbWidget
 {
@@ -81,17 +83,13 @@
     void setSpnDisplay(QString value);
     
 protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); 
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event); 
+    void gestureEvent(QGestureEvent *event); 
     void changeEvent(QEvent *event);
     void timerEvent(QTimerEvent *event);
     
     void updateInfoDisplay();
     bool readPersistentPreferences();
     void initializeCheckBoxStates(); 
-    bool installTranslator(QString translationFile); 
-    void removeTranslators(); 
      
 private: 
     void updateItemsVisibility();
@@ -137,9 +135,6 @@
     QScopedPointer<InfoWidgetEngine> m_engine;
     QScopedPointer<InfoWidgetPreferences> m_preferences;
     QScopedPointer<InfoWidgetLayoutManager> m_layoutManager;
-    
-    // Translators, owned
-    QList<QTranslator *> m_translators;
 
     // Widget main layout, not owned 
     QGraphicsLinearLayout *m_layout;
@@ -156,7 +151,6 @@
     
     // Flags 
     bool m_layoutChanging;
-    bool m_dragEvent; 
     bool m_initialized;
 
 };
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/infowidget/src/infowidget.cpp
--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidget.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidget.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -27,14 +27,15 @@
 #include <hbmessagebox.h>
 #include <hbframedrawer.h>
 #include <hbframeitem.h>
+#include <hbtapgesture.h>
 #include <QPainter>
 #include <QPainterPath>
 #include <QBrush>
 #include <QGraphicsLinearLayout>
 #include <QApplication>
 #include <QLocale>
-#include <QTranslator>
 #include <QScopedPointer>
+#include <QGesture>
 #include "infowidgetlogging.h"
 #include "infowidgetengine.h"
 #include "infowidgetlayoutmanager.h"
@@ -54,8 +55,6 @@
 const int INFOWIDGET_DEFAULT_HEIGHT = 100;
 const int INFOWIDGET_DEFAULT_WIDTH = 200;
 const int INFOWIDGET_MARQUEE_START_DELAY = 5000; 
-const char *TS_FILE_OPERATOR_WIDGET = "operator_widget"; 
-const char *TS_FILE_COMMON = "common";
 const char *BACKGROUND_FRAME_NAME = "qtg_fr_hswidget_normal"; 
 
 /*!
@@ -71,15 +70,11 @@
     m_backgroundFrameItem(NULL),
     m_timerId(0),
     m_layoutChanging(false),
-    m_dragEvent(false), 
     m_initialized(false)
 {
     INSTALL_TRACE_MSG_HANDLER; 
     DPRINT;
-    
-    // Localization file loading
-    installTranslator(TS_FILE_OPERATOR_WIDGET);
-
+ 
     // Create layout & child-widget manager 
     m_layoutManager.reset(new InfoWidgetLayoutManager);
     
@@ -116,7 +111,10 @@
     m_backgroundFrameItem = new HbFrameItem(
             backgroundFrameDrawer.take(), this);  
     
-    setBackgroundItem(m_backgroundFrameItem); 
+    setBackgroundItem(m_backgroundFrameItem);
+    
+    // Listen for tap events 
+    grabGesture(Qt::TapGesture);
 }
 
 /*!
@@ -128,9 +126,6 @@
     // Force layout manager to delete widgets 
     // before InfoWidget is destroyed   
     m_layoutManager->destroyWidgets(); 
-    
-    // Remove and delete language translators 
-    removeTranslators(); 
     UNINSTALL_TRACE_MSG_HANDLER;
 }
 
@@ -145,7 +140,6 @@
     m_initialized = true; 
     // Initialize preferences from meta-object data
     if (!readPersistentPreferences()) {
-
         // Reading failed, initialize default values  
         m_preferences->setPreference(InfoWidgetPreferences::DisplaySpn, 
                 DISPLAY_SETTING_ON);
@@ -226,40 +220,6 @@
 }
 
 /*!
-    Install widget translator for given translation file.  
-*/
-bool InfoWidget::installTranslator(QString translationFile)
-{
-    DPRINT;
-    QString lang = QLocale::system().name();
-    QString path = "z:/resource/qt/translations/";
-    bool translatorLoaded(false);  
-    
-    QScopedPointer<QTranslator> widgetTranslator; 
-    widgetTranslator.reset(new QTranslator);
-    translatorLoaded = widgetTranslator->load(
-            path + translationFile + "_" + lang);
-    if (translatorLoaded) {
-        qApp->installTranslator(widgetTranslator.data());
-        m_translators.append(widgetTranslator.take()); 
-        DPRINT << ": translator installed: " << translationFile; 
-    }
-    return translatorLoaded;
-}
-
-/*!
-    Remove translators. No need to call 
-    QApplication::removeTranslator, 
-    QTranslator object removes itself before deletion.  
-*/
-void InfoWidget::removeTranslators()
-{
-    DPRINT;
-    qDeleteAll(m_translators);
-    m_translators.clear();
-}
-
-/*!
     Returns bounding rect. 
 */
 QRectF InfoWidget::boundingRect() const
@@ -270,7 +230,8 @@
 /*!
     Calculate widget size hint based on visible row count.  
 */
-QSizeF InfoWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const   
+QSizeF InfoWidget::sizeHint(Qt::SizeHint which, 
+        const QSizeF & constraint) const   
 {
     Q_UNUSED(which);
     Q_UNUSED(constraint); 
@@ -503,43 +464,28 @@
 }
 
 /*!
-    Mouse press handler. 
+    Tap gesture handler.   
 */
-void InfoWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_UNUSED(event);
-    // Clear flag 
-    m_dragEvent = false; 
-}
-
-/*!
-    Mouse release handler.  
-*/
-void InfoWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+void InfoWidget::gestureEvent(QGestureEvent *event)
 {
-    Q_UNUSED(event);
-    // If widget wasn't dragged 
-    // layout and open settings dialog
-    if ((!m_dragEvent) && 
-          m_layoutManager->currentDisplayRole() == 
-                  InfoWidgetLayoutManager::InfoDisplay) {
-        DPRINT << ": layout and display settings dialog";
-        layoutSettingsDialog();
-    } 
+HbTapGesture *gesture = qobject_cast<HbTapGesture *>(
+        event->gesture(Qt::TapGesture));
+
+if(!gesture)return;
+switch (gesture->state()) {
+    case Qt::GestureFinished:
+        if (gesture->tapStyleHint() == HbTapGesture::Tap) {
+            if (m_layoutManager->currentDisplayRole() == 
+                            InfoWidgetLayoutManager::InfoDisplay) {
+                  DPRINT << ": layout and display settings dialog";
+                  layoutSettingsDialog();
+              } 
+        }
+    break;
     
-    // Clear flag 
-    m_dragEvent = false; 
-}
-
-/*!
-    Mouse move handler.  
-*/
-void InfoWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    Q_UNUSED(event);
-    // Mouse is moving 
-    // after mouse press event
-    m_dragEvent = true; 
+    default: 
+        break;
+    }
 }
 
 /*!
@@ -852,7 +798,7 @@
 }
 
 /*!
-   \reimp
+   Listen for theme change event. 
 */
 void InfoWidget::changeEvent(QEvent *event)
 {
@@ -878,8 +824,6 @@
 
 /*!
    Start marquee animations. 
-   First find existing marquee items and 
-   enable marquee sequence. 
 */
 bool InfoWidget::startMarquees()
 {  
@@ -957,7 +901,9 @@
 
 /*!
    Starts marquee animation for 
-   next item in sequence.  
+   next item in sequence. Called if there are 
+   multiple text items needing marquee and animation 
+   start/stop logic is needed.    
 */
 void InfoWidget::marqueeNext()
 {  
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/infowidget/src/infowidgetnetworkhandler.cpp
--- a/phoneplugins/infowidgetplugin/infowidget/src/infowidgetnetworkhandler.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidget/src/infowidgetnetworkhandler.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -52,9 +52,14 @@
 InfoWidgetNetworkHandler::~InfoWidgetNetworkHandler()
 {
     DPRINT;
-    // Disable MCN setting, 
-    // display client is being deleted 
-    disableMcn(); 
+    try {
+        // Disable MCN setting, 
+        // display client is being deleted
+        disableMcn(); 
+    } catch (const std::exception& ex) {
+        DCRITICAL << ": exception detected: " << ex.what();  
+    }      
+     
 }    
 
 /*!
@@ -287,9 +292,7 @@
 }
 
 /*!
-    InfoWidgetNetworkHandler::writeMcnDisplayState()
-    
-    Handler for cenrep key writing   
+    Write Mcn cenrep key.   
 */
 void InfoWidgetNetworkHandler::writeMcnDisplayState(bool enabled)
 {
@@ -309,7 +312,7 @@
 }
 
 /*!
-    InfoWidgetNetworkHandler::readMcnDisplayState()
+    Read Mcn cenrep key.
 */
 bool InfoWidgetNetworkHandler::readMcnDisplayState()
 {
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/resource/infowidgetplugin.manifest
--- a/phoneplugins/infowidgetplugin/resource/infowidgetplugin.manifest	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/resource/infowidgetplugin.manifest	Fri Jul 23 12:55:58 2010 +0300
@@ -3,7 +3,8 @@
     <uri>infowidgetplugin</uri> 
     <title>txt_long_caption_operator_widget</title> 
     <description>txt_operatorwidget_dblist_val_operator_information</description>
-    <icon></icon>
+    <icon>qtg_large_operator_info</icon>
+    <previewimage>qtg_large_operator_info</previewimage>
     <hidden>false</hidden>
     <servicexml>infowidgetplugin.xml</servicexml> 
     <translationfile>operator_widget</translationfile>
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbstyle.cpp
--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbstyle.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbstyle.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -75,28 +75,6 @@
 
 
 // -----------------------------------------------------------------------------
-// HbStyle::registerPlugin
-// -----------------------------------------------------------------------------
-//
-int HbStyle::registerPlugin( 
-        const QString & pluginName )
-    {
-    SMC_MOCK_METHOD1( int, const QString &, pluginName )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbStyle::unregisterPlugin
-// -----------------------------------------------------------------------------
-//
-void HbStyle::unregisterPlugin( 
-        const QString & pluginName )
-    {
-    SMC_MOCK_METHOD1( void, const QString &, pluginName )
-    }
-
-
-// -----------------------------------------------------------------------------
 // HbStyle::setItemName
 // -----------------------------------------------------------------------------
 //
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbwidget.cpp
--- a/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbwidget.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/mocks/mock_hbwidget.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -284,19 +284,6 @@
 // -----------------------------------------------------------------------------
 //
 void HbWidget::setBackgroundItem( 
-        HbStyle::Primitive ,
-        int  )
-    {
-  //  SMC_MOCK_METHOD2( void, HbStyle::Primitive, type, 
-    //    int, zValue )
-    }
-
-
-// -----------------------------------------------------------------------------
-// HbWidget::setBackgroundItem
-// -----------------------------------------------------------------------------
-//
-void HbWidget::setBackgroundItem( 
         QGraphicsItem * ,
         int  )
     {
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/tsrc/ut_infowidget/inc/ut_infowidget.h
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/inc/ut_infowidget.h	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/inc/ut_infowidget.h	Fri Jul 23 12:55:58 2010 +0300
@@ -51,9 +51,6 @@
     void t_setSatDisplay();
 
     void t_paint(); 
-    void t_mousePressEvent();
-    void t_mouseReleaseEvent(); 
-    void t_mouseMoveEvent(); 
     void t_updateInfoDisplay();
     void t_readPersistentPreferences();
 
@@ -86,7 +83,7 @@
      * Not work from commmand prompt.
      */
     void t_changeEvent();
-    
+    void t_gestureEvent(); 
     void t_timerEvent(); 
 
 private:
diff -r 377c906a8701 -r a49bfe5190e4 phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp
--- a/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp	Fri Jul 09 15:40:55 2010 +0300
+++ b/phoneplugins/infowidgetplugin/tsrc/ut_infowidget/src/ut_infowidget.cpp	Fri Jul 23 12:55:58 2010 +0300
@@ -17,6 +17,7 @@
 #include <QString>
 #include <QPainter>
 #include <QEvent>
+#include <QGesture>
 #include <QGraphicsWidget>
 #include <QGraphicsSceneMouseEvent>
 #include <HbMarqueeItem>
@@ -184,54 +185,6 @@
     m_infoWidget->paint(painter.data(), option, widget);
 }
 
-/*!
-  UT_InfoWidget::t_mousePressEvent
- */
-void UT_InfoWidget::t_mousePressEvent()
-{
-    QGraphicsSceneMouseEvent event;
-    m_infoWidget->mousePressEvent(&event);
-}
-
-/*!
-  UT_InfoWidget::t_mouseReleaseEvent
- */
-void UT_InfoWidget::t_mouseReleaseEvent()
-{
-    QGraphicsSceneMouseEvent event;
-    
-    // widget clicked while showing info display => 
-    // switch to settings display expected
-    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
-        .returns(InfoWidgetLayoutManager::InfoDisplay);
-    EXPECT(InfoWidgetLayoutManager::layoutSettingsDialog);
-    m_infoWidget->mousePressEvent(&event);
-    m_infoWidget->mouseReleaseEvent(&event);
-    
-    // widget clicked while showing settings display => 
-    // no action expected
-    EXPECT(InfoWidgetLayoutManager::currentDisplayRole)
-        .returns(InfoWidgetLayoutManager::SettingsDialog);
-    EXPECT(InfoWidgetLayoutManager::layoutSettingsDialog).times(0);
-    m_infoWidget->mousePressEvent(&event);
-    m_infoWidget->mouseReleaseEvent(&event);
-    
-    // release event received after dragging widget => 
-    // no action expected
-    EXPECT(InfoWidgetLayoutManager::layoutSettingsDialog).times(0);
-    m_infoWidget->mouseMoveEvent(&event);
-    m_infoWidget->mouseReleaseEvent(&event);
-    
-    QVERIFY(verify());
-}
-
-/*!
-  UT_InfoWidget::t_mouseMoveEvent
- */
-void UT_InfoWidget::t_mouseMoveEvent()
-{
-    
-}
 
 /*!
   UT_InfoWidget::t_updateInfoDisplay
@@ -815,5 +768,18 @@
     QVERIFY(verify());
 }
 
+/*!
+  UT_InfoWidget::t_gestureEvent
+ */
+void UT_InfoWidget::t_gestureEvent()
+{
+    QList<QGesture> gestures; 
+    //QScopedPointer<QGestureEvent> event(new QGestureEvent); 
+    //void gestureEvent(QGestureEvent *event); 
+    m_infoWidget->gestureEvent(NULL);  
+    QVERIFY(verify());
+}
+
+
 
 QTEST_MAIN_S60(UT_InfoWidget)