← Back to branch summary

~ubuntu-branches/ubuntu/raring/digikam/raring

« back to all changes in this revision

Viewing changes to core/digikam/views/mapwidgetview.h

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/digikam/views/mapwidgetview.h
45
45
#include "imagealbummodel.h"
46
46
#include "thumbnailloadthread.h"
47
47
#include "imagefiltermodel.h"
 
48
#include "camiteminfo.h"
48
49
 
49
50
namespace Digikam
50
51
{
58
59
 
59
60
public:
60
61
 
61
 
    MapViewModelHelper(QItemSelectionModel* selection, ImageFilterModel* const filterModel, QObject* const parent = 0);
 
62
    MapViewModelHelper(QItemSelectionModel* const selection, KCategorizedSortFilterProxyModel* const filterModel,
 
63
                       QObject* const parent = 0, bool mode = true);
62
64
    virtual ~MapViewModelHelper();
63
65
 
64
 
    virtual QAbstractItemModel* model() const;
65
 
    virtual QItemSelectionModel* selectionModel() const;
 
66
    virtual QAbstractItemModel* model()                                                                const;
 
67
    virtual QItemSelectionModel* selectionModel()                                                      const;
66
68
    virtual bool itemCoordinates(const QModelIndex& index, KGeoMap::GeoCoordinates* const coordinates) const;
67
69
 
68
70
    virtual QPixmap pixmapFromRepresentativeIndex(const QPersistentModelIndex& index, const QSize& size);
77
79
private Q_SLOTS:
78
80
 
79
81
    void slotThumbnailLoaded(const LoadingDescription&, const QPixmap&);
 
82
    void slotThumbnailLoaded(const QString& folder, const QString& file, const CamItemInfo& info, const QImage& thumb);
80
83
    void slotImageChange(const ImageChangeset& changeset);
81
84
 
82
85
private:
83
86
 
84
 
    class MapViewModelHelperPrivate;
85
 
    MapViewModelHelperPrivate* const d;
 
87
    class Private;
 
88
    Private* const d;
86
89
};
87
90
 
88
91
// ------------------------------------------------------------------------------------------------------------
94
97
public:
95
98
 
96
99
    MapWidgetView(QItemSelectionModel* const selectionModel,
97
 
                  ImageFilterModel* const imageFilterModel, QWidget* const parent);
 
100
                  KCategorizedSortFilterProxyModel* const imageFilterModel, QWidget* const parent, bool mode = true);
98
101
    ~MapWidgetView();
99
102
 
100
103
    void openAlbum(Album* const album);
101
104
    void setActive(const bool state);
102
105
    bool getActiveState() const;
103
 
    ImageInfo currentInfo();
 
106
 
 
107
    ImageInfo   currentImageInfo()   const;
 
108
    CamItemInfo currentCamItemInfo() const;
104
109
 
105
110
protected:
106
111
 
109
114
 
110
115
private:
111
116
 
112
 
    class MapWidgetViewPriv;
113
 
    MapWidgetViewPriv* const d;
 
117
    class Private;
 
118
    Private* const d;
114
119
};
115
120
 
116
121
} // namespace Digikam