1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BlackBerry: Implement the dark palette

Browse Source 
This patch only implements the dark palette and returns it by default.

Change-Id: Ieab39c2d5c8f35b9479719b78843b13355c5f123
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
Fabian Bumberger 2014-02-20 17:31:02 +01:00 committed by The Qt Project
parent b1bdeba086
commit 63608e4e32
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/platforms/qnx/qqnxtheme.cpp
View File

@ -49,6 +49,23 @@ QT_BEGIN_NAMESPACE
QQnxTheme::QQnxTheme(const QQnxIntegration *integration) : m_integration(integration) QQnxTheme::QQnxTheme(const QQnxIntegration *integration) : m_integration(integration)
{ {
// Set the dark theme as default palette
QColor color = QColor(211, 211, 211);
m_defaultPalette.setBrush(QPalette::ButtonText, color);
m_defaultPalette.setBrush(QPalette::WindowText, color);
m_defaultPalette.setBrush(QPalette::Text, color);
color.setAlpha(179);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::ButtonText, color);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::WindowText, color);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Text, color);
m_defaultPalette.setColor(QPalette::Window, QColor(18, 18, 18));
m_defaultPalette.setColor(QPalette::Base, QColor(18, 18, 18));
m_defaultPalette.setColor(QPalette::AlternateBase, QColor(50, 50, 50));
m_defaultPalette.setBrush(QPalette::Highlight, QColor(0, 168, 223));
m_defaultPalette.setBrush(QPalette::HighlightedText, QColor(250, 250,250));
} }
QQnxTheme::~QQnxTheme() QQnxTheme::~QQnxTheme()
@ -96,4 +113,13 @@ const QFont *QQnxTheme::font(Font type) const
return m_fonts.value(type, 0); return m_fonts.value(type, 0);
} }
const QPalette *QQnxTheme::palette(Palette type) const
{
// Return the default palette
if (type == SystemPalette)
return &m_defaultPalette;
return QPlatformTheme::palette(type);
}
QT_END_NAMESPACE QT_END_NAMESPACE

5
src/plugins/platforms/qnx/qqnxtheme.h
View File

@ -49,6 +49,8 @@
#include <QtCore/qhash.h> #include <QtCore/qhash.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtGui/QPalette>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QQnxIntegration; class QQnxIntegration;
@ -66,9 +68,12 @@ public:
const QFont *font(Font type = SystemFont) const; const QFont *font(Font type = SystemFont) const;
const QPalette *palette(Palette type = SystemPalette) const;
private: private:
mutable QHash<QPlatformTheme::Font, QFont*> m_fonts; mutable QHash<QPlatformTheme::Font, QFont*> m_fonts;
const QQnxIntegration *m_integration; const QQnxIntegration *m_integration;
QPalette m_defaultPalette;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE