← Back to branch summary

~ubuntu-branches/ubuntu/natty/digikam/natty

« back to all changes in this revision

Viewing changes to digikam/digikamimagedelegate.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/digikamimagedelegate.cpp
55
55
};
56
56
 
57
57
DigikamImageDelegate::DigikamImageDelegate(ImageCategorizedView* parent)
58
 
                    : ImageDelegate(*new DigikamImageDelegatePrivate, parent)
 
58
    : ImageDelegate(*new DigikamImageDelegatePrivate, parent)
59
59
{
60
60
    Q_D(DigikamImageDelegate);
61
61
 
79
79
    y = d->pixmapRect.bottom();
80
80
 
81
81
    const AlbumSettings* albumSettings = AlbumSettings::instance();
 
82
 
82
83
    if (albumSettings->getIconShowRating())
83
84
    {
84
85
        d->ratingRect = QRect(d->margin, y, d->contentWidth, d->starPolygonSize.height());