gallery-app

Merge lp:~artmello/gallery-app/gallery-app-support_photo_url into lp:gallery-app

gallery-app-support_photo_url
Merge into trunk

Proposed by Arthur Mello on 2014-09-23

Status:

Merged

Approved by:

Bill Filler on 2014-09-25

Approved revision:

1091

Merged at revision:

1083

Proposed branch:

lp:~artmello/gallery-app/gallery-app-support_photo_url

Merge into:

lp:gallery-app

Diff against target:

531 lines (+248/-14)

12 files modified

click/manifest.json.in (+2/-1)
debian/gallery-app.install (+1/-0)
desktop/CMakeLists.txt (+6/-0)
desktop/gallery-app.url-dispatcher (+5/-0)
rc/qml/MainScreen.qml (+46/-11)
src/gallery-application.cpp (+31/-1)
src/gallery-application.h (+8/-0)
src/util/CMakeLists.txt (+2/-0)
src/util/command-line-parser.cpp (+29/-1)
src/util/command-line-parser.h (+5/-0)
src/util/urlhandler.cpp (+70/-0)
src/util/urlhandler.h (+43/-0)

To merge this branch:

bzr merge lp:~artmello/gallery-app/gallery-app-support_photo_url

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-09-23	Approve on 2014-09-25
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-25
Review via email: mp+235656@code.launchpad.net

Commit message

Add support for the photo and video url schema

Description of the change

Add support for the photo and video url schema

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1028/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-support_photo_url updated on 2014-09-23

1085. By Arthur Mello on 2014-09-23: Add "file://" protocol to the media selected property
1086. By Arthur Mello on 2014-09-23: Remove support for the video scheme

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1029/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1030/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-24:

two issues:
1) remove pot file from the MR
2) the url-dispatcher registration is not working during the click package install

review: Needs Fixing

lp:~artmello/gallery-app/gallery-app-support_photo_url updated on 2014-09-24

1087. By Arthur Mello on 2014-09-24: Add urls to the manifest of the click pkg
1088. By Arthur Mello on 2014-09-24: Fix manifest file

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1035/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-support_photo_url updated on 2014-09-24

1089. By Arthur Mello on 2014-09-24: Undo changes on pot file

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1036/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1037/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-25:

It's registered properly but it has issues:

1) Launch app, go to events page
- call url-dispatcher photo://file1.jpg
- the photo is opened correctly
- tap the photo to display the header
- press the back button in the header to go back to Events view
- call url-dispatcher photo://file1.jpg again
- the photo is never shown
Photos are never shown if they were previously requested by url-dispatcher.

2) Launch app, go to events page
- call url-dispatcher photo://file1.jpg
- the photo is opened correctly
- call url-dispatcher photo://file2.jpg
- the photo is opened correctly
- tap on the photo to display header
- press the back button
- You get a blank page, still showing the Gallery header with the back button
- press the back button again and it correctly shows the Events view

Seems like each time you open a photo via the url-dispatcher you are putting a new page on the stack and you have to pop all of them by pressing the back button each time to get back to the event view. This is not correct. If you repeat the same thing above 5 times you have to press back button 5 times to get back to Events view.

3) Similar problem
- open a photo from Events view or Photo view
- call url-dispatcher photo://file1.jpg
- tap photo to reveal header
- press back button
- get a blank page with Gallery header

review: Needs Fixing

lp:~artmello/gallery-app/gallery-app-support_photo_url updated on 2014-09-25

1090. By Arthur Mello on 2014-09-25: Make sure we do not keep stacking new pages for it photo opened

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1039/rebuild

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-support_photo_url updated on 2014-09-25

1091. By Arthur Mello on 2014-09-25: Make sure the selected mediaFile should open if it was the same as the last call

Revision history for this message

Arthur Mello (artmello) wrote on 2014-09-25:

The 3 issues are fixed on rev1091

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1040/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-25:

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

lp:~artmello/gallery-app/gallery-app-support_photo_url updated on 2014-09-25

1092. By Arthur Mello on 2014-09-25: Fix gallery-app.install file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Arthur Mello

