AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made QWindowsMobileStyle internal

Browse Source 
We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsMobileStyle directly.

Change-Id: Id64f3dabff38db7864e235c79b2e9276379f4ba4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
This commit is contained in:
J-P Nurmi 2012-11-20 13:50:40 +01:00 committed by The Qt Project
parent 4fb0e52515
commit 7d48fd1c83
7 changed files with 193 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/styles/qstylefactory.cpp
View File

@ -62,7 +62,7 @@
#include "qwindowscestyle_p.h"
#endif
#ifndef QT_NO_STYLE_WINDOWSMOBILE
#include "qwindowsmobilestyle.h"
#include "qwindowsmobilestyle_p.h"
#endif
#if !defined(QT_NO_STYLE_MAC) && defined(Q_OS_MAC)

2
src/widgets/styles/qwindowsmobilestyle.cpp
View File

@ -39,8 +39,8 @@
**
****************************************************************************/
#include "qwindowsmobilestyle.h"
#include "qwindowsmobilestyle_p.h"
#include "qwindowsmobilestyle_p_p.h"
#if !defined(QT_NO_STYLE_WINDOWSMOBILE) || defined(QT_PLUGIN)

116
src/widgets/styles/qwindowsmobilestyle.h
View File

@ -1,116 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, 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.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QWINDOWSMOBILESTYLE_H
#define QWINDOWSMOBILESTYLE_H
#include <QtWidgets/qwindowsstyle.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#if !defined(QT_NO_STYLE_WINDOWSMOBILE)
class QWindowsMobileStylePrivate;
class Q_WIDGETS_EXPORT QWindowsMobileStyle : public QWindowsStyle
{
Q_OBJECT
public:
QWindowsMobileStyle();
~QWindowsMobileStyle();
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget = 0) const;
void drawControl(ControlElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget) const;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
QPainter *painter, const QWidget *widget) const;
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
const QSize &size, const QWidget *widget) const;
QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget) const;
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *option) const;
QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *option,
const QWidget *widget) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
void polish(QApplication*);
void unpolish(QApplication*);
void polish(QWidget *widget);
void unpolish(QWidget *widget);
void polish(QPalette &);
QPalette standardPalette() const;
bool doubleControls() const;
void setDoubleControls(bool);
protected:
QWindowsMobileStyle(QWindowsMobileStylePrivate &dd);
private:
Q_DECLARE_PRIVATE(QWindowsMobileStyle)
};
#endif // QT_NO_STYLE_WINDOWSMOBILE
QT_END_NAMESPACE
QT_END_HEADER
#endif //QWINDOWSMOBILESTYLE_H

121
src/widgets/styles/qwindowsmobilestyle_p.h
View File

