Inline qcolordialog_p.h into qcolordialog.cpp
This is preparation of moving all the helper classes into the unnamed namespace. Change-Id: I1028fc0b3661a58ca678f5bd839c64109c2a4884 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Marc Mutz
parent
0de90cb0fc
commit
132d8b66cf
@ -2,7 +2,6 @@
|
||||
|
||||
HEADERS += \
|
||||
dialogs/qcolordialog.h \
|
||||
dialogs/qcolordialog_p.h \
|
||||
dialogs/qfscompleter_p.h \
|
||||
dialogs/qdialog.h \
|
||||
dialogs/qdialog_p.h \
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qcolordialog_p.h"
|
||||
#include "qcolordialog.h"
|
||||
|
||||
#ifndef QT_NO_COLORDIALOG
|
||||
|
||||
@ -49,6 +49,7 @@
|
||||
#include "qpixmap.h"
|
||||
#include "qpushbutton.h"
|
||||
#include "qsettings.h"
|
||||
#include "qsharedpointer.h"
|
||||
#include "qstyle.h"
|
||||
#include "qstyleoption.h"
|
||||
#include "qvalidator.h"
|
||||
@ -58,11 +59,126 @@
|
||||
#include "qscreen.h"
|
||||
#include "qcursor.h"
|
||||
#include "qtimer.h"
|
||||
#include "qwindow.h"
|
||||
|
||||
#include "private/qdialog_p.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QColorLuminancePicker;
|
||||
class QColorPicker;
|
||||
class QColorShower;
|
||||
class QWellArray;
|
||||
class QColorPickingEventFilter;
|
||||
|
||||
class QColorDialogPrivate : public QDialogPrivate
|
||||
{
|
||||
Q_DECLARE_PUBLIC(QColorDialog)
|
||||
|
||||
public:
|
||||
enum SetColorMode {
|
||||
ShowColor = 0x1,
|
||||
SelectColor = 0x2,
|
||||
SetColorAll = ShowColor | SelectColor
|
||||
};
|
||||
|
||||
QColorDialogPrivate() : options(new QColorDialogOptions)
|
||||
#ifdef Q_OS_WIN32
|
||||
, updateTimer(0)
|
||||
#endif
|
||||
{}
|
||||
|
||||
QPlatformColorDialogHelper *platformColorDialogHelper() const
|
||||
{ return static_cast<QPlatformColorDialogHelper *>(platformHelper()); }
|
||||
|
||||
void init(const QColor &initial);
|
||||
void initWidgets();
|
||||
QRgb currentColor() const;
|
||||
QColor currentQColor() const;
|
||||
void setCurrentColor(const QColor &color, SetColorMode setColorMode = SetColorAll);
|
||||
void setCurrentRgbColor(QRgb rgb);
|
||||
void setCurrentQColor(const QColor &color);
|
||||
bool selectColor(const QColor &color);
|
||||
QColor grabScreenColor(const QPoint &p);
|
||||
|
||||
int currentAlpha() const;
|
||||
void setCurrentAlpha(int a);
|
||||
void showAlpha(bool b);
|
||||
bool isAlphaVisible() const;
|
||||
void retranslateStrings();
|
||||
|
||||
void _q_addCustom();
|
||||
|
||||
void _q_newHsv(int h, int s, int v);
|
||||
void _q_newColorTypedIn(QRgb rgb);
|
||||
void _q_nextCustom(int, int);
|
||||
void _q_newCustom(int, int);
|
||||
void _q_newStandard(int, int);
|
||||
void _q_pickScreenColor();
|
||||
void _q_updateColorPicking();
|
||||
void updateColorLabelText(const QPoint &);
|
||||
void updateColorPicking(const QPoint &pos);
|
||||
void releaseColorPicking();
|
||||
bool handleColorPickingMouseMove(QMouseEvent *e);
|
||||
bool handleColorPickingMouseButtonRelease(QMouseEvent *e);
|
||||
bool handleColorPickingKeyPress(QKeyEvent *e);
|
||||
|
||||
bool canBeNativeDialog() const Q_DECL_OVERRIDE;
|
||||
|
||||
QWellArray *custom;
|
||||
QWellArray *standard;
|
||||
|
||||
QDialogButtonBox *buttons;
|
||||
QVBoxLayout *leftLay;
|
||||
QColorPicker *cp;
|
||||
QColorLuminancePicker *lp;
|
||||
QColorShower *cs;
|
||||
QLabel *lblBasicColors;
|
||||
QLabel *lblCustomColors;
|
||||
QLabel *lblScreenColorInfo;
|
||||
QPushButton *ok;
|
||||
QPushButton *cancel;
|
||||
QPushButton *addCusBt;
|
||||
QPushButton *screenColorPickerButton;
|
||||
QColor selectedQColor;
|
||||
int nextCust;
|
||||
bool smallDisplay;
|
||||
bool screenColorPicking;
|
||||
QColorPickingEventFilter *colorPickingEventFilter;
|
||||
QRgb beforeScreenColorPicking;
|
||||
QSharedPointer<QColorDialogOptions> options;
|
||||
|
||||
QPointer<QObject> receiverToDisconnectOnClose;
|
||||
QByteArray memberToDisconnectOnClose;
|
||||
#ifdef Q_OS_WIN32
|
||||
QTimer *updateTimer;
|
||||
QWindow dummyTransparentWindow;
|
||||
#endif
|
||||
|
||||
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
|
||||
void openCocoaColorPanel(const QColor &initial,
|
||||
QWidget *parent, const QString &title, QColorDialog::ColorDialogOptions options);
|
||||
void closeCocoaColorPanel();
|
||||
void releaseCocoaColorPanelDelegate();
|
||||
void setCocoaPanelColor(const QColor &color);
|
||||
|
||||
inline void done(int result) { q_func()->done(result); }
|
||||
inline QColorDialog *colorDialog() { return q_func(); }
|
||||
|
||||
void *delegate;
|
||||
|
||||
static bool sharedColorPanelAvailable;
|
||||
|
||||
void _q_macRunNativeAppModalPanel();
|
||||
void mac_nativeDialogModalHelp();
|
||||
#endif
|
||||
private:
|
||||
virtual void initHelper(QPlatformDialogHelper *h) Q_DECL_OVERRIDE;
|
||||
virtual void helperPrepareShow(QPlatformDialogHelper *h) Q_DECL_OVERRIDE;
|
||||
};
|
||||
|
||||
//////////// QWellArray BEGIN
|
||||
|
||||
struct QWellArrayData;
|
||||
|
||||
@ -1,179 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2015 The Qt Company Ltd.
|
||||
** Contact: http://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtWidgets module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL21$
|
||||
** 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 The Qt Company. For licensing terms
|
||||
** and conditions see http://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free
|
||||
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
** following information to ensure the GNU Lesser General Public License
|
||||
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** As a special exception, The Qt Company gives you certain additional
|
||||
** rights. These rights are described in The Qt Company LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QCOLORDIALOG_P_H
|
||||
#define QCOLORDIALOG_P_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
//
|
||||
// This file is not part of the Qt API. It exists purely as an
|
||||
// implementation detail. This header file may change from version to
|
||||
// to version without notice, or even be removed.
|
||||
//
|
||||
// We mean it.
|
||||
//
|
||||
//
|
||||
|
||||
#include "private/qdialog_p.h"
|
||||
#include "qcolordialog.h"
|
||||
#include "qsharedpointer.h"
|
||||
#include "qwindow.h"
|
||||
|
||||
#ifndef QT_NO_COLORDIALOG
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QColorLuminancePicker;
|
||||
class QColorPicker;
|
||||
class QColorShower;
|
||||
class QDialogButtonBox;
|
||||
class QLabel;
|
||||
class QVBoxLayout;
|
||||
class QPushButton;
|
||||
class QWellArray;
|
||||
class QColorPickingEventFilter;
|
||||
class QTimer;
|
||||
|
||||
class QColorDialogPrivate : public QDialogPrivate
|
||||
{
|
||||
Q_DECLARE_PUBLIC(QColorDialog)
|
||||
|
||||
public:
|
||||
enum SetColorMode {
|
||||
ShowColor = 0x1,
|
||||
SelectColor = 0x2,
|
||||
SetColorAll = ShowColor | SelectColor
|
||||
};
|
||||
|
||||
QColorDialogPrivate() : options(new QColorDialogOptions)
|
||||
#ifdef Q_OS_WIN32
|
||||
, updateTimer(0)
|
||||
#endif
|
||||
{}
|
||||
|
||||
QPlatformColorDialogHelper *platformColorDialogHelper() const
|
||||
{ return static_cast<QPlatformColorDialogHelper *>(platformHelper()); }
|
||||
|
||||
void init(const QColor &initial);
|
||||
void initWidgets();
|
||||
QRgb currentColor() const;
|
||||
QColor currentQColor() const;
|
||||
void setCurrentColor(const QColor &color, SetColorMode setColorMode = SetColorAll);
|
||||
void setCurrentRgbColor(QRgb rgb);
|
||||
void setCurrentQColor(const QColor &color);
|
||||
bool selectColor(const QColor &color);
|
||||
QColor grabScreenColor(const QPoint &p);
|
||||
|
||||
int currentAlpha() const;
|
||||
void setCurrentAlpha(int a);
|
||||
void showAlpha(bool b);
|
||||
bool isAlphaVisible() const;
|
||||
void retranslateStrings();
|
||||
|
||||
void _q_addCustom();
|
||||
|
||||
void _q_newHsv(int h, int s, int v);
|
||||
void _q_newColorTypedIn(QRgb rgb);
|
||||
void _q_nextCustom(int, int);
|
||||
void _q_newCustom(int, int);
|
||||
void _q_newStandard(int, int);
|
||||
void _q_pickScreenColor();
|
||||
void _q_updateColorPicking();
|
||||
void updateColorLabelText(const QPoint &);
|
||||
void updateColorPicking(const QPoint &pos);
|
||||
void releaseColorPicking();
|
||||
bool handleColorPickingMouseMove(QMouseEvent *e);
|
||||
bool handleColorPickingMouseButtonRelease(QMouseEvent *e);
|
||||
bool handleColorPickingKeyPress(QKeyEvent *e);
|
||||
|
||||
bool canBeNativeDialog() const Q_DECL_OVERRIDE;
|
||||
|
||||
QWellArray *custom;
|
||||
QWellArray *standard;
|
||||
|
||||
QDialogButtonBox *buttons;
|
||||
QVBoxLayout *leftLay;
|
||||
QColorPicker *cp;
|
||||
QColorLuminancePicker *lp;
|
||||
QColorShower *cs;
|
||||
QLabel *lblBasicColors;
|
||||
QLabel *lblCustomColors;
|
||||
QLabel *lblScreenColorInfo;
|
||||
QPushButton *ok;
|
||||
QPushButton *cancel;
|
||||
QPushButton *addCusBt;
|
||||
QPushButton *screenColorPickerButton;
|
||||
QColor selectedQColor;
|
||||
int nextCust;
|
||||
bool smallDisplay;
|
||||
bool screenColorPicking;
|
||||
QColorPickingEventFilter *colorPickingEventFilter;
|
||||
QRgb beforeScreenColorPicking;
|
||||
QSharedPointer<QColorDialogOptions> options;
|
||||
|
||||
QPointer<QObject> receiverToDisconnectOnClose;
|
||||
QByteArray memberToDisconnectOnClose;
|
||||
#ifdef Q_OS_WIN32
|
||||
QTimer *updateTimer;
|
||||
QWindow dummyTransparentWindow;
|
||||
#endif
|
||||
|
||||
#ifdef Q_DEAD_CODE_FROM_QT4_MAC
|
||||
void openCocoaColorPanel(const QColor &initial,
|
||||
QWidget *parent, const QString &title, QColorDialog::ColorDialogOptions options);
|
||||
void closeCocoaColorPanel();
|
||||
void releaseCocoaColorPanelDelegate();
|
||||
void setCocoaPanelColor(const QColor &color);
|
||||
|
||||
inline void done(int result) { q_func()->done(result); }
|
||||
inline QColorDialog *colorDialog() { return q_func(); }
|
||||
|
||||
void *delegate;
|
||||
|
||||
static bool sharedColorPanelAvailable;
|
||||
|
||||
void _q_macRunNativeAppModalPanel();
|
||||
void mac_nativeDialogModalHelp();
|
||||
#endif
|
||||
private:
|
||||
virtual void initHelper(QPlatformDialogHelper *h) Q_DECL_OVERRIDE;
|
||||
virtual void helperPrepareShow(QPlatformDialogHelper *h) Q_DECL_OVERRIDE;
|
||||
};
|
||||
|
||||
#endif // QT_NO_COLORDIALOG
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QCOLORDIALOG_P_H
|
||||
Loading…
x
Reference in New Issue
Block a user