1 files changed, 16 insertions, 4 deletions
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index 6eb5da2..385c6e8 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -396,8 +396,6 @@ public:
     static QColor lighterColor(const QColor &baseColor);
     //deduces if the given widget should have separately themeable background
     static bool drawsOwnThemeBackground(const QWidget *widget);
-    // gets layout
-    static const QHash<QStyle::PixelMetric, int> &s60StyleLayout();
 
     QFont s60Font(QS60StyleEnums::FontCategories fontCategory,
         int pointSize = -1) const;
@@ -413,8 +411,13 @@ public:
 
     // calculates average color based on button skin graphics (minus borders).
     QColor colorFromFrameGraphics(QS60StylePrivate::SkinFrameElements frame) const;
+
+    //set theme palette for application
     void setThemePalette(QApplication *application) const;
-    void setThemePalette(QWidget *widget) const;
+    //set theme palette for style option
+    void setThemePalette(QStyleOption *option) const;
+    //access to theme palette
+    static QPalette* themePalette();
 
     static int focusRectPenWidth();
 
@@ -439,7 +442,6 @@ public:
 
     static QPixmap frame(SkinFrameElements frame, const QSize &size,
         SkinElementFlags flags = KDefaultSkinElementFlags);
-
     static QPixmap backgroundTexture();
 
 private:
@@ -458,6 +460,13 @@ private:
 
     static void refreshUI();
 
+    // set S60 font for widget
+    void setFont(QWidget *widget) const;
+    void setThemePalette(QWidget *widget) const;
+    void setThemePalette(QPalette *palette) const;
+    void setThemePaletteHash(QPalette *palette) const;
+    static void QS60StylePrivate::storeThemePalette(QPalette *palette);
+
     static QSize partSize(QS60StyleEnums::SkinParts part,
         SkinElementFlags flags = KDefaultSkinElementFlags);
     static QPixmap part(QS60StyleEnums::SkinParts part, const QSize &size,
@@ -470,6 +479,9 @@ private:
     // Contains background texture.
     static QPixmap *m_background;
     const static SkinElementFlags KDefaultSkinElementFlags;
+    // defined theme palette
+    static QPalette *m_themePalette;
+    QPalette m_originalPalette;
 };
 
 QT_END_NAMESPACE