← Back to branch summary

~ubuntu-branches/ubuntu/edgy/digikam/edgy-updates

« back to all changes in this revision

Viewing changes to digikam/digikam/albumiconview.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Achim Bohnet
  • Date: 2006-05-15 01:15:02 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060515011502-kpyuz7766hpbuia8
Tags: 0.8.2~rc1-0ubuntu1
* sync with debian (UVF see #44102)
  0.8.2~rc1-0ubuntu1 is identical to debian's 0.8.1+0.8.2-rc1-1.
  Version was changed due to latest 0.8.1.ubuntu-0ubuntu1 upload.
  This version is unfortunately bigger than debian's 0.8.1+0.8.2-rc1-1
* Merge in ubuntu changelog

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/digikam/albumiconview.cpp
107
107
#include "thumbnailsize.h"
108
108
#include "themeengine.h"
109
109
#include "pixmapmanager.h"
 
110
#include "dcrawbinary.h"
110
111
 
111
112
#include "cameradragobject.h"
112
113
#include "dragobjects.h"
189
190
 
190
191
    QPainter painter(&d->ratingPixmap);
191
192
    painter.fillRect(0, 0, d->ratingPixmap.width(), d->ratingPixmap.height(),
192
 
                     ThemeEngine::instance()->textSpecialRegColor());
 
193
                     Digikam::ThemeEngine::instance()->textSpecialRegColor());
193
194
    painter.end();
194
195
    
195
196
    // -- ImageLister connections -------------------------------------
225
226
 
226
227
    // -- ThemeEngine connections ---------------------------------------
227
228
 
228
 
    connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()),
 
229
    connect(Digikam::ThemeEngine::instance(), SIGNAL(signalThemeChanged()),
229
230
            SLOT(slotThemeChanged()));
230
231
 
231
232
    // -- Pixmap manager connections ------------------------------------
879
880
    QString currentFileExtension =
880
881
        item->imageInfo()->name().section( '.', -1 );
881
882
    QString imagefilter = settings->getImageFileFilter().lower() +
882
 
                          settings->getImageFileFilter().upper() + 
883
 
                          settings->getRawFileFilter().lower() +
884
 
                          settings->getRawFileFilter().upper();
 
883
                          settings->getImageFileFilter().upper();
 
884
 
 
885
    if (Digikam::DcrawBinary::instance()->isAvailable())
 
886
    {
 
887
        imagefilter += settings->getRawFileFilter().lower() +
 
888
                       settings->getRawFileFilter().upper();
 
889
    }
885
890
 
886
891
    // If the current item isn't an image file.
887
892
    if ( !imagefilter.contains(currentFileExtension) )
1462
1467
    d->bannerRect.setHeight(d->bannerRect.height() + tr.height() + 10);
1463
1468
    d->bannerRect.setWidth(frameRect().width());
1464
1469
 
1465
 
    d->bannerPixmap = ThemeEngine::instance()->bannerPixmap(d->bannerRect.width(),
 
1470
    d->bannerPixmap = Digikam::ThemeEngine::instance()->bannerPixmap(d->bannerRect.width(),
1466
1471
                                                            d->bannerRect.height());
1467
1472
}
1468
1473
 
1562
1567
 
1563
1568
    d->itemRect = QRect(0, 0, w+2*margin, y+margin);
1564
1569
 
1565
 
    d->itemRegPixmap = ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(),
 
1570
    d->itemRegPixmap = Digikam::ThemeEngine::instance()->thumbRegPixmap(d->itemRect.width(),
1566
1571
                                                               d->itemRect.height());
1567
1572
 
1568
 
    d->itemSelPixmap = ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(),
 
1573
    d->itemSelPixmap = Digikam::ThemeEngine::instance()->thumbSelPixmap(d->itemRect.width(),
1569
1574
                                                               d->itemRect.height());
1570
1575
}
1571
1576
 
1573
1578
{
1574
1579
    QPalette plt(palette());
1575
1580
    QColorGroup cg(plt.active());
1576
 
    cg.setColor(QColorGroup::Base, ThemeEngine::instance()->baseColor());
1577
 
    cg.setColor(QColorGroup::Text, ThemeEngine::instance()->textRegColor());
1578
 
    cg.setColor(QColorGroup::HighlightedText, ThemeEngine::instance()->textSelColor());
 
1581
    cg.setColor(QColorGroup::Base, Digikam::ThemeEngine::instance()->baseColor());
 
1582
    cg.setColor(QColorGroup::Text, Digikam::ThemeEngine::instance()->textRegColor());
 
1583
    cg.setColor(QColorGroup::HighlightedText, Digikam::ThemeEngine::instance()->textSelColor());
1579
1584
    plt.setActive(cg);
1580
1585
    plt.setInactive(cg);
1581
1586
    setPalette(plt);
1582
1587
 
1583
1588
    QPainter painter(&d->ratingPixmap);
1584
1589
    painter.fillRect(0, 0, d->ratingPixmap.width(), d->ratingPixmap.height(),
1585
 
                     ThemeEngine::instance()->textSpecialRegColor());
 
1590
                     Digikam::ThemeEngine::instance()->textSpecialRegColor());
1586
1591
    painter.end();
1587
1592
    
1588
1593
    updateBannerRectPixmap();
1688
1693
    triggerUpdate();
1689
1694
}
1690
1695
 
 
1696
void AlbumIconView::slotAssignRatingNoStar()
 
1697
{
 
1698
    slotAssignRating(0);
 
1699
}
 
1700
 
 
1701
void AlbumIconView::slotAssignRatingOneStar()
 
1702
{
 
1703
    slotAssignRating(1);
 
1704
}
 
1705
 
 
1706
void AlbumIconView::slotAssignRatingTwoStar()
 
1707
{
 
1708
    slotAssignRating(2);
 
1709
}
 
1710
 
 
1711
void AlbumIconView::slotAssignRatingThreeStar()
 
1712
{
 
1713
    slotAssignRating(3);
 
1714
}
 
1715
 
 
1716
void AlbumIconView::slotAssignRatingFourStar()
 
1717
{
 
1718
    slotAssignRating(4);
 
1719
}
 
1720
 
 
1721
void AlbumIconView::slotAssignRatingFiveStar()
 
1722
{
 
1723
    slotAssignRating(5);
 
1724
}
 
1725
 
1691
1726
void AlbumIconView::slotDIOResult(KIO::Job* job)
1692
1727
{
1693
1728
    if (job->error())