diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-12-16 16:05:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 14:40:00 +0100 |
commit | 34793538fbbfce733da1d8495b7f2ed05c5e9a8b (patch) | |
tree | 1902ad80e8d9484182f5b11d969f766e511d6346 /src/imports/dialogs/qquickabstractcolordialog.cpp | |
parent | 2740cf4e844f8b8612ea595219eb72c57bbdc42b (diff) |
remove QtQuick.Dialogs and related modules
They are being moved to the QtQuick Controls repository (see change
ba9ba084124403bd8930e29d8afcea9d64b6c0b6 in qtquickcontrols).
This makes it possible to use QtQuick Controls in the implementation.
[ChangeLog][QtQuick][Dialogs]Moved dialog implementations from
qtdeclarative module to qtquickcontrols module due to dependencies
Change-Id: I76d5b71b185dd14a188ea68f18bfec61b4bf2f41
Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'src/imports/dialogs/qquickabstractcolordialog.cpp')
-rw-r--r-- | src/imports/dialogs/qquickabstractcolordialog.cpp | 134 |
1 files changed, 0 insertions, 134 deletions
diff --git a/src/imports/dialogs/qquickabstractcolordialog.cpp b/src/imports/dialogs/qquickabstractcolordialog.cpp deleted file mode 100644 index 1931bde905..0000000000 --- a/src/imports/dialogs/qquickabstractcolordialog.cpp +++ /dev/null @@ -1,134 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQuick.Dialogs 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$ -** -****************************************************************************/ - -#include "qquickabstractcolordialog_p.h" -#include "qquickitem.h" - -#include <private/qguiapplication_p.h> -#include <QWindow> -#include <QQuickWindow> - -QT_BEGIN_NAMESPACE - -QQuickAbstractColorDialog::QQuickAbstractColorDialog(QObject *parent) - : QQuickAbstractDialog(parent) - , m_dlgHelper(0) - , m_options(QSharedPointer<QColorDialogOptions>(new QColorDialogOptions())) -{ - // On the Mac, modality doesn't work unless you call exec(). But this is a reasonable default anyway. - m_modality = Qt::NonModal; - connect(this, SIGNAL(accepted()), this, SIGNAL(selectionAccepted())); -} - -QQuickAbstractColorDialog::~QQuickAbstractColorDialog() -{ -} - -void QQuickAbstractColorDialog::setVisible(bool v) -{ - if (helper() && v) { - m_dlgHelper->setOptions(m_options); - // Due to the fact that QColorDialogOptions doesn't have currentColor... - m_dlgHelper->setCurrentColor(m_color); - } - QQuickAbstractDialog::setVisible(v); - // QTBUG-35206 -#if defined(Q_OS_WIN) - if (m_dialogWindow) - m_dialogWindow->setWidth(m_dialogWindow->width() + 1); -#endif -} - -void QQuickAbstractColorDialog::setModality(Qt::WindowModality m) -{ -#ifdef Q_OS_MAC - // On the Mac, modality doesn't work unless you call exec() - m_modality = Qt::NonModal; - emit modalityChanged(); - return; -#endif - QQuickAbstractDialog::setModality(m); -} - -QString QQuickAbstractColorDialog::title() const -{ - return m_options->windowTitle(); -} - -bool QQuickAbstractColorDialog::showAlphaChannel() const -{ - return m_options->testOption(QColorDialogOptions::ShowAlphaChannel); -} - -void QQuickAbstractColorDialog::setTitle(const QString &t) -{ - if (m_options->windowTitle() == t) return; - m_options->setWindowTitle(t); - emit titleChanged(); -} - -void QQuickAbstractColorDialog::setColor(QColor arg) -{ - if (m_dlgHelper) - m_dlgHelper->setCurrentColor(arg); - // m_options->setCustomColor or setStandardColor don't make sense here - if (m_color != arg) { - m_color = arg; - emit colorChanged(); - } - setCurrentColor(arg); -} - -void QQuickAbstractColorDialog::setCurrentColor(QColor currentColor) -{ - if (m_currentColor != currentColor) { - m_currentColor = currentColor; - emit currentColorChanged(); - } -} - -void QQuickAbstractColorDialog::setShowAlphaChannel(bool arg) -{ - m_options->setOption(QColorDialogOptions::ShowAlphaChannel, arg); - emit showAlphaChannelChanged(); -} - -QT_END_NAMESPACE |