1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-08-16 12:55:55 +0000
3
+++ CMakeLists.txt	2013-08-28 19:23:56 +0000
4
@@ -38,10 +38,15 @@
5
38
endif()
38
endif()
6
39
39
7
40
find_package(PkgConfig REQUIRED)
40
find_package(PkgConfig REQUIRED)
8
41
#pkg_check_modules(CONTENTHUB REQUIRED libcontent-hub)
9
41
pkg_check_modules(EXIV2 REQUIRED exiv2)
42
pkg_check_modules(EXIV2 REQUIRED exiv2)
10
42
pkg_check_modules(GSTLIB REQUIRED gstreamer-0.10)
43
pkg_check_modules(GSTLIB REQUIRED gstreamer-0.10)
11
43
pkg_check_modules(MEDIAINFO REQUIRED libmediainfo)
44
pkg_check_modules(MEDIAINFO REQUIRED libmediainfo)
12
44
45
13
46
# FIXME use cmake to find the proper variables
14
47
set(CONTENTHUB_INCLUDE_DIRS "/usr/include/com/ubuntu/content")
15
48
set(CONTENTHUB_LIBRARIES "content-hub")
16
49
17
45
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
50
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
18
46
51
19
47
# Standard install paths
52
# Standard install paths
20
48
53
21
=== modified file 'debian/control'
22
--- debian/control	2013-08-26 09:28:46 +0000
23
+++ debian/control	2013-08-28 19:23:56 +0000
24
@@ -5,6 +5,7 @@
25
5
Build-Depends: debhelper (>= 9),
5
Build-Depends: debhelper (>= 9),
26
6
               cmake,
6
               cmake,
27
7
               dh-translations,
7
               dh-translations,
28
8
               libcontent-hub-dev,
29
8
               libgstreamer0.10-dev,
9
               libgstreamer0.10-dev,
30
9
               libexiv2-dev,
10
               libexiv2-dev,
31
10
               libgl1-mesa-dev | libgl-dev,
11
               libgl1-mesa-dev | libgl-dev,
32
11
12
33
=== modified file 'rc/qml/GalleryApplication.qml'
34
--- rc/qml/GalleryApplication.qml	2013-06-26 08:59:08 +0000
35
+++ rc/qml/GalleryApplication.qml	2013-08-28 19:23:56 +0000
36
@@ -37,6 +37,9 @@
37
37
37
38
38
    property bool automaticOrientation: true
38
    property bool automaticOrientation: true
39
39
39
40
40
    /// Indicates if the backend is loaded and the UI can be shown
41
41
    property bool allLoaded: false
42
42
43
40
    // Big list of form factor-specific values.  'default' is used if the key
43
    // Big list of form factor-specific values.  'default' is used if the key
44
41
    // can't be found under any other form_factor (otherwise, form_factors should
44
    // can't be found under any other form_factor (otherwise, form_factors should
45
42
    // match the FORM_FACTOR values passed from main.cpp).  Just add Portrait to
45
    // match the FORM_FACTOR values passed from main.cpp).  Just add Portrait to
46
@@ -141,8 +144,7 @@
47
141
    /*!
144
    /*!
48
142
    */
145
    */
49
143
    function onLoaded() {
146
    function onLoaded() {
52
144
        mainScreenLoader.load();
147
        allLoaded = true;
51
145
        loadingScreen.visible = false;
53
146
    }
148
    }
54
147
149
55
148
    width: units.gu(DEVICE_WIDTH)
150
    width: units.gu(DEVICE_WIDTH)
56
@@ -161,26 +163,22 @@
57
161
        }
163
        }
58
162
    }
164
    }
59
163
165
61
164
    LoadingScreen {
166
    Loader {
62
165
        id: loadingScreen
167
        id: loadingScreen
63
166
64
167
        anchors.fill: parent
168
        anchors.fill: parent
65
169
        visible: mainScreenLoader.status !== Loader.Ready
66
170
        source: visible ? Qt.resolvedUrl("LoadingScreen.qml") : ""
67
168
    }
171
    }
