From 9ca11175a4c9e93607131c45b8e5470e1e5014b7 Mon Sep 17 00:00:00 2001 From: Chirag Anand Date: Thu, 22 Sep 2011 18:08:49 +0530 Subject: Fixed bug for selecting files with --select parameter. Files selected via --select parameter did not get current item focus. And if files were deleted while being current item, updating the view would select the next item instead of the first item in the list. BUG: 257805 CCMAIL: peter.penz19@gmail.com CCMAIL: frank78ac@googlemail.com --- src/kitemviews/kfileitemmodel.cpp | 7 +++++++ src/kitemviews/kfileitemmodel.h | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'src/kitemviews') diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 9b96d7eac..a36ca0cdf 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -263,6 +263,13 @@ int KFileItemModel::index(const KFileItem& item) const return m_items.value(item.url(), -1); } +int KFileItemModel::index(const KUrl& url) const +{ + KUrl urlToFind = url; + urlToFind.adjustPath(KUrl::RemoveTrailingSlash); + return m_items.value(urlToFind, -1); +} + KFileItem KFileItemModel::rootItem() const { const KDirLister* dirLister = m_dirLister.data(); diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index b79eec4ee..3c8cdba2c 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -105,6 +105,12 @@ public: */ int index(const KFileItem& item) const; + /** + * @return The index for the URL \a url. -1 is returned if no file-item + * is found. The runtime complexity of this call is O(1). + */ + int index(const KUrl& url) const; + /** * @return Root item of all items. */ -- cgit v1.3