The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index ad886acf251b9525072404c15e5fd11327fae4f1..346c7b691800a3037f7a78cc735c9ae09e81d734 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -314,16 +314,6 @@ KFileItemList DolphinView::selectedItems() const
     return itemList;
 }
 
-KUrl::List DolphinView::selectedUrls() const
-{
-    KUrl::List urls;
-    const KFileItemList list = selectedItems();
-    foreach (const KFileItem &item, list) {
-        urls.append(item.url());
-    }
-    return urls;
-}
-
 int DolphinView::selectedItemsCount() const
 {
     const QAbstractItemView* view = m_viewAccessor.itemView();
@@ -537,6 +527,7 @@ void DolphinView::setUrl(const KUrl& url)
 
     // The selection model might change in the case of the column view. Disconnect
     // from the current selection model and reconnect later after the URL switch.
+    const bool hadSelection = hasSelection();
     QAbstractItemView* view = m_viewAccessor.itemView();
     disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
                this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
@@ -558,6 +549,9 @@ void DolphinView::setUrl(const KUrl& url)
     view = m_viewAccessor.itemView();
     connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
             this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+    if (hadSelection || hasSelection()) {
+        emitSelectionChangedSignal();
+    }
 }
 
 void DolphinView::selectAll()
@@ -705,40 +699,6 @@ void DolphinView::setCategorizedSorting(bool categorized)
     emit categorizedSortingChanged();
 }
 
-void DolphinView::toggleSortOrder()
-{
-    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
-                                Qt::DescendingOrder :
-                                Qt::AscendingOrder;
-    setSortOrder(order);
-}
-
-void DolphinView::toggleSortFoldersFirst()
-{
-    setSortFoldersFirst(!sortFoldersFirst());
-}
-
-void DolphinView::toggleAdditionalInfo(QAction* action)
-{
-    const KFileItemDelegate::Information info =
-        static_cast<KFileItemDelegate::Information>(action->data().toInt());
-
-    KFileItemDelegate::InformationList list = additionalInfo();
-
-    const bool show = action->isChecked();
-
-    const int index = list.indexOf(info);
-    const bool containsInfo = (index >= 0);
-    if (show && !containsInfo) {
-        list.append(info);
-        setAdditionalInfo(list);
-    } else if (!show && containsInfo) {
-        list.removeAt(index);
-        setAdditionalInfo(list);
-        Q_ASSERT(list.indexOf(info) < 0);
-    }
-}
-
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
@@ -832,7 +792,8 @@ void DolphinView::slotSelectionChanged(const QItemSelection& selected, const QIt
 
 void DolphinView::emitSelectionChangedSignal()
 {
-    emit selectionChanged(DolphinView::selectedItems());
+    m_selectionChangedTimer->stop();
+    emit selectionChanged(selectedItems());
 }
 
 void DolphinView::openContextMenu(const QPoint& pos,
@@ -1256,11 +1217,19 @@ void DolphinView::updateZoomLevel(int oldZoomLevel)
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
-    KUrl::List list = selectedUrls();
-    if (itemsExpandable() ) {
-        list = KDirModel::simplifiedUrlList(list);
+    KUrl::List urls;
+
+    const KFileItemList items = selectedItems();
+    foreach (const KFileItem &item, items) {
+        urls.append(item.url());
     }
-    return list;
+
+
+    if (itemsExpandable()) {
+        urls = KDirModel::simplifiedUrlList(urls);
+    }
+
+    return urls;
 }
 
 QMimeData* DolphinView::selectionMimeData() const