diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-06 14:29:20 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 03:21:43 +0100 |
commit | 78ffd1bc18ecaf5c989187f89fba82dd53503ecc (patch) | |
tree | d330232da42c89b3b16a2ad3ab58c76eb9c3c576 /examples | |
parent | 4bbe267f303f379311a2d8f98aa8dfcf173b1ad6 (diff) |
Remove QMediaImageViewer (SC break).
This class has turned out to be not very useful at this point in time.
Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 1 | ||||
-rw-r--r-- | examples/slideshow/main.cpp | 53 | ||||
-rw-r--r-- | examples/slideshow/slideshow.cpp | 215 | ||||
-rw-r--r-- | examples/slideshow/slideshow.h | 87 | ||||
-rw-r--r-- | examples/slideshow/slideshow.pro | 19 |
5 files changed, 0 insertions, 375 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 9d9442e72..3f2aaca97 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -5,7 +5,6 @@ TEMPLATE = subdirs SUBDIRS += \ radio \ camera \ - slideshow \ spectrum \ audiorecorder \ audiodevices \ diff --git a/examples/slideshow/main.cpp b/examples/slideshow/main.cpp deleted file mode 100644 index 46350eb66..000000000 --- a/examples/slideshow/main.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "slideshow.h" - -#include <QtWidgets> - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - - SlideShow slideShow; - slideShow.show(); - - return app.exec(); -} diff --git a/examples/slideshow/slideshow.cpp b/examples/slideshow/slideshow.cpp deleted file mode 100644 index 55174fe06..000000000 --- a/examples/slideshow/slideshow.cpp +++ /dev/null @@ -1,215 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "slideshow.h" - -#include <qmediaservice.h> -#include <qmediaplaylist.h> -#include <qvideowidget.h> - -#include <QtWidgets> - -SlideShow::SlideShow(QWidget *parent) - : QMainWindow(parent) - , imageViewer(0) - , playlist(0) - , statusLabel(0) - , countdownLabel(0) - , playAction(0) - , stopAction(0) -{ - imageViewer = new QMediaImageViewer(this); - - connect(imageViewer, SIGNAL(stateChanged(QMediaImageViewer::State)), - this, SLOT(stateChanged(QMediaImageViewer::State))); - connect(imageViewer, SIGNAL(mediaStatusChanged(QMediaImageViewer::MediaStatus)), - this, SLOT(statusChanged(QMediaImageViewer::MediaStatus))); - connect(imageViewer, SIGNAL(elapsedTimeChanged(int)), this, SLOT(elapsedTimeChanged(int))); - - playlist = new QMediaPlaylist; - imageViewer->bind(playlist); - - connect(playlist, SIGNAL(loaded()), this, SLOT(playlistLoaded())); - connect(playlist, SIGNAL(loadFailed()), this, SLOT(playlistLoadFailed())); - - QVideoWidget *videoWidget = new QVideoWidget; - imageViewer->setVideoOutput(videoWidget); - - menuBar()->addAction(tr("Open Directory..."), this, SLOT(openDirectory())); - menuBar()->addAction(tr("Open Playlist..."), this, SLOT(openPlaylist())); - - toolBar = new QToolBar; - toolBar->setMovable(false); - toolBar->setFloatable(false); - toolBar->setEnabled(false); - - toolBar->addAction( - style()->standardIcon(QStyle::SP_MediaSkipBackward), - tr("Previous"), - playlist, - SLOT(previous())); - stopAction = toolBar->addAction( - style()->standardIcon(QStyle::SP_MediaStop), tr("Stop"), imageViewer, SLOT(stop())); - playAction = toolBar->addAction( - style()->standardIcon(QStyle::SP_MediaPlay), tr("Play"), this, SLOT(play())); - toolBar->addAction( - style()->standardIcon(QStyle::SP_MediaSkipForward), tr("Next"), playlist, SLOT(next())); - - addToolBar(Qt::BottomToolBarArea, toolBar); - - statusLabel = new QLabel(tr("%1 Images").arg(0)); - statusLabel->setAlignment(Qt::AlignCenter); - - countdownLabel = new QLabel; - countdownLabel->setAlignment(Qt::AlignRight); - - statusBar()->addPermanentWidget(statusLabel, 1); - statusBar()->addPermanentWidget(countdownLabel); - - setCentralWidget(videoWidget); -} - -void SlideShow::openPlaylist() -{ - QString path = QFileDialog::getOpenFileName(this); - - if (!path.isEmpty()) { - playlist->clear(); - playlist->load(QUrl::fromLocalFile(path)); - } -} - -void SlideShow::openDirectory() -{ - QString path = QFileDialog::getExistingDirectory(this); - - if (!path.isEmpty()) { - playlist->clear(); - - QDir dir(path); - - foreach (const QString &fileName, dir.entryList(QDir::Files)) - playlist->addMedia(QUrl::fromLocalFile(dir.absoluteFilePath(fileName))); - - statusChanged(imageViewer->mediaStatus()); - - toolBar->setEnabled(playlist->mediaCount() > 0); - } -} - -void SlideShow::play() -{ - switch (imageViewer->state()) { - case QMediaImageViewer::StoppedState: - case QMediaImageViewer::PausedState: - imageViewer->play(); - break; - case QMediaImageViewer::PlayingState: - imageViewer->pause(); - break; - } -} - -void SlideShow::stateChanged(QMediaImageViewer::State state) -{ - switch (state) { - case QMediaImageViewer::StoppedState: - stopAction->setEnabled(false); - playAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); - break; - case QMediaImageViewer::PlayingState: - stopAction->setEnabled(true); - playAction->setIcon(style()->standardIcon(QStyle::SP_MediaPause)); - break; - case QMediaImageViewer::PausedState: - stopAction->setEnabled(true); - playAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay)); - break; - } -} - -void SlideShow::statusChanged(QMediaImageViewer::MediaStatus status) -{ - switch (status) { - case QMediaImageViewer::NoMedia: - statusLabel->setText(tr("%1 Images").arg(playlist->mediaCount())); - break; - case QMediaImageViewer::LoadingMedia: - statusLabel->setText(tr("Image %1 of %2\nLoading...") - .arg(playlist->currentIndex()) - .arg(playlist->mediaCount())); - break; - case QMediaImageViewer::LoadedMedia: - statusLabel->setText(tr("Image %1 of %2") - .arg(playlist->currentIndex()) - .arg(playlist->mediaCount())); - break; - case QMediaImageViewer::InvalidMedia: - statusLabel->setText(tr("Image %1 of %2\nInvalid") - .arg(playlist->currentIndex()) - .arg(playlist->mediaCount())); - break; - default: - break; - } -} - -void SlideShow::playlistLoaded() -{ - statusChanged(imageViewer->mediaStatus()); - - toolBar->setEnabled(playlist->mediaCount() > 0); -} - -void SlideShow::playlistLoadFailed() -{ - statusLabel->setText(playlist->errorString()); - - toolBar->setEnabled(false); -} - -void SlideShow::elapsedTimeChanged(int time) -{ - const int remaining = (imageViewer->timeout() - time) / 1000; - - countdownLabel->setText(tr("%1:%2") - .arg(remaining / 60, 2, 10, QLatin1Char('0')) - .arg(remaining % 60, 2, 10, QLatin1Char('0'))); -} diff --git a/examples/slideshow/slideshow.h b/examples/slideshow/slideshow.h deleted file mode 100644 index 4ea2e492c..000000000 --- a/examples/slideshow/slideshow.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef SLIDESHOW_H -#define SLIDESHOW_H - -#include <QMainWindow> -#include <qmediaimageviewer.h> - -QT_BEGIN_NAMESPACE -class QAbstractButton; -class QLabel; -class QStackedLayout; - -class QMediaPlaylist; -QT_END_NAMESPACE - -QT_USE_NAMESPACE - -class SlideShow : public QMainWindow -{ - Q_OBJECT -public: - SlideShow(QWidget *parent = 0); - -private slots: - void openPlaylist(); - void openDirectory(); - - void play(); - - void stateChanged(QMediaImageViewer::State state); - void statusChanged(QMediaImageViewer::MediaStatus status); - - void playlistLoaded(); - void playlistLoadFailed(); - - void elapsedTimeChanged(int time); - -private: - QMediaImageViewer *imageViewer; - QMediaPlaylist *playlist; - QLabel *statusLabel; - QLabel *countdownLabel; - QAction *playAction; - QAction *stopAction; - QToolBar *toolBar; -}; - -#endif diff --git a/examples/slideshow/slideshow.pro b/examples/slideshow/slideshow.pro deleted file mode 100644 index 133735d6f..000000000 --- a/examples/slideshow/slideshow.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app -TARGET = slideshow - -QT += multimedia multimediawidgets - -HEADERS = \ - slideshow.h - -SOURCES = \ - main.cpp \ - slideshow.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtmultimedia/slideshow - -INSTALLS += target sources - -QT+=widgets |