68
169
172
69
170
    Loader {
173
    Loader {
70
171
        id: mainScreenLoader
174
        id: mainScreenLoader
71
172
72
173
        // find the loader with autopilot:
175
        // find the loader with autopilot:
73
174
        objectName: "mainLoader"
176
        objectName: "mainLoader"
74
175
177
75
176
        function load() {
76
177
            if (PICK_MODE_ENABLED)
77
178
                source = "PickerScreen.qml";
78
179
            else
79
180
                source = "MainScreen.qml";
80
181
        }
81
182
82
183
        anchors.fill: parent
178
        anchors.fill: parent
83
179
        source: allLoaded ? (MANAGER.pickModeEnabled ? Qt.resolvedUrl("PickerScreen.qml")
84
180
                                                     : Qt.resolvedUrl("MainScreen.qml"))
85
181
                          : ""
86
184
    }
182
    }
87
185
183
88
186
    HUD.HUD {
184
    HUD.HUD {
89
187
185
90
=== modified file 'rc/qml/PickerScreen.qml'
91
--- rc/qml/PickerScreen.qml	2013-08-27 06:48:42 +0000
92
+++ rc/qml/PickerScreen.qml	2013-08-28 19:23:56 +0000
93
@@ -102,7 +102,6 @@
94
102
                    return;
102
                    return;
95
103
103
96
104
                MANAGER.returnPickedContent(mediaLibrary.selectedMedias);
104
                MANAGER.returnPickedContent(mediaLibrary.selectedMedias);
97
105
                Qt.quit();
98
106
            }
105
            }
99
107
        }
106
        }
100
108
107
101
@@ -113,7 +112,6 @@
102
113
            width: units.gu(10)
112
            width: units.gu(10)
103
114
            onClicked: {
113
            onClicked: {
104
115
                MANAGER.contentPickingCanceled()
114
                MANAGER.contentPickingCanceled()
105
116
                Qt.quit();
106
117
            }
115
            }
107
118
        }
116
        }
108
119
        opened: true
117
        opened: true
109
120
118
110
=== modified file 'src/CMakeLists.txt'
111
--- src/CMakeLists.txt	2013-08-14 20:19:09 +0000
112
+++ src/CMakeLists.txt	2013-08-28 19:23:56 +0000
113
@@ -31,15 +31,18 @@
114
31
    ${gallery_video_src_SOURCE_DIR}
31
    ${gallery_video_src_SOURCE_DIR}
115
32
    ${gallery_qml_src_SOURCE_DIR}
32
    ${gallery_qml_src_SOURCE_DIR}
116
33
    ${CMAKE_BINARY_DIR}
33
    ${CMAKE_BINARY_DIR}
117
34
    ${CONTENTHUB_INCLUDE_DIRS}
118
34
    )
35
    )
119
35
36
120
36
set(gallery_HDRS
37
set(gallery_HDRS
121
38
    content-communicator.h
122
37
    gallery-application.h
39
    gallery-application.h
123
38
    gallery-manager.h
40
    gallery-manager.h
124
39
    media-object-factory.h
41
    media-object-factory.h
125
40
    )
42
    )
126
41
43
127
42
set(gallery_SRCS
44
set(gallery_SRCS
128
45
    content-communicator.cpp
129
43
    gallery-application.cpp
46
    gallery-application.cpp
130
44
    gallery-manager.cpp
47
    gallery-manager.cpp
131
45
    main.cpp
48
    main.cpp
132
@@ -63,7 +66,7 @@
133
63
    gallery-qml
66
    gallery-qml
134
64
    gallery-util
67
    gallery-util
135
65
    gallery-video
68
    gallery-video
137
66
    ${GSTLIB_LDFLAGS}
69
    ${CONTENTHUB_LIBRARIES}
138
67
    )
70
    )
