Commit 0812e67f authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner.PropertyEditor: remove QProxyLayout/QProxyLayoutItem



Those were examples how to expose QGraphicsViewLayouts to QML.
Since we do not use those anywhere anymore we remove them.

Also they do not seem to compile with the latest version
of Qt 5 dev, because of the Q_INTERFACES() macro.

Change-Id: Iee1944de1d38de30829a1b39bcf4012387cb6e3b
Reviewed-by: default avatarOliver Wolff <oliver.wolff@digia.com>
parent 394155bb
......@@ -372,7 +372,6 @@ PropertyEditor::PropertyEditor(QWidget *parent) :
QLayoutObject::registerDeclarativeType();
QmlEditorWidgets::ColorWidgets::registerDeclarativeTypes();
BehaviorDialog::registerDeclarativeType();
QProxyLayoutItem::registerDeclarativeTypes();
PropertyEditorValue::registerDeclarativeTypes();
FontWidget::registerDeclarativeTypes();
SiblingComboBox::registerDeclarativeTypes();
......
......@@ -7,7 +7,6 @@ SOURCES += propertyeditor.cpp \
basiclayouts.cpp \
basicwidgets.cpp \
behaviordialog.cpp \
qproxylayoutitem.cpp \
layoutwidget.cpp \
filewidget.cpp \
propertyeditorvalue.cpp \
......@@ -26,7 +25,6 @@ HEADERS += propertyeditor.h \
basiclayouts.h \
basicwidgets.h \
behaviordialog.h \
qproxylayoutitem.h \
layoutwidget.h \
filewidget.h \
propertyeditorvalue.h \
......
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** 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.
**
****************************************************************************/
#include "qproxylayoutitem.h"
#include <QGraphicsWidget>
QT_BEGIN_NAMESPACE
QProxyLayoutItem::QProxyLayoutItem(QGraphicsLayoutItem *i)
: enabled(true), other(i)
{
}
void QProxyLayoutItem::setGeometry(const QRectF &r)
{
geometry = r;
if (enabled && other)
other->setGeometry(r);
}
QGraphicsLayoutItem *QProxyLayoutItem::item() const
{
return other;
}
void QProxyLayoutItem::setItem(QGraphicsLayoutItem *o)
{
if (other == o)
return;
other = o;
if (enabled && other)
other->setGeometry(geometry);
updateGeometry();
if (parentLayoutItem())
parentLayoutItem()->updateGeometry();
}
void QProxyLayoutItem::setEnabled(bool e)
{
if (e == enabled)
return;
enabled = e;
if (e && other)
other->setGeometry(geometry);
}
QSizeF QProxyLayoutItem::sizeHint(Qt::SizeHint which, const QSizeF &c) const
{
struct Accessor : public QGraphicsLayoutItem
{
QSizeF getSizeHint(Qt::SizeHint which, const QSizeF &c) const
{
return sizeHint(which, c);
}
};
QSizeF rv;
if (other)
rv = static_cast<Accessor *>(other)->getSizeHint(which, c);
return rv;
}
QProxyLayout::QProxyLayout(QObject *parent)
: QObject(parent), proxy(0)
{
}
void QProxyLayout::setLayout(QGraphicsLayout *l)
{
proxy = l;
updateGeometry();
if (parentLayoutItem())
parentLayoutItem()->updateGeometry();
}
QGraphicsLayout *QProxyLayout::layout() const
{
return proxy;
}
void QProxyLayout::updateGeometry()
{
QGraphicsLayout::updateGeometry();
}
void QProxyLayout::setGeometry(const QRectF &g)
{
geometry = g;
if (proxy)
proxy->setGeometry(g);
}
int QProxyLayout::count() const
{
if (proxy)
return proxy->count();
else
return 0;
}
QGraphicsLayoutItem *QProxyLayout::itemAt(int idx) const
{
if (proxy)
return proxy->itemAt(idx);
else
return 0;
}
void QProxyLayout::removeAt(int idx)
{
if (proxy)
proxy->removeAt(idx);
}
QSizeF QProxyLayout::sizeHint(Qt::SizeHint which,
const QSizeF &constraint) const
{
struct Accessor : public QGraphicsLayout
{
QSizeF getSizeHint(Qt::SizeHint which, const QSizeF &c) const
{
return sizeHint(which, c);
}
};
if (proxy)
return static_cast<Accessor *>(proxy)->getSizeHint(which, constraint);
else
return QSizeF();
}
void QProxyLayoutItem::registerDeclarativeTypes()
{
qmlRegisterType<QProxyLayoutItem>("Bauhaus",1,0,"LayoutItem");
qmlRegisterType<QProxyLayout>("Bauhaus",1,0,"ProxyLayout");
}
QT_END_NAMESPACE
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** 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.
**
****************************************************************************/
#ifndef QPROXYLAYOUTITEM_H
#define QPROXYLAYOUTITEM_H
#include <qdeclarative.h>
#include <QGraphicsLayout>
QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
class QProxyLayout : public QObject, public QGraphicsLayout
{
Q_OBJECT
Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
Q_PROPERTY(QGraphicsLayout *layout READ layout WRITE setLayout)
public:
QProxyLayout(QObject *parent=0);
void setLayout(QGraphicsLayout *);
QGraphicsLayout *layout() const;
virtual void setGeometry(const QRectF &);
virtual int count() const;
virtual QGraphicsLayoutItem *itemAt(int) const;
virtual void removeAt(int);
virtual void updateGeometry();
protected:
virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
private:
QRectF geometry;
QGraphicsLayout *proxy;
};
class QProxyLayoutItem : public QObject, public QGraphicsLayoutItem
{
Q_OBJECT
Q_INTERFACES(QGraphicsLayoutItem)
Q_PROPERTY(QGraphicsLayoutItem *widget READ item WRITE setItem)
public:
QProxyLayoutItem(QGraphicsLayoutItem * = 0);
virtual void setGeometry(const QRectF &);
QGraphicsLayoutItem *item() const;
void setItem(QGraphicsLayoutItem *);
void setEnabled(bool);
static void registerDeclarativeTypes();
protected:
virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
private:
bool enabled;
QRectF geometry;
QGraphicsLayoutItem *other;
};
QT_END_NAMESPACE
QML_DECLARE_TYPE(QProxyLayout)
QML_DECLARE_TYPE(QProxyLayoutItem)
#endif // QPROXYLAYOUTITEM_H
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment