mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
PreviewJob API change (KFileItems by value)
svn path=/trunk/KDE/kdebase/apps/; revision=659426
This commit is contained in:
parent
1b9feca40e
commit
864e8e93b9
|
@ -801,24 +801,24 @@ void DolphinView::generatePreviews(const KFileItemList& items)
|
|||
{
|
||||
if (m_controller->showPreview()) {
|
||||
KIO::PreviewJob* job = KIO::filePreview(items, 128);
|
||||
connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
|
||||
this, SLOT(showPreview(const KFileItem*, const QPixmap&)));
|
||||
connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
|
||||
this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
|
||||
}
|
||||
}
|
||||
|
||||
void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap)
|
||||
void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap)
|
||||
{
|
||||
Q_ASSERT(item != 0);
|
||||
if (item->url().directory() != m_dirLister->url().path()) {
|
||||
if (item.url().directory() != m_dirLister->url().path()) {
|
||||
// the preview job is still working on items of an older URL, hence
|
||||
// the item is not part of the directory model anymore
|
||||
return;
|
||||
}
|
||||
|
||||
const QModelIndex idx = m_dirModel->indexForItem(*item);
|
||||
const QModelIndex idx = m_dirModel->indexForItem(item);
|
||||
if (idx.isValid() && (idx.column() == 0)) {
|
||||
const QMimeData* mimeData = QApplication::clipboard()->mimeData();
|
||||
if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(*item)) {
|
||||
if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
|
||||
KIconEffect iconEffect;
|
||||
const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
|
||||
m_dirModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
|
||||
|
|
|
@ -451,7 +451,7 @@ private slots:
|
|||
* Replaces the icon of the item \a item by the preview pixmap
|
||||
* \a pixmap.
|
||||
*/
|
||||
void showPreview(const KFileItem* item, const QPixmap& pixmap);
|
||||
void showPreview(const KFileItem& item, const QPixmap& pixmap);
|
||||
|
||||
/**
|
||||
* Restores the x- and y-position of the contents if the
|
||||
|
|
|
@ -187,10 +187,10 @@ void InfoSidebarPage::showItemInfo()
|
|||
false);
|
||||
job->setIgnoreMaximumSize(true);
|
||||
|
||||
connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
|
||||
this, SLOT(gotPreview(const KFileItem*, const QPixmap&)));
|
||||
connect(job, SIGNAL(failed(const KFileItem*)),
|
||||
this, SLOT(slotPreviewFailed(const KFileItem*)));
|
||||
connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
|
||||
this, SLOT(gotPreview(const KFileItem&, const QPixmap&)));
|
||||
connect(job, SIGNAL(failed(const KFileItem&)),
|
||||
this, SLOT(slotPreviewFailed(const KFileItem&)));
|
||||
|
||||
QString text("<b>");
|
||||
text.append(file.fileName());
|
||||
|
@ -208,15 +208,15 @@ void InfoSidebarPage::slotTimeout()
|
|||
showItemInfo();
|
||||
}
|
||||
|
||||
void InfoSidebarPage::slotPreviewFailed(const KFileItem* item)
|
||||
void InfoSidebarPage::slotPreviewFailed(const KFileItem& item)
|
||||
{
|
||||
m_pendingPreview = false;
|
||||
if (!applyBookmark(item->url())) {
|
||||
m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous));
|
||||
if (!applyBookmark(item.url())) {
|
||||
m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous));
|
||||
}
|
||||
}
|
||||
|
||||
void InfoSidebarPage::gotPreview(const KFileItem* item,
|
||||
void InfoSidebarPage::gotPreview(const KFileItem& item,
|
||||
const QPixmap& pixmap)
|
||||
{
|
||||
Q_UNUSED(item);
|
||||
|
|
|
@ -90,13 +90,13 @@ private slots:
|
|||
* Is invoked if no preview is available for the item. In this
|
||||
* case the icon will be shown.
|
||||
*/
|
||||
void slotPreviewFailed(const KFileItem* item);
|
||||
void slotPreviewFailed(const KFileItem& item);
|
||||
|
||||
/**
|
||||
* Is invoked if a preview is available for the item. The preview
|
||||
* \a pixmap is shown inside the info page.
|
||||
*/
|
||||
void gotPreview(const KFileItem* item, const QPixmap& pixmap);
|
||||
void gotPreview(const KFileItem& item, const QPixmap& pixmap);
|
||||
|
||||
/**
|
||||
* Starts the service of m_actionsVector with the index \index on
|
||||
|
|
Loading…
Reference in a new issue