Merge lp:~schwann/gallery-app/gallery-remove-directory-includes into lp:gallery-app
- gallery-remove-directory-includes
- Merge into trunk
Proposed by
Günter Schwann
| Status: | Merged |
|---|---|
| Approved by: | Olivier Tilloy |
| Approved revision: | 688 |
| Merged at revision: | 688 |
| Proposed branch: | lp:~schwann/gallery-app/gallery-remove-directory-includes |
| Merge into: | lp:gallery-app |
| Diff against target: |
1610 lines (+402/-227) 74 files modified
src/CMakeLists.txt (+10/-2) src/album/CMakeLists.txt (+14/-0) src/album/album-collection.cpp (+9/-3) src/album/album-collection.h (+6/-4) src/album/album-default-template.h (+2/-2) src/album/album-page.cpp (+7/-4) src/album/album-page.h (+8/-4) src/album/album-template.h (+2/-2) src/album/album.cpp (+18/-7) src/album/album.h (+9/-5) src/core/CMakeLists.txt (+2/-1) src/core/container-source-collection.h (+2/-2) src/core/container-source.h (+3/-3) src/core/data-collection.cpp (+2/-2) src/core/data-collection.h (+4/-3) src/core/data-object.cpp (+2/-2) src/core/selectable-view-collection.h (+2/-2) src/database/CMakeLists.txt (+12/-0) src/database/album-table.cpp (+6/-2) src/database/album-table.h (+1/-1) src/database/database.cpp (+1/-1) src/database/database.h (+2/-2) src/database/media-table.cpp (+3/-3) src/database/media-table.h (+2/-2) src/database/photo-edit-table.cpp (+6/-4) src/event/CMakeLists.txt (+10/-0) src/event/event-collection.cpp (+9/-3) src/event/event-collection.h (+2/-2) src/event/event.cpp (+5/-3) src/event/event.h (+7/-4) src/gallery-application.cpp (+28/-16) src/gallery-application.h (+1/-1) src/gallery-manager.cpp (+22/-11) src/gallery-manager.h (+2/-1) src/media/CMakeLists.txt (+14/-0) src/media/media-collection.cpp (+13/-7) src/media/media-collection.h (+2/-1) src/media/media-monitor.h (+1/-1) src/media/media-source.cpp (+17/-7) src/media/media-source.h (+6/-3) src/media/preview-manager.cpp (+8/-4) src/photo/CMakeLists.txt (+12/-0) src/photo/photo-caches.h (+2/-2) src/photo/photo-edit-state.h (+2/-2) src/photo/photo-metadata.cpp (+2/-2) src/photo/photo-metadata.h (+1/-1) src/photo/photo.cpp (+20/-10) src/photo/photo.h (+6/-4) src/qml/CMakeLists.txt (+15/-0) src/qml/gallery-standard-image-provider.cpp (+7/-5) src/qml/gallery-standard-image-provider.h (+4/-4) src/qml/gallery-thumbnail-image-provider.cpp (+3/-1) src/qml/qml-album-collection-model.cpp (+5/-5) src/qml/qml-event-collection-model.cpp (+3/-3) src/qml/qml-event-overview-model.cpp (+5/-5) src/qml/qml-media-collection-model.cpp (+8/-8) src/qml/qml-view-collection-model.cpp (+3/-3) src/qml/qml-view-collection-model.h (+1/-1) src/util/CMakeLists.txt (+1/-1) src/util/collections.h (+1/-0) tests/unittests/command-line-parser/CMakeLists.txt (+1/-1) tests/unittests/command-line-parser/tst_commandlineparser.cpp (+1/-1) tests/unittests/gallerystandardimageprovider/CMakeLists.txt (+3/-0) tests/unittests/gallerystandardimageprovider/photometa-data.cpp (+1/-1) tests/unittests/gallerystandardimageprovider/preview-manager.cpp (+2/-2) tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp (+3/-3) tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt (+2/-1) tests/unittests/gallerythumbnailimageprovider/media/media-collection.h (+0/-28) tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp (+1/-1) tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp (+1/-1) tests/unittests/imaging/CMakeLists.txt (+1/-1) tests/unittests/imaging/tst_imaging.cpp (+1/-1) tests/unittests/resource/CMakeLists.txt (+1/-1) tests/unittests/resource/tst_resource.cpp (+1/-1) |
| To merge this branch: | bzr merge lp:~schwann/gallery-app/gallery-remove-directory-includes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Olivier Tilloy | Approve | ||
|
Review via email:
|
|||
Commit message
Remove directories from includes, but set them in the include paths
Description of the change
Remove the directories in the includes.
Set the include paths in the cmake files instead. As well as the target_library dependencies.
This nicely hightlights the dependencies (lots of circular dependencies).
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
review:
Needs Fixing
(continuous-integration)
- 686. By Günter Schwann
-
Work around cmake issues with circular dependencies
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:686
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Olivier Tilloy (osomon) wrote : | # |
44 + ${gallery_
45 + ${gallery_
46 + ${gallery_
47 + ${gallery_
Shouldn’t this be:
${gallery_
${gallery_
${gallery_
${gallery_
review:
Needs Information
Revision history for this message
| Olivier Tilloy (osomon) wrote : | # |
A suggestion: since #include statements are not prefixed with the subproject directory anymore, I would group them by subproject and separate each group with a blank line, and prefix it with a comment with the name of the subproject, e.g.:
// core
#include "container-
#include "selectable-
// media
#include "media-
// util
#include "collections.h"
#include "resource.h"
Revision history for this message
| Günter Schwann (schwann) wrote : | # |
> 44 + ${gallery_
> 45 + ${gallery_
> 46 + ${gallery_
> 47 + ${gallery_
>
> Shouldn’t this be:
>
> ${gallery_
> ${gallery_
> ${gallery_
> ${gallery_
I had this before. But I had to do this because of the cmake issues with circular dependencies
Revision history for this message
| Günter Schwann (schwann) wrote : | # |
> A suggestion: since #include statements are not prefixed with the subproject
> directory anymore, I would group them by subproject and separate each group
> with a blank line, and prefix it with a comment with the name of the
> subproject, e.g.:
Ok - I will do this
Revision history for this message
| Olivier Tilloy (osomon) wrote : | # |
> > 44 + ${gallery_
> > 45 + ${gallery_
> > 46 + ${gallery_
> > 47 + ${gallery_
> >
> > Shouldn’t this be:
> >
> > ${gallery_
> > ${gallery_
> > ${gallery_
> > ${gallery_
>
> I had this before. But I had to do this because of the cmake issues with
> circular dependencies
Ouch :(
Can you please add a comment there to explain?
- 687. By Günter Schwann
-
Comment the workaround in the cmake files
- 688. By Günter Schwann
-
Group and sort includes
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:687
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:688
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:688
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) : | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'src/CMakeLists.txt' | |||
| 2 | --- src/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 3 | +++ src/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 4 | @@ -1,13 +1,13 @@ | |||
| 5 | 1 | project(gallery_src) | 1 | project(gallery_src) |
| 6 | 2 | 2 | ||
| 7 | 3 | add_subdirectory(util) | ||
| 8 | 4 | add_subdirectory(core) | ||
| 9 | 3 | add_subdirectory(album) | 5 | add_subdirectory(album) |
| 10 | 4 | add_subdirectory(core) | ||
| 11 | 5 | add_subdirectory(database) | 6 | add_subdirectory(database) |
| 12 | 6 | add_subdirectory(event) | 7 | add_subdirectory(event) |
| 13 | 7 | add_subdirectory(media) | 8 | add_subdirectory(media) |
| 14 | 8 | add_subdirectory(photo) | 9 | add_subdirectory(photo) |
| 15 | 9 | add_subdirectory(qml) | 10 | add_subdirectory(qml) |
| 16 | 10 | add_subdirectory(util) | ||
| 17 | 11 | 11 | ||
| 18 | 12 | configure_file( | 12 | configure_file( |
| 19 | 13 | config.h.in | 13 | config.h.in |
| 20 | @@ -18,6 +18,14 @@ | |||
| 21 | 18 | set(GALLERY gallery-app) | 18 | set(GALLERY gallery-app) |
| 22 | 19 | 19 | ||
| 23 | 20 | include_directories( | 20 | include_directories( |
| 24 | 21 | ${gallery_album_src_SOURCE_DIR} | ||
| 25 | 22 | ${gallery_core_src_SOURCE_DIR} | ||
| 26 | 23 | ${gallery_database_src_SOURCE_DIR} | ||
| 27 | 24 | ${gallery_event_src_SOURCE_DIR} | ||
| 28 | 25 | ${gallery_media_src_SOURCE_DIR} | ||
| 29 | 26 | ${gallery_photo_src_SOURCE_DIR} | ||
| 30 | 27 | ${gallery_qml_src_SOURCE_DIR} | ||
| 31 | 28 | ${gallery_util_src_SOURCE_DIR} | ||
| 32 | 21 | ${CMAKE_BINARY_DIR} | 29 | ${CMAKE_BINARY_DIR} |
| 33 | 22 | ${GSTLIB_INCLUDE_DIRS} | 30 | ${GSTLIB_INCLUDE_DIRS} |
| 34 | 23 | ) | 31 | ) |
| 35 | 24 | 32 | ||
| 36 | === modified file 'src/album/CMakeLists.txt' | |||
| 37 | --- src/album/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 38 | +++ src/album/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 39 | @@ -4,6 +4,14 @@ | |||
| 40 | 4 | 4 | ||
| 41 | 5 | include_directories( | 5 | include_directories( |
| 42 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_src_SOURCE_DIR} |
| 43 | 7 | ${gallery_core_src_SOURCE_DIR} | ||
| 44 | 8 | # because of circulate dependencies the sub project can't be used directly | ||
| 45 | 9 | # FIXME resolve the circulate dependencies | ||
| 46 | 10 | ${gallery_src_SOURCE_DIR}/database | ||
| 47 | 11 | ${gallery_src_SOURCE_DIR}/media | ||
| 48 | 12 | ${gallery_src_SOURCE_DIR}/photo | ||
| 49 | 13 | ${gallery_src_SOURCE_DIR}/qml | ||
| 50 | 14 | ${gallery_util_src_SOURCE_DIR} | ||
| 51 | 7 | ${CMAKE_BINARY_DIR} | 15 | ${CMAKE_BINARY_DIR} |
| 52 | 8 | ${GSTLIB_INCLUDE_DIRS} | 16 | ${GSTLIB_INCLUDE_DIRS} |
| 53 | 9 | ) | 17 | ) |
| 54 | @@ -33,5 +41,11 @@ | |||
| 55 | 33 | qt5_use_modules(${GALLERY_ALBUM_LIB} Widgets Core Qml) | 41 | qt5_use_modules(${GALLERY_ALBUM_LIB} Widgets Core Qml) |
| 56 | 34 | 42 | ||
| 57 | 35 | target_link_libraries( ${GALLERY_ALBUM_LIB} | 43 | target_link_libraries( ${GALLERY_ALBUM_LIB} |
| 58 | 44 | gallery-core | ||
| 59 | 45 | gallery-database | ||
| 60 | 46 | gallery-media | ||
| 61 | 47 | gallery-photo | ||
| 62 | 48 | gallery-qml | ||
| 63 | 49 | gallery-util | ||
| 64 | 36 | ${GSTLIB_LDFLAGS} | 50 | ${GSTLIB_LDFLAGS} |
| 65 | 37 | ) | 51 | ) |
| 66 | 38 | 52 | ||
| 67 | === modified file 'src/album/album-collection.cpp' | |||
| 68 | --- src/album/album-collection.cpp 2013-05-28 13:50:03 +0000 | |||
| 69 | +++ src/album/album-collection.cpp 2013-06-06 16:04:27 +0000 | |||
| 70 | @@ -18,9 +18,15 @@ | |||
| 71 | 18 | */ | 18 | */ |
| 72 | 19 | 19 | ||
| 73 | 20 | #include "album-collection.h" | 20 | #include "album-collection.h" |
| 77 | 21 | #include "media/media-collection.h" | 21 | |
| 78 | 22 | #include "database/database.h" | 22 | // database |
| 79 | 23 | #include "database/album-table.h" | 23 | #include "album-table.h" |
| 80 | 24 | #include "database.h" | ||
| 81 | 25 | |||
| 82 | 26 | // media | ||
| 83 | 27 | #include "media-collection.h" | ||
| 84 | 28 | |||
| 85 | 29 | // src | ||
| 86 | 24 | #include "gallery-manager.h" | 30 | #include "gallery-manager.h" |
| 87 | 25 | 31 | ||
| 88 | 26 | /*! | 32 | /*! |
| 89 | 27 | 33 | ||
| 90 | === modified file 'src/album/album-collection.h' | |||
| 91 | --- src/album/album-collection.h 2013-05-28 13:50:03 +0000 | |||
| 92 | +++ src/album/album-collection.h 2013-06-06 16:04:27 +0000 | |||
| 93 | @@ -20,12 +20,14 @@ | |||
| 94 | 20 | #ifndef GALLERY_ALBUM_COLLECTION_H_ | 20 | #ifndef GALLERY_ALBUM_COLLECTION_H_ |
| 95 | 21 | #define GALLERY_ALBUM_COLLECTION_H_ | 21 | #define GALLERY_ALBUM_COLLECTION_H_ |
| 96 | 22 | 22 | ||
| 97 | 23 | #include "album.h" | ||
| 98 | 24 | |||
| 99 | 25 | // core | ||
| 100 | 26 | #include "container-source-collection.h" | ||
| 101 | 27 | #include "data-object.h" | ||
| 102 | 28 | |||
| 103 | 23 | #include <QObject> | 29 | #include <QObject> |
| 104 | 24 | 30 | ||
| 105 | 25 | #include "album.h" | ||
| 106 | 26 | #include "core/container-source-collection.h" | ||
| 107 | 27 | #include "core/data-object.h" | ||
| 108 | 28 | |||
| 109 | 29 | /*! | 31 | /*! |
| 110 | 30 | * \brief The AlbumCollection class | 32 | * \brief The AlbumCollection class |
| 111 | 31 | */ | 33 | */ |
| 112 | 32 | 34 | ||
| 113 | === modified file 'src/album/album-default-template.h' | |||
| 114 | --- src/album/album-default-template.h 2013-05-28 13:50:03 +0000 | |||
| 115 | +++ src/album/album-default-template.h 2013-06-06 16:04:27 +0000 | |||
| 116 | @@ -21,10 +21,10 @@ | |||
| 117 | 21 | #ifndef GALLERY_ALBUM_DEFAULT_TEMPLATE_H_ | 21 | #ifndef GALLERY_ALBUM_DEFAULT_TEMPLATE_H_ |
| 118 | 22 | #define GALLERY_ALBUM_DEFAULT_TEMPLATE_H_ | 22 | #define GALLERY_ALBUM_DEFAULT_TEMPLATE_H_ |
| 119 | 23 | 23 | ||
| 120 | 24 | #include "album-template.h" | ||
| 121 | 25 | |||
| 122 | 24 | #include <QObject> | 26 | #include <QObject> |
| 123 | 25 | 27 | ||
| 124 | 26 | #include "album-template.h" | ||
| 125 | 27 | |||
| 126 | 28 | /*! | 28 | /*! |
| 127 | 29 | * \brief The AlbumDefaultTemplate class | 29 | * \brief The AlbumDefaultTemplate class |
| 128 | 30 | */ | 30 | */ |
| 129 | 31 | 31 | ||
| 130 | === modified file 'src/album/album-page.cpp' | |||
| 131 | --- src/album/album-page.cpp 2013-05-28 13:50:03 +0000 | |||
| 132 | +++ src/album/album-page.cpp 2013-06-06 16:04:27 +0000 | |||
| 133 | @@ -19,10 +19,13 @@ | |||
| 134 | 19 | 19 | ||
| 135 | 20 | #include "album-page.h" | 20 | #include "album-page.h" |
| 136 | 21 | #include "album.h" | 21 | #include "album.h" |
| 141 | 22 | #include "media/media-collection.h" | 22 | |
| 142 | 23 | #include "util/collections.h" | 23 | // media |
| 143 | 24 | #include "util/resource.h" | 24 | #include "media-collection.h" |
| 144 | 25 | #include "gallery-manager.h" | 25 | |
| 145 | 26 | // util | ||
| 146 | 27 | #include "collections.h" | ||
| 147 | 28 | #include "resource.h" | ||
| 148 | 26 | 29 | ||
| 149 | 27 | /*! | 30 | /*! |
| 150 | 28 | * \brief AlbumPage::AlbumPage | 31 | * \brief AlbumPage::AlbumPage |
| 151 | 29 | 32 | ||
| 152 | === modified file 'src/album/album-page.h' | |||
| 153 | --- src/album/album-page.h 2013-05-28 13:50:03 +0000 | |||
| 154 | +++ src/album/album-page.h 2013-06-06 16:04:27 +0000 | |||
| 155 | @@ -20,13 +20,17 @@ | |||
| 156 | 20 | #ifndef GALLERY_ALBUM_PAGE_H_ | 20 | #ifndef GALLERY_ALBUM_PAGE_H_ |
| 157 | 21 | #define GALLERY_ALBUM_PAGE_H_ | 21 | #define GALLERY_ALBUM_PAGE_H_ |
| 158 | 22 | 22 | ||
| 159 | 23 | #include "album-template-page.h" | ||
| 160 | 24 | |||
| 161 | 25 | // core | ||
| 162 | 26 | #include "container-source.h" | ||
| 163 | 27 | |||
| 164 | 28 | // media | ||
| 165 | 29 | #include "media-source.h" | ||
| 166 | 30 | |||
| 167 | 23 | #include <QObject> | 31 | #include <QObject> |
| 168 | 24 | #include <QUrl> | 32 | #include <QUrl> |
| 169 | 25 | 33 | ||
| 170 | 26 | #include "album-template-page.h" | ||
| 171 | 27 | #include "core/container-source.h" | ||
| 172 | 28 | #include "media/media-source.h" | ||
| 173 | 29 | |||
| 174 | 30 | class Album; | 34 | class Album; |
| 175 | 31 | 35 | ||
| 176 | 32 | /*! | 36 | /*! |
| 177 | 33 | 37 | ||
| 178 | === modified file 'src/album/album-template.h' | |||
| 179 | --- src/album/album-template.h 2013-05-28 13:50:03 +0000 | |||
| 180 | +++ src/album/album-template.h 2013-06-06 16:04:27 +0000 | |||
| 181 | @@ -20,12 +20,12 @@ | |||
| 182 | 20 | #ifndef GALLERY_ALBUM_TEMPLATE_H_ | 20 | #ifndef GALLERY_ALBUM_TEMPLATE_H_ |
| 183 | 21 | #define GALLERY_ALBUM_TEMPLATE_H_ | 21 | #define GALLERY_ALBUM_TEMPLATE_H_ |
| 184 | 22 | 22 | ||
| 185 | 23 | #include "album-template-page.h" | ||
| 186 | 24 | |||
| 187 | 23 | #include <QObject> | 25 | #include <QObject> |
| 188 | 24 | #include <QList> | 26 | #include <QList> |
| 189 | 25 | #include <QString> | 27 | #include <QString> |
| 190 | 26 | 28 | ||
| 191 | 27 | #include "album-template-page.h" | ||
| 192 | 28 | |||
| 193 | 29 | /*! | 29 | /*! |
| 194 | 30 | * \brief The AlbumTemplate class | 30 | * \brief The AlbumTemplate class |
| 195 | 31 | */ | 31 | */ |
| 196 | 32 | 32 | ||
| 197 | === modified file 'src/album/album.cpp' | |||
| 198 | --- src/album/album.cpp 2013-05-28 13:50:03 +0000 | |||
| 199 | +++ src/album/album.cpp 2013-06-06 16:04:27 +0000 | |||
| 200 | @@ -18,17 +18,28 @@ | |||
| 201 | 18 | * Charles Lindsay <chaz@yorba.org> | 18 | * Charles Lindsay <chaz@yorba.org> |
| 202 | 19 | */ | 19 | */ |
| 203 | 20 | 20 | ||
| 204 | 21 | |||
| 205 | 22 | #include "album.h" | 21 | #include "album.h" |
| 206 | 23 | #include "album-collection.h" | 22 | #include "album-collection.h" |
| 207 | 24 | #include "album-default-template.h" | 23 | #include "album-default-template.h" |
| 211 | 25 | #include "core/selectable-view-collection.h" | 24 | |
| 212 | 26 | #include "database/album-table.h" | 25 | // core |
| 213 | 27 | #include "database/database.h" | 26 | #include "selectable-view-collection.h" |
| 214 | 27 | |||
| 215 | 28 | // database | ||
| 216 | 29 | #include "album-table.h" | ||
| 217 | 30 | #include "database.h" | ||
| 218 | 31 | |||
| 219 | 32 | // media | ||
| 220 | 33 | #include "media-collection.h" | ||
| 221 | 34 | |||
| 222 | 35 | // qml | ||
| 223 | 36 | #include "qml-media-collection-model.h" | ||
| 224 | 37 | |||
| 225 | 38 | // util | ||
| 226 | 39 | #include "variants.h" | ||
| 227 | 40 | |||
| 228 | 41 | // src | ||
| 229 | 28 | #include "gallery-manager.h" | 42 | #include "gallery-manager.h" |
| 230 | 29 | #include "media/media-collection.h" | ||
| 231 | 30 | #include "qml/qml-media-collection-model.h" | ||
| 232 | 31 | #include "util/variants.h" | ||
| 233 | 32 | 43 | ||
| 234 | 33 | const char *Album::DEFAULT_TITLE = "New Photo Album"; | 44 | const char *Album::DEFAULT_TITLE = "New Photo Album"; |
| 235 | 34 | const char *Album::DEFAULT_SUBTITLE = "Subtitle"; | 45 | const char *Album::DEFAULT_SUBTITLE = "Subtitle"; |
| 236 | 35 | 46 | ||
| 237 | === modified file 'src/album/album.h' | |||
| 238 | --- src/album/album.h 2013-05-28 13:50:03 +0000 | |||
| 239 | +++ src/album/album.h 2013-06-06 16:04:27 +0000 | |||
| 240 | @@ -21,16 +21,20 @@ | |||
| 241 | 21 | #ifndef GALLERY_ALBUM_H_ | 21 | #ifndef GALLERY_ALBUM_H_ |
| 242 | 22 | #define GALLERY_ALBUM_H_ | 22 | #define GALLERY_ALBUM_H_ |
| 243 | 23 | 23 | ||
| 244 | 24 | #include "album-page.h" | ||
| 245 | 25 | #include "album-template.h" | ||
| 246 | 26 | |||
| 247 | 27 | // core | ||
| 248 | 28 | #include "container-source.h" | ||
| 249 | 29 | |||
| 250 | 30 | // media | ||
| 251 | 31 | #include "media-source.h" | ||
| 252 | 32 | |||
| 253 | 24 | #include <QDateTime> | 33 | #include <QDateTime> |
| 254 | 25 | #include <QQmlListProperty> | 34 | #include <QQmlListProperty> |
| 255 | 26 | #include <QString> | 35 | #include <QString> |
| 256 | 27 | #include <QVariant> | 36 | #include <QVariant> |
| 257 | 28 | 37 | ||
| 258 | 29 | #include "album-page.h" | ||
| 259 | 30 | #include "album-template.h" | ||
| 260 | 31 | #include "core/container-source.h" | ||
| 261 | 32 | #include "media/media-source.h" | ||
| 262 | 33 | |||
| 263 | 34 | /*! | 38 | /*! |
| 264 | 35 | * \brief The AlbumTemplate class | 39 | * \brief The AlbumTemplate class |
| 265 | 36 | 40 | ||
| 266 | 37 | 41 | ||
| 267 | === modified file 'src/core/CMakeLists.txt' | |||
| 268 | --- src/core/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 269 | +++ src/core/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 270 | @@ -3,7 +3,7 @@ | |||
| 271 | 3 | set(GALLERY_CORE_LIB gallery-core) | 3 | set(GALLERY_CORE_LIB gallery-core) |
| 272 | 4 | 4 | ||
| 273 | 5 | include_directories( | 5 | include_directories( |
| 275 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_util_src_SOURCE_DIR} |
| 276 | 7 | ${CMAKE_BINARY_DIR} | 7 | ${CMAKE_BINARY_DIR} |
| 277 | 8 | ${GSTLIB_INCLUDE_DIRS} | 8 | ${GSTLIB_INCLUDE_DIRS} |
| 278 | 9 | ) | 9 | ) |
| 279 | @@ -37,5 +37,6 @@ | |||
| 280 | 37 | qt5_use_modules(${GALLERY_CORE_LIB} Core Quick) | 37 | qt5_use_modules(${GALLERY_CORE_LIB} Core Quick) |
| 281 | 38 | 38 | ||
| 282 | 39 | target_link_libraries( ${GALLERY_CORE_LIB} | 39 | target_link_libraries( ${GALLERY_CORE_LIB} |
| 283 | 40 | gallery-util | ||
| 284 | 40 | ${GSTLIB_LDFLAGS} | 41 | ${GSTLIB_LDFLAGS} |
| 285 | 41 | ) | 42 | ) |
| 286 | 42 | 43 | ||
| 287 | === modified file 'src/core/container-source-collection.h' | |||
| 288 | --- src/core/container-source-collection.h 2013-05-28 13:50:03 +0000 | |||
| 289 | +++ src/core/container-source-collection.h 2013-06-06 16:04:27 +0000 | |||
| 290 | @@ -20,11 +20,11 @@ | |||
| 291 | 20 | #ifndef GALLERY_CONTAINER_SOURCE_COLLECTION_H_ | 20 | #ifndef GALLERY_CONTAINER_SOURCE_COLLECTION_H_ |
| 292 | 21 | #define GALLERY_CONTAINER_SOURCE_COLLECTION_H_ | 21 | #define GALLERY_CONTAINER_SOURCE_COLLECTION_H_ |
| 293 | 22 | 22 | ||
| 294 | 23 | #include <QString> | ||
| 295 | 24 | |||
| 296 | 25 | #include "data-object.h" | 23 | #include "data-object.h" |
| 297 | 26 | #include "source-collection.h" | 24 | #include "source-collection.h" |
| 298 | 27 | 25 | ||
| 299 | 26 | #include <QString> | ||
| 300 | 27 | |||
| 301 | 28 | /** | 28 | /** |
| 302 | 29 | * ContainerSourceCollection is a SourceCollection that holds ContainerSources. | 29 | * ContainerSourceCollection is a SourceCollection that holds ContainerSources. |
| 303 | 30 | * That is, it represents all active ContainerSources of a particular finalized | 30 | * That is, it represents all active ContainerSources of a particular finalized |
| 304 | 31 | 31 | ||
| 305 | === modified file 'src/core/container-source.h' | |||
| 306 | --- src/core/container-source.h 2013-05-28 13:50:03 +0000 | |||
| 307 | +++ src/core/container-source.h 2013-06-06 16:04:27 +0000 | |||
| 308 | @@ -20,13 +20,13 @@ | |||
| 309 | 20 | #ifndef GALLERY_CONTAINER_SOURCE_H_ | 20 | #ifndef GALLERY_CONTAINER_SOURCE_H_ |
| 310 | 21 | #define GALLERY_CONTAINER_SOURCE_H_ | 21 | #define GALLERY_CONTAINER_SOURCE_H_ |
| 311 | 22 | 22 | ||
| 312 | 23 | #include <QObject> | ||
| 313 | 24 | #include <QSet> | ||
| 314 | 25 | |||
| 315 | 26 | #include "data-object.h" | 23 | #include "data-object.h" |
| 316 | 27 | #include "data-source.h" | 24 | #include "data-source.h" |
| 317 | 28 | #include "view-collection.h" | 25 | #include "view-collection.h" |
| 318 | 29 | 26 | ||
| 319 | 27 | #include <QObject> | ||
| 320 | 28 | #include <QSet> | ||
| 321 | 29 | |||
| 322 | 30 | /** | 30 | /** |
| 323 | 31 | * A ContainerSource is a DataSource that holds other DataSources. Generally | 31 | * A ContainerSource is a DataSource that holds other DataSources. Generally |
| 324 | 32 | * these are used for organizational features. | 32 | * these are used for organizational features. |
| 325 | 33 | 33 | ||
| 326 | === modified file 'src/core/data-collection.cpp' | |||
| 327 | --- src/core/data-collection.cpp 2013-05-28 13:50:03 +0000 | |||
| 328 | +++ src/core/data-collection.cpp 2013-06-06 16:04:27 +0000 | |||
| 329 | @@ -17,11 +17,11 @@ | |||
| 330 | 17 | * Jim Nelson <jim@yorba.org> | 17 | * Jim Nelson <jim@yorba.org> |
| 331 | 18 | */ | 18 | */ |
| 332 | 19 | 19 | ||
| 333 | 20 | #include <QQmlEngine> | ||
| 334 | 21 | |||
| 335 | 22 | #include "data-collection.h" | 20 | #include "data-collection.h" |
| 336 | 23 | #include "data-object.h" | 21 | #include "data-object.h" |
| 337 | 24 | 22 | ||
| 338 | 23 | #include <QQmlEngine> | ||
| 339 | 24 | |||
| 340 | 25 | /*! | 25 | /*! |
| 341 | 26 | * \brief DataCollection::DataCollection | 26 | * \brief DataCollection::DataCollection |
| 342 | 27 | * \param name | 27 | * \param name |
| 343 | 28 | 28 | ||
| 344 | === modified file 'src/core/data-collection.h' | |||
| 345 | --- src/core/data-collection.h 2013-05-29 15:02:27 +0000 | |||
| 346 | +++ src/core/data-collection.h 2013-06-06 16:04:27 +0000 | |||
| 347 | @@ -20,14 +20,15 @@ | |||
| 348 | 20 | #ifndef GALLERY_DATA_COLLECTION_H_ | 20 | #ifndef GALLERY_DATA_COLLECTION_H_ |
| 349 | 21 | #define GALLERY_DATA_COLLECTION_H_ | 21 | #define GALLERY_DATA_COLLECTION_H_ |
| 350 | 22 | 22 | ||
| 352 | 23 | #include <QObject> | 23 | // core |
| 353 | 24 | #include "collections.h" | ||
| 354 | 25 | |||
| 355 | 24 | #include <QByteArray> | 26 | #include <QByteArray> |
| 356 | 25 | #include <QList> | 27 | #include <QList> |
| 357 | 28 | #include <QObject> | ||
| 358 | 26 | #include <QSet> | 29 | #include <QSet> |
| 359 | 27 | #include <QString> | 30 | #include <QString> |
| 360 | 28 | 31 | ||
| 361 | 29 | #include "util/collections.h" | ||
| 362 | 30 | |||
| 363 | 31 | class DataObject; | 32 | class DataObject; |
| 364 | 32 | 33 | ||
| 365 | 33 | // Defined as a LessThan comparator (return true if a is less than b) | 34 | // Defined as a LessThan comparator (return true if a is less than b) |
| 366 | 34 | 35 | ||
| 367 | === modified file 'src/core/data-object.cpp' | |||
| 368 | --- src/core/data-object.cpp 2013-05-28 13:50:03 +0000 | |||
| 369 | +++ src/core/data-object.cpp 2013-06-06 16:04:27 +0000 | |||
| 370 | @@ -17,10 +17,10 @@ | |||
| 371 | 17 | * Jim Nelson <jim@yorba.org> | 17 | * Jim Nelson <jim@yorba.org> |
| 372 | 18 | */ | 18 | */ |
| 373 | 19 | 19 | ||
| 374 | 20 | #include "data-object.h" | ||
| 375 | 21 | |||
| 376 | 20 | #include <QQmlEngine> | 22 | #include <QQmlEngine> |
| 377 | 21 | 23 | ||
| 378 | 22 | #include "data-object.h" | ||
| 379 | 23 | |||
| 380 | 24 | DataObjectNumber DataObject::next_number_ = 0; | 24 | DataObjectNumber DataObject::next_number_ = 0; |
| 381 | 25 | 25 | ||
| 382 | 26 | /*! | 26 | /*! |
| 383 | 27 | 27 | ||
| 384 | === modified file 'src/core/selectable-view-collection.h' | |||
| 385 | --- src/core/selectable-view-collection.h 2013-05-28 13:50:03 +0000 | |||
| 386 | +++ src/core/selectable-view-collection.h 2013-06-06 16:04:27 +0000 | |||
| 387 | @@ -20,11 +20,11 @@ | |||
| 388 | 20 | #ifndef GALLERY_SELECTABLE_VIEW_COLLECTION_H_ | 20 | #ifndef GALLERY_SELECTABLE_VIEW_COLLECTION_H_ |
| 389 | 21 | #define GALLERY_SELECTABLE_VIEW_COLLECTION_H_ | 21 | #define GALLERY_SELECTABLE_VIEW_COLLECTION_H_ |
| 390 | 22 | 22 | ||
| 391 | 23 | #include <QSet> | ||
| 392 | 24 | |||
| 393 | 25 | #include "data-object.h" | 23 | #include "data-object.h" |
| 394 | 26 | #include "view-collection.h" | 24 | #include "view-collection.h" |
| 395 | 27 | 25 | ||
| 396 | 26 | #include <QSet> | ||
| 397 | 27 | |||
| 398 | 28 | /** | 28 | /** |
| 399 | 29 | * SelectableViewCollection adds the notion of selection to a ViewCollection. | 29 | * SelectableViewCollection adds the notion of selection to a ViewCollection. |
| 400 | 30 | * It's primarily of use in grid or checkerboard views when the user may want | 30 | * It's primarily of use in grid or checkerboard views when the user may want |
| 401 | 31 | 31 | ||
| 402 | === modified file 'src/database/CMakeLists.txt' | |||
| 403 | --- src/database/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 404 | +++ src/database/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 405 | @@ -4,6 +4,13 @@ | |||
| 406 | 4 | 4 | ||
| 407 | 5 | include_directories( | 5 | include_directories( |
| 408 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_src_SOURCE_DIR} |
| 409 | 7 | # because of circulate dependencies the sub project can't be used directly | ||
| 410 | 8 | # FIXME resolve the circulate dependencies | ||
| 411 | 9 | ${gallery_src_SOURCE_DIR}/album | ||
| 412 | 10 | ${gallery_core_src_SOURCE_DIR} | ||
| 413 | 11 | ${gallery_src_SOURCE_DIR}/media | ||
| 414 | 12 | ${gallery_src_SOURCE_DIR}/photo | ||
| 415 | 13 | ${gallery_util_src_SOURCE_DIR} | ||
| 416 | 7 | ${CMAKE_BINARY_DIR} | 14 | ${CMAKE_BINARY_DIR} |
| 417 | 8 | ${GSTLIB_INCLUDE_DIRS} | 15 | ${GSTLIB_INCLUDE_DIRS} |
| 418 | 9 | ) | 16 | ) |
| 419 | @@ -29,5 +36,10 @@ | |||
| 420 | 29 | qt5_use_modules(${GALLERY_DATABASE_LIB} Widgets Core Qml Quick Sql) | 36 | qt5_use_modules(${GALLERY_DATABASE_LIB} Widgets Core Qml Quick Sql) |
| 421 | 30 | 37 | ||
| 422 | 31 | target_link_libraries( ${GALLERY_DATABASE_LIB} | 38 | target_link_libraries( ${GALLERY_DATABASE_LIB} |
| 423 | 39 | gallery-album | ||
| 424 | 40 | gallery-core | ||
| 425 | 41 | gallery-media | ||
| 426 | 42 | gallery-photo | ||
| 427 | 43 | gallery-util | ||
| 428 | 32 | ${GSTLIB_LDFLAGS} | 44 | ${GSTLIB_LDFLAGS} |
| 429 | 33 | ) | 45 | ) |
| 430 | 34 | 46 | ||
| 431 | === modified file 'src/database/album-table.cpp' | |||
| 432 | --- src/database/album-table.cpp 2013-05-28 13:50:03 +0000 | |||
| 433 | +++ src/database/album-table.cpp 2013-06-06 16:04:27 +0000 | |||
| 434 | @@ -19,8 +19,12 @@ | |||
| 435 | 19 | 19 | ||
| 436 | 20 | #include "album-table.h" | 20 | #include "album-table.h" |
| 437 | 21 | #include "database.h" | 21 | #include "database.h" |
| 440 | 22 | #include "album/album.h" | 22 | |
| 441 | 23 | #include "album/album-default-template.h" | 23 | // album |
| 442 | 24 | #include "album.h" | ||
| 443 | 25 | #include "album-default-template.h" | ||
| 444 | 26 | |||
| 445 | 27 | // src | ||
| 446 | 24 | #include "gallery-manager.h" | 28 | #include "gallery-manager.h" |
| 447 | 25 | 29 | ||
| 448 | 26 | #include <QtSql> | 30 | #include <QtSql> |
| 449 | 27 | 31 | ||
| 450 | === modified file 'src/database/album-table.h' | |||
| 451 | --- src/database/album-table.h 2013-04-18 13:42:50 +0000 | |||
| 452 | +++ src/database/album-table.h 2013-06-06 16:04:27 +0000 | |||
| 453 | @@ -20,8 +20,8 @@ | |||
| 454 | 20 | #ifndef ALBUMTABLE_H | 20 | #ifndef ALBUMTABLE_H |
| 455 | 21 | #define ALBUMTABLE_H | 21 | #define ALBUMTABLE_H |
| 456 | 22 | 22 | ||
| 457 | 23 | #include <QList> | ||
| 458 | 23 | #include <QObject> | 24 | #include <QObject> |
| 459 | 24 | #include <QList> | ||
| 460 | 25 | 25 | ||
| 461 | 26 | class Album; | 26 | class Album; |
| 462 | 27 | class Database; | 27 | class Database; |
| 463 | 28 | 28 | ||
| 464 | === modified file 'src/database/database.cpp' | |||
| 465 | --- src/database/database.cpp 2013-06-05 08:52:51 +0000 | |||
| 466 | +++ src/database/database.cpp 2013-06-06 16:04:27 +0000 | |||
| 467 | @@ -24,8 +24,8 @@ | |||
| 468 | 24 | #include "photo-edit-table.h" | 24 | #include "photo-edit-table.h" |
| 469 | 25 | 25 | ||
| 470 | 26 | #include <QFile> | 26 | #include <QFile> |
| 471 | 27 | #include <QSqlTableModel> | ||
| 472 | 27 | #include <QtSql> | 28 | #include <QtSql> |
| 473 | 28 | #include <QSqlTableModel> | ||
| 474 | 29 | 29 | ||
| 475 | 30 | /*! | 30 | /*! |
| 476 | 31 | * \brief Database::Database | 31 | * \brief Database::Database |
| 477 | 32 | 32 | ||
| 478 | === modified file 'src/database/database.h' | |||
| 479 | --- src/database/database.h 2013-06-03 15:18:06 +0000 | |||
| 480 | +++ src/database/database.h 2013-06-06 16:04:27 +0000 | |||
| 481 | @@ -20,16 +20,16 @@ | |||
| 482 | 20 | #ifndef DATABASE_H | 20 | #ifndef DATABASE_H |
| 483 | 21 | #define DATABASE_H | 21 | #define DATABASE_H |
| 484 | 22 | 22 | ||
| 485 | 23 | #include <QFile> | ||
| 486 | 23 | #include <QObject> | 24 | #include <QObject> |
| 487 | 24 | #include <QFile> | ||
| 488 | 25 | #include <QString> | 25 | #include <QString> |
| 489 | 26 | 26 | ||
| 490 | 27 | class AlbumTable; | 27 | class AlbumTable; |
| 491 | 28 | class MediaTable; | 28 | class MediaTable; |
| 492 | 29 | class PhotoEditTable; | 29 | class PhotoEditTable; |
| 493 | 30 | 30 | ||
| 494 | 31 | class QSqlDatabase; | ||
| 495 | 31 | class QSqlQuery; | 32 | class QSqlQuery; |
| 496 | 32 | class QSqlDatabase; | ||
| 497 | 33 | 33 | ||
| 498 | 34 | const qint64 INVALID_ID = -1; | 34 | const qint64 INVALID_ID = -1; |
| 499 | 35 | 35 | ||
| 500 | 36 | 36 | ||
| 501 | === modified file 'src/database/media-table.cpp' | |||
| 502 | --- src/database/media-table.cpp 2013-05-28 13:50:03 +0000 | |||
| 503 | +++ src/database/media-table.cpp 2013-06-06 16:04:27 +0000 | |||
| 504 | @@ -17,12 +17,12 @@ | |||
| 505 | 17 | * Eric Gregory <eric@yorba.org> | 17 | * Eric Gregory <eric@yorba.org> |
| 506 | 18 | */ | 18 | */ |
| 507 | 19 | 19 | ||
| 508 | 20 | #include "media-table.h" | ||
| 509 | 21 | #include "database.h" | ||
| 510 | 22 | |||
| 511 | 20 | #include <QApplication> | 23 | #include <QApplication> |
| 512 | 21 | #include <QtSql> | 24 | #include <QtSql> |
| 513 | 22 | 25 | ||
| 514 | 23 | #include "media-table.h" | ||
| 515 | 24 | #include "database.h" | ||
| 516 | 25 | |||
| 517 | 26 | /*! | 26 | /*! |
| 518 | 27 | * \brief MediaTable::MediaTable | 27 | * \brief MediaTable::MediaTable |
| 519 | 28 | * \param db | 28 | * \param db |
| 520 | 29 | 29 | ||
| 521 | === modified file 'src/database/media-table.h' | |||
| 522 | --- src/database/media-table.h 2013-02-25 10:16:29 +0000 | |||
| 523 | +++ src/database/media-table.h 2013-06-06 16:04:27 +0000 | |||
| 524 | @@ -20,10 +20,10 @@ | |||
| 525 | 20 | #ifndef MEDIATABLE_H | 20 | #ifndef MEDIATABLE_H |
| 526 | 21 | #define MEDIATABLE_H | 21 | #define MEDIATABLE_H |
| 527 | 22 | 22 | ||
| 528 | 23 | #include "photo-metadata.h" | ||
| 529 | 24 | |||
| 530 | 23 | #include <QObject> | 25 | #include <QObject> |
| 531 | 24 | 26 | ||
| 532 | 25 | #include "photo/photo-metadata.h" | ||
| 533 | 26 | |||
| 534 | 27 | class Database; | 27 | class Database; |
| 535 | 28 | 28 | ||
| 536 | 29 | /*! | 29 | /*! |
| 537 | 30 | 30 | ||
| 538 | === modified file 'src/database/photo-edit-table.cpp' | |||
| 539 | --- src/database/photo-edit-table.cpp 2013-06-03 15:46:21 +0000 | |||
| 540 | +++ src/database/photo-edit-table.cpp 2013-06-06 16:04:27 +0000 | |||
| 541 | @@ -17,14 +17,16 @@ | |||
| 542 | 17 | * Charles Lindsay <chaz@yorba.org> | 17 | * Charles Lindsay <chaz@yorba.org> |
| 543 | 18 | */ | 18 | */ |
| 544 | 19 | 19 | ||
| 545 | 20 | #include "photo-edit-table.h" | ||
| 546 | 21 | #include "database.h" | ||
| 547 | 22 | |||
| 548 | 23 | // photo | ||
| 549 | 24 | #include "photo-edit-state.h" | ||
| 550 | 25 | |||
| 551 | 20 | #include <QSqlQuery> | 26 | #include <QSqlQuery> |
| 552 | 21 | #include <QStringList> | 27 | #include <QStringList> |
| 553 | 22 | #include <QVariant> | 28 | #include <QVariant> |
| 554 | 23 | 29 | ||
| 555 | 24 | #include "photo-edit-table.h" | ||
| 556 | 25 | #include "database.h" | ||
| 557 | 26 | #include "photo/photo-edit-state.h" | ||
| 558 | 27 | |||
| 559 | 28 | /*! | 30 | /*! |
| 560 | 29 | * \brief PhotoEditTable::PhotoEditTable | 31 | * \brief PhotoEditTable::PhotoEditTable |
| 561 | 30 | * \param db | 32 | * \param db |
| 562 | 31 | 33 | ||
| 563 | === modified file 'src/event/CMakeLists.txt' | |||
| 564 | --- src/event/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 565 | +++ src/event/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 566 | @@ -4,6 +4,12 @@ | |||
| 567 | 4 | 4 | ||
| 568 | 5 | include_directories( | 5 | include_directories( |
| 569 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_src_SOURCE_DIR} |
| 570 | 7 | ${gallery_core_src_SOURCE_DIR} | ||
| 571 | 8 | # because of circulate dependencies the sub project can't be used directly | ||
| 572 | 9 | # FIXME resolve the circulate dependencies | ||
| 573 | 10 | ${gallery_src_SOURCE_DIR}/media | ||
| 574 | 11 | ${gallery_src_SOURCE_DIR}/photo | ||
| 575 | 12 | ${gallery_util_src_SOURCE_DIR} | ||
| 576 | 7 | ${CMAKE_BINARY_DIR} | 13 | ${CMAKE_BINARY_DIR} |
| 577 | 8 | ${GSTLIB_INCLUDE_DIRS} | 14 | ${GSTLIB_INCLUDE_DIRS} |
| 578 | 9 | ) | 15 | ) |
| 579 | @@ -25,5 +31,9 @@ | |||
| 580 | 25 | qt5_use_modules(${GALLERY_EVENT_LIB} Widgets Core Qml) | 31 | qt5_use_modules(${GALLERY_EVENT_LIB} Widgets Core Qml) |
| 581 | 26 | 32 | ||
| 582 | 27 | target_link_libraries( ${GALLERY_EVENT_LIB} | 33 | target_link_libraries( ${GALLERY_EVENT_LIB} |
| 583 | 34 | gallery-core | ||
| 584 | 35 | gallery-media | ||
| 585 | 36 | gallery-photo | ||
| 586 | 37 | gallery-util | ||
| 587 | 28 | ${GSTLIB_LDFLAGS} | 38 | ${GSTLIB_LDFLAGS} |
| 588 | 29 | ) | 39 | ) |
| 589 | 30 | 40 | ||
| 590 | === modified file 'src/event/event-collection.cpp' | |||
| 591 | --- src/event/event-collection.cpp 2013-05-28 13:50:03 +0000 | |||
| 592 | +++ src/event/event-collection.cpp 2013-06-06 16:04:27 +0000 | |||
| 593 | @@ -19,9 +19,15 @@ | |||
| 594 | 19 | 19 | ||
| 595 | 20 | #include "event-collection.h" | 20 | #include "event-collection.h" |
| 596 | 21 | #include "event.h" | 21 | #include "event.h" |
| 600 | 22 | #include "core/data-object.h" | 22 | |
| 601 | 23 | #include "media/media-collection.h" | 23 | // core |
| 602 | 24 | #include "media/media-source.h" | 24 | #include "data-object.h" |
| 603 | 25 | |||
| 604 | 26 | // media | ||
| 605 | 27 | #include "media-collection.h" | ||
| 606 | 28 | #include "media-source.h" | ||
| 607 | 29 | |||
| 608 | 30 | // src | ||
| 609 | 25 | #include "gallery-manager.h" | 31 | #include "gallery-manager.h" |
| 610 | 26 | 32 | ||
| 611 | 27 | /*! | 33 | /*! |
| 612 | 28 | 34 | ||
| 613 | === modified file 'src/event/event-collection.h' | |||
| 614 | --- src/event/event-collection.h 2013-02-25 10:16:29 +0000 | |||
| 615 | +++ src/event/event-collection.h 2013-06-06 16:04:27 +0000 | |||
| 616 | @@ -20,12 +20,12 @@ | |||
| 617 | 20 | #ifndef GALLERY_EVENT_COLLECTION_H_ | 20 | #ifndef GALLERY_EVENT_COLLECTION_H_ |
| 618 | 21 | #define GALLERY_EVENT_COLLECTION_H_ | 21 | #define GALLERY_EVENT_COLLECTION_H_ |
| 619 | 22 | 22 | ||
| 620 | 23 | #include "source-collection.h" | ||
| 621 | 24 | |||
| 622 | 23 | #include <QDate> | 25 | #include <QDate> |
| 623 | 24 | #include <QHash> | 26 | #include <QHash> |
| 624 | 25 | #include <QSet> | 27 | #include <QSet> |
| 625 | 26 | 28 | ||
| 626 | 27 | #include "core/source-collection.h" | ||
| 627 | 28 | |||
| 628 | 29 | class DataObject; | 29 | class DataObject; |
| 629 | 30 | class Event; | 30 | class Event; |
| 630 | 31 | class MediaSource; | 31 | class MediaSource; |
| 631 | 32 | 32 | ||
| 632 | === modified file 'src/event/event.cpp' | |||
| 633 | --- src/event/event.cpp 2013-02-25 10:16:29 +0000 | |||
| 634 | +++ src/event/event.cpp 2013-06-06 16:04:27 +0000 | |||
| 635 | @@ -17,11 +17,13 @@ | |||
| 636 | 17 | * Jim Nelson <jim@yorba.org> | 17 | * Jim Nelson <jim@yorba.org> |
| 637 | 18 | */ | 18 | */ |
| 638 | 19 | 19 | ||
| 639 | 20 | #include "event.h" | ||
| 640 | 21 | |||
| 641 | 22 | // media | ||
| 642 | 23 | #include "media-collection.h" | ||
| 643 | 24 | |||
| 644 | 20 | #include <QString> | 25 | #include <QString> |
| 645 | 21 | 26 | ||
| 646 | 22 | #include "event.h" | ||
| 647 | 23 | #include "media/media-collection.h" | ||
| 648 | 24 | |||
| 649 | 25 | /*! | 27 | /*! |
| 650 | 26 | * \brief Event::Event | 28 | * \brief Event::Event |
| 651 | 27 | * \param parent | 29 | * \param parent |
| 652 | 28 | 30 | ||
| 653 | === modified file 'src/event/event.h' | |||
| 654 | --- src/event/event.h 2013-02-25 10:16:29 +0000 | |||
| 655 | +++ src/event/event.h 2013-06-06 16:04:27 +0000 | |||
| 656 | @@ -20,12 +20,15 @@ | |||
| 657 | 20 | #ifndef GALLERY_EVENT_H_ | 20 | #ifndef GALLERY_EVENT_H_ |
| 658 | 21 | #define GALLERY_EVENT_H_ | 21 | #define GALLERY_EVENT_H_ |
| 659 | 22 | 22 | ||
| 661 | 23 | #include <QObject> | 23 | // core |
| 662 | 24 | #include "container-source.h" | ||
| 663 | 25 | |||
| 664 | 26 | // media | ||
| 665 | 27 | #include "media-source.h" | ||
| 666 | 28 | |||
| 667 | 24 | #include <QDate> | 29 | #include <QDate> |
| 668 | 25 | #include <QDateTime> | 30 | #include <QDateTime> |
| 672 | 26 | 31 | #include <QObject> | |
| 670 | 27 | #include "core/container-source.h" | ||
| 671 | 28 | #include "media/media-source.h" | ||
| 673 | 29 | 32 | ||
| 674 | 30 | /*! | 33 | /*! |
| 675 | 31 | * \brief The Event class | 34 | * \brief The Event class |
| 676 | 32 | 35 | ||
| 677 | === modified file 'src/gallery-application.cpp' | |||
| 678 | --- src/gallery-application.cpp 2013-05-28 13:50:03 +0000 | |||
| 679 | +++ src/gallery-application.cpp 2013-06-06 16:04:27 +0000 | |||
| 680 | @@ -23,22 +23,34 @@ | |||
| 681 | 23 | 23 | ||
| 682 | 24 | #include "gallery-application.h" | 24 | #include "gallery-application.h" |
| 683 | 25 | #include "gallery-manager.h" | 25 | #include "gallery-manager.h" |
| 700 | 26 | #include "album/album.h" | 26 | |
| 701 | 27 | #include "album/album-page.h" | 27 | // album |
| 702 | 28 | #include "event/event.h" | 28 | #include "album.h" |
| 703 | 29 | #include "media/media-collection.h" | 29 | #include "album-page.h" |
| 704 | 30 | #include "media/media-monitor.h" | 30 | |
| 705 | 31 | #include "media/media-source.h" | 31 | // event |
| 706 | 32 | #include "photo/photo.h" | 32 | #include "event.h" |
| 707 | 33 | #include "qml/gallery-standard-image-provider.h" | 33 | |
| 708 | 34 | #include "qml/gallery-thumbnail-image-provider.h" | 34 | // media |
| 709 | 35 | #include "qml/qml-album-collection-model.h" | 35 | #include "media-collection.h" |
| 710 | 36 | #include "qml/qml-event-collection-model.h" | 36 | #include "media-monitor.h" |
| 711 | 37 | #include "qml/qml-event-overview-model.h" | 37 | #include "media-source.h" |
| 712 | 38 | #include "qml/qml-media-collection-model.h" | 38 | |
| 713 | 39 | #include "util/command-line-parser.h" | 39 | // photo |
| 714 | 40 | #include "util/resource.h" | 40 | #include "photo.h" |
| 715 | 41 | #include "util/sharefile.h" | 41 | |
| 716 | 42 | // qml | ||
| 717 | 43 | #include "gallery-standard-image-provider.h" | ||
| 718 | 44 | #include "gallery-thumbnail-image-provider.h" | ||
| 719 | 45 | #include "qml-album-collection-model.h" | ||
| 720 | 46 | #include "qml-event-collection-model.h" | ||
| 721 | 47 | #include "qml-event-overview-model.h" | ||
| 722 | 48 | #include "qml-media-collection-model.h" | ||
| 723 | 49 | |||
| 724 | 50 | // util | ||
| 725 | 51 | #include "command-line-parser.h" | ||
| 726 | 52 | #include "resource.h" | ||
| 727 | 53 | #include "sharefile.h" | ||
| 728 | 42 | 54 | ||
| 729 | 43 | /*! | 55 | /*! |
| 730 | 44 | * \brief GalleryApplication::GalleryApplication | 56 | * \brief GalleryApplication::GalleryApplication |
| 731 | 45 | 57 | ||
| 732 | === modified file 'src/gallery-application.h' | |||
| 733 | --- src/gallery-application.h 2013-05-28 13:50:03 +0000 | |||
| 734 | +++ src/gallery-application.h 2013-06-06 16:04:27 +0000 | |||
| 735 | @@ -21,9 +21,9 @@ | |||
| 736 | 21 | #define GALLERYAPPLICATION_H | 21 | #define GALLERYAPPLICATION_H |
| 737 | 22 | 22 | ||
| 738 | 23 | #include <QApplication> | 23 | #include <QApplication> |
| 739 | 24 | #include <QQuickView> | ||
| 740 | 25 | #include <QElapsedTimer> | 24 | #include <QElapsedTimer> |
| 741 | 26 | #include <QFileInfo> | 25 | #include <QFileInfo> |
| 742 | 26 | #include <QQuickView> | ||
| 743 | 27 | 27 | ||
| 744 | 28 | class CommandLineParser; | 28 | class CommandLineParser; |
| 745 | 29 | class GalleryManager; | 29 | class GalleryManager; |
| 746 | 30 | 30 | ||
| 747 | === modified file 'src/gallery-manager.cpp' | |||
| 748 | --- src/gallery-manager.cpp 2013-06-04 10:21:17 +0000 | |||
| 749 | +++ src/gallery-manager.cpp 2013-06-06 16:04:27 +0000 | |||
| 750 | @@ -19,17 +19,28 @@ | |||
| 751 | 19 | */ | 19 | */ |
| 752 | 20 | 20 | ||
| 753 | 21 | #include "gallery-manager.h" | 21 | #include "gallery-manager.h" |
| 765 | 22 | #include "album/album-collection.h" | 22 | |
| 766 | 23 | #include "album/album-default-template.h" | 23 | // album |
| 767 | 24 | #include "database/database.h" | 24 | #include "album-collection.h" |
| 768 | 25 | #include "database/media-table.h" | 25 | #include "album-default-template.h" |
| 769 | 26 | #include "event/event-collection.h" | 26 | |
| 770 | 27 | #include "media/media-collection.h" | 27 | // database |
| 771 | 28 | #include "media/preview-manager.h" | 28 | #include "database.h" |
| 772 | 29 | #include "qml/gallery-standard-image-provider.h" | 29 | #include "media-table.h" |
| 773 | 30 | #include "qml/gallery-thumbnail-image-provider.h" | 30 | |
| 774 | 31 | #include "util/command-line-parser.h" | 31 | // event |
| 775 | 32 | #include "util/resource.h" | 32 | #include "event-collection.h" |
| 776 | 33 | |||
| 777 | 34 | // media | ||
| 778 | 35 | #include "media-collection.h" | ||
| 779 | 36 | #include "preview-manager.h" | ||
| 780 | 37 | |||
| 781 | 38 | // qml | ||
| 782 | 39 | #include "gallery-standard-image-provider.h" | ||
| 783 | 40 | #include "gallery-thumbnail-image-provider.h" | ||
| 784 | 41 | |||
| 785 | 42 | // util | ||
| 786 | 43 | #include "resource.h" | ||
| 787 | 33 | 44 | ||
| 788 | 34 | GalleryManager* GalleryManager::gallery_mgr_ = NULL; | 45 | GalleryManager* GalleryManager::gallery_mgr_ = NULL; |
| 789 | 35 | 46 | ||
| 790 | 36 | 47 | ||
| 791 | === modified file 'src/gallery-manager.h' | |||
| 792 | --- src/gallery-manager.h 2013-06-04 10:21:17 +0000 | |||
| 793 | +++ src/gallery-manager.h 2013-06-06 16:04:27 +0000 | |||
| 794 | @@ -20,8 +20,9 @@ | |||
| 795 | 20 | #ifndef GALLERYMANAGER_H | 20 | #ifndef GALLERYMANAGER_H |
| 796 | 21 | #define GALLERYMANAGER_H | 21 | #define GALLERYMANAGER_H |
| 797 | 22 | 22 | ||
| 798 | 23 | #include <QDir> | ||
| 799 | 24 | |||
| 800 | 23 | #include <cstddef> | 25 | #include <cstddef> |
| 801 | 24 | #include <QDir> | ||
| 802 | 25 | 26 | ||
| 803 | 26 | class QQuickView; | 27 | class QQuickView; |
| 804 | 27 | 28 | ||
| 805 | 28 | 29 | ||
| 806 | === modified file 'src/media/CMakeLists.txt' | |||
| 807 | --- src/media/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 808 | +++ src/media/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 809 | @@ -4,6 +4,14 @@ | |||
| 810 | 4 | 4 | ||
| 811 | 5 | include_directories( | 5 | include_directories( |
| 812 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_src_SOURCE_DIR} |
| 813 | 7 | ${gallery_core_src_SOURCE_DIR} | ||
| 814 | 8 | # because of circulate dependencies the sub project can't be used directly | ||
| 815 | 9 | # FIXME resolve the circulate dependencies | ||
| 816 | 10 | ${gallery_src_SOURCE_DIR}/database | ||
| 817 | 11 | ${gallery_src_SOURCE_DIR}/event | ||
| 818 | 12 | ${gallery_src_SOURCE_DIR}/photo | ||
| 819 | 13 | ${gallery_src_SOURCE_DIR}/qml | ||
| 820 | 14 | ${gallery_util_src_SOURCE_DIR} | ||
| 821 | 7 | ${CMAKE_BINARY_DIR} | 15 | ${CMAKE_BINARY_DIR} |
| 822 | 8 | ${GSTLIB_INCLUDE_DIRS} | 16 | ${GSTLIB_INCLUDE_DIRS} |
| 823 | 9 | ) | 17 | ) |
| 824 | @@ -29,5 +37,11 @@ | |||
| 825 | 29 | qt5_use_modules(${GALLERY_MEDIA_LIB} Core Quick) | 37 | qt5_use_modules(${GALLERY_MEDIA_LIB} Core Quick) |
| 826 | 30 | 38 | ||
| 827 | 31 | target_link_libraries( ${GALLERY_MEDIA_LIB} | 39 | target_link_libraries( ${GALLERY_MEDIA_LIB} |
| 828 | 40 | gallery-core | ||
| 829 | 41 | gallery-database | ||
| 830 | 42 | gallery-event | ||
| 831 | 43 | gallery-photo | ||
| 832 | 44 | gallery-qml | ||
| 833 | 45 | gallery-util | ||
| 834 | 32 | ${GSTLIB_LDFLAGS} | 46 | ${GSTLIB_LDFLAGS} |
| 835 | 33 | ) | 47 | ) |
| 836 | 34 | 48 | ||
| 837 | === modified file 'src/media/media-collection.cpp' | |||
| 838 | --- src/media/media-collection.cpp 2013-05-28 13:50:03 +0000 | |||
| 839 | +++ src/media/media-collection.cpp 2013-06-06 16:04:27 +0000 | |||
| 840 | @@ -17,15 +17,21 @@ | |||
| 841 | 17 | * Jim Nelson <jim@yorba.org> | 17 | * Jim Nelson <jim@yorba.org> |
| 842 | 18 | */ | 18 | */ |
| 843 | 19 | 19 | ||
| 844 | 20 | #include "media-collection.h" | ||
| 845 | 21 | |||
| 846 | 22 | // database | ||
| 847 | 23 | #include "database.h" | ||
| 848 | 24 | #include "media-table.h" | ||
| 849 | 25 | |||
| 850 | 26 | // photo | ||
| 851 | 27 | #include "photo.h" | ||
| 852 | 28 | |||
| 853 | 29 | // src | ||
| 854 | 30 | #include "gallery-manager.h" | ||
| 855 | 31 | |||
| 856 | 20 | #include <QFileInfo> | 32 | #include <QFileInfo> |
| 857 | 33 | #include <QString> | ||
| 858 | 21 | #include <QStringList> | 34 | #include <QStringList> |
| 859 | 22 | #include <QString> | ||
| 860 | 23 | |||
| 861 | 24 | #include "media-collection.h" | ||
| 862 | 25 | #include "photo/photo.h" | ||
| 863 | 26 | #include "database/database.h" | ||
| 864 | 27 | #include "database/media-table.h" | ||
| 865 | 28 | #include "gallery-manager.h" | ||
| 866 | 29 | 35 | ||
| 867 | 30 | /*! | 36 | /*! |
| 868 | 31 | * \brief MediaCollection::MediaCollection | 37 | * \brief MediaCollection::MediaCollection |
| 869 | 32 | 38 | ||
| 870 | === modified file 'src/media/media-collection.h' | |||
| 871 | --- src/media/media-collection.h 2013-02-25 10:16:29 +0000 | |||
| 872 | +++ src/media/media-collection.h 2013-06-06 16:04:27 +0000 | |||
| 873 | @@ -24,7 +24,8 @@ | |||
| 874 | 24 | #include <QHash> | 24 | #include <QHash> |
| 875 | 25 | #include <QSet> | 25 | #include <QSet> |
| 876 | 26 | 26 | ||
| 878 | 27 | #include "core/source-collection.h" | 27 | // core |
| 879 | 28 | #include "source-collection.h" | ||
| 880 | 28 | 29 | ||
| 881 | 29 | class DataObject; | 30 | class DataObject; |
| 882 | 30 | class MediaSource; | 31 | class MediaSource; |
| 883 | 31 | 32 | ||
| 884 | === modified file 'src/media/media-monitor.h' | |||
| 885 | --- src/media/media-monitor.h 2013-02-25 10:16:29 +0000 | |||
| 886 | +++ src/media/media-monitor.h 2013-06-06 16:04:27 +0000 | |||
| 887 | @@ -20,9 +20,9 @@ | |||
| 888 | 20 | #ifndef GALLERY_MEDIA_MONITOR_H_ | 20 | #ifndef GALLERY_MEDIA_MONITOR_H_ |
| 889 | 21 | #define GALLERY_MEDIA_MONITOR_H_ | 21 | #define GALLERY_MEDIA_MONITOR_H_ |
| 890 | 22 | 22 | ||
| 891 | 23 | #include <QObject> | ||
| 892 | 24 | #include <QDir> | 23 | #include <QDir> |
| 893 | 25 | #include <QFileSystemWatcher> | 24 | #include <QFileSystemWatcher> |
| 894 | 25 | #include <QObject> | ||
| 895 | 26 | #include <QStringList> | 26 | #include <QStringList> |
| 896 | 27 | #include <QTimer> | 27 | #include <QTimer> |
| 897 | 28 | 28 | ||
| 898 | 29 | 29 | ||
| 899 | === modified file 'src/media/media-source.cpp' | |||
| 900 | --- src/media/media-source.cpp 2013-06-04 09:24:50 +0000 | |||
| 901 | +++ src/media/media-source.cpp 2013-06-06 16:04:27 +0000 | |||
| 902 | @@ -19,13 +19,23 @@ | |||
| 903 | 19 | 19 | ||
| 904 | 20 | #include "media-source.h" | 20 | #include "media-source.h" |
| 905 | 21 | #include "preview-manager.h" | 21 | #include "preview-manager.h" |
| 913 | 22 | #include "database/database.h" | 22 | |
| 914 | 23 | #include "database/media-table.h" | 23 | // database |
| 915 | 24 | #include "event/event.h" | 24 | #include "database.h" |
| 916 | 25 | #include "event/event-collection.h" | 25 | #include "media-table.h" |
| 917 | 26 | #include "qml/gallery-standard-image-provider.h" | 26 | |
| 918 | 27 | #include "qml/gallery-thumbnail-image-provider.h" | 27 | // event |
| 919 | 28 | #include "util/resource.h" | 28 | #include "event.h" |
| 920 | 29 | #include "event-collection.h" | ||
| 921 | 30 | |||
| 922 | 31 | // qml | ||
| 923 | 32 | #include "gallery-standard-image-provider.h" | ||
| 924 | 33 | #include "gallery-thumbnail-image-provider.h" | ||
| 925 | 34 | |||
| 926 | 35 | // util | ||
| 927 | 36 | #include "resource.h" | ||
| 928 | 37 | |||
| 929 | 38 | // src | ||
| 930 | 29 | #include "gallery-manager.h" | 39 | #include "gallery-manager.h" |
| 931 | 30 | 40 | ||
| 932 | 31 | /*! | 41 | /*! |
| 933 | 32 | 42 | ||
| 934 | === modified file 'src/media/media-source.h' | |||
| 935 | --- src/media/media-source.h 2013-06-04 09:24:50 +0000 | |||
| 936 | +++ src/media/media-source.h 2013-06-06 16:04:27 +0000 | |||
| 937 | @@ -20,6 +20,12 @@ | |||
| 938 | 20 | #ifndef GALLERY_MEDIA_SOURCE_H_ | 20 | #ifndef GALLERY_MEDIA_SOURCE_H_ |
| 939 | 21 | #define GALLERY_MEDIA_SOURCE_H_ | 21 | #define GALLERY_MEDIA_SOURCE_H_ |
| 940 | 22 | 22 | ||
| 941 | 23 | // core | ||
| 942 | 24 | #include "data-source.h" | ||
| 943 | 25 | |||
| 944 | 26 | // photo | ||
| 945 | 27 | #include "photo-metadata.h" | ||
| 946 | 28 | |||
| 947 | 23 | #include <QDate> | 29 | #include <QDate> |
| 948 | 24 | #include <QDateTime> | 30 | #include <QDateTime> |
| 949 | 25 | #include <QFileInfo> | 31 | #include <QFileInfo> |
| 950 | @@ -29,9 +35,6 @@ | |||
| 951 | 29 | #include <QVariant> | 35 | #include <QVariant> |
| 952 | 30 | #include <QtQml> | 36 | #include <QtQml> |
| 953 | 31 | 37 | ||
| 954 | 32 | #include "core/data-source.h" | ||
| 955 | 33 | #include "photo/photo-metadata.h" | ||
| 956 | 34 | |||
| 957 | 35 | class Event; | 38 | class Event; |
| 958 | 36 | class GalleryManager; | 39 | class GalleryManager; |
| 959 | 37 | 40 | ||
| 960 | 38 | 41 | ||
| 961 | === modified file 'src/media/preview-manager.cpp' | |||
| 962 | --- src/media/preview-manager.cpp 2013-06-05 08:52:51 +0000 | |||
| 963 | +++ src/media/preview-manager.cpp 2013-06-06 16:04:27 +0000 | |||
| 964 | @@ -17,14 +17,18 @@ | |||
| 965 | 17 | * Jim Nelson <jim@yorba.org> | 17 | * Jim Nelson <jim@yorba.org> |
| 966 | 18 | */ | 18 | */ |
| 967 | 19 | 19 | ||
| 968 | 20 | #include "preview-manager.h" | ||
| 969 | 21 | |||
| 970 | 22 | // media | ||
| 971 | 23 | #include "media-collection.h" | ||
| 972 | 24 | |||
| 973 | 25 | // photo | ||
| 974 | 26 | #include "photo.h" | ||
| 975 | 27 | |||
| 976 | 20 | #include <QCryptographicHash> | 28 | #include <QCryptographicHash> |
| 977 | 21 | #include <QDir> | 29 | #include <QDir> |
| 978 | 22 | #include <QMutexLocker> | 30 | #include <QMutexLocker> |
| 979 | 23 | 31 | ||
| 980 | 24 | #include "preview-manager.h" | ||
| 981 | 25 | #include "media-collection.h" | ||
| 982 | 26 | #include "photo/photo.h" | ||
| 983 | 27 | |||
| 984 | 28 | // FIXME adapt to different sizes. This is fixed size for the demo device | 32 | // FIXME adapt to different sizes. This is fixed size for the demo device |
| 985 | 29 | const int PreviewManager::PREVIEW_SIZE = 360; // in pixel | 33 | const int PreviewManager::PREVIEW_SIZE = 360; // in pixel |
| 986 | 30 | const int PreviewManager::THUMBNAIL_SIZE = 216; // in pixel | 34 | const int PreviewManager::THUMBNAIL_SIZE = 216; // in pixel |
| 987 | 31 | 35 | ||
| 988 | === modified file 'src/photo/CMakeLists.txt' | |||
| 989 | --- src/photo/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 990 | +++ src/photo/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 991 | @@ -4,6 +4,13 @@ | |||
| 992 | 4 | 4 | ||
| 993 | 5 | include_directories( | 5 | include_directories( |
| 994 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_src_SOURCE_DIR} |
| 995 | 7 | ${gallery_core_src_SOURCE_DIR} | ||
| 996 | 8 | # because of circulate dependencies the sub project can't be used directly | ||
| 997 | 9 | # FIXME resolve the circulate dependencies | ||
| 998 | 10 | ${gallery_src_SOURCE_DIR}/media | ||
| 999 | 11 | ${gallery_src_SOURCE_DIR}/database | ||
| 1000 | 12 | ${gallery_src_SOURCE_DIR}/qml | ||
| 1001 | 13 | ${gallery_util_src_SOURCE_DIR} | ||
| 1002 | 7 | ${CMAKE_BINARY_DIR} | 14 | ${CMAKE_BINARY_DIR} |
| 1003 | 8 | ${EXIV2_INCLUDEDIR} | 15 | ${EXIV2_INCLUDEDIR} |
| 1004 | 9 | ${GSTLIB_INCLUDE_DIRS} | 16 | ${GSTLIB_INCLUDE_DIRS} |
| 1005 | @@ -30,6 +37,11 @@ | |||
| 1006 | 30 | qt5_use_modules(${GALLERY_PHOTO_LIB} Widgets Core Quick) | 37 | qt5_use_modules(${GALLERY_PHOTO_LIB} Widgets Core Quick) |
| 1007 | 31 | 38 | ||
| 1008 | 32 | target_link_libraries( ${GALLERY_PHOTO_LIB} | 39 | target_link_libraries( ${GALLERY_PHOTO_LIB} |
| 1009 | 40 | gallery-core | ||
| 1010 | 41 | gallery-media | ||
| 1011 | 42 | gallery-database | ||
| 1012 | 43 | gallery-qml | ||
| 1013 | 44 | gallery-util | ||
| 1014 | 33 | ${EXIV2_LIBRARIES} | 45 | ${EXIV2_LIBRARIES} |
| 1015 | 34 | ${GSTLIB_LDFLAGS} | 46 | ${GSTLIB_LDFLAGS} |
| 1016 | 35 | ) | 47 | ) |
| 1017 | 36 | 48 | ||
| 1018 | === modified file 'src/photo/photo-caches.h' | |||
| 1019 | --- src/photo/photo-caches.h 2013-02-25 10:16:29 +0000 | |||
| 1020 | +++ src/photo/photo-caches.h 2013-06-06 16:04:27 +0000 | |||
| 1021 | @@ -20,9 +20,9 @@ | |||
| 1022 | 20 | #ifndef GALLERY_PHOTO_CACHES_H_ | 20 | #ifndef GALLERY_PHOTO_CACHES_H_ |
| 1023 | 21 | #define GALLERY_PHOTO_CACHES_H_ | 21 | #define GALLERY_PHOTO_CACHES_H_ |
| 1024 | 22 | 22 | ||
| 1025 | 23 | #include <QFile> | ||
| 1026 | 24 | #include <QFileInfo> | ||
| 1027 | 23 | #include <QString> | 25 | #include <QString> |
| 1028 | 24 | #include <QFileInfo> | ||
| 1029 | 25 | #include <QFile> | ||
| 1030 | 26 | 26 | ||
| 1031 | 27 | /*! | 27 | /*! |
| 1032 | 28 | * \brief The PhotoCaches class | 28 | * \brief The PhotoCaches class |
| 1033 | 29 | 29 | ||
| 1034 | === modified file 'src/photo/photo-edit-state.h' | |||
| 1035 | --- src/photo/photo-edit-state.h 2013-05-28 13:50:03 +0000 | |||
| 1036 | +++ src/photo/photo-edit-state.h 2013-06-06 16:04:27 +0000 | |||
| 1037 | @@ -20,11 +20,11 @@ | |||
| 1038 | 20 | #ifndef GALLERY_PHOTO_EDIT_STATE_H_ | 20 | #ifndef GALLERY_PHOTO_EDIT_STATE_H_ |
| 1039 | 21 | #define GALLERY_PHOTO_EDIT_STATE_H_ | 21 | #define GALLERY_PHOTO_EDIT_STATE_H_ |
| 1040 | 22 | 22 | ||
| 1041 | 23 | #include "photo-metadata.h" | ||
| 1042 | 24 | |||
| 1043 | 23 | #include <QRect> | 25 | #include <QRect> |
| 1044 | 24 | #include <QVector4D> | 26 | #include <QVector4D> |
| 1045 | 25 | 27 | ||
| 1046 | 26 | #include "photo-metadata.h" | ||
| 1047 | 27 | |||
| 1048 | 28 | /*! | 28 | /*! |
| 1049 | 29 | * \brief The PhotoEditState class | 29 | * \brief The PhotoEditState class |
| 1050 | 30 | * | 30 | * |
| 1051 | 31 | 31 | ||
| 1052 | === modified file 'src/photo/photo-metadata.cpp' | |||
| 1053 | --- src/photo/photo-metadata.cpp 2013-02-25 10:16:29 +0000 | |||
| 1054 | +++ src/photo/photo-metadata.cpp 2013-06-06 16:04:27 +0000 | |||
| 1055 | @@ -17,10 +17,10 @@ | |||
| 1056 | 17 | * Lucas Beeler <lucas@yorba.org> | 17 | * Lucas Beeler <lucas@yorba.org> |
| 1057 | 18 | */ | 18 | */ |
| 1058 | 19 | 19 | ||
| 1059 | 20 | #include "photo-metadata.h" | ||
| 1060 | 21 | |||
| 1061 | 20 | #include <cstdio> | 22 | #include <cstdio> |
| 1062 | 21 | 23 | ||
| 1063 | 22 | #include "photo-metadata.h" | ||
| 1064 | 23 | |||
| 1065 | 24 | namespace { | 24 | namespace { |
| 1066 | 25 | const Orientation DEFAULT_ORIENTATION = TOP_LEFT_ORIGIN; | 25 | const Orientation DEFAULT_ORIENTATION = TOP_LEFT_ORIGIN; |
| 1067 | 26 | const char* EXIF_ORIENTATION_KEY = "Exif.Image.Orientation"; | 26 | const char* EXIF_ORIENTATION_KEY = "Exif.Image.Orientation"; |
| 1068 | 27 | 27 | ||
| 1069 | === modified file 'src/photo/photo-metadata.h' | |||
| 1070 | --- src/photo/photo-metadata.h 2013-02-25 10:16:29 +0000 | |||
| 1071 | +++ src/photo/photo-metadata.h 2013-06-06 16:04:27 +0000 | |||
| 1072 | @@ -20,9 +20,9 @@ | |||
| 1073 | 20 | #ifndef GALLERY_PHOTO_METADATA_H_ | 20 | #ifndef GALLERY_PHOTO_METADATA_H_ |
| 1074 | 21 | #define GALLERY_PHOTO_METADATA_H_ | 21 | #define GALLERY_PHOTO_METADATA_H_ |
| 1075 | 22 | 22 | ||
| 1076 | 23 | #include <QObject> | ||
| 1077 | 24 | #include <QDateTime> | 23 | #include <QDateTime> |
| 1078 | 25 | #include <QFileInfo> | 24 | #include <QFileInfo> |
| 1079 | 25 | #include <QObject> | ||
| 1080 | 26 | #include <QString> | 26 | #include <QString> |
| 1081 | 27 | #include <QSet> | 27 | #include <QSet> |
| 1082 | 28 | #include <QTransform> | 28 | #include <QTransform> |
| 1083 | 29 | 29 | ||
| 1084 | === modified file 'src/photo/photo.cpp' | |||
| 1085 | --- src/photo/photo.cpp 2013-05-28 13:50:03 +0000 | |||
| 1086 | +++ src/photo/photo.cpp 2013-06-06 16:04:27 +0000 | |||
| 1087 | @@ -21,22 +21,32 @@ | |||
| 1088 | 21 | * Clint Rogers <clinton@yorba.org> | 21 | * Clint Rogers <clinton@yorba.org> |
| 1089 | 22 | */ | 22 | */ |
| 1090 | 23 | 23 | ||
| 1091 | 24 | #include "photo.h" | ||
| 1092 | 25 | |||
| 1093 | 26 | // database | ||
| 1094 | 27 | #include "database.h" | ||
| 1095 | 28 | #include "media-table.h" | ||
| 1096 | 29 | #include "photo-edit-table.h" | ||
| 1097 | 30 | |||
| 1098 | 31 | // media | ||
| 1099 | 32 | #include "media-collection.h" | ||
| 1100 | 33 | |||
| 1101 | 34 | // qml | ||
| 1102 | 35 | #include "gallery-standard-image-provider.h" | ||
| 1103 | 36 | #include "gallery-thumbnail-image-provider.h" | ||
| 1104 | 37 | |||
| 1105 | 38 | // util | ||
| 1106 | 39 | #include "imaging.h" | ||
| 1107 | 40 | |||
| 1108 | 41 | // src | ||
| 1109 | 42 | #include "gallery-manager.h" | ||
| 1110 | 43 | |||
| 1111 | 24 | #include <QApplication> | 44 | #include <QApplication> |
| 1112 | 25 | #include <QFileInfo> | 45 | #include <QFileInfo> |
| 1113 | 26 | #include <QImage> | 46 | #include <QImage> |
| 1114 | 27 | #include <QImageReader> | 47 | #include <QImageReader> |
| 1115 | 28 | #include <QImageWriter> | 48 | #include <QImageWriter> |
| 1116 | 29 | 49 | ||
| 1117 | 30 | #include "photo.h" | ||
| 1118 | 31 | #include "database/database.h" | ||
| 1119 | 32 | #include "database/media-table.h" | ||
| 1120 | 33 | #include "database/photo-edit-table.h" | ||
| 1121 | 34 | #include "media/media-collection.h" | ||
| 1122 | 35 | #include "qml/gallery-standard-image-provider.h" | ||
| 1123 | 36 | #include "qml/gallery-thumbnail-image-provider.h" | ||
| 1124 | 37 | #include "util/imaging.h" | ||
| 1125 | 38 | #include "gallery-manager.h" | ||
| 1126 | 39 | |||
| 1127 | 40 | // A simple class for dealing with an undo-/redo-able stack of applied edits. | 50 | // A simple class for dealing with an undo-/redo-able stack of applied edits. |
| 1128 | 41 | class EditStack { | 51 | class EditStack { |
| 1129 | 42 | public: | 52 | public: |
| 1130 | 43 | 53 | ||
| 1131 | === modified file 'src/photo/photo.h' | |||
| 1132 | --- src/photo/photo.h 2013-05-28 13:50:03 +0000 | |||
| 1133 | +++ src/photo/photo.h 2013-06-06 16:04:27 +0000 | |||
| 1134 | @@ -22,13 +22,15 @@ | |||
| 1135 | 22 | #ifndef GALLERY_PHOTO_H_ | 22 | #ifndef GALLERY_PHOTO_H_ |
| 1136 | 23 | #define GALLERY_PHOTO_H_ | 23 | #define GALLERY_PHOTO_H_ |
| 1137 | 24 | 24 | ||
| 1138 | 25 | #include <QDateTime> | ||
| 1139 | 26 | #include <QStack> | ||
| 1140 | 27 | |||
| 1141 | 28 | #include "photo-caches.h" | 25 | #include "photo-caches.h" |
| 1142 | 29 | #include "photo-edit-state.h" | 26 | #include "photo-edit-state.h" |
| 1143 | 30 | #include "photo-metadata.h" | 27 | #include "photo-metadata.h" |
| 1145 | 31 | #include "media/media-source.h" | 28 | |
| 1146 | 29 | // media | ||
| 1147 | 30 | #include "media-source.h" | ||
| 1148 | 31 | |||
| 1149 | 32 | #include <QDateTime> | ||
| 1150 | 33 | #include <QStack> | ||
| 1151 | 32 | 34 | ||
| 1152 | 33 | class PhotoPrivate; | 35 | class PhotoPrivate; |
| 1153 | 34 | 36 | ||
| 1154 | 35 | 37 | ||
| 1155 | === modified file 'src/qml/CMakeLists.txt' | |||
| 1156 | --- src/qml/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 1157 | +++ src/qml/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 1158 | @@ -4,6 +4,14 @@ | |||
| 1159 | 4 | 4 | ||
| 1160 | 5 | include_directories( | 5 | include_directories( |
| 1161 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_src_SOURCE_DIR} |
| 1162 | 7 | # because of circulate dependencies the sub project can't be used directly | ||
| 1163 | 8 | # FIXME resolve the circulate dependencies | ||
| 1164 | 9 | ${gallery_src_SOURCE_DIR}/album | ||
| 1165 | 10 | ${gallery_core_src_SOURCE_DIR} | ||
| 1166 | 11 | ${gallery_src_SOURCE_DIR}/event | ||
| 1167 | 12 | ${gallery_src_SOURCE_DIR}/media | ||
| 1168 | 13 | ${gallery_src_SOURCE_DIR}/photo | ||
| 1169 | 14 | ${gallery_util_src_SOURCE_DIR} | ||
| 1170 | 7 | ${CMAKE_BINARY_DIR} | 15 | ${CMAKE_BINARY_DIR} |
| 1171 | 8 | ${GSTLIB_INCLUDE_DIRS} | 16 | ${GSTLIB_INCLUDE_DIRS} |
| 1172 | 9 | ) | 17 | ) |
| 1173 | @@ -35,5 +43,12 @@ | |||
| 1174 | 35 | qt5_use_modules(${GALLERY_QML_LIB} Core Quick) | 43 | qt5_use_modules(${GALLERY_QML_LIB} Core Quick) |
| 1175 | 36 | 44 | ||
| 1176 | 37 | target_link_libraries( ${GALLERY_QML_LIB} | 45 | target_link_libraries( ${GALLERY_QML_LIB} |
| 1177 | 46 | gallery-album | ||
| 1178 | 47 | gallery-core | ||
| 1179 | 48 | gallery-event | ||
| 1180 | 49 | gallery-media | ||
| 1181 | 50 | gallery-photo | ||
| 1182 | 51 | gallery-qml | ||
| 1183 | 52 | gallery-util | ||
| 1184 | 38 | ${GSTLIB_LDFLAGS} | 53 | ${GSTLIB_LDFLAGS} |
| 1185 | 39 | ) | 54 | ) |
| 1186 | 40 | 55 | ||
| 1187 | === modified file 'src/qml/gallery-standard-image-provider.cpp' | |||
| 1188 | --- src/qml/gallery-standard-image-provider.cpp 2013-06-04 09:24:50 +0000 | |||
| 1189 | +++ src/qml/gallery-standard-image-provider.cpp 2013-06-06 16:04:27 +0000 | |||
| 1190 | @@ -18,14 +18,16 @@ | |||
| 1191 | 18 | * Jim Nelson <jim@yorba.org> | 18 | * Jim Nelson <jim@yorba.org> |
| 1192 | 19 | */ | 19 | */ |
| 1193 | 20 | 20 | ||
| 1194 | 21 | #include "gallery-standard-image-provider.h" | ||
| 1195 | 22 | |||
| 1196 | 23 | // media | ||
| 1197 | 24 | #include "preview-manager.h" | ||
| 1198 | 25 | |||
| 1199 | 26 | #include <QDebug> | ||
| 1200 | 27 | #include <QElapsedTimer> | ||
| 1201 | 21 | #include <QImageReader> | 28 | #include <QImageReader> |
| 1202 | 22 | #include <QSize> | 29 | #include <QSize> |
| 1203 | 23 | #include <QElapsedTimer> | ||
| 1204 | 24 | #include <QUrlQuery> | 30 | #include <QUrlQuery> |
| 1205 | 25 | #include <QDebug> | ||
| 1206 | 26 | |||
| 1207 | 27 | #include "gallery-standard-image-provider.h" | ||
| 1208 | 28 | #include "media/preview-manager.h" | ||
| 1209 | 29 | 31 | ||
| 1210 | 30 | const char* GalleryStandardImageProvider::PROVIDER_ID = "gallery-standard"; | 32 | const char* GalleryStandardImageProvider::PROVIDER_ID = "gallery-standard"; |
| 1211 | 31 | const char* GalleryStandardImageProvider::PROVIDER_ID_SCHEME = "image://gallery-standard/"; | 33 | const char* GalleryStandardImageProvider::PROVIDER_ID_SCHEME = "image://gallery-standard/"; |
| 1212 | 32 | 34 | ||
| 1213 | === modified file 'src/qml/gallery-standard-image-provider.h' | |||
| 1214 | --- src/qml/gallery-standard-image-provider.h 2013-06-04 09:24:50 +0000 | |||
| 1215 | +++ src/qml/gallery-standard-image-provider.h 2013-06-06 16:04:27 +0000 | |||
| 1216 | @@ -21,18 +21,18 @@ | |||
| 1217 | 21 | #ifndef GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_ | 21 | #ifndef GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_ |
| 1218 | 22 | #define GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_ | 22 | #define GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_ |
| 1219 | 23 | 23 | ||
| 1222 | 24 | #include <QObject> | 24 | #include "photo-metadata.h" |
| 1223 | 25 | #include <QQuickImageProvider> | 25 | |
| 1224 | 26 | #include <QFileInfo> | 26 | #include <QFileInfo> |
| 1225 | 27 | #include <QImage> | 27 | #include <QImage> |
| 1226 | 28 | #include <QMap> | 28 | #include <QMap> |
| 1227 | 29 | #include <QMutex> | 29 | #include <QMutex> |
| 1228 | 30 | #include <QObject> | ||
| 1229 | 31 | #include <QQuickImageProvider> | ||
| 1230 | 30 | #include <QSize> | 32 | #include <QSize> |
| 1231 | 31 | #include <QString> | 33 | #include <QString> |
| 1232 | 32 | #include <QUrl> | 34 | #include <QUrl> |
| 1233 | 33 | 35 | ||
| 1234 | 34 | #include "photo/photo-metadata.h" | ||
| 1235 | 35 | |||
| 1236 | 36 | class PreviewManager; | 36 | class PreviewManager; |
| 1237 | 37 | 37 | ||
| 1238 | 38 | /*! | 38 | /*! |
| 1239 | 39 | 39 | ||
| 1240 | === modified file 'src/qml/gallery-thumbnail-image-provider.cpp' | |||
| 1241 | --- src/qml/gallery-thumbnail-image-provider.cpp 2013-06-04 09:24:50 +0000 | |||
| 1242 | +++ src/qml/gallery-thumbnail-image-provider.cpp 2013-06-06 16:04:27 +0000 | |||
| 1243 | @@ -18,7 +18,9 @@ | |||
| 1244 | 18 | */ | 18 | */ |
| 1245 | 19 | 19 | ||
| 1246 | 20 | #include "gallery-thumbnail-image-provider.h" | 20 | #include "gallery-thumbnail-image-provider.h" |
| 1248 | 21 | #include "media/preview-manager.h" | 21 | |
| 1249 | 22 | // media | ||
| 1250 | 23 | #include "preview-manager.h" | ||
| 1251 | 22 | 24 | ||
| 1252 | 23 | #include <QDebug> | 25 | #include <QDebug> |
| 1253 | 24 | #include <QElapsedTimer> | 26 | #include <QElapsedTimer> |
| 1254 | 25 | 27 | ||
| 1255 | === modified file 'src/qml/qml-album-collection-model.cpp' | |||
| 1256 | --- src/qml/qml-album-collection-model.cpp 2013-05-28 13:50:03 +0000 | |||
| 1257 | +++ src/qml/qml-album-collection-model.cpp 2013-06-06 16:04:27 +0000 | |||
| 1258 | @@ -18,11 +18,11 @@ | |||
| 1259 | 18 | */ | 18 | */ |
| 1260 | 19 | 19 | ||
| 1261 | 20 | #include "qml-album-collection-model.h" | 20 | #include "qml-album-collection-model.h" |
| 1267 | 21 | #include "album/album.h" | 21 | #include "album.h" |
| 1268 | 22 | #include "album/album-collection.h" | 22 | #include "album-collection.h" |
| 1269 | 23 | #include "album/album-default-template.h" | 23 | #include "album-default-template.h" |
| 1270 | 24 | #include "core/selectable-view-collection.h" | 24 | #include "selectable-view-collection.h" |
| 1271 | 25 | #include "util/variants.h" | 25 | #include "variants.h" |
| 1272 | 26 | #include "gallery-manager.h" | 26 | #include "gallery-manager.h" |
| 1273 | 27 | 27 | ||
| 1274 | 28 | /*! | 28 | /*! |
| 1275 | 29 | 29 | ||
| 1276 | === modified file 'src/qml/qml-event-collection-model.cpp' | |||
| 1277 | --- src/qml/qml-event-collection-model.cpp 2013-05-28 13:50:03 +0000 | |||
| 1278 | +++ src/qml/qml-event-collection-model.cpp 2013-06-06 16:04:27 +0000 | |||
| 1279 | @@ -18,9 +18,9 @@ | |||
| 1280 | 18 | */ | 18 | */ |
| 1281 | 19 | 19 | ||
| 1282 | 20 | #include "qml-event-collection-model.h" | 20 | #include "qml-event-collection-model.h" |
| 1286 | 21 | #include "event/event.h" | 21 | #include "event.h" |
| 1287 | 22 | #include "event/event-collection.h" | 22 | #include "event-collection.h" |
| 1288 | 23 | #include "util/variants.h" | 23 | #include "variants.h" |
| 1289 | 24 | #include "gallery-manager.h" | 24 | #include "gallery-manager.h" |
| 1290 | 25 | 25 | ||
| 1291 | 26 | /*! | 26 | /*! |
| 1292 | 27 | 27 | ||
| 1293 | === modified file 'src/qml/qml-event-overview-model.cpp' | |||
| 1294 | --- src/qml/qml-event-overview-model.cpp 2013-05-28 13:50:03 +0000 | |||
| 1295 | +++ src/qml/qml-event-overview-model.cpp 2013-06-06 16:04:27 +0000 | |||
| 1296 | @@ -18,11 +18,11 @@ | |||
| 1297 | 18 | */ | 18 | */ |
| 1298 | 19 | 19 | ||
| 1299 | 20 | #include "qml-event-overview-model.h" | 20 | #include "qml-event-overview-model.h" |
| 1305 | 21 | #include "core/data-object.h" | 21 | #include "data-object.h" |
| 1306 | 22 | #include "core/selectable-view-collection.h" | 22 | #include "selectable-view-collection.h" |
| 1307 | 23 | #include "event/event.h" | 23 | #include "event.h" |
| 1308 | 24 | #include "event/event-collection.h" | 24 | #include "event-collection.h" |
| 1309 | 25 | #include "util/variants.h" | 25 | #include "variants.h" |
| 1310 | 26 | #include "gallery-manager.h" | 26 | #include "gallery-manager.h" |
| 1311 | 27 | 27 | ||
| 1312 | 28 | /*! | 28 | /*! |
| 1313 | 29 | 29 | ||
| 1314 | === modified file 'src/qml/qml-media-collection-model.cpp' | |||
| 1315 | --- src/qml/qml-media-collection-model.cpp 2013-05-28 13:50:03 +0000 | |||
| 1316 | +++ src/qml/qml-media-collection-model.cpp 2013-06-06 16:04:27 +0000 | |||
| 1317 | @@ -20,14 +20,14 @@ | |||
| 1318 | 20 | 20 | ||
| 1319 | 21 | #include "qml-media-collection-model.h" | 21 | #include "qml-media-collection-model.h" |
| 1320 | 22 | 22 | ||
| 1329 | 23 | #include "album/album.h" | 23 | #include "album.h" |
| 1330 | 24 | #include "album/album-collection.h" | 24 | #include "album-collection.h" |
| 1331 | 25 | #include "album/album-default-template.h" | 25 | #include "album-default-template.h" |
| 1332 | 26 | #include "core/data-object.h" | 26 | #include "data-object.h" |
| 1333 | 27 | #include "core/selectable-view-collection.h" | 27 | #include "selectable-view-collection.h" |
| 1334 | 28 | #include "media/media-source.h" | 28 | #include "media-source.h" |
| 1335 | 29 | #include "media/media-collection.h" | 29 | #include "media-collection.h" |
| 1336 | 30 | #include "util/variants.h" | 30 | #include "variants.h" |
| 1337 | 31 | #include "gallery-manager.h" | 31 | #include "gallery-manager.h" |
| 1338 | 32 | 32 | ||
| 1339 | 33 | /*! | 33 | /*! |
| 1340 | 34 | 34 | ||
| 1341 | === modified file 'src/qml/qml-view-collection-model.cpp' | |||
| 1342 | --- src/qml/qml-view-collection-model.cpp 2013-02-25 10:16:29 +0000 | |||
| 1343 | +++ src/qml/qml-view-collection-model.cpp 2013-06-06 16:04:27 +0000 | |||
| 1344 | @@ -18,9 +18,9 @@ | |||
| 1345 | 18 | */ | 18 | */ |
| 1346 | 19 | 19 | ||
| 1347 | 20 | #include "qml-view-collection-model.h" | 20 | #include "qml-view-collection-model.h" |
| 1351 | 21 | #include "core/container-source.h" | 21 | #include "container-source.h" |
| 1352 | 22 | #include "core/data-object.h" | 22 | #include "data-object.h" |
| 1353 | 23 | #include "core/selectable-view-collection.h" | 23 | #include "selectable-view-collection.h" |
| 1354 | 24 | #include "util/variants.h" | 24 | #include "util/variants.h" |
| 1355 | 25 | 25 | ||
| 1356 | 26 | /*! | 26 | /*! |
| 1357 | 27 | 27 | ||
| 1358 | === modified file 'src/qml/qml-view-collection-model.h' | |||
| 1359 | --- src/qml/qml-view-collection-model.h 2013-02-25 10:16:29 +0000 | |||
| 1360 | +++ src/qml/qml-view-collection-model.h 2013-06-06 16:04:27 +0000 | |||
| 1361 | @@ -27,7 +27,7 @@ | |||
| 1362 | 27 | #include <QModelIndex> | 27 | #include <QModelIndex> |
| 1363 | 28 | #include <QVariant> | 28 | #include <QVariant> |
| 1364 | 29 | 29 | ||
| 1366 | 30 | #include <core/data-collection.h> | 30 | #include <data-collection.h> |
| 1367 | 31 | 31 | ||
| 1368 | 32 | class DataObject; | 32 | class DataObject; |
| 1369 | 33 | class ContainerSource; | 33 | class ContainerSource; |
| 1370 | 34 | 34 | ||
| 1371 | === modified file 'src/util/CMakeLists.txt' | |||
| 1372 | --- src/util/CMakeLists.txt 2013-06-03 07:06:50 +0000 | |||
| 1373 | +++ src/util/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 1374 | @@ -4,7 +4,7 @@ | |||
| 1375 | 4 | 4 | ||
| 1376 | 5 | include_directories( | 5 | include_directories( |
| 1377 | 6 | ${gallery_src_SOURCE_DIR} | 6 | ${gallery_src_SOURCE_DIR} |
| 1379 | 7 | ${CMAKE_CURRENT_BINARY_DIR}/.. | 7 | ${gallery_src_BINARY_DIR} |
| 1380 | 8 | ${CMAKE_BINARY_DIR} | 8 | ${CMAKE_BINARY_DIR} |
| 1381 | 9 | ${GSTLIB_INCLUDE_DIRS} | 9 | ${GSTLIB_INCLUDE_DIRS} |
| 1382 | 10 | ) | 10 | ) |
| 1383 | 11 | 11 | ||
| 1384 | === modified file 'src/util/collections.h' | |||
| 1385 | --- src/util/collections.h 2013-02-25 10:16:29 +0000 | |||
| 1386 | +++ src/util/collections.h 2013-06-06 16:04:27 +0000 | |||
| 1387 | @@ -21,6 +21,7 @@ | |||
| 1388 | 21 | #define GALLERY_UTIL_COLLECTIONS_H_ | 21 | #define GALLERY_UTIL_COLLECTIONS_H_ |
| 1389 | 22 | 22 | ||
| 1390 | 23 | #include <QList> | 23 | #include <QList> |
| 1391 | 24 | #include <QObject> | ||
| 1392 | 24 | #include <QSet> | 25 | #include <QSet> |
| 1393 | 25 | 26 | ||
| 1394 | 26 | template <class F, class T> | 27 | template <class F, class T> |
| 1395 | 27 | 28 | ||
| 1396 | === modified file 'tests/unittests/command-line-parser/CMakeLists.txt' | |||
| 1397 | --- tests/unittests/command-line-parser/CMakeLists.txt 2013-05-28 13:50:03 +0000 | |||
| 1398 | +++ tests/unittests/command-line-parser/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 1399 | @@ -5,8 +5,8 @@ | |||
| 1400 | 5 | endif() | 5 | endif() |
| 1401 | 6 | 6 | ||
| 1402 | 7 | include_directories( | 7 | include_directories( |
| 1403 | 8 | ${gallery_util_src_SOURCE_DIR} | ||
| 1404 | 8 | ${CMAKE_BINARY_DIR} | 9 | ${CMAKE_BINARY_DIR} |
| 1405 | 9 | ${gallery_src_SOURCE_DIR} | ||
| 1406 | 10 | ) | 10 | ) |
| 1407 | 11 | 11 | ||
| 1408 | 12 | add_executable(command-line-parser | 12 | add_executable(command-line-parser |
| 1409 | 13 | 13 | ||
| 1410 | === modified file 'tests/unittests/command-line-parser/tst_commandlineparser.cpp' | |||
| 1411 | --- tests/unittests/command-line-parser/tst_commandlineparser.cpp 2013-05-28 13:50:03 +0000 | |||
| 1412 | +++ tests/unittests/command-line-parser/tst_commandlineparser.cpp 2013-06-06 16:04:27 +0000 | |||
| 1413 | @@ -21,7 +21,7 @@ | |||
| 1414 | 21 | #include <QStringList> | 21 | #include <QStringList> |
| 1415 | 22 | #include <QtTest> | 22 | #include <QtTest> |
| 1416 | 23 | 23 | ||
| 1418 | 24 | #include "util/command-line-parser.h" | 24 | #include "command-line-parser.h" |
| 1419 | 25 | 25 | ||
| 1420 | 26 | class tst_CommandLineParser : public QObject | 26 | class tst_CommandLineParser : public QObject |
| 1421 | 27 | { | 27 | { |
| 1422 | 28 | 28 | ||
| 1423 | === modified file 'tests/unittests/gallerystandardimageprovider/CMakeLists.txt' | |||
| 1424 | --- tests/unittests/gallerystandardimageprovider/CMakeLists.txt 2013-06-04 09:24:50 +0000 | |||
| 1425 | +++ tests/unittests/gallerystandardimageprovider/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 1426 | @@ -7,6 +7,9 @@ | |||
| 1427 | 7 | include_directories( | 7 | include_directories( |
| 1428 | 8 | ${CMAKE_BINARY_DIR} | 8 | ${CMAKE_BINARY_DIR} |
| 1429 | 9 | ${gallery_src_SOURCE_DIR} | 9 | ${gallery_src_SOURCE_DIR} |
| 1430 | 10 | ${gallery_media_src_SOURCE_DIR} | ||
| 1431 | 11 | ${gallery_photo_src_SOURCE_DIR} | ||
| 1432 | 12 | ${gallery_qml_src_SOURCE_DIR} | ||
| 1433 | 10 | ${GSTLIB_INCLUDE_DIRS} | 13 | ${GSTLIB_INCLUDE_DIRS} |
| 1434 | 11 | ) | 14 | ) |
| 1435 | 12 | 15 | ||
| 1436 | 13 | 16 | ||
| 1437 | === removed directory 'tests/unittests/gallerystandardimageprovider/media' | |||
| 1438 | === renamed file 'tests/unittests/gallerystandardimageprovider/media/media-collection.h' => 'tests/unittests/gallerystandardimageprovider/media-collection.h' | |||
| 1439 | === modified file 'tests/unittests/gallerystandardimageprovider/photometa-data.cpp' | |||
| 1440 | --- tests/unittests/gallerystandardimageprovider/photometa-data.cpp 2013-01-16 11:01:23 +0000 | |||
| 1441 | +++ tests/unittests/gallerystandardimageprovider/photometa-data.cpp 2013-06-06 16:04:27 +0000 | |||
| 1442 | @@ -18,7 +18,7 @@ | |||
| 1443 | 18 | * | 18 | * |
| 1444 | 19 | */ | 19 | */ |
| 1445 | 20 | 20 | ||
| 1447 | 21 | #include "photo/photo-metadata.h" | 21 | #include "photo-metadata.h" |
| 1448 | 22 | 22 | ||
| 1449 | 23 | Orientation PhotoMetadata::orientation() const | 23 | Orientation PhotoMetadata::orientation() const |
| 1450 | 24 | { | 24 | { |
| 1451 | 25 | 25 | ||
| 1452 | === modified file 'tests/unittests/gallerystandardimageprovider/preview-manager.cpp' | |||
| 1453 | --- tests/unittests/gallerystandardimageprovider/preview-manager.cpp 2013-06-05 08:52:51 +0000 | |||
| 1454 | +++ tests/unittests/gallerystandardimageprovider/preview-manager.cpp 2013-06-06 16:04:27 +0000 | |||
| 1455 | @@ -20,8 +20,8 @@ | |||
| 1456 | 20 | 20 | ||
| 1457 | 21 | #include <QDir> | 21 | #include <QDir> |
| 1458 | 22 | 22 | ||
| 1461 | 23 | #include "media/preview-manager.h" | 23 | #include "preview-manager.h" |
| 1462 | 24 | #include "media/media-collection.h" | 24 | #include "media-collection.h" |
| 1463 | 25 | 25 | ||
| 1464 | 26 | const int PreviewManager::PREVIEW_SIZE = 360; | 26 | const int PreviewManager::PREVIEW_SIZE = 360; |
| 1465 | 27 | const QString PreviewManager::PREVIEW_DIR = ".thumbs"; | 27 | const QString PreviewManager::PREVIEW_DIR = ".thumbs"; |
| 1466 | 28 | 28 | ||
| 1467 | === modified file 'tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp' | |||
| 1468 | --- tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp 2013-06-04 11:32:12 +0000 | |||
| 1469 | +++ tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp 2013-06-06 16:04:27 +0000 | |||
| 1470 | @@ -23,9 +23,9 @@ | |||
| 1471 | 23 | #include <QFileInfo> | 23 | #include <QFileInfo> |
| 1472 | 24 | #include <QUrl> | 24 | #include <QUrl> |
| 1473 | 25 | 25 | ||
| 1477 | 26 | #include "qml/gallery-standard-image-provider.h" | 26 | #include "gallery-standard-image-provider.h" |
| 1478 | 27 | #include "media/preview-manager.h" | 27 | #include "preview-manager.h" |
| 1479 | 28 | #include "media/media-collection.h" | 28 | #include "media-collection.h" |
| 1480 | 29 | #include "gallery-manager.h" | 29 | #include "gallery-manager.h" |
| 1481 | 30 | 30 | ||
| 1482 | 31 | class tst_GalleryStandardImageProvider : public QObject | 31 | class tst_GalleryStandardImageProvider : public QObject |
| 1483 | 32 | 32 | ||
| 1484 | === modified file 'tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt' | |||
| 1485 | --- tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt 2013-06-04 09:24:50 +0000 | |||
| 1486 | +++ tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 1487 | @@ -5,8 +5,9 @@ | |||
| 1488 | 5 | endif() | 5 | endif() |
| 1489 | 6 | 6 | ||
| 1490 | 7 | include_directories( | 7 | include_directories( |
| 1491 | 8 | ${gallery_media_src_SOURCE_DIR} | ||
| 1492 | 9 | ${gallery_qml_src_SOURCE_DIR} | ||
| 1493 | 8 | ${CMAKE_BINARY_DIR} | 10 | ${CMAKE_BINARY_DIR} |
| 1494 | 9 | ${gallery_src_SOURCE_DIR} | ||
| 1495 | 10 | ${GSTLIB_INCLUDE_DIRS} | 11 | ${GSTLIB_INCLUDE_DIRS} |
| 1496 | 11 | ) | 12 | ) |
| 1497 | 12 | 13 | ||
| 1498 | 13 | 14 | ||
| 1499 | === removed directory 'tests/unittests/gallerythumbnailimageprovider/media' | |||
| 1500 | === removed file 'tests/unittests/gallerythumbnailimageprovider/media/media-collection.h' | |||
| 1501 | --- tests/unittests/gallerythumbnailimageprovider/media/media-collection.h 2013-06-04 11:32:12 +0000 | |||
| 1502 | +++ tests/unittests/gallerythumbnailimageprovider/media/media-collection.h 1970-01-01 00:00:00 +0000 | |||
| 1503 | @@ -1,28 +0,0 @@ | |||
| 1504 | 1 | /* | ||
| 1505 | 2 | * Copyright (C) 2013 Canonical Ltd | ||
| 1506 | 3 | * | ||
| 1507 | 4 | * This program is free software: you can redistribute it and/or modify | ||
| 1508 | 5 | * it under the terms of the GNU General Public License version 3 as | ||
| 1509 | 6 | * published by the Free Software Foundation. | ||
| 1510 | 7 | * | ||
| 1511 | 8 | * This program is distributed in the hope that it will be useful, | ||
| 1512 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 1513 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 1514 | 11 | * GNU General Public License for more details. | ||
| 1515 | 12 | * | ||
| 1516 | 13 | * You should have received a copy of the GNU General Public License | ||
| 1517 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 1518 | 15 | */ | ||
| 1519 | 16 | |||
| 1520 | 17 | #ifndef GALLERY_MEDIA_COLLECTION_H_ | ||
| 1521 | 18 | #define GALLERY_MEDIA_COLLECTION_H_ | ||
| 1522 | 19 | |||
| 1523 | 20 | #include <QDir> | ||
| 1524 | 21 | |||
| 1525 | 22 | class MediaCollection | ||
| 1526 | 23 | { | ||
| 1527 | 24 | public: | ||
| 1528 | 25 | MediaCollection(const QDir& directory) {Q_UNUSED(directory);} | ||
| 1529 | 26 | }; | ||
| 1530 | 27 | |||
| 1531 | 28 | #endif | ||
| 1532 | 29 | 0 | ||
| 1533 | === modified file 'tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp' | |||
| 1534 | --- tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp 2013-06-05 08:52:51 +0000 | |||
| 1535 | +++ tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp 2013-06-06 16:04:27 +0000 | |||
| 1536 | @@ -20,7 +20,7 @@ | |||
| 1537 | 20 | 20 | ||
| 1538 | 21 | #include <QDir> | 21 | #include <QDir> |
| 1539 | 22 | 22 | ||
| 1541 | 23 | #include "media/preview-manager.h" | 23 | #include "preview-manager.h" |
| 1542 | 24 | 24 | ||
| 1543 | 25 | const QString PreviewManager::PREVIEW_DIR = ".thumbs"; | 25 | const QString PreviewManager::PREVIEW_DIR = ".thumbs"; |
| 1544 | 26 | const char* PreviewManager::PREVIEW_FILE_EXT = "JPG"; | 26 | const char* PreviewManager::PREVIEW_FILE_EXT = "JPG"; |
| 1545 | 27 | 27 | ||
| 1546 | === modified file 'tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp' | |||
| 1547 | --- tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp 2013-05-28 13:50:03 +0000 | |||
| 1548 | +++ tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp 2013-06-06 16:04:27 +0000 | |||
| 1549 | @@ -21,7 +21,7 @@ | |||
| 1550 | 21 | #include <QFileInfo> | 21 | #include <QFileInfo> |
| 1551 | 22 | #include <QUrl> | 22 | #include <QUrl> |
| 1552 | 23 | 23 | ||
| 1554 | 24 | #include "qml/gallery-thumbnail-image-provider.h" | 24 | #include "gallery-thumbnail-image-provider.h" |
| 1555 | 25 | 25 | ||
| 1556 | 26 | class tst_GalleryThumbnailImageProvider : public QObject | 26 | class tst_GalleryThumbnailImageProvider : public QObject |
| 1557 | 27 | { | 27 | { |
| 1558 | 28 | 28 | ||
| 1559 | === modified file 'tests/unittests/imaging/CMakeLists.txt' | |||
| 1560 | --- tests/unittests/imaging/CMakeLists.txt 2013-05-28 13:50:03 +0000 | |||
| 1561 | +++ tests/unittests/imaging/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 1562 | @@ -5,8 +5,8 @@ | |||
| 1563 | 5 | endif() | 5 | endif() |
| 1564 | 6 | 6 | ||
| 1565 | 7 | include_directories( | 7 | include_directories( |
| 1566 | 8 | ${gallery_util_src_SOURCE_DIR} | ||
| 1567 | 8 | ${CMAKE_BINARY_DIR} | 9 | ${CMAKE_BINARY_DIR} |
| 1568 | 9 | ${gallery_src_SOURCE_DIR} | ||
| 1569 | 10 | ) | 10 | ) |
| 1570 | 11 | 11 | ||
| 1571 | 12 | add_executable(imaging | 12 | add_executable(imaging |
| 1572 | 13 | 13 | ||
| 1573 | === modified file 'tests/unittests/imaging/tst_imaging.cpp' | |||
| 1574 | --- tests/unittests/imaging/tst_imaging.cpp 2013-02-19 12:50:54 +0000 | |||
| 1575 | +++ tests/unittests/imaging/tst_imaging.cpp 2013-06-06 16:04:27 +0000 | |||
| 1576 | @@ -17,7 +17,7 @@ | |||
| 1577 | 17 | #include <QtTest/QtTest> | 17 | #include <QtTest/QtTest> |
| 1578 | 18 | #include <QString> | 18 | #include <QString> |
| 1579 | 19 | 19 | ||
| 1581 | 20 | #include "util/imaging.h" | 20 | #include "imaging.h" |
| 1582 | 21 | 21 | ||
| 1583 | 22 | class tst_Imaging : public QObject | 22 | class tst_Imaging : public QObject |
| 1584 | 23 | { | 23 | { |
| 1585 | 24 | 24 | ||
| 1586 | === modified file 'tests/unittests/resource/CMakeLists.txt' | |||
| 1587 | --- tests/unittests/resource/CMakeLists.txt 2013-05-28 13:50:03 +0000 | |||
| 1588 | +++ tests/unittests/resource/CMakeLists.txt 2013-06-06 16:04:27 +0000 | |||
| 1589 | @@ -6,7 +6,7 @@ | |||
| 1590 | 6 | 6 | ||
| 1591 | 7 | include_directories( | 7 | include_directories( |
| 1592 | 8 | ${CMAKE_BINARY_DIR} | 8 | ${CMAKE_BINARY_DIR} |
| 1594 | 9 | ${gallery_src_SOURCE_DIR} | 9 | ${gallery_util_src_SOURCE_DIR} |
| 1595 | 10 | ) | 10 | ) |
| 1596 | 11 | 11 | ||
| 1597 | 12 | add_executable(resource | 12 | add_executable(resource |
| 1598 | 13 | 13 | ||
| 1599 | === modified file 'tests/unittests/resource/tst_resource.cpp' | |||
| 1600 | --- tests/unittests/resource/tst_resource.cpp 2013-06-05 08:52:51 +0000 | |||
| 1601 | +++ tests/unittests/resource/tst_resource.cpp 2013-06-06 16:04:27 +0000 | |||
| 1602 | @@ -21,7 +21,7 @@ | |||
| 1603 | 21 | #include <QStandardPaths> | 21 | #include <QStandardPaths> |
| 1604 | 22 | #include <QString> | 22 | #include <QString> |
| 1605 | 23 | 23 | ||
| 1607 | 24 | #include "util/resource.h" | 24 | #include "resource.h" |
| 1608 | 25 | 25 | ||
| 1609 | 26 | class tst_Resource : public QObject | 26 | class tst_Resource : public QObject |
| 1610 | 27 | { | 27 | { |
FAILED: Continuous integration, rev:685
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://