Ubuntu Phablet Team

 === modified file 'click/manifest.json.in'
 --- click/manifest.json.in	2014-09-09 08:14:03 +0000
 +++ click/manifest.json.in	2014-09-25 20:20:53 +0000
@@ -6,7 +6,8 @@
          "gallery": {
              "apparmor": "gallery.apparmor",
              "content-hub": "gallery-content.json",
--            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
++            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@",
++            "urls": "share/url-dispatcher/urls/gallery-app.url-dispatcher"
+         }
      },
      "icon": "share/icons/gallery-app.svg",
 === modified file 'debian/gallery-app.install'
 --- debian/gallery-app.install	2013-05-22 17:29:50 +0000
 +++ debian/gallery-app.install	2014-09-25 20:20:53 +0000
@@ -3,3 +3,4 @@
  usr/share/gallery-app
  usr/share/icons
  usr/share/locale/*/LC_MESSAGES/gallery-app.mo
++usr/share/url-dispatcher/urls/*
 === modified file 'desktop/CMakeLists.txt'
 --- desktop/CMakeLists.txt	2014-09-15 12:19:20 +0000
 +++ desktop/CMakeLists.txt	2014-09-25 20:20:53 +0000
@@ -10,6 +10,8 @@
  	set(ICON "${GALLERY}")
  endif(CLICK_MODE)
++set(GALLERY_URL_DISPATCHER gallery-app.url-dispatcher)
++
  configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
  add_custom_target(${DESKTOP_FILE} ALL
                    COMMENT "Merging translations into ${DESKTOP_FILE}"
@@ -18,3 +20,7 @@
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
          DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
++
++install(FILES ${GALLERY_URL_DISPATCHER}
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls
++    )
 === added file 'desktop/gallery-app.url-dispatcher'
 --- desktop/gallery-app.url-dispatcher	1970-01-01 00:00:00 +0000
 +++ desktop/gallery-app.url-dispatcher	2014-09-25 20:20:53 +0000
@@ -0,0 +1,5 @@
++[
++   {
++       "protocol": "photo"
++   }
++]
 === modified file 'rc/qml/MainScreen.qml'
 --- rc/qml/MainScreen.qml	2014-09-19 01:05:46 +0000
 +++ rc/qml/MainScreen.qml	2014-09-25 20:20:53 +0000
@@ -38,26 +38,43 @@
      property string mediaCurrentlyInView
      StateSaver.properties: "mediaCurrentlyInView"
++    property bool applicationLoaded: application.allLoaded
++
      //fullScreen property is used on autopilot tests
      property bool fullScreen: APP.fullScreen
      property alias currentPage: pageStack.currentPage
++    function openMediaFile(media) {
++        if (__isPhotoViewerOpen) {
++            popPage();
++            photoViewerLoader.item.fadeClosed();
++        }
++
++        mediaCurrentlyInView = media;
++        for (var i = 0; i < MANAGER.mediaLibrary.count; i++) {
++            if (MANAGER.mediaLibrary.getAt(i).path == mediaCurrentlyInView) {
++                photoViewerLoader.load();
++                photoViewerLoader.item.animateOpen(MANAGER.mediaLibrary.getAt(i),
++                                                   Qt.rect(0,0,0,0));
++                return;
++            }
++        }
++    }
++
      Component.onCompleted: {
--        if (mediaCurrentlyInView !== "") {
--            for (var i = 0; i < MANAGER.mediaLibrary.count; i++) {
--                if (MANAGER.mediaLibrary.getAt(i).path == mediaCurrentlyInView) {
--                    photoViewerLoader.load();
--                    photoViewerLoader.item.animateOpen(MANAGER.mediaLibrary.getAt(i),
--                                                       Qt.rect(0,0,0,0));
--                    return;
--                }
--            }
--        }
--
          pageStack.push(tabs);
+     }
++    onApplicationLoadedChanged: {
++        if (applicationLoaded) {
++            if (APP.mediaFile !== "")
++                openMediaFile(APP.mediaFile);
++            else if (mediaCurrentlyInView !== "")
++                openMediaFile(mediaCurrentlyInView);
++        }
++    }
++
      function pushPage(page) {
          pageStack.push(page);
+     }
@@ -216,4 +233,22 @@
              active: __isPhotoViewerOpen
+         }
+     ]
++
++    Connections {
++        target: UriHandler
++        onOpened: {
++            for (var i = 0; i < uris.length; ++i) {
++                APP.parseUri(uris[i])
++            }
++        }
++    }
++
++    Connections {
++        target: APP
++        onMediaFileChanged: {
++            if (applicationLoaded) {
++                openMediaFile(APP.mediaFile);
++            }
++        }
++    }
+ }
 === modified file 'src/gallery-application.cpp'
 --- src/gallery-application.cpp	2014-08-20 18:37:06 +0000
 +++ src/gallery-application.cpp	2014-09-25 20:20:53 +0000
@@ -45,6 +45,7 @@
  // util
  #include "command-line-parser.h"
++#include "urlhandler.h"
  #include "resource.h"
  #include <QQuickItem>
@@ -67,7 +68,8 @@
        m_contentCommunicator(new ContentCommunicator(this)),
        m_pickModeEnabled(false),
        m_defaultUiMode(BrowseContentMode),
--      m_mediaTypeFilter(MediaSource::None)
++      m_mediaTypeFilter(MediaSource::None),
++      m_mediaFile("")
+ {
      m_bguSize = QProcessEnvironment::systemEnvironment().value("GRID_UNIT_PX", "8").toInt();
      if (m_bguSize <= 0)
@@ -98,6 +100,8 @@
+         }
+     }
++    m_urlHandler = new UrlHandler();
++
      registerQML();
      m_galleryManager = new GalleryManager(isDesktopMode(), m_cmdLineParser->picturesDir());
@@ -181,6 +185,15 @@
+ }
  /*!
++ * \brief GalleryApplication::getMediaFile
++ * Returns the media file passed as a parameter
++ */
++const QString& GalleryApplication::getMediaFile() const
++{
++    return m_mediaFile;
++}
++
++/*!
   * \brief GalleryApplication::createView
   * Create the master QDeclarativeView that all the pages will operate within
   */
