Adjust zoom-slider in the statusbar if settings have been changed

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 8ec7f335df5666e77ed2e7f490b12eb89072145a..661ce101bbe7f4c55e9d918eb4d893a875dd6c6d 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -132,18 +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);

-    if (GeneralSettings::autoExpandFolders()) {
-        controller->setAutoActivationDelay(750);
-    }

     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(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(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*)));


@@ -154,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>)));


@@ -302,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));


@@ -443,10 +446,24 @@ void DolphinView::stopLoading()
     m_dirLister->stop();
 }
 
     m_dirLister->stop();
 }
 

-void DolphinView::refresh()
+void DolphinView::readSettings()

 {
 {

-    m_container->refresh();
+    const int oldZoomLevel = m_container->zoomLevel();
+    
+    GeneralSettings::self()->readConfig();
+    m_container->readSettings();

     applyViewProperties();
     applyViewProperties();

+    
+    const int newZoomLevel = m_container->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }
+}
+
+void DolphinView::writeSettings()
+{
+    GeneralSettings::self()->writeConfig();
+    m_container->writeSettings();

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


@@ -544,9 +561,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


@@ -724,18 +739,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*>());
 }
 


@@ -793,7 +802,7 @@ void DolphinView::slotItemHovered(int index)
 {
     const KFileItem item = fileItemModel()->fileItem(index);
 
 {
     const KFileItem item = fileItemModel()->fileItem(index);
 

-    if (GeneralSettings::showToolTips()) {
+    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);
         QRectF itemRect = m_container->controller()->view()->itemContextRect(index);
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);


@@ -807,15 +816,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);
+    KUrl destUrl;
+    KFileItem destItem = fileItemModel()->fileItem(index);
+    if (destItem.isNull()) {
+        destItem = fileItemModel()->rootItem();
+        destUrl = url();
+    } else {
+        destUrl = destItem.url();
+    }

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


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

-    const QString error = DragAndDropHelper::dropUrls(destItem, url(), &dropEvent);
+    const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);

     if (!error.isEmpty()) {
         emit errorMessage(error);
     }
     if (!error.isEmpty()) {
         emit errorMessage(error);
     }


@@ -862,16 +876,6 @@ void DolphinView::emitSelectionChangedSignal()
     emit selectionChanged(selectedItems());
 }
 
     emit selectionChanged(selectedItems());
 }
 

-void DolphinView::dropUrls(const KFileItem& destItem,
-                           const KUrl& destPath,
-                           QDropEvent* event)
-{
-    Q_UNUSED(destItem);
-    Q_UNUSED(destPath);
-    markPastedUrlsAsSelected(event->mimeData());
-    //DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
-}
-

 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());


@@ -1041,6 +1045,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);


@@ -1096,6 +1107,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());