QS60Style: provide more standard icons

Add custom standard icons for Symbian iconography. Additionally,
map few existing standard icon enums to new icons.

Task-number: QT-5116
Reviewed-by: Miikka Heikkinen

4 files changed, 638 insertions, 6 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 6625416..1b84aba 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -3404,6 +3404,12 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon,
             QS60StylePrivate::SF_StateEnabled :
             QS60StylePrivate::SF_StateDisabled;
 
+    int metric = PM_ToolBarIconSize;
+#if defined(Q_WS_S60)
+    //Support version specific standard icons only with Symbian/S60 platform.
+    QSysInfo::S60Version versionSupport = QSysInfo::SV_S60_Unknown;
+#endif
+
     switch(standardIcon) {
         case SP_MessageBoxWarning:
             // By default, S60 messagebox icons have 4:3 ratio. Value is from S60 LAF documentation.
@@ -3474,11 +3480,353 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon,
             adjustedFlags |= QS60StylePrivate::SF_PointEast;
             part = QS60StyleEnums::SP_QgnIndiSubmenu;
             break;
+        case SP_TitleBarMenuButton:
+#if defined(Q_WS_S60)
+            versionSupport = QSysInfo::SV_S60_5_3;
+#endif
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarOptions;
+            break;
+        case SP_DirHomeIcon:
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QgnIndiBrowserTbHome;
+            break;
+        case SP_BrowserReload:
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QgnIndiBrowserTbReload;
+            break;
+        case SP_BrowserStop:
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QgnIndiBrowserTbStop;
+            break;
+#if defined(Q_WS_S60)
+        case SP_MediaPlay:
+            versionSupport = QSysInfo::SV_S60_5_3;
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarPlay;
+            break;
+        case SP_MediaStop:
+            versionSupport = QSysInfo::SV_S60_5_3;
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarStop;
+            break;
+        case SP_MediaPause:
+            versionSupport = QSysInfo::SV_S60_5_3;
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarPause;
+            break;
+        case SP_MediaSkipForward:
+            versionSupport = QSysInfo::SV_S60_5_3;
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarNext;
+            break;
+        case SP_MediaSkipBackward:
+            versionSupport = QSysInfo::SV_S60_5_3;
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarPrevious;
+            break;
+        case SP_MediaSeekForward:
+            versionSupport = QSysInfo::SV_S60_5_3;
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarForward;
+            break;
+        case SP_MediaSeekBackward:
+            versionSupport = QSysInfo::SV_S60_5_3;
+            metric = PM_SmallIconSize;
+            part = QS60StyleEnums::SP_QtgToolBarRewind;
+            break;
+#endif
+// Custom icons
+        case SP_CustomToolBarAdd:
+            part = QS60StyleEnums::SP_QtgToolBarAdd;
+            break;
+        case SP_CustomToolBarAddDetail:
+            part = QS60StyleEnums::SP_QtgToolBarAddDetail;
+            break;
+        case SP_CustomToolBarAgain:
+            part = QS60StyleEnums::SP_QtgToolBarAgain;
+            break;
+        case SP_CustomToolBarAgenda:
+            part = QS60StyleEnums::SP_QtgToolBarAgenda;
+            break;
+        case SP_CustomToolBarAudioOff:
+            part = QS60StyleEnums::SP_QtgToolBarAudioOff;
+            break;
+        case SP_CustomToolBarAudioOn:
+            part = QS60StyleEnums::SP_QtgToolBarAudioOn;
+            break;
+        case SP_CustomToolBarBack:
+            part = QS60StyleEnums::SP_QtgToolBarBack;
+            break;
+        case SP_CustomToolBarBluetoothOff:
+            part = QS60StyleEnums::SP_QtgToolBarBluetoothOff;
+            break;
+        case SP_CustomToolBarBluetoothOn:
+            part = QS60StyleEnums::SP_QtgToolBarBluetoothOn;
+            break;
+        case SP_CustomToolBarCancel:
+            part = QS60StyleEnums::SP_QtgToolBarCancel;
+            break;
+        case SP_CustomToolBarDelete:
+            part = QS60StyleEnums::SP_QtgToolBarDelete;
+            break;
+        case SP_CustomToolBarDone:
+            part = QS60StyleEnums::SP_QtgToolBarDone;
+            break;
+        case SP_CustomToolBarEdit:
+            part = QS60StyleEnums::SP_QtgToolBarEdit;
+            break;
+        case SP_CustomToolBarEmailSend:
+            part = QS60StyleEnums::SP_QtgToolBarEmailSend;
+            break;
+        case SP_CustomToolBarEmergencyCall:
+            part = QS60StyleEnums::SP_QtgToolBarEmergencyCall;
+            break;
+        case SP_CustomToolBarFavouriteAdd:
+            part = QS60StyleEnums::SP_QtgToolBarFavouriteAdd;
+            break;
+        case SP_CustomToolBarFavouriteRemove:
+            part = QS60StyleEnums::SP_QtgToolBarFavouriteRemove;
+            break;
+        case SP_CustomToolBarFavourites:
+            part = QS60StyleEnums::SP_QtgToolBarFavourites;
+            break;
+        case SP_CustomToolBarGo:
+            part = QS60StyleEnums::SP_QtgToolBarGo;
+            break;
+        case SP_CustomToolBarHome:
+            part = QS60StyleEnums::SP_QtgToolBarHome;
+            break;
+        case SP_CustomToolBarList:
+            part = QS60StyleEnums::SP_QtgToolBarList;
+            break;
+        case SP_CustomToolBarLock:
+            part = QS60StyleEnums::SP_QtgToolBarLock;
+            break;
+        case SP_CustomToolBarLogs:
+            part = QS60StyleEnums::SP_QtgToolBarLogs;
+            break;
+        case SP_CustomToolBarMenu:
+            part = QS60StyleEnums::SP_QtgToolBarMenu;
+            break;
+        case SP_CustomToolBarNewContact:
+            part = QS60StyleEnums::SP_QtgToolBarNewContact;
+            break;
+        case SP_CustomToolBarNewGroup:
+            part = QS60StyleEnums::SP_QtgToolBarNewGroup;
+            break;
+        case SP_CustomToolBarNowPlay:
+            part = QS60StyleEnums::SP_QtgToolBarNowPlay;
+            break;
+        case SP_CustomToolBarOptions:
+            part = QS60StyleEnums::SP_QtgToolBarOptions;
+            break;
+        case SP_CustomToolBarOther:
+            part = QS60StyleEnums::SP_QtgToolBarOther;
+            break;
+        case SP_CustomToolBarOvi:
+            part = QS60StyleEnums::SP_QtgToolBarOvi;
+            break;
+        case SP_CustomToolBarRead:
+            part = QS60StyleEnums::SP_QtgToolBarRead;
+            break;
+        case SP_CustomToolBarRefresh:
+            part = QS60StyleEnums::SP_QtgToolBarRefresh;
+            break;
+        case SP_CustomToolBarRemoveDetail:
+            part = QS60StyleEnums::SP_QtgToolBarRemoveDetail;
+            break;
+        case SP_CustomToolBarRepeat:
+            part = QS60StyleEnums::SP_QtgToolBarRepeat;
+            break;
+        case SP_CustomToolBarRepeatOff:
+            part = QS60StyleEnums::SP_QtgToolBarRepeatOff;
+            break;
+        case SP_CustomToolBarRepeatOne:
+            part = QS60StyleEnums::SP_QtgToolBarRepeatOne;
+            break;
+        case SP_CustomToolBarSearch:
+            part = QS60StyleEnums::SP_QtgToolBarSearch;
+            break;
+        case SP_CustomToolBarSelfTimer:
+            part = QS60StyleEnums::SP_QtgToolBarSelfTimer;
+            break;
+        case SP_CustomToolBarSend:
+            part = QS60StyleEnums::SP_QtgToolBarSend;
+            break;
+        case SP_CustomToolBarShare:
+            part = QS60StyleEnums::SP_QtgToolBarShare;
+            break;
+        case SP_CustomToolBarShift:
+            part = QS60StyleEnums::SP_QtgToolBarShift;
+            break;
+        case SP_CustomToolBarShuffle:
+            part = QS60StyleEnums::SP_QtgToolBarShuffle;
+            break;
+        case SP_CustomToolBarShuffleOff:
+            part = QS60StyleEnums::SP_QtgToolBarShuffleOff;
+            break;
+        case SP_CustomToolBarSignalOff:
+            part = QS60StyleEnums::SP_QtgToolBarSignalOff;
+            break;
+        case SP_CustomToolBarSignalOn:
+            part = QS60StyleEnums::SP_QtgToolBarSignalOn;
+            break;
+        case SP_CustomToolBarSync:
+            part = QS60StyleEnums::SP_QtgToolBarSync;
+            break;
+        case SP_CustomToolBarUnlock:
+            part = QS60StyleEnums::SP_QtgToolBarUnlock;
+            break;
+        case SP_CustomToolBarUnmark:
+            part = QS60StyleEnums::SP_QtgToolBarUnmark;
+            break;
+        case SP_CustomToolBarView:
+            part = QS60StyleEnums::SP_QtgToolBarView;
+            break;
+        case SP_CustomToolBarWlanOff:
+            part = QS60StyleEnums::SP_QtgToolBarWlanOff;
+            break;
+        case SP_CustomToolBarWlanOn:
+            part = QS60StyleEnums::SP_QtgToolBarWlanOn;
+            break;
+#if defined(Q_WS_S60)
+        case SP_CustomCameraCaptureButton:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonCaptureNormal;
+            break;
+        case SP_CustomCameraCaptureButtonPressed:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonCapturePressed;
+            break;
+        case SP_CustomCameraPauseButton:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonPauseNormal;
+            break;
+        case SP_CustomCameraPauseButtonPressed:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonPausePressed;
+            break;
+        case SP_CustomCameraPlayButton:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonPlayNormal;
+            break;
+        case SP_CustomCameraPlayButtonPressed:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonPlayPressed;
+            break;
+        case SP_CustomCameraRecButton:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonRecNormal;
+            break;
+        case SP_CustomCameraRecButtonPressed:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonRecPressed;
+            break;
+        case SP_CustomCameraStopButton:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonStopNormal;
+            break;
+        case SP_CustomCameraStopButtonPressed:
+            versionSupport = QSysInfo::SV_S60_5_2;
+            part = QS60StyleEnums::SP_QtgGrafCameraButtonStopPressed;
+            break;
+#endif
+        case SP_CustomTabAll:
+            part = QS60StyleEnums::SP_QtgTabAll;
+            break;
+        case SP_CustomTabArtist:
+            part = QS60StyleEnums::SP_QtgTabArtist;
+            break;
+        case SP_CustomTabFavourite:
+            part = QS60StyleEnums::SP_QtgTabFavourite;
+            break;
+        case SP_CustomTabGenre:
+            part = QS60StyleEnums::SP_QtgTabGenre;
+            break;
+        case SP_CustomTabLanguage:
+            part = QS60StyleEnums::SP_QtgTabLanguage;
+            break;
+        case SP_CustomTabMusicAlbum:
+            part = QS60StyleEnums::SP_QtgTabMusicAlbum;
+            break;
+        case SP_CustomTabPhotosAlbum:
+            part = QS60StyleEnums::SP_QtgTabPhotosAlbum;
+            break;
+        case SP_CustomTabPhotosAll:
+            part = QS60StyleEnums::SP_QtgTabPhotosAll;
+            break;
+        case SP_CustomTabPlaylist:
+            part = QS60StyleEnums::SP_QtgTabPlaylist;
+            break;
+        case SP_CustomTabServices:
+            part = QS60StyleEnums::SP_QtgTabServices;
+            break;
+        case SP_CustomTabSongs:
+            part = QS60StyleEnums::SP_QtgTabSongs;
+            break;
+        case SP_CustomTabVideos:
+            part = QS60StyleEnums::SP_QtgTabVideos;
+            break;
+        case SP_CustomToolBarEditDisabled:
+            part = QS60StyleEnums::SP_QtgToolBarEditDisabled;
+            break;
+        case SP_CustomToolBarImageTools:
+            part = QS60StyleEnums::SP_QtgToolBarImageTools;
+            break;
+        case SP_CustomToolBarNextFrame:
+            part = QS60StyleEnums::SP_QtgToolBarNextFrame;
+            break;
+        case SP_CustomToolBarPreviousFrame:
+            part = QS60StyleEnums::SP_QtgToolBarPreviousFrame;
+            break;
+        case SP_CustomToolBarRedoDisabled:
+            part = QS60StyleEnums::SP_QtgToolBarRedoDisabled;
+            break;
+        case SP_CustomToolBarRedo:
+            part = QS60StyleEnums::SP_QtgToolBarRedo;
+            break;
+        case SP_CustomToolBarRemoveDisabled:
+            part = QS60StyleEnums::SP_QtgToolBarRemoveDisabled;
+            break;
+        case SP_CustomToolBarSearchDisabled:
+            part = QS60StyleEnums::SP_QtgToolBarSearchDisabled;
+            break;
+        case SP_CustomToolBarSelectContent:
+            part = QS60StyleEnums::SP_QtgToolBarSelectContent;
+            break;
+        case SP_CustomToolBarSendDimmed:
+            part = QS60StyleEnums::SP_QtgToolBarSendDimmed;
+            break;
+        case SP_CustomToolBarTools:
+            part = QS60StyleEnums::SP_QtgToolBarTools;
+            break;
+        case SP_CustomToolBarTrim:
+            part = QS60StyleEnums::SP_QtgToolBarTrim;
+            break;
         default:
             return QCommonStyle::standardIconImplementation(standardIcon, option, widget);
     }
