[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] plugins/reporting/web: Proper painting of the designer item
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2011-09-30 22:30:28
Message-ID: 20110930223028.A63A4A60D5 () git ! kde ! org
[Download RAW message or body]

Git commit 5146c8bd2abcc91acd6467be1739c840a5039f8f by Jaroslaw Staniek, on behalf of \
Adam Pigg. Committed on 30/09/2011 at 12:14.
Pushed by staniek into branch 'master'.

Proper painting of the designer item
Now shows control-source and type, and handles.

M  +6    -10   plugins/reporting/web/KoReportDesignerItemWeb.cpp
M  +1    -1    plugins/reporting/web/KoReportDesignerItemWeb.h

http://commits.kde.org/calligra/5146c8bd2abcc91acd6467be1739c840a5039f8f

diff --git a/plugins/reporting/web/KoReportDesignerItemWeb.cpp \
b/plugins/reporting/web/KoReportDesignerItemWeb.cpp index e29a70c..6fdc01f 100644
--- a/plugins/reporting/web/KoReportDesignerItemWeb.cpp
+++ b/plugins/reporting/web/KoReportDesignerItemWeb.cpp
@@ -87,19 +87,15 @@ KoReportDesignerItemWeb::~KoReportDesignerItemWeb() \
//done,compared  // do we need to clean anything up?
 }
 
-void KoReportDesignerItemWeb::paint(QPainter *painter, const KoViewConverter \
&converter) +void KoReportDesignerItemWeb::paint(QPainter* painter, const \
QStyleOptionGraphicsItem* option, QWidget* widget)  {
-    QRectF target = converter.documentToView(QRectF(QPointF(0, 0), QPointF(500, \
                500)));
-    m_webPage->setViewportSize(target.size().toSize());
-//    qreal cz = target.width() / size().width();
-//    m_webPage->mainFrame()->setZoomFactor(m_zoom * cz);
-//    m_webPage->mainFrame()->setScrollPosition(m_scrollPosition.toPoint());
-    m_webPage->mainFrame()->load(QUrl("http://www.google.com"));
-    m_webPage->mainFrame()->render(painter);
-    
-    kDebug() << QGraphicsRectItem::rect();
+    Q_UNUSED(option);
+    Q_UNUSED(widget);
     
     painter->drawRect(QGraphicsRectItem::rect());
+    painter->drawText(rect(), 0, dataSourceAndObjectTypeName(itemDataSource(), \
"web-view")); +    
+    painter->setBackgroundMode(Qt::TransparentMode);
     
     drawHandles(painter);
 }
diff --git a/plugins/reporting/web/KoReportDesignerItemWeb.h \
b/plugins/reporting/web/KoReportDesignerItemWeb.h index e62c857..2e85132 100644
--- a/plugins/reporting/web/KoReportDesignerItemWeb.h
+++ b/plugins/reporting/web/KoReportDesignerItemWeb.h
@@ -38,7 +38,7 @@ public:
     void init(QGraphicsScene *scene);
     virtual ~KoReportDesignerItemWeb();
     virtual void buildXML(QDomDocument &doc, QDomElement &parent);
-    virtual void paint(QPainter *painter, const KoViewConverter &converter);
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, \
QWidget* widget);  virtual KoReportDesignerItemWeb *clone();
 
     using QGraphicsRectItem::paint;


[prev in list] [next in list] [prev in thread] [next in thread]