diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2009-07-14 00:06:15 (GMT) |
---|---|---|
committer | Damian Jansen <damian.jansen@nokia.com> | 2009-07-14 01:58:27 (GMT) |
commit | 3da921b6b33a12e8e665ee52536948ca9824b769 (patch) | |
tree | 375b3e2144918c59601a1630a52c63d5f212e676 | |
parent | aff53500dbfba0a3338f8ab649c754cce3569ede (diff) | |
download | Qt-3da921b6b33a12e8e665ee52536948ca9824b769.zip Qt-3da921b6b33a12e8e665ee52536948ca9824b769.tar.gz Qt-3da921b6b33a12e8e665ee52536948ca9824b769.tar.bz2 |
Add access to Qt palettes from QML.
-rw-r--r-- | src/declarative/util/qmlpalette.cpp | 163 | ||||
-rw-r--r-- | src/declarative/util/qmlpalette.h | 111 | ||||
-rw-r--r-- | src/declarative/util/util.pri | 2 | ||||
-rw-r--r-- | tools/qmlviewer/qmlviewer.cpp | 25 | ||||
-rw-r--r-- | tools/qmlviewer/qmlviewer.h | 5 |
5 files changed, 306 insertions, 0 deletions
diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp new file mode 100644 index 0000000..670966d --- /dev/null +++ b/src/declarative/util/qmlpalette.cpp @@ -0,0 +1,163 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "private/qobject_p.h" +#include "qmlpalette.h" + +QT_BEGIN_NAMESPACE + +class QmlPalettePrivate : public QObjectPrivate +{ +public: + QPalette palette; + QPalette::ColorGroup group; +}; + +QML_DEFINE_TYPE(QmlPalette,Palette) + +/*! + \internal + \class QmlPalette + \ingroup group_utility + \brief The QmlPalette class gives access to the Qt palettes. +*/ +QmlPalette::QmlPalette(QObject *parent) + : QObject(*(new QmlPalettePrivate), parent) +{ + Q_D(QmlPalette); + d->group = QPalette::Active; +} + +QmlPalette::~QmlPalette() +{ +} + +QColor QmlPalette::window() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Window); +} + +QColor QmlPalette::windowText() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::WindowText); +} + +QColor QmlPalette::base() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Base); +} + +QColor QmlPalette::alternateBase() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::AlternateBase); +} + +QColor QmlPalette::button() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Button); +} + +QColor QmlPalette::buttonText() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::ButtonText); +} + +QColor QmlPalette::light() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Light); +} + +QColor QmlPalette::midlight() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Midlight); +} + +QColor QmlPalette::dark() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Dark); +} + +QColor QmlPalette::mid() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Mid); +} + +QColor QmlPalette::shadow() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Shadow); +} + +QColor QmlPalette::highlight() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::Highlight); +} + +QColor QmlPalette::highlightedText() const +{ + Q_D(const QmlPalette); + return d->palette.color(d->group, QPalette::HighlightedText); +} + +void QmlPalette::setColorGroup(QPalette::ColorGroup colorGroup) +{ + Q_D(QmlPalette); + d->group = colorGroup; +} + +QPalette QmlPalette::palette() const +{ + Q_D(const QmlPalette); + return d->palette; +} + +QT_END_NAMESPACE diff --git a/src/declarative/util/qmlpalette.h b/src/declarative/util/qmlpalette.h new file mode 100644 index 0000000..f176764 --- /dev/null +++ b/src/declarative/util/qmlpalette.h @@ -0,0 +1,111 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QMLPALETTE_H +#define QMLPALETTE_H + +#include <QtCore/qobject.h> +#include <QtDeclarative/qml.h> +#include <QPalette> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Declarative) + +class QmlPalettePrivate; +class Q_DECLARATIVE_EXPORT QmlPalette : public QObject +{ + Q_OBJECT + Q_DECLARE_PRIVATE(QmlPalette) + +public: + QmlPalette(QObject *parent=0); + ~QmlPalette(); + + Q_PROPERTY(QColor window READ window CONSTANT) + Q_PROPERTY(QColor windowText READ windowText CONSTANT) + Q_PROPERTY(QColor base READ base CONSTANT) + Q_PROPERTY(QColor alternateBase READ alternateBase CONSTANT) + Q_PROPERTY(QColor button READ button CONSTANT) + Q_PROPERTY(QColor buttonText READ buttonText CONSTANT) + Q_PROPERTY(QColor light READ light CONSTANT) + Q_PROPERTY(QColor midlight READ midlight CONSTANT) + Q_PROPERTY(QColor dark READ dark CONSTANT) + Q_PROPERTY(QColor mid READ mid CONSTANT) + Q_PROPERTY(QColor shadow READ shadow CONSTANT) + Q_PROPERTY(QColor highlight READ highlight CONSTANT) + Q_PROPERTY(QColor highlightedText READ highlightedText CONSTANT) + + QColor window() const; + QColor windowText() const; + + QColor base() const; + QColor alternateBase() const; + + QColor button() const; + QColor buttonText() const; + + QColor light() const; + QColor midlight() const; + QColor dark() const; + QColor mid() const; + QColor shadow() const; + + QColor highlight() const; + QColor highlightedText() const; + + QPalette palette() const; + + void setColorGroup(QPalette::ColorGroup); + +Q_SIGNALS: + void updated(); +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QmlPalette) + +QT_END_HEADER + +#endif // QMLPALETTE_H diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index aae10af..dcab10a 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -7,6 +7,7 @@ SOURCES += \ util/qmlscript.cpp \ util/qmlanimation.cpp \ util/qmlfont.cpp \ + util/qmlpalette.cpp \ util/qmlfollow.cpp \ util/qmlstate.cpp\ util/qmltransitionmanager.cpp \ @@ -31,6 +32,7 @@ HEADERS += \ util/qmlanimation.h \ util/qmlanimation_p.h \ util/qmlfont.h \ + util/qmlpalette.h \ util/qmlfollow.h \ util/qmlstate.h\ util/qmlstateoperations.h \ diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index db0dc18..b6ce619 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -17,6 +17,7 @@ #include "qmlviewer.h" #include <QtDeclarative/qmlcontext.h> #include <QtDeclarative/qmlengine.h> +#include "qmlpalette.h" #include "qml.h" #include <private/qperformancelog_p.h> #include "qfxtestengine.h" @@ -133,6 +134,8 @@ QmlViewer::QmlViewer(QFxTestEngine::TestMode testMode, const QString &testDir, Q devicemode = false; skin = 0; canvas = 0; + palette = 0; + disabledPalette = 0; record_autotime = 0; record_period = 20; @@ -383,6 +386,7 @@ void QmlViewer::openQml(const QString& fileName) } } + setupPalettes(); canvas->setUrl(url); QTime t; @@ -407,6 +411,18 @@ void QmlViewer::openQml(const QString& fileName) #endif } +void QmlViewer:: setupPalettes() +{ + delete palette; + palette = new QmlPalette; + QmlContext *ctxt = canvas->rootContext(); + ctxt->setContextProperty("activePalette", palette); + + delete disabledPalette; + disabledPalette = new QmlPalette; + disabledPalette->setColorGroup(QPalette::Disabled); + ctxt->setContextProperty("disabledPalette", disabledPalette); +} void QmlViewer::setSkin(const QString& skinDirectory) { @@ -486,6 +502,15 @@ void QmlViewer::setRecordFile(const QString& f) record_file = f; } +bool QmlViewer::event(QEvent *event) +{ + if (event->type() == QEvent::PaletteChange) { + setupPalette(); + return true; + } + return QWidget::event(event); +} + void QmlViewer::setRecordPeriod(int ms) { record_period = ms; diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h index c533fe0..765d42f 100644 --- a/tools/qmlviewer/qmlviewer.h +++ b/tools/qmlviewer/qmlviewer.h @@ -25,6 +25,7 @@ QT_BEGIN_NAMESPACE class QFxView; class PreviewDeviceSkin; class QFxTestEngine; +class QmlPalette; class QProcess; class QmlViewer : public QWidget @@ -61,6 +62,7 @@ public slots: protected: virtual void keyPressEvent(QKeyEvent *); virtual void timerEvent(QTimerEvent *); + virtual bool event(QEvent *event); void createMenu(QMenuBar *menu, QMenu *flatmenu); @@ -70,11 +72,14 @@ private slots: private: void setupProxy(); + void setupPalettes(); QString currentFileName; PreviewDeviceSkin *skin; QSize skinscreensize; QFxView *canvas; + QmlPalette *palette; + QmlPalette *disabledPalette; void init(QFxTestEngine::TestMode, const QString &, const QString& fileName); QBasicTimer recordTimer; QList<QImage*> frames; |