+
+#if defined(Q_WS_S60)
+    //If new custom standardIcon is missing version information, assume S60 5.3.
+    if (standardIcon >= SP_CustomToolBarAdd) {
+        if (versionSupport == QSysInfo::SV_Unknown)
+            versionSupport = QSysInfo::SV_S60_5_3;
+        metric = PM_SmallIconSize;
+    }
+
+    // Toolbar icons are only available from SV_S60_5_3 onwards. Use common style for earlier releases.
+    if ((versionSupport != QSysInfo::SV_Unknown) && QSysInfo::s60Version() < versionSupport) {
+        return QCommonStyle::standardIconImplementation(standardIcon, option, widget);
+    }
+#else
+    if (standardIcon >= SP_CustomToolBarAdd)
+        metric = PM_SmallIconSize;
+#endif
+
     const QS60StylePrivate::SkinElementFlags flags = adjustedFlags;
-    const int iconDimension = QS60StylePrivate::pixelMetric(PM_ToolBarIconSize);
+    const int iconDimension = QS60StylePrivate::pixelMetric(metric);
     const QRect iconSize = (!option) ? 
         QRect(0, 0, iconDimension * iconWidthMultiplier, iconDimension * iconHeightMultiplier) : option->rect;
     const QPixmap cachedPixMap(QS60StylePrivate::cachedPart(part, iconSize.size(), 0, flags));
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
index 8ec5eb9..0e76cf2 100644
--- a/src/gui/styles/qs60style.h
+++ b/src/gui/styles/qs60style.h
@@ -62,6 +62,94 @@ enum {
     PM_CbaIconHeight
     };
 