139
68
71
140
69
install(TARGETS ${GALLERY} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
72
install(TARGETS ${GALLERY} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
141
70
73
142
=== added file 'src/content-communicator.cpp'
143
--- src/content-communicator.cpp	1970-01-01 00:00:00 +0000
144
+++ src/content-communicator.cpp	2013-08-28 19:23:56 +0000
145
@@ -0,0 +1,96 @@
146
1
/*
147
2
 * Copyright (C) 2013 Canonical, Ltd.
148
3
 *
149
4
 * This program is free software; you can redistribute it and/or modify
150
5
 * it under the terms of the GNU General Public License as published by
151
6
 * the Free Software Foundation; version 3.
152
7
 *
153
8
 * This program is distributed in the hope that it will be useful,
154
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
155
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
156
11
 * GNU General Public License for more details.
157
12
 *
158
13
 * You should have received a copy of the GNU General Public License
159
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
160
15
 *
161
16
 */
162
17
163
18
#include <content-communicator.h>
164
19
165
20
#include <QDebug>
166
21
#include <QFileInfo>
167
22
168
23
#include <com/ubuntu/content/hub.h>
169
24
#include <com/ubuntu/content/item.h>
170
25
#include <com/ubuntu/content/transfer.h>
171
26
172
27
using namespace com::ubuntu::content;
173
28
174
29
/*!
175
30
 * \brief ContentCommunicator::ContentCommunicator
176
31
 * \param parent
177
32
 */
178
33
ContentCommunicator::ContentCommunicator(QObject *parent)
179
34
    : ImportExportHandler(parent),
180
35
      m_transfer(nullptr)
181
36
{
182
37
    Hub *hub = Hub::Client::instance();
183
38
    hub->register_import_export_handler(this);
184
39
}
185
40
186
41
/*!
187
42
 * \brief \reimp
188
43
 */
189
44
void ContentCommunicator::handle_import(content::Transfer *)
190
45
{
191
46
    qDebug() << Q_FUNC_INFO << "gallery does not import content";
192
47
}
193
48
194
49
/*!
195
50
 * \brief \reimp
196
51
 */
197
52
void ContentCommunicator::handle_export(content::Transfer *transfer)
198
53
{
199
54
    if (m_transfer != nullptr) {
200
55
        qWarning() << "gallery-app does only one content export at a time";
201
56
        transfer->abort();
202
57
        return;
203
58
    }
204
59
205
60
    m_transfer = transfer;
206
61
    emit photoRequested();
207
62
}
208
63
209
64
/*!
210
65
 * \brief ContentCommunicator::cancelTransfer aborts the current transfer
211
66
 */
212
67
void ContentCommunicator::cancelTransfer()
213
68
{
214
69
    if (!m_transfer) {
215
70
        qWarning() << "No ongoing transfer to cancel";
216
71
        return;
217
72
    }
218
73
219
74
    m_transfer->abort();
220
75
}
221
76
222
77
/*!
223
78
 * \brief ContentCommunicator::returnPhoto returns the given photos
224
79
 * via content hub to the requester
225
80
 * \param urls
226
81
 */
227
82
void ContentCommunicator::returnPhotos(const QVector<QUrl> &urls)
228
83
{
229
84
    if (!m_transfer) {
230
85
        qWarning() << "No ongoing transfer to return a photo";
231
86
        return;
232
87
    }
233
88
234
89
    QVector<Item> items;
235
90
    items.reserve(urls.size());
236
91
    foreach (const QUrl &url, urls) {
237
92
        items.append(Item(url));
238
93
    }
239
94
    m_transfer->charge(items);
240
95
    m_transfer = nullptr;
241
96
}
242
0
97
243
=== added file 'src/content-communicator.h'
244
--- src/content-communicator.h	1970-01-01 00:00:00 +0000
245
+++ src/content-communicator.h	2013-08-28 19:23:56 +0000
246
@@ -0,0 +1,51 @@
247
1
/*
248
2
 * Copyright (C) 2013 Canonical, Ltd.
249
3
 *
250
4
 * This program is free software; you can redistribute it and/or modify
251
5
 * it under the terms of the GNU General Public License as published by
252
6
 * the Free Software Foundation; version 3.
253
7
 *
254
8
 * This program is distributed in the hope that it will be useful,
255
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
256
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
257
11
 * GNU General Public License for more details.
258
12
 *
259
13
 * You should have received a copy of the GNU General Public License
260
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
261
15
 *
262
16
 */
263
17
264
18
#ifndef CONTENTCOMMUNICATOR_H
265
19
#define CONTENTCOMMUNICATOR_H
266
20
267
21
#include <com/ubuntu/content/import_export_handler.h>
268
22
269
23
#include <QUrl>
270
24
#include <QVector>
271
25
272
26
using namespace com::ubuntu;
273
27
274
28
/*!
275
29
 * Class to handle the communication with the content manager
276
30
 */
277
31
class ContentCommunicator : public content::ImportExportHandler
278
32
{
279
33
    Q_OBJECT
280
34
281
35
public:
282
36
    ContentCommunicator(QObject *parent = nullptr);
283
37
284
38
    virtual void handle_import(content::Transfer*);
285
39
    virtual void handle_export(content::Transfer *transfer);
286
40
287
41
    void cancelTransfer();
288
42
    void returnPhotos(const QVector<QUrl> &urls);
289
43
290
44
signals:
291
45
    void photoRequested();
292
46
293
47
private:
294
48
    content::Transfer *m_transfer;
295
49
};
296
50
297
51
#endif // CONTENTCOMMUNICATOR_H
298
0
52
299
=== modified file 'src/gallery-application.cpp'
300
--- src/gallery-application.cpp	2013-08-27 06:48:42 +0000
301
+++ src/gallery-application.cpp	2013-08-28 19:23:56 +0000
302
@@ -81,6 +81,8 @@
303
81
81
304
82
    m_galleryManager = new GalleryManager(m_cmdLineParser->picturesDir(), m_view);
82
    m_galleryManager = new GalleryManager(m_cmdLineParser->picturesDir(), m_view);
305
83
    m_galleryManager->logImageLoading(m_cmdLineParser->logImageLoading());
83
    m_galleryManager->logImageLoading(m_cmdLineParser->logImageLoading());
306
84
    if (m_cmdLineParser->pickModeEnabled())
307
85
        m_galleryManager->setDefaultUiMode(GalleryManager::PickContentMode);
308
84
86
309
85
    if (m_cmdLineParser->startupTimer())
87
    if (m_cmdLineParser->startupTimer())
310
86
        qDebug() << "Construct GalleryApplication" << m_timer->elapsed() << "ms";
88
        qDebug() << "Construct GalleryApplication" << m_timer->elapsed() << "ms";
311
@@ -161,7 +163,6 @@
312
161
    rootContext->setContextProperty("DEVICE_WIDTH", QVariant(size.width()));
163
    rootContext->setContextProperty("DEVICE_WIDTH", QVariant(size.width()));
313
162
    rootContext->setContextProperty("DEVICE_HEIGHT", QVariant(size.height()));
164
    rootContext->setContextProperty("DEVICE_HEIGHT", QVariant(size.height()));
314
163
    rootContext->setContextProperty("FORM_FACTOR", QVariant(m_cmdLineParser->formFactor()));
165
    rootContext->setContextProperty("FORM_FACTOR", QVariant(m_cmdLineParser->formFactor()));
315
164
    rootContext->setContextProperty("PICK_MODE_ENABLED", QVariant(m_cmdLineParser->pickModeEnabled()));
316
165
    rootContext->setContextProperty("MAX_GL_TEXTURE_SIZE",
166
    rootContext->setContextProperty("MAX_GL_TEXTURE_SIZE",
317
166
                                    QVariant(m_galleryManager->resource()->maxTextureSize()));
167
                                    QVariant(m_galleryManager->resource()->maxTextureSize()));
318
167
168
319
168
169
320
=== modified file 'src/gallery-application.h'
321
--- src/gallery-application.h	2013-06-28 11:53:54 +0000
322
+++ src/gallery-application.h	2013-08-28 19:23:56 +0000
323
@@ -56,7 +56,6 @@
324
56
    void registerQML();
56
    void registerQML();
325
57
    void createView();
57
    void createView();
326
58
58
327
59
328
60
    QQuickView *m_view;
59
    QQuickView *m_view;
329
61
    GalleryManager *m_galleryManager;
60
    GalleryManager *m_galleryManager;
330
62
    CommandLineParser* m_cmdLineParser;
61
    CommandLineParser* m_cmdLineParser;
331
63
62
332
=== modified file 'src/gallery-manager.cpp'
333
--- src/gallery-manager.cpp	2013-08-13 09:31:23 +0000
334
+++ src/gallery-manager.cpp	2013-08-28 19:23:56 +0000
335
@@ -19,6 +19,7 @@
336
19
 */
19
 */
337
20
20
338
21
#include "gallery-manager.h"
21
#include "gallery-manager.h"
339
22
#include "content-communicator.h"
340
22
#include "media-object-factory.h"
23
#include "media-object-factory.h"
341
23
24
342
24
// album
25
// album
343
@@ -45,6 +46,7 @@
344
45
// util
46
// util
345
46
#include "resource.h"
47
#include "resource.h"
346
47
48
347
49
#include <QApplication>
348
48
#include <QElapsedTimer>
50
#include <QElapsedTimer>
349
49
51
350
50
#include <exiv2/exiv2.hpp>
52
#include <exiv2/exiv2.hpp>
351
@@ -70,6 +72,9 @@
352
70
      m_eventCollection(0),
72
      m_eventCollection(0),
353
71
      m_previewManager(0),
73
      m_previewManager(0),
354
72
      m_monitor(0),
74
      m_monitor(0),
355
75
      m_contentCommunicator(new ContentCommunicator(this)),
356
76
      m_pickModeEnabled(false),
357
77
      m_defaultUiMode(BrowseContentMode),
358
73
      m_mediaLibrary(0)
78
      m_mediaLibrary(0)
359
74
{
79
{
360
75
    const int maxTextureSize = m_resource->maxTextureSize();
80
    const int maxTextureSize = m_resource->maxTextureSize();
361
@@ -77,6 +82,9 @@
362
77
    m_mediaFactory = new MediaObjectFactory();
82
    m_mediaFactory = new MediaObjectFactory();
363
78
83
364
79
    m_galleryManager = this;
84
    m_galleryManager = this;
365
85
366
86
    QObject::connect(m_contentCommunicator, SIGNAL(photoRequested()),
367
87
                     this, SLOT(switchToPickMode()));
368
80
}
88
}
369
81
89
370
82
/*!
90
/*!
371
@@ -125,10 +133,18 @@
372
125
    }
133
    }
373
126
134
374
127
    QList<MediaSource*> sources = qvariant_cast<QList<MediaSource*> >(variant);
135
    QList<MediaSource*> sources = qvariant_cast<QList<MediaSource*> >(variant);
376
128
136
    QVector<QUrl> selectedMedias;
377
137
    selectedMedias.reserve(sources.size());
378
129
    foreach (const MediaSource *media, sources) {
138
    foreach (const MediaSource *media, sources) {
381
130
        //FIXME call content manager API
139
        QUrl url(media->path().toLocalFile());
382
131
        qDebug() << "Picked media:" << media->path();
140
        selectedMedias.append(url);
383
141
    }
384
142
    m_contentCommunicator->returnPhotos(selectedMedias);
385
143
386
144
    if (m_defaultUiMode == BrowseContentMode) {
387
145
        setUiMode(BrowseContentMode);
388
146
    } else {
389
147
        qApp->quit();
390
132
    }
148
    }
391
133
}
149
}
392
134
150
393
@@ -138,7 +154,13 @@
394
138
 */
154
 */
395
139
void GalleryManager::contentPickingCanceled()
155
void GalleryManager::contentPickingCanceled()
396
140
{
156
{
398
141
    //FIXME call content manager API
157
    m_contentCommunicator->cancelTransfer();
399
158
400
159
    if (m_defaultUiMode == BrowseContentMode) {
401
160
        setUiMode(BrowseContentMode);
402
161
    } else {
403
162
        qApp->quit();
404
163
    }
405
142
}
164
}
406
143
165
407
144
/*!
166
/*!
408
@@ -240,6 +262,41 @@
409
240
}
262
}
410
241
263
411
242
/*!
264
/*!
412
265
 * \brief GalleryManager::setDefaultUiMode set the default UI mode. This might
413
266
 * get overridden during the lifetime
414
267
 * \param mode
415
268
 */
416
269
void GalleryManager::setDefaultUiMode(GalleryManager::UiMode mode)
417
270
{
418
271
    m_defaultUiMode = mode;
419
272
    m_pickModeEnabled = true;
420
273
}
421
274
422
275
/*!
423
276
 * \brief GalleryManager::setUiMode set's the current UI mode
424
277
 * \param mode
425
278
 */
426
279
void GalleryManager::setUiMode(GalleryManager::UiMode mode)
427
280
{
428
281
    bool enablePickMode = (mode == PickContentMode);
429
282
430
283
    if (enablePickMode != m_pickModeEnabled) {
431
284
        m_pickModeEnabled = enablePickMode;
432
285
        Q_EMIT pickModeEnabledChanged();
433
286
    }
434
287
}
435
288
436
289
/*!
437
290
 * \brief GalleryManager::pickModeEnabled returns if the current UI mode should be for
438
291
 * picking acontent
439
292
 * \return
440
293
 */
441
294
bool GalleryManager::pickModeEnabled() const
442
295
{
443
296
    return m_pickModeEnabled;
444
297
}
445
298
446
299
/*!
447
243
 * \brief GalleryManager::logImageLoading enabled or disbaled logging image load
300
 * \brief GalleryManager::logImageLoading enabled or disbaled logging image load
448
244
 * times to stdout
301
 * times to stdout
449
245
 * \param log
302
 * \param log
450
@@ -343,6 +400,14 @@
451
343
}
400
}
452
344
401
453
345
/*!
402
/*!
454
403
 * \brief GalleryManager::switchToPickMode
455
404
 */
456
405
void GalleryManager::switchToPickMode()
457
406
{
458
407
    setUiMode(PickContentMode);
459
408
}
460
409
461
410
/*!
462
346
 * \brief GalleryManager::takeGalleryStandardImageProvider returns the standard image provider
411
 * \brief GalleryManager::takeGalleryStandardImageProvider returns the standard image provider
463
347
 * and gives up the owndership 
412
 * and gives up the owndership 
464
348
 */
413
 */
465
349
414
466
=== modified file 'src/gallery-manager.h'
467
--- src/gallery-manager.h	2013-08-13 09:31:23 +0000
468
+++ src/gallery-manager.h	2013-08-28 19:23:56 +0000
469
@@ -32,6 +32,7 @@
470
32
32
471
33
class AlbumCollection;
33
class AlbumCollection;
472
34
class AlbumDefaultTemplate;
34
class AlbumDefaultTemplate;
473
35
class ContentCommunicator;
474
35
class Database;
36
class Database;
475
36
class EventCollection;
37
class EventCollection;
476
37
class GalleryManager;
38
class GalleryManager;
477
@@ -51,9 +52,13 @@
478
51
{
52
{
479
52
    Q_OBJECT
53
    Q_OBJECT
480
53
    Q_PROPERTY(QmlMediaCollectionModel* mediaLibrary READ mediaLibrary NOTIFY mediaLibraryChanged)
54
    Q_PROPERTY(QmlMediaCollectionModel* mediaLibrary READ mediaLibrary NOTIFY mediaLibraryChanged)
482
54
55
    Q_PROPERTY(bool pickModeEnabled READ pickModeEnabled NOTIFY pickModeEnabledChanged)
483
55
56
484
56
public:
57
public:
485
58
    enum UiMode{
486
59
        BrowseContentMode,
487
60
        PickContentMode
488
61
    };
489
57
    GalleryManager(const QString &picturesDir, QQuickView *view);
62
    GalleryManager(const QString &picturesDir, QQuickView *view);
490
58
    ~GalleryManager();
63
    ~GalleryManager();
491
59
64
492
@@ -78,12 +83,18 @@
493
78
83
494
79
    QmlMediaCollectionModel *mediaLibrary() const;
84
    QmlMediaCollectionModel *mediaLibrary() const;
495
80
85
496
86
    void setDefaultUiMode(UiMode mode);
497
87
    void setUiMode(UiMode mode);
498
88
    bool pickModeEnabled() const;
499
89
500
81
signals:
90
signals:
501
82
    void mediaLibraryChanged();
91
    void mediaLibraryChanged();
502
92
    void pickModeEnabledChanged();
503
83
93
504
84
private slots:
94
private slots:
505
85
    void onMediaItemAdded(QString file);
95
    void onMediaItemAdded(QString file);
506
86
    void onMediaItemRemoved(qint64 mediaId);
96
    void onMediaItemRemoved(qint64 mediaId);
507
97
    void switchToPickMode();
508
87
98
509
88
private:
99
private:
510
89
    GalleryManager(const GalleryManager&);
100
    GalleryManager(const GalleryManager&);
511
@@ -108,6 +119,9 @@
512
108
    PreviewManager* m_previewManager;
119
    PreviewManager* m_previewManager;
513
109
    MediaObjectFactory *m_mediaFactory;
120
    MediaObjectFactory *m_mediaFactory;
514
110
    MediaMonitor *m_monitor;
121
    MediaMonitor *m_monitor;
515
122
    ContentCommunicator *m_contentCommunicator;
516
123
    bool m_pickModeEnabled;
517
124
    UiMode m_defaultUiMode;
518
111
125
519
112
    mutable QmlMediaCollectionModel *m_mediaLibrary;
126
    mutable QmlMediaCollectionModel *m_mediaLibrary;
520
113
};
127
};
521
114
128
522
=== added file 'tests/unittests/stubs/content-communicator_stub.cpp'
523
--- tests/unittests/stubs/content-communicator_stub.cpp	1970-01-01 00:00:00 +0000
524
+++ tests/unittests/stubs/content-communicator_stub.cpp	2013-08-28 19:23:56 +0000
525
@@ -0,0 +1,43 @@
526
1
/*
527
2
 * Copyright (C) 2013 Canonical, Ltd.
528
3
 *
529
4
 * This program is free software; you can redistribute it and/or modify
530
5
 * it under the terms of the GNU General Public License as published by
531
6
 * the Free Software Foundation; version 3.
532
7
 *
533
8
 * This program is distributed in the hope that it will be useful,
534
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
535
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
536
11
 * GNU General Public License for more details.
537
12
 *
538
13
 * You should have received a copy of the GNU General Public License
539
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
540
15
 *
541
16
 */
542
17
543
18
#include <content-communicator.h>
544
19
545
20
using namespace com::ubuntu::content;
546
21
547
22
ContentCommunicator::ContentCommunicator(QObject *parent)
548
23
    : ImportExportHandler(parent),
549
24
      m_transfer(nullptr)
550
25
{
551
26
}
552
27
553
28
void ContentCommunicator::handle_import(content::Transfer *)
554
29
{
555
30
}
556
31
557
32
void ContentCommunicator::handle_export(content::Transfer *)
558
33
{
559
34
}
560
35
561
36
void ContentCommunicator::cancelTransfer()
562
37
{
563
38
}
564
39
565
40
void ContentCommunicator::returnPhotos(const QVector<QUrl> &urls)
566
41
{
567
42
    Q_UNUSED(urls);
568
43
}
569
0
44
570
=== modified file 'tests/unittests/stubs/gallery-manager_stub.cpp'
571
--- tests/unittests/stubs/gallery-manager_stub.cpp	2013-08-13 09:31:23 +0000
572
+++ tests/unittests/stubs/gallery-manager_stub.cpp	2013-08-28 19:23:56 +0000
573
@@ -119,6 +119,15 @@
574
119
    Q_UNUSED(mediaId);
119
    Q_UNUSED(mediaId);
575
120
}
120
}
576
121
121
577
122
bool GalleryManager::pickModeEnabled() const
578
123
{
579
124
    return false;
580
125
}
581
126
582
127
void GalleryManager::switchToPickMode()
583
128
{
584
129
}
585
130
586
122
GalleryStandardImageProvider* GalleryManager::takeGalleryStandardImageProvider()
131
GalleryStandardImageProvider* GalleryManager::takeGalleryStandardImageProvider()
587
123
{
132
{
588
124
    return 0;
133
    return 0;
589
@@ -127,4 +136,4 @@
590
127
GalleryThumbnailImageProvider* GalleryManager::takeGalleryThumbnailImageProvider()
136
GalleryThumbnailImageProvider* GalleryManager::takeGalleryThumbnailImageProvider()
591
128
{
137
{
592
129
    return 0;
138
    return 0;
593
130
}
594
131
\ No newline at end of file
139
\ No newline at end of file
595
140
}
596
132
141
597
=== modified file 'tests/unittests/video/CMakeLists.txt'
598
--- tests/unittests/video/CMakeLists.txt	2013-08-14 07:26:50 +0000
599
+++ tests/unittests/video/CMakeLists.txt	2013-08-28 19:23:56 +0000
600
@@ -24,10 +24,16 @@
601
24
    ${gallery_video_src_SOURCE_DIR}
24
    ${gallery_video_src_SOURCE_DIR}
602
25
    )
25
    )
