diff --git a/tests/manual/progressmanager/find.png b/tests/manual/progressmanager/find.png deleted file mode 100644 index cbe2f31521a0ae72eb5cbedde285372e5bd5affd..0000000000000000000000000000000000000000 Binary files a/tests/manual/progressmanager/find.png and /dev/null differ diff --git a/tests/manual/progressmanager/main.cpp b/tests/manual/progressmanager/main.cpp deleted file mode 100644 index 4bf513321c083d45435074242d63688f96c0c6fc..0000000000000000000000000000000000000000 --- a/tests/manual/progressmanager/main.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** 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.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ - -#include "roundprogress.h" - -#include <QtGui/QApplication> - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - roundprogress w; - w.show(); - return a.exec(); -} diff --git a/tests/manual/progressmanager/roundprogress.cpp b/tests/manual/progressmanager/roundprogress.cpp deleted file mode 100644 index 0cfb18b7686a150108efe8edbef8bbf2dc169fbb..0000000000000000000000000000000000000000 --- a/tests/manual/progressmanager/roundprogress.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** 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.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ - -#include "roundprogress.h" -#include "multitask.h" -#include "runextensions.h" - -roundprogress::roundprogress(QWidget *parent) - : QWidget(parent), task(MyInternalTask(true)), task2(MyInternalTask(false)) -{ - ui.setupUi(this); - ui.progressButton->setIcon(QIcon("find.png")); - connect(ui.startButton, SIGNAL(clicked()), this, SLOT(start())); - connect(ui.startButton2, SIGNAL(clicked()), this, SLOT(start2())); - connect(ui.startBothButton, SIGNAL(clicked()), this, SLOT(start3())); - ui.startButton->setFocus(); -} - -void roundprogress::start() -{ - if (future.isRunning()) - return; - future = QtConcurrent::run(&MyInternalTask::run, &task); - ui.progressButton->setFuture(future); -} - -void roundprogress::start2() -{ - if (future.isRunning()) - return; - future = QtConcurrent::run(&MyInternalTask::run, &task2); - ui.progressButton->setFuture(future); -} - -void roundprogress::start3() -{ - if (future.isRunning()) - return; - future = QtConcurrent::run(&MyInternalTask::run, QList<MyInternalTask*>() << &task2 << &task); - ui.progressButton->setFuture(future); -} diff --git a/tests/manual/progressmanager/roundprogress.h b/tests/manual/progressmanager/roundprogress.h deleted file mode 100644 index c45300915151a30d44e0f87bf8a94a53a7d4db75..0000000000000000000000000000000000000000 --- a/tests/manual/progressmanager/roundprogress.h +++ /dev/null @@ -1,117 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** 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.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ - -#ifndef ROUNDPROGRESS_H -#define ROUNDPROGRESS_H - -#include "ui_roundprogress.h" - -#include <QtCore> -#include <QtGui> -#include <QtDebug> -#include <QtGui/QMainWindow> -#include <QtCore/QFutureInterface> -#include <QtCore/QFuture> - -class MyInternalTask : public QObject -{ - Q_OBJECT -public: - static const int MAX = 10; - - MyInternalTask(bool withProgress) - { - m_hasProgress = withProgress; - if (m_hasProgress) - m_duration = 4000; - else - m_duration = 2500; - } - - MyInternalTask(const MyInternalTask &) : QObject() {} - - void run(QFutureInterface<void> &f) - { - m_future = &f; - m_count = 0; - m_future->setProgressRange(0, (m_hasProgress ? MAX : 0)); - m_future->setProgressValueAndText(m_count, tr("Starting...")); - m_loop = new QEventLoop; - m_timer = new QTimer; - m_timer->setInterval(m_duration/MAX); - m_timer->setSingleShot(false); - connect(m_timer, SIGNAL(timeout()), this, SLOT(advance())); - m_timer->start(); - m_loop->exec(); - delete m_timer; - delete m_loop; - } - -private slots: - void advance() - { - ++m_count; - m_future->setProgressValueAndText(m_count, tr("Something happening %1").arg(m_count)); - if (m_count == MAX || m_future->isCanceled()) { - m_future->setProgressValueAndText(m_count, tr("Finished!")); - m_loop->quit(); - } - } -private: - bool m_hasProgress; - QEventLoop *m_loop; - QTimer *m_timer; - QFutureInterface<void> *m_future; - int m_count; - int m_duration; -}; - -class roundprogress : public QWidget -{ - Q_OBJECT - -public: - roundprogress(QWidget *parent = 0); - ~roundprogress() {} - -private slots: - void start(); - void start2(); - void start3(); -private: - Ui::roundprogressClass ui; - MyInternalTask task; - MyInternalTask task2; - QFuture<void> future; -}; - -#endif // ROUNDPROGRESS_H diff --git a/tests/manual/progressmanager/roundprogress.pro b/tests/manual/progressmanager/roundprogress.pro deleted file mode 100644 index 6e34bdca1d04f20c1a984bad755986940cb10966..0000000000000000000000000000000000000000 --- a/tests/manual/progressmanager/roundprogress.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = roundprogress -TEMPLATE = app -QT += core \ - gui -INCLUDEPATH += $$PWD/../../../src/plugins/core/progressmanager $$PWD/../../../src/libs/qtconcurrent -SOURCES += main.cpp \ - roundprogress.cpp \ - $$PWD/../../../src/plugins/core/progressmanager/progresspie.cpp \ - $$PWD/../../../src/plugins/core/progressmanager/futureprogress.cpp -HEADERS += roundprogress.h \ - $$PWD/../../../src/libs/qtconcurrent/multitask.h \ - $$PWD/../../../src/plugins/core/progressmanager/progresspie_p.h \ - $$PWD/../../../src/plugins/core/progressmanager/progresspie.h \ - $$PWD/../../../src/plugins/core/progressmanager/futureprogress.h -FORMS += roundprogress.ui diff --git a/tests/manual/progressmanager/roundprogress.ui b/tests/manual/progressmanager/roundprogress.ui deleted file mode 100644 index 8ed0cdfdf9a9444d2a2bc77ef9e38674590bc87c..0000000000000000000000000000000000000000 --- a/tests/manual/progressmanager/roundprogress.ui +++ /dev/null @@ -1,52 +0,0 @@ -<ui version="4.0" > - <class>roundprogressClass</class> - <widget class="QWidget" name="roundprogressClass" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>212</width> - <height>144</height> - </rect> - </property> - <layout class="QGridLayout" > - <item row="0" column="0" > - <widget class="FutureProgress" name="progressButton" > - <property name="font" > - <font/> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QPushButton" name="startButton" > - <property name="text" > - <string>Start with progress</string> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QPushButton" name="startButton2" > - <property name="text" > - <string>Start with animation</string> - </property> - </widget> - </item> - <item row="3" column="0" > - <widget class="QPushButton" name="startBothButton" > - <property name="text" > - <string>Start both</string> - </property> - </widget> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>FutureProgress</class> - <extends>QToolButton</extends> - <header>../../../src/plugins/core/progressmanager/futureprogress.h</header> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui>