From e0a4002d91c88470a82b4eb18beeee4850ea5a26 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
Date: Thu, 24 Mar 2011 11:08:36 +0100
Subject: [PATCH] Apply Scenegraph changes
---
components/Button.qml | 2 +-
components/ButtonRow.qml | 2 +-
components/CheckBox.qml | 2 +-
components/ChoiceList.qml | 9 +--------
components/Dial.qml | 2 +-
components/Frame.qml | 2 +-
components/GroupBox.qml | 2 +-
components/ProgressBar.qml | 2 +-
components/RadioButton.qml | 2 +-
components/ScrollArea.qml | 2 +-
components/ScrollBar.qml | 2 +-
components/Slider.qml | 2 +-
components/SpinBox.qml | 2 +-
components/Switch.qml | 2 +-
components/Tab.qml | 2 +-
components/TabBar.qml | 2 +-
components/TabFrame.qml | 2 +-
components/TextArea.qml | 2 +-
components/TextField.qml | 2 +-
components/ToolBar.qml | 2 +-
components/ToolButton.qml | 2 +-
components/custom/BasicButton.qml | 2 +-
components/custom/Button.qml | 2 +-
components/custom/ButtonColumn.qml | 2 +-
components/custom/ButtonRow.qml | 2 +-
components/custom/CheckBox.qml | 2 +-
components/custom/ChoiceList.qml | 2 +-
components/custom/ProgressBar.qml | 2 +-
components/custom/Slider.qml | 2 +-
components/custom/SpinBox.qml | 2 +-
components/custom/TextField.qml | 2 +-
components/custom/behaviors/ButtonBehavior.qml | 2 +-
.../custom/behaviors/ModalPopupBehavior.qml | 2 +-
components/custom/private/ChoiceListPopup.qml | 2 +-
components/styleitem/qstyleitem.cpp | 16 ++++++++--------
components/styleitem/qstyleitem.h | 9 +++++----
examples/Browser.qml | 2 +-
examples/Gallery.qml | 2 +-
examples/Panel.qml | 2 +-
39 files changed, 50 insertions(+), 56 deletions(-)
diff --git a/components/Button.qml b/components/Button.qml
index 3c2170872..6bf4153f7 100644
--- a/components/Button.qml
+++ b/components/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/ButtonRow.qml b/components/ButtonRow.qml
index 7123b415b..cb0407e0f 100644
--- a/components/ButtonRow.qml
+++ b/components/ButtonRow.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
Components.ButtonRow {
diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index 55323832c..80c230aa9 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/ChoiceList.qml b/components/ChoiceList.qml
index 08a222092..4a4b50999 100644
--- a/components/ChoiceList.qml
+++ b/components/ChoiceList.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
@@ -47,12 +47,5 @@ Components.ChoiceList {
anchors.topMargin: backgroundItem.pixelMetric("menuvmargin") + fw
anchors.bottomMargin: backgroundItem.pixelMetric("menuvmargin") + fw
elementType: "menu"
-
- effect: DropShadow {
- blurRadius: 10
- color: "#60000000"
- xOffset: 1
- yOffset: 1
- }
}
}
diff --git a/components/Dial.qml b/components/Dial.qml
index 6173774a4..ef660e594 100644
--- a/components/Dial.qml
+++ b/components/Dial.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/Frame.qml b/components/Frame.qml
index 24a8e8332..e2034303e 100644
--- a/components/Frame.qml
+++ b/components/Frame.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/GroupBox.qml b/components/GroupBox.qml
index 16dc83d05..cb516709d 100644
--- a/components/GroupBox.qml
+++ b/components/GroupBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml
index b993c228c..edf4d7f9e 100644
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/RadioButton.qml b/components/RadioButton.qml
index 885a0573b..dba26157e 100644
--- a/components/RadioButton.qml
+++ b/components/RadioButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/ScrollArea.qml b/components/ScrollArea.qml
index c7f8473e0..250161e66 100644
--- a/components/ScrollArea.qml
+++ b/components/ScrollArea.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/ScrollBar.qml b/components/ScrollBar.qml
index 225d2ef22..8327f2f89 100644
--- a/components/ScrollBar.qml
+++ b/components/ScrollBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/Slider.qml b/components/Slider.qml
index 694d2305a..05afbb8f1 100644
--- a/components/Slider.qml
+++ b/components/Slider.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/SpinBox.qml b/components/SpinBox.qml
index 508d4f4dd..96e8cef56 100644
--- a/components/SpinBox.qml
+++ b/components/SpinBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/Switch.qml b/components/Switch.qml
index 5d661ec3d..36be613b9 100644
--- a/components/Switch.qml
+++ b/components/Switch.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/Tab.qml b/components/Tab.qml
index e258185ba..45bba83b6 100644
--- a/components/Tab.qml
+++ b/components/Tab.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 2.0
Item {
id:tab
diff --git a/components/TabBar.qml b/components/TabBar.qml
index 8ab2134ea..064a3d261 100644
--- a/components/TabBar.qml
+++ b/components/TabBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/TabFrame.qml b/components/TabFrame.qml
index c8816e660..b2e8983ce 100644
--- a/components/TabFrame.qml
+++ b/components/TabFrame.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/TextArea.qml b/components/TextArea.qml
index 5c95d7edc..de872a5ad 100644
--- a/components/TextArea.qml
+++ b/components/TextArea.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/TextField.qml b/components/TextField.qml
index ccadadf86..a83aa1674 100644
--- a/components/TextField.qml
+++ b/components/TextField.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/ToolBar.qml b/components/ToolBar.qml
index 98367723c..7b15334e4 100644
--- a/components/ToolBar.qml
+++ b/components/ToolBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/ToolButton.qml b/components/ToolButton.qml
index 636a11db5..2b265547b 100644
--- a/components/ToolButton.qml
+++ b/components/ToolButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "custom" as Components
import "plugin"
diff --git a/components/custom/BasicButton.qml b/components/custom/BasicButton.qml
index 14c929b1c..9eba3fc24 100644
--- a/components/custom/BasicButton.qml
+++ b/components/custom/BasicButton.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "./behaviors" // ButtonBehavior
Item {
diff --git a/components/custom/Button.qml b/components/custom/Button.qml
index 45abc83f6..3d239d5dd 100644
--- a/components/custom/Button.qml
+++ b/components/custom/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
BasicButton {
id: button
diff --git a/components/custom/ButtonColumn.qml b/components/custom/ButtonColumn.qml
index 8d63a855c..45a02696f 100644
--- a/components/custom/ButtonColumn.qml
+++ b/components/custom/ButtonColumn.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 2.0
import "ButtonGroup.js" as Behavior
/*
diff --git a/components/custom/ButtonRow.qml b/components/custom/ButtonRow.qml
index 7c2d3ea7a..c5bc9a33c 100644
--- a/components/custom/ButtonRow.qml
+++ b/components/custom/ButtonRow.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 2.0
import "ButtonGroup.js" as Behavior
/*
diff --git a/components/custom/CheckBox.qml b/components/custom/CheckBox.qml
index a49d71d8a..82f50072b 100644
--- a/components/custom/CheckBox.qml
+++ b/components/custom/CheckBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "./behaviors"
Item {
diff --git a/components/custom/ChoiceList.qml b/components/custom/ChoiceList.qml
index 892a297eb..b1ef10b4d 100644
--- a/components/custom/ChoiceList.qml
+++ b/components/custom/ChoiceList.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "./private" as Private // for ChoiceListPopup
// KNOWN ISSUES
diff --git a/components/custom/ProgressBar.qml b/components/custom/ProgressBar.qml
index 3ad8bca6c..3e85e1393 100644
--- a/components/custom/ProgressBar.qml
+++ b/components/custom/ProgressBar.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
Item {
id: progressBar
diff --git a/components/custom/Slider.qml b/components/custom/Slider.qml
index ef725d75b..837b348da 100644
--- a/components/custom/Slider.qml
+++ b/components/custom/Slider.qml
@@ -24,7 +24,7 @@
**
****************************************************************************/
-import QtQuick 1.0
+import QtQuick 2.0
import "../plugin"
Item {
diff --git a/components/custom/SpinBox.qml b/components/custom/SpinBox.qml
index 3eece53ea..459583638 100644
--- a/components/custom/SpinBox.qml
+++ b/components/custom/SpinBox.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
FocusScope {
id: spinbox
diff --git a/components/custom/TextField.qml b/components/custom/TextField.qml
index b38b3ecb7..2d412e156 100644
--- a/components/custom/TextField.qml
+++ b/components/custom/TextField.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "./behaviors" // TextEditMouseBehavior
// KNOWN ISSUES
diff --git a/components/custom/behaviors/ButtonBehavior.qml b/components/custom/behaviors/ButtonBehavior.qml
index 57ea62690..b9ab1f350 100644
--- a/components/custom/behaviors/ButtonBehavior.qml
+++ b/components/custom/behaviors/ButtonBehavior.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
Item {
id: behavior
diff --git a/components/custom/behaviors/ModalPopupBehavior.qml b/components/custom/behaviors/ModalPopupBehavior.qml
index 108bf02ae..c5e39311f 100644
--- a/components/custom/behaviors/ModalPopupBehavior.qml
+++ b/components/custom/behaviors/ModalPopupBehavior.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
// KNOWN ISSUES
// none
diff --git a/components/custom/private/ChoiceListPopup.qml b/components/custom/private/ChoiceListPopup.qml
index 9b34fb4c3..0262f52bf 100644
--- a/components/custom/private/ChoiceListPopup.qml
+++ b/components/custom/private/ChoiceListPopup.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
MouseArea {
id: popup
diff --git a/components/styleitem/qstyleitem.cpp b/components/styleitem/qstyleitem.cpp
index 528336e1a..33b0a0d8d 100644
--- a/components/styleitem/qstyleitem.cpp
+++ b/components/styleitem/qstyleitem.cpp
@@ -49,8 +49,8 @@
#include <QtGui/QMenu>
-QStyleItem::QStyleItem(QDeclarativeItem *parent)
- : QDeclarativeItem(parent),
+QStyleItem::QStyleItem(QSGPaintedItem *parent)
+ : QSGPaintedItem(parent),
m_dummywidget(0),
m_styleoption(0),
m_sunken(false),
@@ -66,8 +66,8 @@ QStyleItem::QStyleItem(QDeclarativeItem *parent)
m_value(0),
m_paintMargins(0)
{
- setFlag(QGraphicsItem::ItemHasNoContents, false);
- setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+ setFlag(QSGItem::ItemHasContents, true);
+ //setCacheMode(QGraphicsItem::DeviceCoordinateCache);
setSmooth(true);
connect(this, SIGNAL(infoChanged()), this, SLOT(updateItem()));
@@ -587,9 +587,9 @@ bool QStyleItem::eventFilter(QObject *o, QEvent *e) {
void QStyleItem::showToolTip(const QString &str)
{
- QPointF scene = mapToScene(width() - 20, 0);
- QPoint global = qApp->focusWidget()->mapToGlobal(scene.toPoint());
- QToolTip::showText(QPoint(global.x(), global.y()), str);
+// QPointF scene = mapToScene(width() - 20, 0);
+// QPoint global = qApp->focusWidget()->mapToGlobal(scene.toPoint());
+// QToolTip::showText(QPoint(global.x(), global.y()), str);
}
QRect QStyleItem::subControlRect(const QString &subcontrolString)
@@ -639,7 +639,7 @@ QRect QStyleItem::subControlRect(const QString &subcontrolString)
return QRect();
}
-void QStyleItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+void QStyleItem::paint(QPainter *painter)
{
QString type = elementType();
initStyleOption();
diff --git a/components/styleitem/qstyleitem.h b/components/styleitem/qstyleitem.h
index 16dd15a92..49ca5b03d 100644
--- a/components/styleitem/qstyleitem.h
+++ b/components/styleitem/qstyleitem.h
@@ -40,12 +40,13 @@
#ifndef STYLEWRAPPER_H
#define STYLEWRAPPER_H
-#include <QDeclarativeItem>
+#include <private/qsgpainteditem_p.h>
+//#include <QDeclarativeItem>
#include <QtGui/QStyle>
#include <QtGui>
#include <QEvent>
-class QStyleItem: public QDeclarativeItem
+class QStyleItem: public QSGPaintedItem
{
Q_OBJECT
@@ -70,10 +71,10 @@ class QStyleItem: public QDeclarativeItem
Q_PROPERTY( int paintMargins READ paintMargins WRITE setPaintMargins NOTIFY paintMarginsChanged)
public:
- QStyleItem(QDeclarativeItem *parent = 0);
+ QStyleItem(QSGPaintedItem *parent = 0);
~QStyleItem();
- void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+ void paint(QPainter *);
bool sunken() const { return m_sunken; }
bool raised() const { return m_raised; }
diff --git a/examples/Browser.qml b/examples/Browser.qml
index 88f920b09..c14e977d3 100644
--- a/examples/Browser.qml
+++ b/examples/Browser.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import QtWebKit 1.0
import "../components"
diff --git a/examples/Gallery.qml b/examples/Gallery.qml
index 370920ff8..0da33a465 100644
--- a/examples/Gallery.qml
+++ b/examples/Gallery.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import "../components"
import "../components/plugin"
diff --git a/examples/Panel.qml b/examples/Panel.qml
index ed5d49b2b..985e7836f 100644
--- a/examples/Panel.qml
+++ b/examples/Panel.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 2.0
import QtWebKit 1.0
import "../components"
--
GitLab