1
=== modified file 'CameraApp/foldersmodel.cpp'
2
--- CameraApp/foldersmodel.cpp	2015-01-25 18:54:51 +0000
3
+++ CameraApp/foldersmodel.cpp	2015-01-28 15:58:22 +0000
4
@@ -275,6 +275,11 @@
5
275
            m_fileInfoList[fileIndex] = fileInfo;
275
            m_fileInfoList[fileIndex] = fileInfo;
6
276
            Q_EMIT dataChanged(modelIndex, modelIndex);
276
            Q_EMIT dataChanged(modelIndex, modelIndex);
7
277
        }
277
        }
8
278
9
279
        // As the documentation states, in some cases the watch is removed on a
10
280
        // fileChanged signal, so we will need to add it back again.
11
281
        // addPath() will safely do nothing if the file is still being watched.
12
282
        m_watcher->addPath(filePath);
13
278
    } else {
283
    } else {
14
279
        // file has either been removed or renamed
284
        // file has either been removed or renamed
15
280
        if (fileIndex != -1) {
285
        if (fileIndex != -1) {
16
281
286
17
=== modified file 'PhotogridView.qml'
18
--- PhotogridView.qml	2015-01-24 13:05:54 +0000
19
+++ PhotogridView.qml	2015-01-28 15:58:22 +0000
20
@@ -111,7 +111,9 @@
21
111
                
111
                
22
112
                asynchronous: true
112
                asynchronous: true
23
113
                cache: false
113
                cache: false
25
114
                source: photogridView.inView ? "image://thumbnailer/" + fileURL.toString() : ""
114
                // The thumbnailer does not seem to check when an image has been changed on disk,
26
115
                // so we use this hack to force it to check and refresh if necessary.
27
116
                source: photogridView.inView ? "image://thumbnailer/" + fileURL.toString() + "?at=" + Date.now() : ""
28
115
                sourceSize {
117
                sourceSize {
29
116
                    width: width
118
                    width: width
30
117
                    height: height
119
                    height: height
Status:	Merged
Approved by:	Bill Filler on 2015-02-02
Approved revision:	483
Merged at revision:	493
Proposed branch:	lp:~phablet-team/camera-app/watch-refresh-thumbs
Merge into:	lp:camera-app
Diff against target:	30 lines (+8/-1) 2 files modified CameraApp/foldersmodel.cpp (+5/-0) PhotogridView.qml (+3/-1)
To merge this branch:	bzr merge lp:~phablet-team/camera-app/watch-refresh-thumbs
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Florian Boucault (community)		2015-01-28	Needs Fixing on 2015-01-29
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-01-28
Review via email: mp+247837@code.launchpad.net