← Back to branch summary

~elopio/gallery-app/revert_workaround-1302706-click_toolbar_button_failure

« back to all changes in this revision

Viewing changes to src/gallery-manager.h

  • Committer: Leo Arias
  • Date: 2015-05-15 08:05:23 UTC
  • mfrom: (954.1.241 gallery-app)
  • Revision ID: leo.arias@canonical.com-20150515080523-i2of3vr8h7dioj59
Now the toolbar object is not needed at all.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallery-manager.h
35
35
class Database;
36
36
class EventCollection;
37
37
class GalleryManager;
38
 
class GalleryStandardImageProvider;
39
38
class MediaCollection;
40
39
class MediaMonitor;
41
40
class MediaObjectFactory;
51
50
    Q_PROPERTY(QmlMediaCollectionModel* mediaLibrary READ mediaLibrary NOTIFY mediaLibraryChanged)
52
51
 
53
52
public:
54
 
    GalleryManager(bool desktopMode, const QString &picturesDir, QQuickView *view);
 
53
    GalleryManager(bool desktopMode, const QString &picturesDir);
55
54
    ~GalleryManager();
56
55
 
57
56
    static GalleryManager* instance();
65
64
    AlbumCollection *albumCollection();
66
65
    EventCollection *eventCollection();
67
66
    Resource *resource() { return m_resource; }
68
 
    GalleryStandardImageProvider *takeGalleryStandardImageProvider();
69
67
 
70
68
    void logImageLoading(bool log);
71
69
 
73
71
 
74
72
signals:
75
73
    void mediaLibraryChanged();
 
74
    void consistencyCheckFinished();
 
75
    void collectionChanged();
76
76
 
77
77
private slots:
78
 
    void onMediaItemAdded(QString file);
 
78
    void onMediaItemAdded(QString file, int priority);
79
79
    void onMediaItemRemoved(qint64 mediaId);
 
80
    void onMediaObjectCreated(MediaSource *mediaObject);
 
81
    void onMediaFromDBLoaded(QSet<DataObject *> mediaFromDB);
80
82
 
81
83
private:
82
84
    GalleryManager(const GalleryManager&);
90
92
    bool collectionsInitialised;
91
93
 
92
94
    Resource* m_resource;
93
 
    GalleryStandardImageProvider* m_standardImageProvider;
94
95
    Database* m_database;
95
96
    AlbumDefaultTemplate* m_defaultTemplate;
96
97
    MediaCollection* m_mediaCollection;