Merge lp:~osomon/webbrowser-app/video-contextual-actions into lp:webbrowser-app

[Olivier Tilloy]

Add video-specific contextual actions.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1341
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2597/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1350
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1350
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6286
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27193

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

review: Needs Fixing (continuous-integration)

=== added file 'src/app/actions/OpenVideoInNewTab.qml'
--- src/app/actions/OpenVideoInNewTab.qml	1970-01-01 00:00:00 +0000
+++ src/app/actions/OpenVideoInNewTab.qml	2016-02-01 11:47:09 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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/>.
+ */
+
+import Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open video in new tab")
+}
 
=== added file 'src/app/actions/SaveVideo.qml'
--- src/app/actions/SaveVideo.qml	1970-01-01 00:00:00 +0000
+++ src/app/actions/SaveVideo.qml	2016-02-01 11:47:09 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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/>.
+ */
+
+import Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Save video")
+}
 
=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-01-22 10:23:17 +0000
+++ src/app/webbrowser/Browser.qml	2016-02-01 11:47:09 +0000
@@ -1091,7 +1091,9 @@
                     }
                     Actions.OpenImageInNewTab {
                         objectName: "OpenImageInNewTabContextualAction"
-                        enabled: contextModel && contextModel.srcUrl.toString()
+                        enabled: contextModel &&
+                                 (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
+                                 contextModel.srcUrl.toString()
                         onTriggered: browser.openUrlInNewTab(contextModel.srcUrl, true)
                     }
                     Actions.CopyImage {
@@ -1109,6 +1111,20 @@
                                  contextModel.hasImageContents
                         onTriggered: contextModel.saveMedia()
                     }
+                    Actions.OpenVideoInNewTab {
+                        objectName: "OpenVideoInNewTabContextualAction"
+                        enabled: contextModel &&
+                                 (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) &&
+                                 contextModel.srcUrl.toString()
+                        onTriggered: browser.openUrlInNewTab(contextModel.srcUrl, true)
+                    }
+                    Actions.SaveVideo {
+                        objectName: "SaveVideoContextualAction"
+                        enabled: contextModel &&
+                                 (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) &&
+                                 contextModel.srcUrl.toString()
+                        onTriggered: contextModel.saveMedia()
+                    }
                     Actions.Undo {
                         objectName: "UndoContextualAction"
                         enabled: contextModel && contextModel.isEditable &&