Implement QDesktopWidget::screenCountChanged signal on desktop platforms,

and add manual testcase.

Provide replacement "screenCount" for numScreens and document numScreens
as obsolete to be more consistent with other APIs.

2 files changed, 190 insertions, 0 deletions

diff --git a/tests/manual/qdesktopwidget/main.cpp b/tests/manual/qdesktopwidget/main.cpp
new file mode 100644
index 0000000000..1afc82eeff
--- /dev/null
+++ b/tests/manual/qdesktopwidget/main.cpp
@@ -0,0 +1,188 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+class DesktopView : public QGraphicsView
+{
+    Q_OBJECT
+public:
+    DesktopView()
+        : that(0)
+    {
+        scene = new QGraphicsScene;
+        setScene(scene);
+
+        QDesktopWidget *desktop = QApplication::desktop();
+        connect(desktop, SIGNAL(resized(int)), this, SLOT(updateScene()));
+        connect(desktop, SIGNAL(workAreaResized(int)), this, SLOT(updateScene()));
+        connect(desktop, SIGNAL(screenCountChanged(int)), this, SLOT(updateScene()));
+
+        updateScene();
+
+        QTransform transform;
+        transform.scale(0.25, 0.25);
+        setTransform(transform);
+
+        setBackgroundBrush(Qt::darkGray);
+    }
+
+protected:
+    void moveEvent(QMoveEvent *e)
+    {
+        if (that) {
+            that->setRect(appRect());
+            scene->update();
+        }
+        QGraphicsView::moveEvent(e);
+    }
+    void resizeEvent(QResizeEvent *e)
+    {
+        if (that) {
+            that->setRect(appRect());
+        }
+        QGraphicsView::resizeEvent(e);
+    }
+
+private slots:
+    void updateScene()
+    {
+        scene->clear();
+
+        const QDesktopWidget *desktop = QApplication::desktop();
+        const bool isVirtualDesktop = desktop->isVirtualDesktop();
+        const int homeScreen = desktop->screenNumber(this);
+
+        QRect sceneRect;
+        int screenCount = desktop->screenCount();
+        for (int s = 0; s < screenCount; ++s) {
+            const bool isPrimary = desktop->primaryScreen() == s;
+            const QRect screenRect = desktop->screenGeometry(s);
+            const QRect workRect = desktop->availableGeometry(s);
+            const QBrush fillBrush = palette().brush(isPrimary ? QPalette::Active : QPalette::Inactive, QPalette::Highlight);
+            QGraphicsRectItem *screen = new QGraphicsRectItem(0, 0, screenRect.width(), screenRect.height());
+
+            if (isVirtualDesktop) {
+                thatRoot = QPoint();
+                screen->setPos(screenRect.x(), screenRect.y());
+            } else {
+               // for non-virtual desktops we assume that screens are
+               // simply next to each other
+                if (s)
+                    screen->setPos(sceneRect.right(), 0);
+                if (s == homeScreen)
+                    thatRoot = screen->pos().toPoint();
+            }
+
+            screen->setBrush(fillBrush);
+            scene->addItem(screen);
+            sceneRect.setLeft(qMin(sceneRect.left(), screenRect.left()));
+            sceneRect.setRight(qMax(sceneRect.right(), screenRect.right()));
+            sceneRect.setTop(qMin(sceneRect.top(), screenRect.top()));
+            sceneRect.setBottom(qMax(sceneRect.bottom(), screenRect.bottom()));
+
+            QGraphicsRectItem *workArea = new QGraphicsRectItem(screen);
+            workArea->setRect(0, 0, workRect.width(), workRect.height());
+            workArea->setPos(workRect.x() - screenRect.x(), workRect.y() - screenRect.y());
+            workArea->setBrush(Qt::white);
+
+            QGraphicsSimpleTextItem *screenNumber = new QGraphicsSimpleTextItem(workArea);
+            screenNumber->setText(QString::number(s));
+            screenNumber->setPen(QPen(Qt::black, 1));
+            screenNumber->setBrush(fillBrush);
+            screenNumber->setFont(QFont("Arial Black", 18));
+            screenNumber->setTransform(QTransform().scale(10, 10));
+            screenNumber->setTransformOrigin(screenNumber->boundingRect().center());
+            QSizeF center = (workRect.size() - screenNumber->boundingRect().size()) / 2;
+            screenNumber->setPos(center.width(), center.height());
+
+            screen->show();
+            screen->setZValue(1);
+        }
+
+        if (isVirtualDesktop) {
+            QGraphicsRectItem *virtualDesktop = new QGraphicsRectItem;
+            virtualDesktop->setRect(sceneRect);
+            virtualDesktop->setPen(QPen(Qt::black));
+            virtualDesktop->setBrush(Qt::DiagCrossPattern);
+            scene->addItem(virtualDesktop);
+            virtualDesktop->setZValue(-1);
+            virtualDesktop->show();
+        }
+
+        that = new QGraphicsRectItem;
+        that->setBrush(Qt::red);
+        that->setOpacity(0.5);
+        that->setZValue(2);
+        that->setRect(appRect());
+        that->show();
+        scene->addItem(that);
+
+        scene->setSceneRect(sceneRect);
+        scene->update();
+    }
+
+    QRect appRect() const
+    {
+        QRect rect = frameGeometry();
+        if (!QApplication::desktop()->isVirtualDesktop()) {
+            rect.translate(thatRoot);
+        }
+        return rect;
+    }
+
+private:
+    QGraphicsScene *scene;
+    QGraphicsRectItem *that;
+    QPoint thatRoot;
+};
+
+#include "main.moc"
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    DesktopView view;
+    view.show();
+
+    return app.exec();
+}
diff --git a/tests/manual/qdesktopwidget/qdesktopwidget.pro b/tests/manual/qdesktopwidget/qdesktopwidget.pro
new file mode 100644
index 0000000000..93d56eb137
--- /dev/null
+++ b/tests/manual/qdesktopwidget/qdesktopwidget.pro
@@ -0,0 +1,2 @@
+TEMPLATE = app
+SOURCES += main.cpp