@@ -225,6 +238,8 @@
      if (m_cmdLineParser->startupTimer())
          qDebug() << "GalleryApplication view created" << m_timer->elapsed() << "ms";
++
++    setMediaFile(m_cmdLineParser->mediaFile());
+ }
  /*!
@@ -333,6 +348,14 @@
      Q_EMIT fullScreenChanged();
+ }
++void GalleryApplication::setMediaFile(const QString &mediaFile)
++{
++    if(!mediaFile.isEmpty()) {
++        m_mediaFile = "file://" + mediaFile;
++        Q_EMIT mediaFileChanged();
++    }
++}
++
  /*!
   * \brief GalleryApplication::returnPickedContent passes the selcted items to the
   * content manager
@@ -399,3 +422,10 @@
      // during start-up.
      m_contentCommunicator->registerWithHub();
+ }
++
++void GalleryApplication::parseUri(const QString &arg)
++{
++    if (m_urlHandler->processUri(arg)) {
++        setMediaFile(m_urlHandler->mediaFile());
++    }
++}
 === modified file 'src/gallery-application.h'
 --- src/gallery-application.h	2014-08-19 08:28:09 +0000
 +++ src/gallery-application.h	2014-09-25 20:20:53 +0000
@@ -27,6 +27,7 @@
  #include "media-source.h"
  class CommandLineParser;
++class UrlHandler;
  class ContentCommunicator;
  class GalleryManager;
@@ -42,6 +43,7 @@
      Q_PROPERTY(MediaSource::MediaType mediaTypeFilter READ mediaTypeFilter NOTIFY mediaTypeFilterChanged)
      Q_PROPERTY(bool desktopMode READ isDesktopMode CONSTANT)
      Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged)
++    Q_PROPERTY(QString mediaFile READ getMediaFile WRITE setMediaFile NOTIFY mediaFileChanged)
  public:
      enum UiMode{
@@ -61,9 +63,11 @@
      bool isDesktopMode() const;
      bool isFullScreen() const;
      MediaSource::MediaType mediaTypeFilter() const;
++    const QString &getMediaFile() const;
      Q_INVOKABLE void returnPickedContent(QVariant variant);
      Q_INVOKABLE void contentPickingCanceled();
++    Q_INVOKABLE void parseUri(const QString &arg);
      static void startStartupTimer();
@@ -72,12 +76,14 @@
      void pickModeEnabledChanged();
      void fullScreenChanged();
      void mediaTypeFilterChanged();
++    void mediaFileChanged();
  private slots:
      void initCollections();
      void switchToPickMode(QString mediaTypeFilter);
      void setFullScreen(bool fullScreen);
      void consistencyCheckFinished();
++    void setMediaFile(const QString &mediaFile);
  private:
      void registerQML();
@@ -86,12 +92,14 @@
      QQuickView *m_view;
      GalleryManager *m_galleryManager;
      CommandLineParser* m_cmdLineParser;
++    UrlHandler *m_urlHandler;
      ContentCommunicator *m_contentCommunicator;
      QHash<QString, QSize> m_formFactors;
      int m_bguSize;
      bool m_pickModeEnabled;
      UiMode m_defaultUiMode;
      MediaSource::MediaType m_mediaTypeFilter;
++    QString m_mediaFile;
      static QElapsedTimer *m_timer;
  };
 === modified file 'src/util/CMakeLists.txt'
 --- src/util/CMakeLists.txt	2013-08-26 10:44:00 +0000
 +++ src/util/CMakeLists.txt	2014-09-25 20:20:53 +0000
@@ -14,6 +14,7 @@
      orientation.h
      resource.h
      variants.h
++    urlhandler.h
+     )
  set(gallery_util_SRCS
@@ -21,6 +22,7 @@
      imaging.cpp
      orientation.cpp
      resource.cpp
++    urlhandler.cpp
+     )
  add_library(${GALLERY_UTIL_LIB}
 === modified file 'src/util/command-line-parser.cpp'
 --- src/util/command-line-parser.cpp	2013-08-27 06:48:42 +0000
 +++ src/util/command-line-parser.cpp	2014-09-25 20:20:53 +0000
@@ -20,10 +20,13 @@
  #include "command-line-parser.h"
++#include "urlhandler.h"
++
  #include <QDebug>
  #include <QDir>
  #include <QStandardPaths>
  #include <QTextStream>
++#include <QUrl>
  CommandLineParser::CommandLineParser(const QHash<QString, QSize>& form_factors)
      : m_startupTimer(false),
@@ -33,8 +36,10 @@
        m_pickMode(false),
        m_logImageLoading(false),
        m_formFactors(form_factors),
--      m_formFactor("desktop")
++      m_formFactor("desktop"),
++      m_mediaFile("")
+ {
++    m_urlHandler = new UrlHandler();
+ }
  /*!
@@ -72,6 +77,25 @@
          else if (args[i] == "--pick-mode") {
              m_pickMode = true;
+         }
++        else if (args[i] == "--media-file") {
++            if (!value.isEmpty()) {
++                QFileInfo fi(value);
++
++                if (fi.exists())
++                    m_mediaFile = fi.absoluteFilePath();
++                else {
++                    QTextStream(stderr) << m_mediaFile << ": Not found" << endl;
++                    valid_args = false;
++                }
++
++                i++;
++            }
++            else {
++                QTextStream(stderr) << "Missing FILE argument for --media-file'" << endl;
++                usage();
++                valid_args = false;
++            }
++        }
          else {
              QString form_factor = args[i].mid(2); // minus initial "--"
@@ -81,6 +105,9 @@
              else if (args[i].startsWith("--desktop_file_hint")) {
                  // ignore this command line switch, hybris uses it to get application info
+             }
++            else if (m_urlHandler->processUri(args.at(i))) {
++                m_mediaFile = m_urlHandler->mediaFile();
++            }
              else if (i == args.count() - 1 && QDir(args[i]).exists()) {
                  m_picturesDir = args[i];
+             }
@@ -112,6 +139,7 @@
      out << "  --startup-timer\n\t\tdebug-print startup time" << endl;
      out << "  --log-image-loading\n\t\tlog image loading" << endl;
      out << "  --pick-mode\n\t\tEnable mode to pick photos" << endl;
++    out << "  --media-file FILE\n\t\tOpens gallery displaying the selected file" << endl;
      out << "pictures_dir defaults to ~/Pictures, and must exist prior to running gallery" << endl;
+ }
 === modified file 'src/util/command-line-parser.h'
 --- src/util/command-line-parser.h	2013-08-27 06:48:42 +0000
 +++ src/util/command-line-parser.h	2014-09-25 20:20:53 +0000
@@ -25,6 +25,8 @@
  #include <QSize>
  #include <QString>
++class UrlHandler;
++
  /*!
   * @brief The CommandLineParser is used to parse our commandline inputs and set
   * parameters accordingly.
@@ -43,11 +45,13 @@
      bool logImageLoading() const { return m_logImageLoading; }
      bool pickModeEnabled() const { return m_pickMode; }
      const QString &formFactor() const { return m_formFactor; }
++    const QString &mediaFile() const { return m_mediaFile; }
  private:
      bool invalidArg(QString arg);
      void usage();
++    UrlHandler *m_urlHandler;
      bool m_startupTimer;
      bool m_isFullscreen;
      bool m_isPortrait;
@@ -57,6 +61,7 @@
      const QHash<QString, QSize> m_formFactors;
      QString m_formFactor;
++    QString m_mediaFile;
  };
  #endif // COMMANDLINEPARSER_H
 === added file 'src/util/urlhandler.cpp'
 --- src/util/urlhandler.cpp	1970-01-01 00:00:00 +0000
 +++ src/util/urlhandler.cpp	2014-09-25 20:20:53 +0000
@@ -0,0 +1,70 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * Authors:
++ *  Arthur Mello <arthur.mello@canonical.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#include "urlhandler.h"
++
++#include <QUrl>
++#include <QStringList>
++#include <QFileInfo>
++#include <QDir>
++#include <QDebug>
++
++UrlHandler::UrlHandler()
++    : m_mediaFile("")
++{
++    m_validSchemes << "photo";
++}
++
++/*!
++ * @brief UrlHandler::processUri parsers our input uri and sets attributes accordingly.
++ * @param QString uri to parse and set attributes.
++ * @return false if invalid parameter is input.
++ */
++bool UrlHandler::processUri(const QString& arg)
++{
++    QUrl uri(arg);
++
++    if (!m_validSchemes.contains(uri.scheme())) {
++        return false;
++    }
++
++    if (uri.scheme() == "photo") {
++        uri.setScheme("file");
++    }
++
++    if (uri.isRelative()) {
++        uri = QUrl::fromLocalFile(QDir::current().absoluteFilePath(arg));
++    }
++
++    // Check if it's a local file
++    if (uri.isValid() && uri.isLocalFile()) {
++        QFileInfo info(uri.toLocalFile());
++        if (info.exists() && info.isFile()) {
++            m_mediaFile = info.absoluteFilePath();
++            return true;
++        } else {
++            qWarning() << "File not found:" << uri << info.exists() << info.isFile();
++        }
++    } else {
++        qWarning() << "Invalid uri:" << uri;
++    }
++
++    return false;
++}
 === added file 'src/util/urlhandler.h'
 --- src/util/urlhandler.h	1970-01-01 00:00:00 +0000
 +++ src/util/urlhandler.h	2014-09-25 20:20:53 +0000
@@ -0,0 +1,43 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * Authors:
++ *  Arthur Mello <arthur.mello@canonical.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#ifndef URLHANDLER_H
++#define URLHANDLER_H
++
++#include <QString>
++#include <QList>
++
++/*!
++ * @brief The UrlHandler is used to parse calls of gallery from the url schema.
++ */
++class UrlHandler
++{
++public:
++    UrlHandler();
++
++    bool processUri(const QString &arg);
++    const QString &mediaFile() { return m_mediaFile; }
++
++private:
++    QList<QString> m_validSchemes;
++    QString m_mediaFile;
++};
++
++#endif // URLHANDLER_H