Differential D15096 Diff 40495 src/widgets/previewjob.cpp

Changeset View

Standalone View

View Options

src/widgets/previewjob.cpp

Show First 20 Lines • Show All 632 Lines • ▼ Show 20 Line(s)625{
633 q->connect(job, SIGNAL(data(KIO::Job*,QByteArray)), SLOT(slotThumbData(KIO::Job*,QByteArray))); 633​ q->connect(job, SIGNAL(data(KIO::Job*,QByteArray)), SLOT(slotThumbData(KIO::Job*,QByteArray)));
634 bool save = bSave && currentItem.plugin->property(QStringLiteral("CacheThumbnail")).toBool() && !sequenceIndex; 634​ bool save = bSave && currentItem.plugin->property(QStringLiteral("CacheThumbnail")).toBool() && !sequenceIndex;
635 job->addMetaData(QStringLiteral("mimeType"), currentItem.item.mimetype()); 635​ job->addMetaData(QStringLiteral("mimeType"), currentItem.item.mimetype());
636 job->addMetaData(QStringLiteral("width"), QString().setNum(save ? cacheWidth : width)); 636​ job->addMetaData(QStringLiteral("width"), QString().setNum(save ? cacheWidth : width));
637 job->addMetaData(QStringLiteral("height"), QString().setNum(save ? cacheHeight : height)); 637​ job->addMetaData(QStringLiteral("height"), QString().setNum(save ? cacheHeight : height));
638 job->addMetaData(QStringLiteral("iconSize"), QString().setNum(save ? 64 : iconSize)); 638​ job->addMetaData(QStringLiteral("iconSize"), QString().setNum(save ? 64 : iconSize));
639 job->addMetaData(QStringLiteral("iconAlpha"), QString().setNum(iconAlpha)); 639​ job->addMetaData(QStringLiteral("iconAlpha"), QString().setNum(iconAlpha));
640 job->addMetaData(QStringLiteral("plugin"), currentItem.plugin->library()); 640​ job->addMetaData(QStringLiteral("plugin"), currentItem.plugin->library());
641​ job->addMetaData(QStringLiteral("enabledPlugins"), enabledPlugins.join(QLatin1Char(',')));
wbauerUnsubmitted
Not Done

That line is commented out. Is this intentional?
I don't see how this will change anything... ;-/

wbauer: That line is commented out. Is this intentional? I don't see how this will change anything...
broulikAuthorUnsubmitted
Not Done

Aw, crap, that's what happens when you have unstaged changes, I was testing stuff and acceidentally pushed that wrong state, will fix, thanks for noticing.

Fixed in 62c57a5f78fc754eb0d1d7c6329f063f55792b19

broulik: Aw, crap, that's what happens when you have unstaged changes, I was testing stuff and…
641 if (sequenceIndex) { 642​ if (sequenceIndex) {
642 job->addMetaData(QStringLiteral("sequence-index"), QString().setNum(sequenceIndex)); 643​ job->addMetaData(QStringLiteral("sequence-index"), QString().setNum(sequenceIndex));
643 } 644​ }
644 645​
645#if WITH_SHM 646​#if WITH_SHM
646 if (shmid == -1) { 647​ if (shmid == -1) {
647 if (shmaddr) { 648​ if (shmaddr) {
648 shmdt((char *)shmaddr); 649​ shmdt((char *)shmaddr);
▲ Show 20 Lines • Show All 151 Lines • Show Last 20 Lines