@ -42,94 +42,75 @@
#ifndef QWINDOWSMOBILESTYLE_P_H
#define QWINDOWSMOBILESTYLE_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
// file may change from version to version without notice, or even be removed.
//
// We mean it.
//
#include <QtWidgets/qwindowsstyle.h>
#include "qwindowsmobilestyle.h"
#include "qwindowsstyle_p.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_STYLE_WINDOWSMOBILE
class QStyleOptionTab;
class QStyleOptionSlider;
#if !defined(QT_NO_STYLE_WINDOWSMOBILE)
class QWindowsMobileStylePrivate : public QWindowsStylePrivate
class QWindowsMobileStylePrivate;
class QWindowsMobileStyle : public QWindowsStyle
{
Q_DECLARE_PUBLIC(QWindowsMobileStyle)
Q_OBJECT
public:
QWindowsMobileStylePrivate();
bool doubleControls;
bool smartphone;
#ifdef Q_OS_WINCE_WM
bool wm65;
#endif
QWindowsMobileStyle();
~QWindowsMobileStyle();
QImage imageRadioButton;
QImage imageRadioButtonChecked;
QImage imageRadioButtonHighlighted;
QImage imageChecked;
QImage imageCheckedBold;
QImage imageArrowDown;
QImage imageArrowUp;
QImage imageArrowLeft;
QImage imageArrowRight;
QImage imageArrowDownBig;
QImage imageArrowUpBig;
QImage imageArrowLeftBig;
QImage imageArrowRightBig;
QImage imageClose;
QImage imageMaximize;
QImage imageNormalize;
QImage imageMinimize;
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget = 0) const;
void setupWindowsMobileStyle65();
void drawControl(ControlElement element, const QStyleOption *option,
QPainter *painter, const QWidget *widget) const;
#ifdef Q_OS_WINCE_WM
//Windows Mobile 6.5 images
QImage imageScrollbarHandleUp;
QImage imageScrollbarHandleDown;
QImage imageScrollbarHandleUpHigh;
QImage imageScrollbarHandleDownHigh;
QImage imageScrollbarGripUp;
QImage imageScrollbarGripDown;
QImage imageScrollbarGripMiddle;
QImage imageListViewHighlightCornerLeft;
QImage imageListViewHighlightCornerRight;
QImage imageListViewHighlightMiddle;
QImage imageTabEnd;
QImage imageTabSelectedEnd;
QImage imageTabSelectedBegin;
QImage imageTabMiddle;
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
QPainter *painter, const QWidget *widget) const;
QColor currentTintHigh;
QColor currentTintButton;
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
const QSize &size, const QWidget *widget) const;
void tintImagesHigh(QColor color);
void tintImagesButton(QColor color);
void tintListViewHighlight(QColor color);
QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const;
#endif //Q_OS_WINCE_WM
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
SubControl sc, const QWidget *widget) const;
void drawScrollbarHandleUp(QPainter *p, QStyleOptionSlider *opt, bool completeFrame = false, bool secondScrollBar = false);
void drawScrollbarHandleDown(QPainter *p, QStyleOptionSlider *opt, bool completeFrame = false, bool secondScrollBar = false);
void drawScrollbarGroove(QPainter *p, const QStyleOptionSlider *opt);
void drawScrollbarGrip(QPainter *p, QStyleOptionSlider *newScrollbar, const QStyleOptionComplex *option, bool drawCompleteFrame);
void drawTabBarTab(QPainter *p, const QStyleOptionTab *tab);
void drawPanelItemViewSelected(QPainter *painter, const QStyleOptionViewItem *option, QRect rect = QRect());
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
const QStyleOption *option) const;
QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *option,
const QWidget *widget) const;
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0,
QStyleHintReturn *returnData = 0) const;
void polish(QApplication*);
void unpolish(QApplication*);
void polish(QWidget *widget);
void unpolish(QWidget *widget);
void polish(QPalette &);
QPalette standardPalette() const;
bool doubleControls() const;
void setDoubleControls(bool);
protected:
QWindowsMobileStyle(QWindowsMobileStylePrivate &dd);
private:
Q_DECLARE_PRIVATE(QWindowsMobileStyle)
};
#endif // QT_NO_STYLE_WINDOWSMOBILE
QT_END_NAMESPACE
#endif // QT_NO_STYLE_WINDOWSMOBILE
QT_END_HEADER
#endif //QWINDOWSMOBILESTYLE_P_H

135
src/widgets/styles/qwindowsmobilestyle_p_p.h Normal file
View File

