Changeset 846 for trunk/src/gui/s60framework

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/s60framework/qs60mainapplication.cpp (modified) (5 diffs)
• src/gui/s60framework/qs60mainapplication.h (modified) (5 diffs)
• src/gui/s60framework/qs60mainapplication_p.h (modified) (1 diff)
• src/gui/s60framework/qs60mainappui.cpp (modified) (10 diffs)
• src/gui/s60framework/qs60mainappui.h (modified) (6 diffs)
• src/gui/s60framework/qs60maindocument.cpp (modified) (4 diffs)
• src/gui/s60framework/qs60maindocument.h (modified) (5 diffs)
• src/gui/s60framework/s60framework.pri (modified) (1 diff)
• src/gui/s60framework/s60main.rss (modified) (1 diff)

trunk/src/gui/s60framework/qs60mainapplication.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -48 +48 @@
 #include <bautils.h>
 #include <coemain.h>
+
+
+
 
 QT_BEGIN_NAMESPACE
@@ -59 +62 @@
 }
 
-_LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main" QT_LIBINFIX_UNICODE L".rsc");
 
 /*!
@@ -72 +74 @@
   The QS60MainApplication provides a helper class for use in migrating
   from existing S60 based applications to Qt based applications. It is
-  used in the exact same way as the \c CAknApplication class from
+  used in the exact same way as the \c CApplication class from
   Symbian, but internally provides extensions used by Qt.
 
   When modifying old S60 applications that rely on implementing
-  functions in \c CAknApplication, the class should be modified to
-  inherit from this class instead of \c CAknApplication. Then the
+  functions in \c CApplication, the class should be modified to
+  inherit from this class instead of \c CApplication. Then the
   application can choose to override only certain functions. To make
   Qt use the custom application objects, pass a factory function to
   \c{QApplication::QApplication(QApplication::QS60MainApplicationFactory, int &, char **)}.
 
-  For more information on \c CAknApplication, please see the S60 documentation.
+  For more information on \c CApplication, please see the S60 documentation.
 
   Unlike other Qt classes, QS60MainApplication behaves like an S60 class, and can throw Symbian
@@ -130 +132 @@
 TFileName QS60MainApplication::ResourceFileName() const
 {
-    TFindFile finder(iCoeEnv->FsSession());
-    TInt err = finder.FindByDir(KQtWrapperResourceFile, KNullDesC);
-    if (err == KErrNone)
-        return finder.File();
     return KNullDesC();
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE

trunk/src/gui/s60framework/qs60mainapplication.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -45 +45 @@
 #include <QtCore/qglobal.h>
 
+
+
 #ifdef Q_WS_S60
-
 #include <aknapp.h>
+
+
+
+
+
 
 QT_BEGIN_HEADER
@@ -55 +61 @@
 QT_MODULE(Gui)
 
-class Q_GUI_EXPORT QS60MainApplication : public CAknApplication
+class Q_GUI_EXPORT QS60MainApplication : public 
 {
 public:
@@ -66 +72 @@
     virtual TFileName ResourceFileName() const;
 
+
+
+
+
+
+
+
+
 protected:
 
@@ -75 +89 @@
 QT_END_HEADER
 
-#endif // Q_WS_S60
+#endif // Q_
 
 #endif // QS60MAINAPPLICATION_H

trunk/src/gui/s60framework/qs60mainapplication_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/gui/s60framework/qs60mainappui.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -42 +42 @@
 // INCLUDE FILES
 #include <exception>
+
+
 #include <avkon.hrh>
 #include <eikmenub.h>
 #include <eikmenup.h>
+
+
 #include <barsread.h>
 #include <qconfig.h>
-#if defined(QT_LIBINFIX_UNQUOTED)
-// Two level macro needed for proper expansion of libinfix
-#  define QT_S60MAIN_RSG_2(x) <s60main##x##.rsg>
-#  define QT_S60MAIN_RSG(x) QT_S60MAIN_RSG_2(x)
-#  include QT_S60MAIN_RSG(QT_LIBINFIX_UNQUOTED)
-#else
-#  include <s60main.rsg>
-#endif
-#include <avkon.rsg>
 
 #include "qs60mainappui.h"
@@ -116 +111 @@
     // resource files in most SDKs. S60 3rd FP1 public seems to require resource file
     // even these flags are defined
-    TInt flags = CAknAppUi::EAknEnableSkin
-                 | CAknAppUi::ENoScreenFurniture
-                 | CAknAppUi::ENonStandardResourceFile;
+    TInt flags = CEikAppUi::ENoScreenFurniture
+               | CEikAppUi::ENonStandardResourceFile;
+#ifdef Q_WS_S60
+    flags |= CAknAppUi::EAknEnableSkin;
     // After 5th Edition S60, native side supports animated wallpapers.
-        // However, there is no support for that feature on Qt side, so indicate to
-        // native UI framework that this application will not support background animations.
+// However, there is no support for that feature on Qt side, so indicate to
+// native UI framework that this application will not support background animations.
     if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0)
         flags |= KAknDisableAnimationBackground;
+
     BaseConstructL(flags);
 }
@@ -169 +166 @@
 void QS60MainAppUi::HandleResourceChangeL(TInt type)
 {
-    CAknAppUi::HandleResourceChangeL(type);
+    ::HandleResourceChangeL(type);
 
     if (qApp) {
@@ -186 +183 @@
  * handle the event.
  */
