X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/81fcd720a2cc095262e52b8a40dd1472d774a415..dc1966aec364ee8d5e960c10356bffe9eae17508:/src/infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index b1dee423f..b2705ec7f 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -66,8 +66,8 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
 
     // preview
     m_preview = new PixmapViewer(this);
-    m_preview->setMinimumWidth(K3Icon::SizeEnormous);
-    m_preview->setFixedHeight(K3Icon::SizeEnormous);
+    m_preview->setMinimumWidth(KIconLoader::SizeEnormous);
+    m_preview->setFixedHeight(KIconLoader::SizeEnormous);
 
     // name
     m_nameLabel = new QLabel(this);
@@ -118,9 +118,15 @@ void InfoSidebarPage::setUrl(const KUrl& url)
     }
 }
 
-void InfoSidebarPage::setSelection(const QList<KFileItem>& selection)
+void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
     SidebarPage::setSelection(selection);
+    if (selection.size() == 1) {
+        const KUrl url = selection.first().url();
+        if (!url.isEmpty()) {
+            m_urlCandidate = url;
+        }
+    }
     m_timer->start(TimerDelay);
 }
 
@@ -167,7 +173,7 @@ void InfoSidebarPage::showItemInfo()
 
     cancelRequest();
 
-    const QList<KFileItem>& selectedItems = selection();
+    const KFileItemList& selectedItems = selection();
 
     KUrl file;
     if (selectedItems.isEmpty()) {
@@ -182,11 +188,11 @@ void InfoSidebarPage::showItemInfo()
     if (itemCount > 1) {
         KIconLoader iconLoader;
         QPixmap icon = iconLoader.loadIcon("exec",
-                                           K3Icon::NoGroup,
-                                           K3Icon::SizeEnormous);
+                                           KIconLoader::NoGroup,
+                                           KIconLoader::SizeEnormous);
         m_preview->setPixmap(icon);
         m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected", selectedItems.count()));
-    } else if (!applyBookmark(file)) {
+    } else if (!applyPlace(file)) {
         // try to get a preview pixmap from the item...
         KUrl::List list;
         list.append(file);
@@ -196,7 +202,7 @@ void InfoSidebarPage::showItemInfo()
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),
-                                                K3Icon::SizeEnormous,
+                                                KIconLoader::SizeEnormous,
                                                 0,
                                                 0,
                                                 true,
@@ -226,8 +232,8 @@ void InfoSidebarPage::slotTimeout()
 void InfoSidebarPage::showIcon(const KFileItem& item)
 {
     m_pendingPreview = false;
-    if (!applyBookmark(item.url())) {
-        m_preview->setPixmap(item.pixmap(K3Icon::SizeEnormous));
+    if (!applyPlace(item.url())) {
+        m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous));
     }
 }
 
@@ -241,7 +247,7 @@ void InfoSidebarPage::showPreview(const KFileItem& item,
     }
 }
 
-bool InfoSidebarPage::applyBookmark(const KUrl& url)
+bool InfoSidebarPage::applyPlace(const KUrl& url)
 {
     KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
     int count = placesModel->rowCount();
@@ -273,7 +279,7 @@ void InfoSidebarPage::showMetaInfo()
 {
     QString text;
 
-    const QList<KFileItem>& selectedItems = selection();
+    const KFileItemList& selectedItems = selection();
     if (selectedItems.size() <= 1) {
         KFileItem fileItem(S_IFDIR, KFileItem::Unknown, m_shownUrl);
         fileItem.refresh();