+enum {
+    SP_CustomToolBarAdd = QStyle::SP_CustomBase + 1,
+    SP_CustomToolBarAddDetail,
+    SP_CustomToolBarAgain,
+    SP_CustomToolBarAgenda,
+    SP_CustomToolBarAudioOff,
+    SP_CustomToolBarAudioOn,
+    SP_CustomToolBarBack,
+    SP_CustomToolBarBluetoothOff,
+    SP_CustomToolBarBluetoothOn,
+    SP_CustomToolBarCancel,
+    SP_CustomToolBarDelete,
+    SP_CustomToolBarDone,
+    SP_CustomToolBarEdit,
+    SP_CustomToolBarEditDisabled,
+    SP_CustomToolBarEmailSend,
+    SP_CustomToolBarEmergencyCall,
+    SP_CustomToolBarFavouriteAdd,
+    SP_CustomToolBarFavouriteRemove,
+    SP_CustomToolBarFavourites,
+    SP_CustomToolBarGo,
+    SP_CustomToolBarHome,
+    SP_CustomToolBarImageTools,
+    SP_CustomToolBarList,
+    SP_CustomToolBarLock,
+    SP_CustomToolBarLogs,
+    SP_CustomToolBarMenu,
+    SP_CustomToolBarNewContact,
+    SP_CustomToolBarNewGroup,
+    SP_CustomToolBarNextFrame,
+    SP_CustomToolBarNowPlay,
+    SP_CustomToolBarOptions,
+    SP_CustomToolBarOther,
+    SP_CustomToolBarOvi,
+    SP_CustomToolBarPreviousFrame,
+    SP_CustomToolBarRead,
+    SP_CustomToolBarRedoDisabled,
+    SP_CustomToolBarRedo,
+    SP_CustomToolBarRefresh,
+    SP_CustomToolBarRemoveDetail,
+    SP_CustomToolBarRemoveDisabled,
+    SP_CustomToolBarRepeat,
+    SP_CustomToolBarRepeatOff,
+    SP_CustomToolBarRepeatOne,
+    SP_CustomToolBarSearch,
+    SP_CustomToolBarSearchDisabled,
+    SP_CustomToolBarSelectContent,
+    SP_CustomToolBarSelfTimer,
+    SP_CustomToolBarSend,
+    SP_CustomToolBarSendDimmed,
+    SP_CustomToolBarShare,
+    SP_CustomToolBarShift,
+    SP_CustomToolBarShuffle,
+    SP_CustomToolBarShuffleOff,
+    SP_CustomToolBarSignalOff,
+    SP_CustomToolBarSignalOn,
+    SP_CustomToolBarSync,
+    SP_CustomToolBarTools,
+    SP_CustomToolBarTrim,
+    SP_CustomToolBarUnlock,
+    SP_CustomToolBarUnmark,
+    SP_CustomToolBarView,
+    SP_CustomToolBarWlanOff,
+    SP_CustomToolBarWlanOn,
+    SP_CustomCameraCaptureButton,
+    SP_CustomCameraCaptureButtonPressed,
+    SP_CustomCameraPauseButton,
+    SP_CustomCameraPauseButtonPressed,
+    SP_CustomCameraPlayButton,
+    SP_CustomCameraPlayButtonPressed,
+    SP_CustomCameraRecButton,
+    SP_CustomCameraRecButtonPressed,
+    SP_CustomCameraStopButton,
+    SP_CustomCameraStopButtonPressed,
+    SP_CustomTabAll,
+    SP_CustomTabArtist,
+    SP_CustomTabFavourite,
+    SP_CustomTabGenre,
+    SP_CustomTabLanguage,
+    SP_CustomTabMusicAlbum,
+    SP_CustomTabPhotosAlbum,
+    SP_CustomTabPhotosAll,
+    SP_CustomTabPlaylist,
+    SP_CustomTabServices,
+    SP_CustomTabSongs,
+    SP_CustomTabVideos
+};
+
 class QS60StylePrivate;
 
 class Q_GUI_EXPORT QS60Style : public QCommonStyle
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index b759fa7..586f1f6 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -142,11 +142,11 @@ public:
         SP_QgnGrafNsliderMiddle,
         SP_QgnIndiCheckboxOff,
         SP_QgnIndiCheckboxOn,