@ -0,0 +1,135 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** 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, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, 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.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QWINDOWSMOBILESTYLE_P_P_H
#define QWINDOWSMOBILESTYLE_P_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
// file may change from version to version without notice, or even be removed.
//
// We mean it.
//
#include "qwindowsmobilestyle_p.h"
#include "qwindowsstyle_p.h"
QT_BEGIN_NAMESPACE
#ifndef QT_NO_STYLE_WINDOWSMOBILE
class QStyleOptionTab;
class QStyleOptionSlider;
class QWindowsMobileStylePrivate : public QWindowsStylePrivate
{
Q_DECLARE_PUBLIC(QWindowsMobileStyle)
public:
QWindowsMobileStylePrivate();
bool doubleControls;
bool smartphone;
#ifdef Q_OS_WINCE_WM
bool wm65;
#endif
QImage imageRadioButton;
QImage imageRadioButtonChecked;
QImage imageRadioButtonHighlighted;
QImage imageChecked;
QImage imageCheckedBold;
QImage imageArrowDown;
QImage imageArrowUp;
QImage imageArrowLeft;
QImage imageArrowRight;
QImage imageArrowDownBig;
QImage imageArrowUpBig;
QImage imageArrowLeftBig;
QImage imageArrowRightBig;
QImage imageClose;
QImage imageMaximize;
QImage imageNormalize;
QImage imageMinimize;
void setupWindowsMobileStyle65();
#ifdef Q_OS_WINCE_WM
//Windows Mobile 6.5 images
QImage imageScrollbarHandleUp;
QImage imageScrollbarHandleDown;
QImage imageScrollbarHandleUpHigh;
QImage imageScrollbarHandleDownHigh;
QImage imageScrollbarGripUp;
QImage imageScrollbarGripDown;
QImage imageScrollbarGripMiddle;
QImage imageListViewHighlightCornerLeft;
QImage imageListViewHighlightCornerRight;
QImage imageListViewHighlightMiddle;
QImage imageTabEnd;
QImage imageTabSelectedEnd;
QImage imageTabSelectedBegin;
QImage imageTabMiddle;
QColor currentTintHigh;
QColor currentTintButton;
void tintImagesHigh(QColor color);
void tintImagesButton(QColor color);
void tintListViewHighlight(QColor color);
#endif //Q_OS_WINCE_WM
void drawScrollbarHandleUp(QPainter *p, QStyleOptionSlider *opt, bool completeFrame = false, bool secondScrollBar = false);
void drawScrollbarHandleDown(QPainter *p, QStyleOptionSlider *opt, bool completeFrame = false, bool secondScrollBar = false);
void drawScrollbarGroove(QPainter *p, const QStyleOptionSlider *opt);
void drawScrollbarGrip(QPainter *p, QStyleOptionSlider *newScrollbar, const QStyleOptionComplex *option, bool drawCompleteFrame);
void drawTabBarTab(QPainter *p, const QStyleOptionTab *tab);
void drawPanelItemViewSelected(QPainter *painter, const QStyleOptionViewItem *option, QRect rect = QRect());
};
QT_END_NAMESPACE
#endif // QT_NO_STYLE_WINDOWSMOBILE
#endif //QWINDOWSMOBILESTYLE_P_P_H

3
src/widgets/styles/styles.pri
View File

@ -129,7 +129,8 @@ contains( styles, windowsce ) {
}
contains( styles, windowsmobile ) {
HEADERS += styles/qwindowsmobilestyle.h
HEADERS += styles/qwindowsmobilestyle_p.h
HEADERS += styles/qwindowsmobilestyle_p_p.h
SOURCES += styles/qwindowsmobilestyle.cpp
} else {
DEFINES += QT_NO_STYLE_WINDOWSMOBILE

6
tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
View File

@ -76,7 +76,6 @@
#endif
#ifdef Q_OS_WINCE_WM
#include <QWindowsMobileStyle>
#include <windows.h>
static bool qt_wince_is_smartphone() {
@ -336,7 +335,7 @@ bool tst_QStyle::testScrollBarSubControls(QStyle* style)
{
// WinCE SmartPhone doesn't have scrollbar subcontrols, so skip the rest of the test.
#ifdef Q_OS_WINCE_WM
if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone())
if (style->inherits("QWindowsMobileStyle") && qt_wince_is_smartphone())
return true;
#else
Q_UNUSED(style);
@ -547,8 +546,9 @@ void tst_QStyle::testWindowsCEStyle()
// WindowsMobileStyle style
void tst_QStyle::testWindowsMobileStyle()
{
QWindowsMobileStyle cstyle;
QStyle *cstyle = QStyleFactory::create("WindowsMobile");
QVERIFY(testAllFunctions(&cstyle));
delete cstyle;
}
#endif