603
26
26
604
27
QT_WRAP_CPP(mediaobjectfactory TST_VIDEO_MOCS
605
28
    ${gallery_src_SOURCE_DIR}/content-communicator.h
606
29
    )
607
30
608
27
add_executable(video
31
add_executable(video
609
28
    tst_video.cpp
32
    tst_video.cpp
610
29
    ${gallery_src_SOURCE_DIR}/gallery-manager.cpp
33
    ${gallery_src_SOURCE_DIR}/gallery-manager.cpp
611
30
    ${gallery_src_SOURCE_DIR}/media-object-factory.cpp
34
    ${gallery_src_SOURCE_DIR}/media-object-factory.cpp
612
35
    ../stubs/content-communicator_stub.cpp
613
36
    ${TST_VIDEO_MOCS}
614
31
    )
37
    )
615
32
38
616
33
qt5_use_modules(video Widgets Core Qml Quick Test)
39
qt5_use_modules(video Widgets Core Qml Quick Test)
617
@@ -48,4 +54,5 @@
618
48
    gallery-qml
54
    gallery-qml
619
49
    gallery-util
55
    gallery-util
620
50
    gallery-video
56
    gallery-video
621
57
    "content-hub"
622
51
    )
58
    )
Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2013-08-28
Approved revision:	824
Merged at revision:	827
Proposed branch:	lp:~schwann/gallery-app/gallery-content-hub
Merge into:	lp:gallery-app
Diff against target:	622 lines (+313/-23) 14 files modified CMakeLists.txt (+5/-0) debian/control (+1/-0) rc/qml/GalleryApplication.qml (+10/-12) rc/qml/PickerScreen.qml (+0/-2) src/CMakeLists.txt (+4/-1) src/content-communicator.cpp (+96/-0) src/content-communicator.h (+51/-0) src/gallery-application.cpp (+2/-1) src/gallery-application.h (+0/-1) src/gallery-manager.cpp (+69/-4) src/gallery-manager.h (+15/-1) tests/unittests/stubs/content-communicator_stub.cpp (+43/-0) tests/unittests/stubs/gallery-manager_stub.cpp (+10/-1) tests/unittests/video/CMakeLists.txt (+7/-0)
To merge this branch:	bzr merge lp:~schwann/gallery-app/gallery-content-hub
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-08-28
Gustavo Pichorim Boiko (community)			Approve on 2013-08-28
Bill Filler (community)		2013-08-15	Needs Fixing on 2013-08-19
Review via email: mp+180378@code.launchpad.net