Fix "general settings" issues

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 91d668e9d6bd8fa70d8e076f4d3b4bf9b77e5d1b..83d80012cbca8c36b8da3dfa489a5894c218f45c 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -132,16 +132,18 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_container->setVisibleRoles(QList<QByteArray>() << "name");
     m_container->installEventFilter(this);
     setFocusProxy(m_container);
     m_container->setVisibleRoles(QList<QByteArray>() << "name");
     m_container->installEventFilter(this);
     setFocusProxy(m_container);

+    connect(m_container->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip()));
+    connect(m_container->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip()));

 
     KItemListController* controller = m_container->controller();
     controller->setSelectionBehavior(KItemListController::MultiSelection);
 
     KItemListController* controller = m_container->controller();
     controller->setSelectionBehavior(KItemListController::MultiSelection);

-    connect(controller, SIGNAL(itemActivated(int)),
-            this, SLOT(slotItemActivated(int)));
+    connect(controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
+    connect(controller, SIGNAL(itemsActivated(QSet<int>)), this, SLOT(slotItemsActivated(QSet<int>)));

     connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
     connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
     connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
     connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));
     connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
     connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
     connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
     connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));

-    connect(controller, SIGNAL(itemExpansionToggleClicked(int)), this, SLOT(slotItemExpansionToggleClicked(int)));
+    connect(controller, SIGNAL(itemPressed(int,Qt::MouseButton)), this, SLOT(hideToolTip()));

     connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
     connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
     connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
     connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
     connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
     connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));


@@ -152,6 +154,12 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
         connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
     }
 
         connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
     }
 

+    KItemListView* view = controller->view();
+    connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
+            this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
+    connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
+            this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
+

     KItemListSelectionManager* selectionManager = controller->selectionManager();
     connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
             this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));
     KItemListSelectionManager* selectionManager = controller->selectionManager();
     connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
             this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));


@@ -260,8 +268,7 @@ void DolphinView::setHiddenFilesShown(bool show)
     ViewProperties props(url());
     props.setHiddenFilesShown(show);
 
     ViewProperties props(url());
     props.setHiddenFilesShown(show);
 

-    m_dirLister->setShowingDotFiles(show);
-    m_dirLister->emitChanges();
+    fileItemModel()->setShowHiddenFiles(show);

     emit hiddenFilesShownChanged(show);
 }
 
     emit hiddenFilesShownChanged(show);
 }
 


@@ -301,11 +308,8 @@ KFileItemList DolphinView::selectedItems() const
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
     const QSet<int> selectedIndexes = selectionManager->selectedItems();
 
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
     const QSet<int> selectedIndexes = selectionManager->selectedItems();
 

-    QList<int> sortedIndexes = selectedIndexes.toList();
-    qSort(sortedIndexes);
-

     KFileItemList selectedItems;
     KFileItemList selectedItems;