-void QS60MainAppUi::HandleWsEventL(const TWsEvent& wsEvent, CCoeControl *destination)
+void QS60MainAppUi::HandleWsEventL(const TWsEventwsEvent, CCoeControl *destination)
 {
     int result = 0;
@@ -197 +194 @@
 
     if (result <= 0)
-        CAknAppUi::HandleWsEventL(wsEvent, destination);
+        ::HandleWsEventL(wsEvent, destination);
 }
 
@@ -237 +234 @@
 void QS60MainAppUi::DynInitMenuPaneL(TInt resourceId, CEikMenuPane *menuPane)
 {
-    if (resourceId == R_QT_WRAPPERAPP_MENU) {
+#ifdef Q_WS_S60
+    if (resourceId == R_AVKON_MENUPANE_EMPTY) {
         if (menuPane->NumberOfItemsInPane() <= 1)
             QT_TRYCATCH_LEAVING(qt_symbian_show_toplevel(menuPane));
@@ -246 +244 @@
         QT_TRYCATCH_LEAVING(qt_symbian_show_submenu(menuPane, resourceId));
     }
+
+
+
 }
 
@@ -256 +257 @@
  * If you override this function, you should call the base class implementation as well.
  */
-void QS60MainAppUi::RestoreMenuL(CCoeControl* menuWindow, TInt resourceId, TMenuType menuType)
-{
+void QS60MainAppUi::RestoreMenuL(CCoeControl *menuWindow, TInt resourceId, TMenuType menuType)
+{
+#ifdef Q_WS_S60
     if (resourceId >= QT_SYMBIAN_FIRST_MENU_ITEM && resourceId <= QT_SYMBIAN_LAST_MENU_ITEM) {
         if (menuType == EMenuPane)
@@ -263 +265 @@
         else
             DynInitMenuBarL(resourceId, (CEikMenuBar*)menuWindow);
-    } else {
-        CAknAppUi::RestoreMenuL(menuWindow, resourceId, menuType);
-    }
-}
+    } else if(resourceId == R_AVKON_MENUPANE_EMPTY) {
+        CEikMenuBarTitle *title = new(ELeave) CEikMenuBarTitle;
+        CleanupStack::PushL(title);
+
+        title->iData.iMenuPaneResourceId = R_AVKON_MENUPANE_EMPTY;
+        title->iTitleFlags = 0;
+
+        S60->menuBar()->TitleArray()->AddTitleL(title);
+        CleanupStack::Pop( title );
+    }
+    else
+#endif
+    {
+        QS60MainAppUiBase::RestoreMenuL(menuWindow, resourceId, menuType);
+    }
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::Exit()
+{
+    QS60MainAppUiBase::Exit();
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::SetFadedL(TBool aFaded)
+{
+    QS60MainAppUiBase::SetFadedL(aFaded);
+}
+
+/*!
+  \internal
+*/
+TRect QS60MainAppUi::ApplicationRect() const
+{
+    return QS60MainAppUiBase::ApplicationRect();
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::HandleScreenDeviceChangedL()
+{
+    QS60MainAppUiBase::HandleScreenDeviceChangedL();
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent)
+{
+    QS60MainAppUiBase::HandleApplicationSpecificEventL(aType, aEvent);
+}
+
+/*!
+  \internal
+*/
+TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId)
+{
+    return QS60MainAppUiBase::MopSupplyObject(aId);
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::ProcessCommandL(TInt aCommand)
+{
+    QS60MainAppUiBase::ProcessCommandL(aCommand);
+}
+
+/*!
+  \internal
+*/
+TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText)
+{
+    return QS60MainAppUiBase::HandleError(aError, aExtErr, aErrorText, aContextText);
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId)
+{
+    QS60MainAppUiBase::HandleViewDeactivation(aViewIdToBeDeactivated, aNewlyActivatedViewId);
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::PrepareToExit()
+{
+    QS60MainAppUiBase::PrepareToExit();
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::HandleTouchPaneSizeChange()
+{
+    QS60MainAppUiBase::HandleTouchPaneSizeChange();
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent)
+{
+    QS60MainAppUiBase::HandleSystemEventL(aEvent);
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::Reserved_MtsmPosition()
+{
+    QS60MainAppUiBase::Reserved_MtsmPosition();
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::Reserved_MtsmObject()
+{
+    QS60MainAppUiBase::Reserved_MtsmObject();
+}
+
+/*!
+  \internal
+*/
+void QS60MainAppUi::HandleForegroundEventL(TBool aForeground)
+{
+    QS60MainAppUiBase::HandleForegroundEventL(aForeground);
+}
+
+#ifndef Q_WS_S60
+
+void QS60StubAknAppUi::HandleViewDeactivation(const TVwsViewId &, const TVwsViewId &) {}
+void QS60StubAknAppUi::HandleTouchPaneSizeChange() {}
+void QS60StubAknAppUi::HandleStatusPaneSizeChange() {}
+void QS60StubAknAppUi::Reserved_MtsmPosition() {}
+void QS60StubAknAppUi::Reserved_MtsmObject() {}
+
+#endif
 
 QT_END_NAMESPACE

trunk/src/gui/s60framework/qs60mainappui.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -45 +45 @@
 #include <QtCore/qglobal.h>
 
+
+
 #ifdef Q_WS_S60
+
+
+
+
+
+
+
+
+
+
 
-#include <aknappui.h>
+class QS60StubMEikStatusPaneObserver
+{
+public:
+    virtual void HandleStatusPaneSizeChange() = 0;
+};
+
+class QS60StubMAknTouchPaneObserver
+{
+public:
+    virtual void HandleTouchPaneSizeChange() = 0;
+};
+
+class QS60StubAknAppUi : public QS60StubAknAppUiBase, QS60StubMEikStatusPaneObserver,
+            public MCoeViewDeactivationObserver,
+            public QS60StubMAknTouchPaneObserver
+{
+public: // MCoeViewDeactivationObserver
+    virtual void HandleViewDeactivation(const TVwsViewId&, const TVwsViewId &);
+
+public: // from MAknTouchPaneObserver
+    virtual void HandleTouchPaneSizeChange();
+
+protected: // from MEikStatusPaneObserver
+    virtual void HandleStatusPaneSizeChange();
+
+protected: // from CAknAppUi
+    virtual void Reserved_MtsmPosition();
+    virtual void Reserved_MtsmObject();
+
+private:
+    int qS60StubAknAppUiSpace[4];
+};
+
+typedef QS60StubAknAppUi QS60MainAppUiBase;
+#endif
 
 QT_BEGIN_HEADER
@@ -55 +101 @@
 QT_MODULE(Gui)
 
-class Q_GUI_EXPORT QS60MainAppUi : public CAknAppUi
+class Q_GUI_EXPORT QS60MainAppUi : public 
 {
 public:
@@ -64 +110 @@
     virtual void ConstructL();
 
-    virtual void RestoreMenuL(CCoeControl* menuWindow,TInt resourceId,TMenuType menuType);
+    virtual void RestoreMenuL(CCoeControlmenuWindow,TInt resourceId,TMenuType menuType);
     virtual void DynInitMenuBarL(TInt resourceId, CEikMenuBar *menuBar);
     virtual void DynInitMenuPaneL(TInt resourceId, CEikMenuPane *menuPane);
@@ -75 +121 @@
 
 protected:
-    virtual void HandleWsEventL(const TWsEvent& event, CCoeControl* destination);
+    virtual void HandleWsEventL(const TWsEvent &event, CCoeControl *destination);
+
+public:
+    virtual void Exit();
+    virtual void SetFadedL(TBool aFaded);
+    virtual TRect ApplicationRect() const;
+    virtual void ProcessCommandL(TInt aCommand);
+    virtual TErrorHandlerResponse HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText);
+    virtual void HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId);
+    virtual void PrepareToExit();
+    virtual void HandleTouchPaneSizeChange();
+
+protected:
+    virtual void HandleScreenDeviceChangedL();
+    virtual void HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent);
+    virtual TTypeUid::Ptr MopSupplyObject(TTypeUid aId);
+    virtual void HandleSystemEventL(const TWsEvent &aEvent);
+    virtual void Reserved_MtsmPosition();
+    virtual void Reserved_MtsmObject();
+    virtual void HandleForegroundEventL(TBool aForeground);
 };
 
@@ -82 +147 @@
 QT_END_HEADER
 
-#endif // Q_WS_S60
+#endif // Q_
 
 #endif // QS60MAINAPPUI_H

trunk/src/gui/s60framework/qs60maindocument.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -58 +58 @@
   The QS60MainDocument provides a helper class for use in migrating
   from existing S60 based applications to Qt based applications. It is
-  used in the exact same way as the \c CAknDocument class from
+  used in the exact same way as the \c CDocument class from
   Symbian, but internally provides extensions used by Qt.
 
   When modifying old S60 applications that rely on implementing
-  functions in \c CAknDocument, the class should be modified to
-  inherit from this class instead of \c CAknDocument. Then the
+  functions in \c CDocument, the class should be modified to
+  inherit from this class instead of \c CDocument. Then the
   application can choose to override only certain functions.
 
-  For more information on \c CAknDocument, please see the S60
+  For more information on \c CDocument, please see the S60
   documentation.
 
@@ -80 +80 @@
  * \a mainApplication should contain a pointer to a QS60MainApplication instance.
  */
-QS60MainDocument::QS60MainDocument(CEikApplication& mainApplication)
-    : CAknDocument(mainApplication)
+QS60MainDocument::QS60MainDocument(CEikApplicationmainApplication)
+    : (mainApplication)
 {
     // No implementation required
@@ -106 +106 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE

trunk/src/gui/s60framework/qs60maindocument.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -45 +45 @@
 #include <QtCore/qglobal.h>
 
+
+
 #ifdef Q_WS_S60
-
 #include <AknDoc.h>
+
+
+
+
+
 
 class CEikApplication;
@@ -59 +65 @@
 class QS60MainAppUi;
 
-class Q_GUI_EXPORT QS60MainDocument : public CAknDocument
+class Q_GUI_EXPORT QS60MainDocument : public 
 {
 public:
@@ -70 +76 @@
 
     virtual CEikAppUi *CreateAppUiL();
+
+
+
+
+
+
 };
 
@@ -76 +88 @@
 QT_END_HEADER
 
-#endif // Q_WS_S60
+#endif // Q_
 
 #endif // QS60MAINDOCUMENT_H

trunk/src/gui/s60framework/s60framework.pri

@@ -1 @@
-# This block serves the minimalistic resource file for S60 3.1 platforms.
-# Note there is no way to ifdef S60 version in mmp file, that is why the resource
-# file is always compiled for WINSCW
-minimalAppResource31 = \
-    "SOURCEPATH s60framework" \
-    "START RESOURCE s60main.rss" \
-    "TARGET s60main$${QT_LIBINFIX}" \
-    "HEADER" \
-    "TARGETPATH /resource/apps" \
-    "END"
-MMP_RULES += minimalAppResource31
-
 SOURCES += s60framework/qs60mainapplication.cpp \
            s60framework/qs60mainappui.cpp \

trunk/src/gui/s60framework/s60main.rss

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])