mediaplayer-app

Merge lp:~bfiller/mediaplayer-app/icons-and-sharing into lp:mediaplayer-app

  1. icons-and-sharing
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 204
Merged at revision: 204
Proposed branch: lp:~bfiller/mediaplayer-app/icons-and-sharing
Merge into: lp:mediaplayer-app
Diff against target: 236 lines (+20/-53)
8 files modified
CMakeLists.txt (+1/-1)
debian/mediaplayer-app.install (+1/-0)
desktop/CMakeLists.txt (+2/-0)
po/mediaplayer-app.pot (+13/-13)
src/CMakeLists.txt (+0/-1)
src/mediaplayer.cpp (+2/-2)
src/mediaplayer.h (+1/-1)
src/qml/player/VideoPlayer.qml (+0/-35)
To merge this branch: bzr merge lp:~bfiller/mediaplayer-app/icons-and-sharing
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+206255@code.launchpad.net

Commit message

add desktop icons and remove linking against sharing as it's not being used

Description of the change

add desktop icons and remove linking against sharing as it's not being used

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3225
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2901
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3227
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3227/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2903
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2903/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5307
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3937

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

review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
YES

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

Did you successfully run all tests found in your component's Test Plan?
YES

If you changed the UI, was the change specified/approved by design?
YES

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Ensure videos are displayed in Video lens: OK
Launch video from video lens and ensure that mediaplayer-app is launched in fullscreen mode (no indicator panel): OK
Test that video playback occurs smoothly: OK
Test that tapping on the video reveals the toolbar and scrubber: OK
Test the scrubber can be used to move forward/back in the moview: OK
Test the video can be played multiple times: OK

review: Approve
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

code looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-09-25 23:08:08 +0000
+++ CMakeLists.txt 2014-02-13 18:30:29 +0000
@@ -45,10 +45,10 @@
45enable_testing()45enable_testing()
4646
47add_subdirectory(data)47add_subdirectory(data)
48add_subdirectory(sdk)
49add_subdirectory(src)48add_subdirectory(src)
50add_subdirectory(tests)49add_subdirectory(tests)
51add_subdirectory(po)50add_subdirectory(po)
51add_subdirectory(desktop)
5252
53configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)53configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
5454
5555
=== modified file 'debian/mediaplayer-app.install'
--- debian/mediaplayer-app.install 2013-05-21 14:44:39 +0000
+++ debian/mediaplayer-app.install 2014-02-13 18:30:29 +0000
@@ -2,4 +2,5 @@
2/usr/share/icons/hicolor/scalable/apps/mediaplayer-app.svg2/usr/share/icons/hicolor/scalable/apps/mediaplayer-app.svg
3/usr/bin/mediaplayer-app3/usr/bin/mediaplayer-app
4/usr/share/mediaplayer-app/qml/*4/usr/share/mediaplayer-app/qml/*
5/usr/share/icons
5/usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo6/usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo
67
=== added directory 'desktop'
=== added file 'desktop/CMakeLists.txt'
--- desktop/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ desktop/CMakeLists.txt 2014-02-13 18:30:29 +0000
@@ -0,0 +1,2 @@
1install(DIRECTORY icons/hicolor DESTINATION DESTINATION
2 ${CMAKE_INSTALL_DATADIR}/icons FILES_MATCHING PATTERN *.png)
03
=== added directory 'desktop/icons'
=== added directory 'desktop/icons/hicolor'
=== added directory 'desktop/icons/hicolor/128x128'
=== added directory 'desktop/icons/hicolor/128x128/apps'
=== added file 'desktop/icons/hicolor/128x128/apps/media-player.png'
1Binary files desktop/icons/hicolor/128x128/apps/media-player.png 1970-01-01 00:00:00 +0000 and desktop/icons/hicolor/128x128/apps/media-player.png 2014-02-13 18:30:29 +0000 differ4Binary files desktop/icons/hicolor/128x128/apps/media-player.png 1970-01-01 00:00:00 +0000 and desktop/icons/hicolor/128x128/apps/media-player.png 2014-02-13 18:30:29 +0000 differ
=== added directory 'desktop/icons/hicolor/256x256'
=== added directory 'desktop/icons/hicolor/256x256/apps'
=== added file 'desktop/icons/hicolor/256x256/apps/media-player.png'
2Binary files desktop/icons/hicolor/256x256/apps/media-player.png 1970-01-01 00:00:00 +0000 and desktop/icons/hicolor/256x256/apps/media-player.png 2014-02-13 18:30:29 +0000 differ5Binary files desktop/icons/hicolor/256x256/apps/media-player.png 1970-01-01 00:00:00 +0000 and desktop/icons/hicolor/256x256/apps/media-player.png 2014-02-13 18:30:29 +0000 differ
=== added directory 'desktop/icons/hicolor/64x64'
=== added directory 'desktop/icons/hicolor/64x64/apps'
=== added file 'desktop/icons/hicolor/64x64/apps/media-player.png'
3Binary files desktop/icons/hicolor/64x64/apps/media-player.png 1970-01-01 00:00:00 +0000 and desktop/icons/hicolor/64x64/apps/media-player.png 2014-02-13 18:30:29 +0000 differ6Binary files desktop/icons/hicolor/64x64/apps/media-player.png 1970-01-01 00:00:00 +0000 and desktop/icons/hicolor/64x64/apps/media-player.png 2014-02-13 18:30:29 +0000 differ
=== modified file 'po/mediaplayer-app.pot'
--- po/mediaplayer-app.pot 2013-09-30 21:41:19 +0000
+++ po/mediaplayer-app.pot 2014-02-13 18:30:29 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2013-09-30 18:40-0300\n"11"POT-Creation-Date: 2014-02-13 13:21-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,27 +17,27 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: src/qml/player/TimeLine.qml:13220#: src/qml/player/TimeLine.qml:135
21#, qt-format21#, qt-format
22msgid "%1:%2:%3"22msgid "%1:%2:%3"
23msgstr ""23msgstr ""
2424
25#: src/qml/player/TimeLine.qml:10125#: src/qml/player/TimeLine.qml:104
26#, qt-format26#, qt-format
27msgid "- %1"27msgid "- %1"
28msgstr ""28msgstr ""
2929
30#: src/qml/player/TimeLine.qml:128 src/qml/player/TimeLine.qml:12930#: src/qml/player/TimeLine.qml:131 src/qml/player/TimeLine.qml:132
31#: src/qml/player/TimeLine.qml:13031#: src/qml/player/TimeLine.qml:133
32#, qt-format32#, qt-format
33msgid "0%1"33msgid "0%1"
34msgstr ""34msgstr ""
3535
36#: src/qml/player/TimeLine.qml:6836#: src/qml/player/TimeLine.qml:71
37msgid "0:00:00"37msgid "0:00:00"
38msgstr ""38msgstr ""
3939
40#: src/qml/player.qml:6240#: src/qml/player.qml:67
41msgid "Error"41msgid "Error"
42msgstr ""42msgstr ""
4343
@@ -46,28 +46,28 @@
46msgid "Media Player"46msgid "Media Player"
47msgstr ""47msgstr ""
4848
49#: src/qml/player.qml:6349#: src/qml/player.qml:68
50msgid ""50msgid ""
51"No video selected to play. Connect your phone to your computer to transfer "51"No video selected to play. Connect your phone to your computer to transfer "
52"videos to the phone. Then select video from Videos lens."52"videos to the phone. Then select video from Videos lens."
53msgstr ""53msgstr ""
5454
55#: src/qml/player.qml:17755#: src/qml/player.qml:189
56msgid "Pause or Resume Playhead"56msgid "Pause or Resume Playhead"
57msgstr ""57msgstr ""
5858
59#: src/qml/player.qml:17659#: src/qml/player.qml:188
60msgid "Play / Pause"60msgid "Play / Pause"
61msgstr ""61msgstr ""
6262
63#: src/qml/player.qml:18263#: src/qml/player.qml:194
64msgid "Post;Upload;Attach"64msgid "Post;Upload;Attach"
65msgstr ""65msgstr ""
6666
67#: src/qml/player.qml:18167#: src/qml/player.qml:193
68msgid "Share"68msgid "Share"
69msgstr ""69msgstr ""
7070
71#: src/qml/player/TimeLine.qml:6571#: src/qml/player/TimeLine.qml:68
72msgid "unknown"72msgid "unknown"
73msgstr ""73msgstr ""
7474
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2014-01-07 19:36:45 +0000
+++ src/CMakeLists.txt 2014-02-13 18:30:29 +0000
@@ -27,7 +27,6 @@
27qt5_use_modules(${MEDIAPLAYER} Gui Widgets Core Qml Quick Multimedia)27qt5_use_modules(${MEDIAPLAYER} Gui Widgets Core Qml Quick Multimedia)
2828
29target_link_libraries(${MEDIAPLAYER}29target_link_libraries(${MEDIAPLAYER}
30 sdkhelper
31 #${GSTLIB_LDFLAGS}30 #${GSTLIB_LDFLAGS}
32 )31 )
3332
3433
=== modified file 'src/mediaplayer.cpp'
--- src/mediaplayer.cpp 2014-01-08 22:38:38 +0000
+++ src/mediaplayer.cpp 2014-02-13 18:30:29 +0000
@@ -15,7 +15,7 @@
15 */15 */
16#include "mediaplayer.h"16#include "mediaplayer.h"
17//#include "thumbnail-provider.h"17//#include "thumbnail-provider.h"
18#include "sharefile.h"18//#include "sharefile.h"
1919
20#include <QtCore/QDir>20#include <QtCore/QDir>
21#include <QtCore/QUrl>21#include <QtCore/QUrl>
@@ -79,7 +79,7 @@
79 }79 }
8080
81 //TODO: move this to SDK/ShareMenu library81 //TODO: move this to SDK/ShareMenu library
82 qmlRegisterType<ShareFile>("SDKHelper", 1, 0, "ShareFile");82 //qmlRegisterType<ShareFile>("SDKHelper", 1, 0, "ShareFile");
8383
84 m_view = new QQuickView();84 m_view = new QQuickView();
85 //m_view->engine()->addImageProvider("video", new ThumbnailProvider);85 //m_view->engine()->addImageProvider("video", new ThumbnailProvider);
8686
=== modified file 'src/mediaplayer.h'
--- src/mediaplayer.h 2014-01-08 22:38:38 +0000
+++ src/mediaplayer.h 2014-02-13 18:30:29 +0000
@@ -25,7 +25,7 @@
25class MediaPlayer : public QApplication25class MediaPlayer : public QApplication
26{26{
27 Q_OBJECT27 Q_OBJECT
28 Q_PROPERTY(bool desktopMode READ isDesktopMode)28 Q_PROPERTY(bool desktopMode READ isDesktopMode CONSTANT)
2929
30public:30public:
31 MediaPlayer(int &argc, char **argv);31 MediaPlayer(int &argc, char **argv);
3232
=== modified file 'src/qml/player/VideoPlayer.qml'
--- src/qml/player/VideoPlayer.qml 2014-01-08 22:38:38 +0000
+++ src/qml/player/VideoPlayer.qml 2014-02-13 18:30:29 +0000
@@ -63,12 +63,6 @@
63 event.accepted = true63 event.accepted = true
64 }64 }
6565
66 function startSharing() {
67 player.controlsActive = true;
68 _sharePopover.caller = _controls;
69 _sharePopover.show();
70 }
71
72 function playPause() {66 function playPause() {
73 if (["paused", "playing"].indexOf(player.state) != -1) {67 if (["paused", "playing"].indexOf(player.state) != -1) {
74 player.togglePause();68 player.togglePause();
@@ -140,7 +134,6 @@
140 }134 }
141 }135 }
142136
143 onShareClicked: player.startSharing()
144 onSettingsClicked: {137 onSettingsClicked: {
145 if (mpApplication.desktopMode) {138 if (mpApplication.desktopMode) {
146 var videoFile = mpApplication.chooseFile()139 var videoFile = mpApplication.chooseFile()
@@ -167,34 +160,6 @@
167 onClicked: _controls.active = !_controls.active160 onClicked: _controls.active = !_controls.active
168 }161 }
169162
170 SharePopover {
171 id: _sharePopover
172 visible: false
173 onSelected: {
174 var position = video.position
175 if (position === 0) {
176 if (video.duration > 10000) {
177 position = 10000;
178 } else if (video.duration > 0){
179 position = video.duration / 2
180 }
181 }
182 if (position >= 0) {
183 _share.fileToShare = "image://video/" + video.source + "/" + position;
184 }
185 _share.userAccountId = accountId;
186 _share.visible = true;
187 }
188 }
189
190 Share {
191 id: _share
192 visible: false
193 anchors.fill: parent
194 onCanceled: _share.visible = false
195 onUploadCompleted: _share.visible = false
196 }
197
198 Keys.onPressed: {163 Keys.onPressed: {
199 switch(event.key) {164 switch(event.key) {
200 case Qt.Key_Space:165 case Qt.Key_Space:

Subscribers

People subscribed via source and target branches