-    QListIterator<int> it(sortedIndexes);
+    QSetIterator<int> it(selectedIndexes);

     while (it.hasNext()) {
         const int index = it.next();
         selectedItems.append(model->fileItem(index));
     while (it.hasNext()) {
         const int index = it.next();
         selectedItems.append(model->fileItem(index));


@@ -339,7 +343,7 @@ void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
 
     for (int index = 0; index < model->count(); index++) {
         const KFileItem item = model->fileItem(index);
 
     for (int index = 0; index < model->count(); index++) {
         const KFileItem item = model->fileItem(index);

-        if (pattern.exactMatch(item.name())) {
+        if (pattern.exactMatch(item.text())) {

             // An alternative approach would be to store the matching items in a QSet<int> and
             // select them in one go after the loop, but we'd need a new function
             // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)
             // An alternative approach would be to store the matching items in a QSet<int> and
             // select them in one go after the loop, but we'd need a new function
             // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)


@@ -444,26 +448,19 @@ void DolphinView::stopLoading()
 
 void DolphinView::refresh()
 {
 
 void DolphinView::refresh()
 {

-    const bool oldActivationState = m_active;
-    const int oldZoomLevel = zoomLevel();
-    m_active = true;
-
+    GeneralSettings::self()->readConfig();
+    m_container->refresh();

     applyViewProperties();
     applyViewProperties();

-    reload();
-
-    setActive(oldActivationState);
-    updateZoomLevel(oldZoomLevel);

 }
 
 void DolphinView::setNameFilter(const QString& nameFilter)
 {
 }
 
 void DolphinView::setNameFilter(const QString& nameFilter)
 {

-    Q_UNUSED(nameFilter);
-    //m_viewModeController->setNameFilter(nameFilter);
+    fileItemModel()->setNameFilter(nameFilter);

 }
 
 QString DolphinView::nameFilter() const
 {
 }
 
 QString DolphinView::nameFilter() const
 {

-    return QString(); //m_viewModeController->nameFilter();
+    return fileItemModel()->nameFilter();

 }
 
 void DolphinView::calculateItemCount(int& fileCount,
 }
 
 void DolphinView::calculateItemCount(int& fileCount,


@@ -551,9 +548,7 @@ void DolphinView::setUrl(const KUrl& url)
     emit urlAboutToBeChanged(url);
     m_url = url;
 
     emit urlAboutToBeChanged(url);
     m_url = url;
 

-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }
+    hideToolTip();

 
     // It is important to clear the items from the model before
     // applying the view properties, otherwise expensive operations
 
     // It is important to clear the items from the model before
     // applying the view properties, otherwise expensive operations


@@ -693,22 +688,30 @@ void DolphinView::activate()
 
 void DolphinView::slotItemActivated(int index)
 {
 
 void DolphinView::slotItemActivated(int index)
 {

-    Q_UNUSED(index);
+    const KFileItem item = fileItemModel()->fileItem(index);
+    if (!item.isNull()) {
+        emit itemActivated(item);
+    }
+}

 
 

-    const KFileItemList items = selectedItems();
-    if (items.isEmpty()) {
-        return;
+void DolphinView::slotItemsActivated(const QSet<int>& indexes)
+{
+    Q_ASSERT(indexes.count() >= 2);
+
+    KFileItemList items;
+
+    KFileItemModel* model = fileItemModel();
+    QSetIterator<int> it(indexes);
+    while (it.hasNext()) {
+        const int index = it.next();
+        items.append(model->fileItem(index));

     }
 
     }
 

-    if (items.count() == 1) {
-        emit itemActivated(items.at(0)); // caught by DolphinViewContainer or DolphinPart
-    } else {
-        foreach (const KFileItem& item, items) {
-            if (item.isDir()) {
-                emit tabRequested(item.url());
-            } else {
-                emit itemActivated(item);
-            }
+    foreach (const KFileItem& item, items) {
+        if (item.isDir()) {
+            emit tabRequested(item.url());
+        } else {
+            emit itemActivated(item);

         }
     }
 }
         }
     }
 }


@@ -723,18 +726,12 @@ void DolphinView::slotItemMiddleClicked(int index)
 
 void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
 {
 
 void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
 {

-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }

     const KFileItem item = fileItemModel()->fileItem(index);
     emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
 }
 
 void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
 {
     const KFileItem item = fileItemModel()->fileItem(index);
     emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
 }
 
 void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
 {

-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }

     emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList<QAction*>());
 }
 
     emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList<QAction*>());
 }
 


@@ -788,23 +785,12 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
     delete menu.data();
 }
 
     delete menu.data();
 }
 

-void DolphinView::slotItemExpansionToggleClicked(int index)
-{
-    // TODO: When doing a model->setExpanded(false) it should
-    // be checked here whether the current index is part of the
-    // closed sub-tree. If this is the case, the current index
-    // should be adjusted to the parent index.
-    KFileItemModel* model = fileItemModel();
-    const bool expanded = model->isExpanded(index);
-    model->setExpanded(index, !expanded);
-}
-

 void DolphinView::slotItemHovered(int index)
 {
     const KFileItem item = fileItemModel()->fileItem(index);
 
 void DolphinView::slotItemHovered(int index)
 {
     const KFileItem item = fileItemModel()->fileItem(index);
 

-    if (GeneralSettings::showToolTips()) {
-        QRectF itemRect = m_container->controller()->view()->itemRect(index);
+    if (GeneralSettings::showToolTips() && QApplication::mouseButtons() == Qt::NoButton) {
+        QRectF itemRect = m_container->controller()->view()->itemContextRect(index);

         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);
 


@@ -817,15 +803,20 @@ void DolphinView::slotItemHovered(int index)
 void DolphinView::slotItemUnhovered(int index)
 {
     Q_UNUSED(index);
 void DolphinView::slotItemUnhovered(int index)
 {
     Q_UNUSED(index);

-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }
+    hideToolTip();

     emit requestItemInfo(KFileItem());
 }
 
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     emit requestItemInfo(KFileItem());
 }
 
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {

-    const KFileItem destItem = fileItemModel()->fileItem(index);
+    KFileItem destItem = fileItemModel()->fileItem(index);
+    if (destItem.isNull()) {
+        destItem = fileItemModel()->rootItem();
+        if (destItem.isNull()) {
+            kWarning() << "No destination item available for drop operation.";
+            return;
+        }
+    }

 
     QDropEvent dropEvent(event->pos().toPoint(),
                          event->possibleActions(),
 
     QDropEvent dropEvent(event->pos().toPoint(),
                          event->possibleActions(),


@@ -833,7 +824,10 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->buttons(),
                          event->modifiers());
 
                          event->buttons(),
                          event->modifiers());
 

-    DragAndDropHelper::dropUrls(destItem, url(), &dropEvent, this);
+    const QString error = DragAndDropHelper::dropUrls(destItem, &dropEvent);
+    if (!error.isEmpty()) {
+        emit errorMessage(error);
+    }

 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)


@@ -952,6 +946,7 @@ void DolphinView::saveState(QDataStream& stream)
     const int currentIndex = m_container->controller()->selectionManager()->currentItem();
     if (currentIndex != -1) {
         KFileItem item = fileItemModel()->fileItem(currentIndex);
     const int currentIndex = m_container->controller()->selectionManager()->currentItem();
     if (currentIndex != -1) {
         KFileItem item = fileItemModel()->fileItem(currentIndex);

+        Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist

         KUrl currentItemUrl = item.url();
         stream << currentItemUrl;
     } else {
         KUrl currentItemUrl = item.url();
         stream << currentItemUrl;
     } else {


@@ -1047,6 +1042,13 @@ void DolphinView::updateViewState()
     }
 }
 
     }
 }
 

+void DolphinView::hideToolTip()
+{
+    if (GeneralSettings::showToolTips()) {
+        m_toolTipManager->hideToolTip();
+    }
+}
+

 void DolphinView::showHoverInformation(const KFileItem& item)
 {
     emit requestItemInfo(item);
 void DolphinView::showHoverInformation(const KFileItem& item)
 {
     emit requestItemInfo(item);


@@ -1102,6 +1104,29 @@ void DolphinView::slotRefreshItems()
     }
 }
 
     }
 }
 

