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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-25 23:08:08 +0000
3+++ CMakeLists.txt 2014-02-13 18:30:29 +0000
4@@ -45,10 +45,10 @@
5 enable_testing()
6
7 add_subdirectory(data)
8-add_subdirectory(sdk)
9 add_subdirectory(src)
10 add_subdirectory(tests)
11 add_subdirectory(po)
12+add_subdirectory(desktop)
13
14 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
15
16
17=== modified file 'debian/mediaplayer-app.install'
18--- debian/mediaplayer-app.install 2013-05-21 14:44:39 +0000
19+++ debian/mediaplayer-app.install 2014-02-13 18:30:29 +0000
20@@ -2,4 +2,5 @@
21 /usr/share/icons/hicolor/scalable/apps/mediaplayer-app.svg
22 /usr/bin/mediaplayer-app
23 /usr/share/mediaplayer-app/qml/*
24+/usr/share/icons
25 /usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo
26
27=== added directory 'desktop'
28=== added file 'desktop/CMakeLists.txt'
29--- desktop/CMakeLists.txt 1970-01-01 00:00:00 +0000
30+++ desktop/CMakeLists.txt 2014-02-13 18:30:29 +0000
31@@ -0,0 +1,2 @@
32+install(DIRECTORY icons/hicolor DESTINATION DESTINATION
33+ ${CMAKE_INSTALL_DATADIR}/icons FILES_MATCHING PATTERN *.png)
34
35=== added directory 'desktop/icons'
36=== added directory 'desktop/icons/hicolor'
37=== added directory 'desktop/icons/hicolor/128x128'
38=== added directory 'desktop/icons/hicolor/128x128/apps'
39=== added file 'desktop/icons/hicolor/128x128/apps/media-player.png'
40Binary 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
41=== added directory 'desktop/icons/hicolor/256x256'
42=== added directory 'desktop/icons/hicolor/256x256/apps'
43=== added file 'desktop/icons/hicolor/256x256/apps/media-player.png'
44Binary 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
45=== added directory 'desktop/icons/hicolor/64x64'
46=== added directory 'desktop/icons/hicolor/64x64/apps'
47=== added file 'desktop/icons/hicolor/64x64/apps/media-player.png'
48Binary 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
49=== modified file 'po/mediaplayer-app.pot'
50--- po/mediaplayer-app.pot 2013-09-30 21:41:19 +0000
51+++ po/mediaplayer-app.pot 2014-02-13 18:30:29 +0000
52@@ -8,7 +8,7 @@
53 msgstr ""
54 "Project-Id-Version: PACKAGE VERSION\n"
55 "Report-Msgid-Bugs-To: \n"
56-"POT-Creation-Date: 2013-09-30 18:40-0300\n"
57+"POT-Creation-Date: 2014-02-13 13:21-0500\n"
58 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
59 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
60 "Language-Team: LANGUAGE <LL@li.org>\n"
61@@ -17,27 +17,27 @@
62 "Content-Type: text/plain; charset=CHARSET\n"
63 "Content-Transfer-Encoding: 8bit\n"
64
65-#: src/qml/player/TimeLine.qml:132
66+#: src/qml/player/TimeLine.qml:135
67 #, qt-format
68 msgid "%1:%2:%3"
69 msgstr ""
70
71-#: src/qml/player/TimeLine.qml:101
72+#: src/qml/player/TimeLine.qml:104
73 #, qt-format
74 msgid "- %1"
75 msgstr ""
76
77-#: src/qml/player/TimeLine.qml:128 src/qml/player/TimeLine.qml:129
78-#: src/qml/player/TimeLine.qml:130
79+#: src/qml/player/TimeLine.qml:131 src/qml/player/TimeLine.qml:132
80+#: src/qml/player/TimeLine.qml:133
81 #, qt-format
82 msgid "0%1"
83 msgstr ""
84
85-#: src/qml/player/TimeLine.qml:68
86+#: src/qml/player/TimeLine.qml:71
87 msgid "0:00:00"
88 msgstr ""
89
90-#: src/qml/player.qml:62
91+#: src/qml/player.qml:67
92 msgid "Error"
93 msgstr ""
94
95@@ -46,28 +46,28 @@
96 msgid "Media Player"
97 msgstr ""
98
99-#: src/qml/player.qml:63
100+#: src/qml/player.qml:68
101 msgid ""
102 "No video selected to play. Connect your phone to your computer to transfer "
103 "videos to the phone. Then select video from Videos lens."
104 msgstr ""
105
106-#: src/qml/player.qml:177
107+#: src/qml/player.qml:189
108 msgid "Pause or Resume Playhead"
109 msgstr ""
110
111-#: src/qml/player.qml:176
112+#: src/qml/player.qml:188
113 msgid "Play / Pause"
114 msgstr ""
115
116-#: src/qml/player.qml:182
117+#: src/qml/player.qml:194
118 msgid "Post;Upload;Attach"
119 msgstr ""
120
121-#: src/qml/player.qml:181
122+#: src/qml/player.qml:193
123 msgid "Share"
124 msgstr ""
125
126-#: src/qml/player/TimeLine.qml:65
127+#: src/qml/player/TimeLine.qml:68
128 msgid "unknown"
129 msgstr ""
130
131=== modified file 'src/CMakeLists.txt'
132--- src/CMakeLists.txt 2014-01-07 19:36:45 +0000
133+++ src/CMakeLists.txt 2014-02-13 18:30:29 +0000
134@@ -27,7 +27,6 @@
135 qt5_use_modules(${MEDIAPLAYER} Gui Widgets Core Qml Quick Multimedia)
136
137 target_link_libraries(${MEDIAPLAYER}
138- sdkhelper
139 #${GSTLIB_LDFLAGS}
140 )
141
142
143=== modified file 'src/mediaplayer.cpp'
144--- src/mediaplayer.cpp 2014-01-08 22:38:38 +0000
145+++ src/mediaplayer.cpp 2014-02-13 18:30:29 +0000
146@@ -15,7 +15,7 @@
147 */
148 #include "mediaplayer.h"
149 //#include "thumbnail-provider.h"
150-#include "sharefile.h"
151+//#include "sharefile.h"
152
153 #include <QtCore/QDir>
154 #include <QtCore/QUrl>
155@@ -79,7 +79,7 @@
156 }
157
158 //TODO: move this to SDK/ShareMenu library
159- qmlRegisterType<ShareFile>("SDKHelper", 1, 0, "ShareFile");
160+ //qmlRegisterType<ShareFile>("SDKHelper", 1, 0, "ShareFile");
161
162 m_view = new QQuickView();
163 //m_view->engine()->addImageProvider("video", new ThumbnailProvider);
164
165=== modified file 'src/mediaplayer.h'
166--- src/mediaplayer.h 2014-01-08 22:38:38 +0000
167+++ src/mediaplayer.h 2014-02-13 18:30:29 +0000
168@@ -25,7 +25,7 @@
169 class MediaPlayer : public QApplication
170 {
171 Q_OBJECT
172- Q_PROPERTY(bool desktopMode READ isDesktopMode)
173+ Q_PROPERTY(bool desktopMode READ isDesktopMode CONSTANT)
174
175 public:
176 MediaPlayer(int &argc, char **argv);
177
178=== modified file 'src/qml/player/VideoPlayer.qml'
179--- src/qml/player/VideoPlayer.qml 2014-01-08 22:38:38 +0000
180+++ src/qml/player/VideoPlayer.qml 2014-02-13 18:30:29 +0000
181@@ -63,12 +63,6 @@
182 event.accepted = true
183 }
184
185- function startSharing() {
186- player.controlsActive = true;
187- _sharePopover.caller = _controls;
188- _sharePopover.show();
189- }
190-
191 function playPause() {
192 if (["paused", "playing"].indexOf(player.state) != -1) {
193 player.togglePause();
194@@ -140,7 +134,6 @@
195 }
196 }
197
198- onShareClicked: player.startSharing()
199 onSettingsClicked: {
200 if (mpApplication.desktopMode) {
201 var videoFile = mpApplication.chooseFile()
202@@ -167,34 +160,6 @@
203 onClicked: _controls.active = !_controls.active
204 }
205
206- SharePopover {
207- id: _sharePopover
208- visible: false
209- onSelected: {
210- var position = video.position
211- if (position === 0) {
212- if (video.duration > 10000) {
213- position = 10000;
214- } else if (video.duration > 0){
215- position = video.duration / 2
216- }
217- }
218- if (position >= 0) {
219- _share.fileToShare = "image://video/" + video.source + "/" + position;
220- }
221- _share.userAccountId = accountId;
222- _share.visible = true;
223- }
224- }
225-
226- Share {
227- id: _share
228- visible: false
229- anchors.fill: parent
230- onCanceled: _share.visible = false
231- onUploadCompleted: _share.visible = false
232- }
233-
234 Keys.onPressed: {
235 switch(event.key) {
236 case Qt.Key_Space:

Subscribers

People subscribed via source and target branches