~artmello/gallery-app/gallery-app-fix_crash_adding

~artmello/gallery-app/gallery-app-fix_crash_adding_files

Committer: Jim Nelson
Date: 2012-01-20 22:12:49 UTC
Revision ID: jim@yorba.org-20120120221249-81cc1q2jzdkej57k

Event and EventCollection introduced, represented in QML by
QmlEventCollectionModel. This is work toward completing bug #915655,
the Event Timeline view.

files added:
src/event

src/event/event-collection.cpp

src/event/event-collection.h

src/event/event.cpp

src/event/event.h

src/qml/qml-event-collection-model.cpp

src/qml/qml-event-collection-model.h

src/util

src/util/time.cpp

src/util/time.h

src/util/variants.h

files renamed:
src/qml/qml-event-collection-model.cpp => src/qml/qml-event-overview-model.cpp

src/qml/qml-event-collection-model.h => src/qml/qml-event-overview-model.h

src/core/utils.h => src/util/collections.h

files modified:
gallery.pro

rc/qml/EventCheckerboard.qml

rc/qml/Overview.qml

src/album/album-collection.cpp

src/album/album-collection.h

src/album/album-page.cpp

src/album/album.cpp

src/core/container-source.cpp

src/core/container-source.h

src/core/data-collection.h

src/core/selectable-view-collection.h

src/main.cpp

src/media/media-collection.cpp

src/qml/qml-album-collection-model.cpp

src/qml/qml-event-marker.cpp

src/qml/qml-event-marker.h

src/qml/qml-media-collection-model.cpp

src/qml/qml-view-collection-model.cpp

Show diffs side-by-side

added added

removed removed

src/event/event.h

* This program is free software: you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 3 as

* published by the Free Software Foundation.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU General Public License for more details.

* You should have received a copy of the GNU General Public License

* along with this program. If not, see <http://www.gnu.org/licenses/>.

* Authors:

* Jim Nelson <jim@yorba.org>

#ifndef GALLERY_EVENT_H_

#define GALLERY_EVENT_H_

#include <QObject>

#include <QDate>

#include <QDeclarativeListProperty>

#include <QList>

#include <QtDeclarative>

#include "core/container-source.h"

#include "media/media-source.h"

class Event : public ContainerSource {

Q_OBJECT

Q_PROPERTY(QDate date READ date NOTIFY date_altered)

Q_PROPERTY(QDeclarativeListProperty<MediaSource> mediaSources READ qml_media_sources

NOTIFY media_content_altered);

signals:

void date_altered();

void media_content_altered();

public:

Event();

explicit Event(const QDate &date);

static void RegisterType();

const QDate& date() const;

QDeclarativeListProperty<MediaSource> qml_media_sources();

protected:

virtual void notify_container_contents_altered(const QSet<DataObject *> *added,

const QSet<DataObject *> *removed);

virtual void DestroySource(bool destroy_backing, bool as_orphan);

private:

QDate date_;

QList<MediaSource*> all_media_;

};

QML_DECLARE_TYPE(Event);

#endif // GALLERY_EVENT_H_

Older »