+void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(fileItemModel()->sortOrder() == current);
+
+    ViewProperties props(url());
+    props.setSortOrder(current);
+
+    emit sortOrderChanged(current);
+}
+
+void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(fileItemModel()->sortRole() == current);
+
+    ViewProperties props(url());
+    const Sorting sorting = sortingForSortRole(current);
+    props.setSorting(sorting);
+
+    emit sortingChanged(sorting);
+}
+

 KFileItemModel* DolphinView::fileItemModel() const
 {
     return static_cast<KFileItemModel*>(m_container->controller()->model());
 KFileItemModel* DolphinView::fileItemModel() const
 {
     return static_cast<KFileItemModel*>(m_container->controller()->model());


@@ -1127,9 +1152,23 @@ void DolphinView::applyViewProperties()
     m_container->beginTransaction();
 
     const ViewProperties props(url());
     m_container->beginTransaction();
 
     const ViewProperties props(url());

+    KFileItemModel* model = fileItemModel();

 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {

+        // Prevent an animated transition of the position and size of the items when switching
+        // the view-mode by temporary clearing the model and updating it again after the view mode
+        // has been modified.
+        const bool restoreModel = (model->count() > 0);
+        if (restoreModel) {
+            const int currentItemIndex = m_container->controller()->selectionManager()->currentItem();
+            if (currentItemIndex >= 0) {
+                m_currentItemUrl = model->fileItem(currentItemIndex).url();
+            }
+            m_selectedUrls = selectedItems().urlList();
+            model->clear();
+        }
+

         const Mode previousMode = m_mode;
         m_mode = mode;
 
         const Mode previousMode = m_mode;
         m_mode = mode;
 


@@ -1150,17 +1189,18 @@ void DolphinView::applyViewProperties()
         if (m_container->zoomLevel() != oldZoomLevel) {
             emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
         }
         if (m_container->zoomLevel() != oldZoomLevel) {
             emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
         }

+
+        if (restoreModel) {
+            loadDirectory(url());
+        }

     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();
     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();

-    if (hiddenFilesShown != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(hiddenFilesShown);
-        m_dirLister->emitChanges();
+    if (hiddenFilesShown != model->showHiddenFiles()) {
+        model->setShowHiddenFiles(hiddenFilesShown);

         emit hiddenFilesShownChanged(hiddenFilesShown);
     }
 
         emit hiddenFilesShownChanged(hiddenFilesShown);
     }
 

-    KFileItemModel* model = fileItemModel();
-

     const bool groupedSorting = props.groupedSorting();
     if (groupedSorting != model->groupedSorting()) {
         model->setGroupedSorting(groupedSorting);
     const bool groupedSorting = props.groupedSorting();
     if (groupedSorting != model->groupedSorting()) {
         model->setGroupedSorting(groupedSorting);


@@ -1231,16 +1271,6 @@ void DolphinView::pasteToUrl(const KUrl& url)
     KonqOperations::doPaste(this, url);
 }
 
     KonqOperations::doPaste(this, url);
 }
 

-void DolphinView::updateZoomLevel(int oldZoomLevel)
-{
-    Q_UNUSED(oldZoomLevel);
- /*   const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
-    if (oldZoomLevel != newZoomLevel) {
-        m_viewModeController->setZoomLevel(newZoomLevel);
-        emit zoomLevelChanged(newZoomLevel);
-    }*/
-}
-

 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
     KUrl::List urls;
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
     KUrl::List urls;