-        SP_QgnIndiHlColSuper,     // Available in S60 release 3.2 and later.
-        SP_QgnIndiHlExpSuper,     // Available in S60 release 3.2 and later.
-        SP_QgnIndiHlLineBranch,   // Available in S60 release 3.2 and later.
-        SP_QgnIndiHlLineEnd,      // Available in S60 release 3.2 and later.
-        SP_QgnIndiHlLineStraight, // Available in S60 release 3.2 and later.
+        SP_QgnIndiHlColSuper,
+        SP_QgnIndiHlExpSuper,
+        SP_QgnIndiHlLineBranch,
+        SP_QgnIndiHlLineEnd,
+        SP_QgnIndiHlLineStraight,
         SP_QgnIndiMarkedAdd,
         SP_QgnIndiNaviArrowLeft,
         SP_QgnIndiNaviArrowRight,
@@ -311,6 +311,102 @@ public:
         SP_QsnFrListSideLPressed,
         SP_QsnFrListSideRPressed,
         SP_QsnFrListCenterPressed,
+        SP_QtgToolBarAdd,
+        SP_QtgToolBarAddDetail,
+        SP_QtgToolBarAgain,
+        SP_QtgToolBarAgenda,
+        SP_QtgToolBarAudioOff,
+        SP_QtgToolBarAudioOn,
+        SP_QtgToolBarBack,
+        SP_QtgToolBarBluetoothOff,
+        SP_QtgToolBarBluetoothOn,
+        SP_QtgToolBarCancel,
+        SP_QtgToolBarDelete,
+        SP_QtgToolBarDetails,
+        SP_QtgToolBarDone,
+        SP_QtgToolBarEdit,
+        SP_QtgToolBarEditDisabled,
+        SP_QtgToolBarEmailSend,
+        SP_QtgToolBarEmergencyCall,
+        SP_QtgToolBarFavouriteAdd,
+        SP_QtgToolBarFavouriteRemove,
+        SP_QtgToolBarFavourites,
+        SP_QtgToolBarForward,
+        SP_QtgToolBarGo,
+        SP_QtgToolBarHome,
+        SP_QtgToolBarImageTools,
+        SP_QtgToolBarList,
+        SP_QtgToolBarLock,
+        SP_QtgToolBarLogs,
+        SP_QtgToolBarMenu,
+        SP_QtgToolBarNewContact,
+        SP_QtgToolBarNewGroup,
+        SP_QtgToolBarNext,
+        SP_QtgToolBarNextFrame,
+        SP_QtgToolBarNowPlay,
+        SP_QtgToolBarOptions,
+        SP_QtgToolBarOther,
+        SP_QtgToolBarOvi,
+        SP_QtgToolBarPause,
+        SP_QtgToolBarPlay,
+        SP_QtgToolBarPrevious,
+        SP_QtgToolBarPreviousFrame,
+        SP_QtgToolBarRead,
+        SP_QtgToolBarRedo,
+        SP_QtgToolBarRedoDisabled,
+        SP_QtgToolBarRefresh,
+        SP_QtgToolBarRemoveDetail,
+        SP_QtgToolBarRemoveDisabled,
+        SP_QtgToolBarRepeat,
+        SP_QtgToolBarRepeatOff,
+        SP_QtgToolBarRepeatOne,
+        SP_QtgToolBarRewind,
+        SP_QtgToolBarSearch,
+        SP_QtgToolBarSearchDisabled,
+        SP_QtgToolBarSelectContent,
+        SP_QtgToolBarSelfTimer,
+        SP_QtgToolBarSend,
+        SP_QtgToolBarSendDimmed,
+        SP_QtgToolBarShare,
+        SP_QtgToolBarShift,
+        SP_QtgToolBarShuffle,
+        SP_QtgToolBarShuffleOff,
+        SP_QtgToolBarSignalOff,
+        SP_QtgToolBarSignalOn,
+        SP_QtgToolBarStop,
+        SP_QtgToolBarSync,
+        SP_QtgToolBarTools,
+        SP_QtgToolBarTrim,
+        SP_QtgToolBarUnlock,
+        SP_QtgToolBarUnmark,
+        SP_QtgToolBarView,
+        SP_QtgToolBarWlanOff,
+        SP_QtgToolBarWlanOn,
+        SP_QtgGrafCameraButtonCaptureNormal,
+        SP_QtgGrafCameraButtonCapturePressed,
+        SP_QtgGrafCameraButtonPauseNormal,
+        SP_QtgGrafCameraButtonPausePressed,
+        SP_QtgGrafCameraButtonPlayNormal,
+        SP_QtgGrafCameraButtonPlayPressed,
+        SP_QtgGrafCameraButtonRecNormal,
+        SP_QtgGrafCameraButtonRecPressed,
+        SP_QtgGrafCameraButtonStopNormal,
+        SP_QtgGrafCameraButtonStopPressed,
+        SP_QtgTabAll,
+        SP_QtgTabArtist,
+        SP_QtgTabFavourite,
+        SP_QtgTabGenre,
+        SP_QtgTabLanguage,
+        SP_QtgTabMusicAlbum,
+        SP_QtgTabPhotosAlbum,
+        SP_QtgTabPhotosAll,
+        SP_QtgTabPlaylist,
+        SP_QtgTabServices,
+        SP_QtgTabSongs,
+        SP_QtgTabVideos,
+        SP_QgnIndiBrowserTbReload,
+        SP_QgnIndiBrowserTbHome,
+        SP_QgnIndiBrowserTbStop,
     };
 
     enum ColorLists {
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 6b66a09..c88d49a 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -413,6 +413,106 @@ const partMapEntry QS60StyleModeSpecifics::m_partMap[] = {
     /* SP_QsnFrListSideLPressed */       {KAknsIIDQsnFrListSideL,       ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2691},
     /* SP_QsnFrListSideRPressed */       {KAknsIIDQsnFrListSideR,       ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2692},
     /* SP_QsnFrListCenterPressed */      {KAknsIIDQsnFrListCenter,      ENoDraw,     ES60_3_X,    EAknsMajorSkin, 0x2693},
+
+    /* SP_QtgToolBarAdd */               {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x27c0}, //KAknsIIDQtgToolbarAdd
+    /* SP_QtgToolBarAddDetail */         {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2778}, //KAknsIIDQtgToolbarAddDetail
+    /* SP_QtgToolbarAgain */             {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x271a}, //KAknsIIDQtgToolbarAgain
+    /* SP_QtgToolBarAgenda */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x281a}, //KAknsIIDQtgToolbarAgenda
+    /* SP_QtgToolBarAudioOff */          {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2751}, //KAknsIIDQtgToolbarAudioOff
+    /* SP_QtgToolBarAudioOn */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2752}, //KAknsIIDQtgToolbarAudioOn
+    /* SP_CustomToolBarBack */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x271b}, //KAknsIIDQtgToolbarBack
+    /* SP_QtgToolBarBluetoothOff */      {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2753}, //KAknsIIDQtgToolbarBluetoothOff
+    /* SP_QtgToolBarBluetoothOn */       {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2754}, //KAknsIIDQtgToolbarBluetoothOn
+    /* SP_QtgToolBarCancel */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2895}, //KAknsIIDQtgToolbarCancel
+    /* SP_QtgToolBarDelete */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2755}, //KAknsIIDQtgToolbarDelete
+    /* SP_QtgToolBarDetails */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x271e}, //KAknsIIDQtgToolbarDetails
+    /* SP_QtgToolBarDone */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x271f}, //KAknsIIDQtgToolbarDone
+    /* SP_QtgToolBarEdit */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2720}, //KAknsIIDQtgToolbarEdit
+    /* SP_QtgToolBarEditDisabled */      {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2946}, //KAknsIIDQtgToolbarEditDisabled
+    /* SP_QtgToolBarEmailSend */         {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x292f}, //KAknsIIDQtgToolbarEmailSend
+    /* SP_QtgToolBarEmergencyCall */     {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2721}, //KAknsIIDQtgToolbarEmergencyCall
+    /* SP_QtgToolBarFavouriteAdd */      {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x28ed}, //KAknsIIDQtgToolbarFavouriteAdd
+    /* SP_QtgToolBarFavouriteRemove */   {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x28ee}, //KAknsIIDQtgToolbarFavouriteRemove
+    /* SP_QtgToolBarFavourites */        {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x28b8}, //KAknsIIDQtgToolbarFavourites
+    /* SP_QtgToolBarForward */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x281b}, //KAknsIIDQtgToolbarForward
+    /* SP_QtgToolBarGo */                {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2930}, //KAknsIIDQtgToolbarGo
+    /* SP_QtgToolBarHome */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2722}, //KAknsIIDQtgToolbarHome
+    /* SP_QtgToolBarImageTools */        {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2947}, //KAknsIIDQtgToolbarImageTools
+    /* SP_QtgToolBarList */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x28b9}, //KAknsIIDQtgToolbarList
+    /* SP_QtgToolBarLock */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2723}, //KAknsIIDQtgToolbarLock
+    /* SP_QtgToolBarLogs */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x281c}, //KAknsIIDQtgToolbarLogs
+    /* SP_QtgToolBarMenu */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2724}, //KAknsIIDQtgToolbarMenu
+    /* SP_QtgToolBarNewContact */        {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2779}, //KAknsIIDQtgToolbarNewContact
+    /* SP_QtgToolBarNewGroup */          {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x277a}, //KAknsIIDQtgToolbarNewGroup
+    /* SP_QtgToolBarNext */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x281d}, //KAknsIIDQtgToolbarNext
+    /* SP_QtgToolBarNextFrame */         {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2981}, //KAknsIIDQtgToolbarNextFrame
+    /* SP_QtgToolBarNowPlay */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x28ef}, //KAknsIIDQtgToolbarNowplay
+    /* SP_QtgToolBarOptions */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2725}, //KAknsIIDQtgToolbarOptions
+    /* SP_QtgToolBarOther */             {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2726}, //KAknsIIDQtgToolbarOther
+    /* SP_QtgToolBarOvi */               {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2931}, //KAknsIIDQtgToolbarOvi
+    /* SP_QtgToolBarPause */             {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2727}, //KAknsIIDQtgToolbarPause
+    /* SP_QtgToolBarPlay */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2728}, //KAknsIIDQtgToolbarPlay
+    /* SP_QtgToolBarPrevious */          {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x281e}, //KAknsIIDQtgToolbarPrevious
+    /* SP_QtgToolBarPreviousFrame */     {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2982}, //KAknsIIDQtgToolbarPreviousFrame
+    /* SP_QtgToolBarRead */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2729}, //KAknsIIDQtgToolbarRead
+    /* SP_QtgToolBarRedo */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2948}, //KAknsIIDQtgToolbarRedo
+    /* SP_QtgToolBarRedoDisabled */      {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2949}, //KAknsIIDQtgToolbarRedoDisabled
+    /* SP_QtgToolBarRefresh */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2932}, //KAknsIIDQtgToolbarRefresh
+    /* SP_QtgToolBarRemoveDetail */      {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x277b}, //KAknsIIDQtgToolbarRemoveDetail
+    /* SP_QtgToolBarRemoveDisabled */    {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x294a}, //KAknsIIDQtgToolbarRemoveDisabled
+    /* SP_QtgToolBarRepeat */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x281f}, //KAknsIIDQtgToolbarRepeat
+    /* SP_QtgToolBarRepeatOff */         {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2820}, //KAknsIIDQtgToolbarRepeatOff
+    /* SP_QtgToolBarRepeatOne */         {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2821}, //KAknsIIDQtgToolbarRepeatOne
+    /* SP_QtgToolBarRewind */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2822}, //KAknsIIDQtgToolbarRewind
+    /* SP_QtgToolBarSearch */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x272a}, //KAknsIIDQtgToolbarSearch
+    /* SP_QtgToolBarSearchDisabled */    {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x294b}, //KAknsIIDQtgToolbarSearchDisabled
+    /* SP_QtgToolBarSelectContent */     {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x294c}, //KAknsIIDQtgToolbarSelectContent
+    /* SP_QtgToolBarSelfTimer */         {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2756}, //KAknsIIDQtgToolbarSelfTimer
+    /* SP_QtgToolBarSend */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x272b}, //KAknsIIDQtgToolbarSend
+    /* SP_QtgToolBarSendDimmed */        {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x29b0}, //KAknsIIDQtgToolbarSendDimmed
+    /* SP_QtgToolBarShare */             {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2823}, //KAknsIIDQtgToolbarShare
+    /* SP_QtgToolBarShift */             {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x272c}, //KAknsIIDQtgToolbarShift
+    /* SP_QtgToolBarShuffle */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2824}, //KAknsIIDQtgToolbarShuffle
+    /* SP_QtgToolBarShuffleOff */        {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2825}, //KAknsIIDQtgToolbarShuffleOff
+    /* SP_QtgToolBarSignalOff */         {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2757}, //KAknsIIDQtgToolbarSignalOff
+    /* SP_QtgToolBarSignalOn */          {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2758}, //KAknsIIDQtgToolbarSignalOn
+    /* SP_QtgToolBarStop */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x272d}, //KAknsIIDQtgToolbarStop
+    /* SP_QtgToolBarSync */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2894}, //KAknsIIDQtgToolbarSync
+    /* SP_QtgToolBarTools */             {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2983}, //KAknsIIDQtgToolbarTools
+    /* SP_QtgToolBarTrim */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2954}, //KAknsIIDQtgToolbarTrim
+    /* SP_QtgToolBarUnlock */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x272e}, //KAknsIIDQtgToolbarUnlock
+    /* SP_QtgToolBarUnmark */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x272f}, //KAknsIIDQtgToolbarUnmark
+    /* SP_QtgToolBarView */              {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2730}, //KAknsIIDQtgToolbarView
+    /* SP_QtgToolBarWlanOff */           {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2759}, //KAknsIIDQtgToolbarWlanOff
+    /* SP_QtgToolBarWlanOn */            {KAknsIIDNone,                 EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x275a}, //KAknsIIDQtgToolbarWlanOn
+
+    /* SP_QtgGrafCameraButtonCaptureNormal */   {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x2743}, //KAknsIIDQtgGrafCameraButtonCaptureNormal (already in 9.2)
+    /* SP_QtgGrafCameraButtonCapturePressed */  {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x2744}, //KAknsIIDQtgGrafCameraButtonCapturePressed
+    /* SP_QtgGrafCameraButtonPauseNormal */     {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x2745}, //KAknsIIDQtgGrafCameraButtonPauseNormal
+    /* SP_QtgGrafCameraButtonPausePressed */    {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x2746}, //KAknsIIDQtgGrafCameraButtonPausePressed
+    /* SP_QtgGrafCameraButtonPlayNormal */      {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x2747}, //KAknsIIDQtgGrafCameraButtonPlayNormal
+    /* SP_QtgGrafCameraButtonPlayPressed */     {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x2748}, //KAknsIIDQtgGrafCameraButtonPlayPressed
+    /* SP_QtgGrafCameraButtonRecNormal */       {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x2749}, //KAknsIIDQtgGrafCameraButtonRecNormal
+    /* SP_QtgGrafCameraButtonRecPressed */      {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x274a}, //KAknsIIDQtgGrafCameraButtonRecPressed
+    /* SP_QtgGrafCameraButtonStopNormal */      {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x274b}, //KAknsIIDQtgGrafCameraButtonStopNormal
+    /* SP_QtgGrafCameraButtonStopPressed */     {KAknsIIDNone,  EDrawIcon,   ES60_Pre52,  EAknsMajorGeneric, 0x274c}, //KAknsIIDQtgGrafCameraButtonStopPressed
+
+    /* SP_QtgTabAll */                          {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2851}, //KAknsIIDQtgTabAll
+    /* SP_QtgTabArtist */                       {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x288f}, //KAknsIIDQtgTabArtist
+    /* SP_QtgTabFavourite */                    {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x28eb}, //KAknsIIDQtgTabFavourite
+    /* SP_QtgTabGenre */                        {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2890}, //KAknsIIDQtgTabGenre
+    /* SP_QtgTabLanguage */                     {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x28ec}, //KAknsIIDQtgTabLanguage
+    /* SP_QtgTabMusicAlbum */                   {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2891}, //KAknsIIDQtgTabMusicAlbum
+    /* SP_QtgTabPhotosAlbum */                  {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2818}, //KAknsIIDQtgTabPhotosAlbum
+    /* SP_QtgTabPhotosAll */                    {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2819}, //KAknsIIDQtgTabPhotosAll
+    /* SP_QtgTabPlaylist */                     {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2892}, //KAknsIIDQtgTabPlaylist
+    /* SP_QtgTabServices */                     {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x274f}, //KAknsIIDQtgTabServices
+    /* SP_QtgTabSongs */                        {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2893}, //KAknsIIDQtgTabSongs
+    /* SP_QtgTabVideos */                       {KAknsIIDNone,  EDrawIcon,   ES60_Pre53,  EAknsMajorGeneric, 0x2750}, //KAknsIIDQtgTabVideos
+
+    /* SP_QgnIndiBrowserTbReload */             {KAknsIIDQgnIndiBrowserTbReload,   EDrawIcon,   ES60_All, -1, -1},
+    /* SP_QgnIndiBrowserTbHome */               {KAknsIIDQgnIndiBrowserTbHome,     EDrawIcon,   ES60_All, -1, -1},
+    /* SP_QgnIndiBrowserTbStop */               {KAknsIIDQgnIndiBrowserTbStop,     EDrawIcon,   ES60_All, -1, -1},
 };
 
 QPixmap QS60StyleModeSpecifics::skinnedGraphics(