← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to utilities/lighttable/lighttablepreview.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Christian Mangold
  • Date: 2010-04-09 21:30:01 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100409213001-4bfyibrd359rn7o3
Tags: 2:1.2.0-0ubuntu1
https://launchpad.net/bugs/560576
* New upstream release (LP: #560576)
* Remove all patches, fixed upstream
  - Remove quilt build-depend

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/lighttable/lighttablepreview.cpp
107
107
    PreviewLoadThread* previewPreloadThread;
108
108
};
109
109
 
110
 
LightTablePreview::LightTablePreview(QWidget *parent)
 
110
LightTablePreview::LightTablePreview(QWidget* parent)
111
111
                 : PreviewWidget(parent), d(new LightTablePreviewPriv)
112
112
{
113
113
    // get preview size from screen size, but limit from VGA to WQXGA
437
437
    palette.setColor(backgroundRole(), ThemeEngine::instance()->baseColor());
438
438
    setPalette(palette);
439
439
    frameChanged();
 
440
    update();
440
441
}
441
442
 
442
443
void LightTablePreview::resizeEvent(QResizeEvent* e)
502
503
        QString text;
503
504
        QRect textRect, fontRect;
504
505
        QRect region = contentsRect();
505
 
        p.translate(region.topLeft());
 
506
        //p.translate(region.topLeft());
506
507
 
507
508
        if (!d->loadFullImageSize)
508
509
        {
509
 
            if (d->imageInfo.format().startsWith("RAW"))
 
510
            if (d->imageInfo.format().startsWith(QLatin1String("RAW")))
510
511
                text = i18n("Embedded JPEG Preview");
511
512
            else
512
513
                text = i18n("Reduced Size Preview");
513
514
        }
514
515
        else
515
516
        {
516
 
            if (d->imageInfo.format().startsWith("RAW"))
 
517
            if (d->imageInfo.format().startsWith(QLatin1String("RAW")))
517
518
                text = i18n("Half Size Raw Preview");
518
519
            else
519
520
                text = i18n("Full Size Preview");
522
523
        fontRect = fontMt.boundingRect(0, 0, contentsWidth(), contentsHeight(), 0, text);
523
524
        textRect.setTopLeft(QPoint(region.topRight().x()-fontRect.width()-20, region.topRight().y()+20));
524
525
        textRect.setSize( QSize(fontRect.width()+2, fontRect.height()+2) );
525
 
        drawText(&p, textRect, text);
 
526
        
 
527
        drawText(&p, QPoint(region.topRight().x()-fontRect.width()-20, region.topRight().y()+20), text);
526
528
        p.end();
527
529
    }
528
530
}
538
540
        KUrl::List kioURLs;
539
541
 
540
542
        if (DItemDrag::decode(e->mimeData(), urls, kioURLs, albumIDs, imageIDs) ||
541
 
            DAlbumDrag::decode(e->mimeData(), urls, albumID) ||
 
543
            DAlbumDrag::decode(e->mimeData(), urls, albumID)                    ||
542
544
            DTagDrag::canDecode(e->mimeData()))
543
545
        {
544
546
            e->accept();
616
618
    {
617
619
        d->selected = sel;
618
620
        frameChanged();
 
621
        update();
619
622
    }
620
623
}
621
624