we've to use Qt's names for keys.

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index ee123b65cac088a5d27a63c4fa89c93e7021e20b..886f3f9a66637a69b338e58793e08c5d91039302 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -24,6 +24,7 @@
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"

+#include "draganddrophelper.h"

 #include "viewproperties.h"
 
 #include "dolphin_detailsmodesettings.h"
 #include "viewproperties.h"
 
 #include "dolphin_detailsmodesettings.h"


@@ -43,6 +44,9 @@
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
     m_controller(controller),
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
     m_controller(controller),

+    m_font(),
+    m_decorationSize(),
+    m_clearAdditionalInfo(false),

     m_dragging(false),
     m_showElasticBand(false),
     m_elasticBandOrigin(),
     m_dragging(false),
     m_showElasticBand(false),
     m_elasticBandOrigin(),


@@ -58,6 +62,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
     setAlternatingRowColors(true);
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
     setAlternatingRowColors(true);

+    setItemsExpandable(false);

 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);


@@ -104,13 +109,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
     Q_ASSERT(settings != 0);
 
     const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
     Q_ASSERT(settings != 0);
 

-    m_viewOptions = QTreeView::viewOptions();
-
-    QFont font(settings->fontFamily(), settings->fontSize());
-    font.setItalic(settings->italicFont());
-    font.setBold(settings->boldFont());
-    m_viewOptions.font = font;
-    m_viewOptions.showDecorationSelected = true;
+    m_font = QFont(settings->fontFamily(), settings->fontSize());

 
 // TODO: Remove this check when 4.3.2 is released and KDE requires it... this
 //       check avoids a division by zero happening on versions before 4.3.1.
 
 // TODO: Remove this check when 4.3.2 is released and KDE requires it... this
 //       check avoids a division by zero happening on versions before 4.3.1.


@@ -133,13 +132,8 @@ DolphinDetailsView::~DolphinDetailsView()
 bool DolphinDetailsView::event(QEvent* event)
 {
     if (event->type() == QEvent::Polish) {
 bool DolphinDetailsView::event(QEvent* event)
 {
     if (event->type() == QEvent::Polish) {

-        // Assure that by respecting the available width that:
-        // - the 'Name' column is stretched as large as possible
-        // - the remaining columns are as small as possible

         QHeaderView* headerView = header();
         QHeaderView* headerView = header();

-        headerView->setStretchLastSection(false);
-        headerView->setResizeMode(QHeaderView::ResizeToContents);
-        headerView->setResizeMode(0, QHeaderView::Stretch);
+        headerView->setResizeMode(QHeaderView::Interactive);

         headerView->setMovable(false);
 
         updateColumnVisibility();
         headerView->setMovable(false);
 
         updateColumnVisibility();


@@ -165,7 +159,11 @@ bool DolphinDetailsView::event(QEvent* event)
 
 QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 {
 
 QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 {

-    return m_viewOptions;
+    QStyleOptionViewItem viewOptions = QTreeView::viewOptions();
+    viewOptions.font = m_font;
+    viewOptions.showDecorationSelected = true;
+    viewOptions.decorationSize = m_decorationSize;
+    return viewOptions;

 }
 
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 }
 
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)


@@ -201,9 +199,27 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 
 void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
 {
 
 void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
 {

-    QTreeView::mouseMoveEvent(event);

     if (m_showElasticBand) {
     if (m_showElasticBand) {

+        const QPoint mousePos = event->pos();
+        const QModelIndex index = indexAt(mousePos);
+        if (!index.isValid()) {
+            // the destination of the selection rectangle is above the viewport. In this
+            // case QTreeView does no selection at all, which is not the wanted behavior
+            // in Dolphin -> select all items within the elastic band rectangle
+            clearSelection();
+
+            const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
+            QRect selRect = QRect(m_elasticBandOrigin, m_elasticBandDestination).normalized();
+            const QRect nameColumnsRect(0, 0, nameColumnWidth, viewport()->height());
+            selRect = nameColumnsRect.intersected(selRect);
+
+            setSelection(selRect, QItemSelectionModel::Select);
+        }
+
+        QTreeView::mouseMoveEvent(event);

         updateElasticBand();
         updateElasticBand();

+    } else {
+        QTreeView::mouseMoveEvent(event);

     }
 }
 
     }
 }
 


@@ -216,6 +232,11 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
     }
 }
 
     }
 }
 

+void DolphinDetailsView::startDrag(Qt::DropActions supportedActions)
+{
+    DragAndDropHelper::startDrag(this, supportedActions);
+}
+

 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 {
     if (event->mimeData()->hasUrls()) {
 void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event)
 {
     if (event->mimeData()->hasUrls()) {


@@ -249,9 +270,19 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
         m_dragging = false;
     } else {
         m_dragging = true;
         m_dragging = false;
     } else {
         m_dragging = true;

-        m_dropRect = visualRect(index);
+        const KFileItem item = itemForIndex(index);
+        if (!item.isNull() && item.isDir()) {
+            m_dropRect = visualRect(index);
+        } else {
+            m_dropRect.setSize(QSize()); // set as invalid
+        }

         setDirtyRegion(m_dropRect);
     }
         setDirtyRegion(m_dropRect);
     }

+
+    if (event->mimeData()->hasUrls()) {
+        // accept url drops, independently from the destination item
+        event->acceptProposedAction();
+    }

 }
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)
 }
 
 void DolphinDetailsView::dropEvent(QDropEvent* event)


@@ -260,13 +291,13 @@ void DolphinDetailsView::dropEvent(QDropEvent* event)
     if (!urls.isEmpty()) {
         event->acceptProposedAction();
         const QModelIndex index = indexAt(event->pos());
     if (!urls.isEmpty()) {
         event->acceptProposedAction();
         const QModelIndex index = indexAt(event->pos());

+        KFileItem item;

         if (index.isValid() && (index.column() == DolphinModel::Name)) {
         if (index.isValid() && (index.column() == DolphinModel::Name)) {

-            const KFileItem item = itemForIndex(index);
-            m_controller->indicateDroppedUrls(urls,
-                                              m_controller->url(),
-                                              item,
-                                              event->source());
+            item = itemForIndex(index);

         }
         }

+        m_controller->indicateDroppedUrls(urls,
+                                          m_controller->url(),
+                                          item);

     }
     QTreeView::dropEvent(event);
     m_dragging = false;
     }
     QTreeView::dropEvent(event);
     m_dragging = false;


@@ -293,8 +324,8 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event)
 
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     if (m_dragging) {
 
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     if (m_dragging) {

-        const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
-        DolphinController::drawHoverIndication(viewport(), m_dropRect, brush);
+        const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
+        DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);

     }
 }
 
     }
 }
 


@@ -316,33 +347,28 @@ void DolphinDetailsView::resizeEvent(QResizeEvent* event)
 {
     QTreeView::resizeEvent(event);
 
 {
     QTreeView::resizeEvent(event);
 

-    // assure that the width of the name-column does not get too small
-    const int minWidth = 120;
-    QHeaderView* headerView = header();
-    bool useFixedWidth = (headerView->sectionSize(KDirModel::Name) <= minWidth)
-                         && (headerView->resizeMode(0) != QHeaderView::Fixed);
-    if (useFixedWidth) {
-        // the current width of the name-column is too small, hence
-        // use a fixed size
-        headerView->setResizeMode(QHeaderView::Fixed);
-        headerView->setResizeMode(0, QHeaderView::Fixed);
-        headerView->resizeSection(KDirModel::Name, minWidth);
-    } else if (headerView->resizeMode(0) != QHeaderView::Stretch) {
-        // check whether there is enough available viewport width
-        // to automatically resize the columns
-        const int availableWidth = viewport()->width();
-
-        int headerWidth = 0;
-        const int count = headerView->count();
-        for (int i = 0; i < count; ++i) {
-            headerWidth += headerView->sectionSize(i);
-        }
+    // TODO: There seems to be no easy way to find out whether the resize event
+    // has been triggered because of resizing the window or by adjusting the column-width
+    // by a left mouse-click (the columns should only be resized automatically when the window
+    // size is adjusted). The following workaround works well, but it should be
+    // considered solving this in a more transparent way.
+    if (!(QApplication::mouseButtons() & Qt::LeftButton)) {
+        resizeColumns();
+    }
+}

 
 

-        if (headerWidth < availableWidth) {
-            headerView->setResizeMode(QHeaderView::ResizeToContents);
-            headerView->setResizeMode(0, QHeaderView::Stretch);
-        }
+void DolphinDetailsView::closeEvent(QCloseEvent* event)
+{
+    if (m_clearAdditionalInfo) {
+        disconnect(m_controller->dolphinView(), SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+                this, SLOT(updateColumnVisibility()));
+
+        KFileItemDelegate::InformationList info;
+        info.append(KFileItemDelegate::NoInformation);
+        m_controller->indicateAdditionalInfoChange(info);
+        m_clearAdditionalInfo = false;

     }
     }

+    QTreeView::closeEvent(event);

 }
 
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 }
 
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)


@@ -381,11 +407,12 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index)
 
 void DolphinDetailsView::updateElasticBand()
 {
 
 void DolphinDetailsView::updateElasticBand()
 {

-    Q_ASSERT(m_showElasticBand);
-    QRect dirtyRegion(elasticBandRect());
-    m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos());
-    dirtyRegion = dirtyRegion.united(elasticBandRect());
-    setDirtyRegion(dirtyRegion);
+    if (m_showElasticBand) {
+        QRect dirtyRegion(elasticBandRect());
+        m_elasticBandDestination = viewport()->mapFromGlobal(QCursor::pos());
+        dirtyRegion = dirtyRegion.united(elasticBandRect());
+        setDirtyRegion(dirtyRegion);
+    }

 }
 
 QRect DolphinDetailsView::elasticBandRect() const
 }
 
 QRect DolphinDetailsView::elasticBandRect() const


@@ -453,17 +480,7 @@ void DolphinDetailsView::configureColumns(const QPoint& pos)
         const int columnIndex = activatedAction->data().toInt();
 
         KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
         const int columnIndex = activatedAction->data().toInt();
 
         KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();

-        KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;
-        switch (columnIndex) {
-        case DolphinModel::Size:         info = KFileItemDelegate::Size; break;
-        case DolphinModel::ModifiedTime: info = KFileItemDelegate::ModificationTime; break;
-        case DolphinModel::Permissions:  info = KFileItemDelegate::Permissions; break;
-        case DolphinModel::Owner:        info = KFileItemDelegate::Owner; break;
-        case DolphinModel::Group:        info = KFileItemDelegate::OwnerAndGroup; break;
-        case DolphinModel::Type:         info = KFileItemDelegate::FriendlyMimeType; break;
-        default: break;
-        }
-
+        const KFileItemDelegate::Information info = infoForColumn(columnIndex);

         if (show) {
             Q_ASSERT(!list.contains(info));
             list.append(info);
         if (show) {
             Q_ASSERT(!list.contains(info));
             list.append(info);


@@ -481,7 +498,10 @@ void DolphinDetailsView::configureColumns(const QPoint& pos)
 void DolphinDetailsView::updateColumnVisibility()
 {
     KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
 void DolphinDetailsView::updateColumnVisibility()
 {
     KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();

-    if (list.isEmpty() || list.contains(KFileItemDelegate::NoInformation)) {
+    const bool useDefaultColumns = !isVisible() &&
+                                   (list.isEmpty() ||
+                                    list.contains(KFileItemDelegate::NoInformation));
+    if (useDefaultColumns) {

         // Using the details view without any additional information (-> additional column)
         // makes no sense and leads to a usability problem as no viewport area is available
         // anymore. Hence as fallback provide at least a size and date column.
         // Using the details view without any additional information (-> additional column)
         // makes no sense and leads to a usability problem as no viewport area is available
         // anymore. Hence as fallback provide at least a size and date column.


@@ -489,14 +509,19 @@ void DolphinDetailsView::updateColumnVisibility()
         list.append(KFileItemDelegate::Size);
         list.append(KFileItemDelegate::ModificationTime);
         m_controller->indicateAdditionalInfoChange(list);
         list.append(KFileItemDelegate::Size);
         list.append(KFileItemDelegate::ModificationTime);
         m_controller->indicateAdditionalInfoChange(list);

+        m_clearAdditionalInfo = true;

     }
 
     }
 

-    setColumnHidden(DolphinModel::Size,         !list.contains(KFileItemDelegate::Size));
-    setColumnHidden(DolphinModel::ModifiedTime, !list.contains(KFileItemDelegate::ModificationTime));
-    setColumnHidden(DolphinModel::Permissions,  !list.contains(KFileItemDelegate::Permissions));
-    setColumnHidden(DolphinModel::Owner,        !list.contains(KFileItemDelegate::Owner));
-    setColumnHidden(DolphinModel::Group,        !list.contains(KFileItemDelegate::OwnerAndGroup));
-    setColumnHidden(DolphinModel::Type,         !list.contains(KFileItemDelegate::FriendlyMimeType));
+    for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) {
+        const KFileItemDelegate::Information info = infoForColumn(i);
+        const bool hide = !list.contains(info);
+        if (isColumnHidden(i) != hide) {
+            setColumnHidden(i, hide);
+            m_clearAdditionalInfo = false;
+        }
+    }
+
+    resizeColumns();

 }
 
 bool DolphinDetailsView::isZoomInPossible() const
 }
 
 bool DolphinDetailsView::isZoomInPossible() const


@@ -515,7 +540,7 @@ void DolphinDetailsView::updateDecorationSize()
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
     const int iconSize = settings->iconSize();
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
     const int iconSize = settings->iconSize();

-    m_viewOptions.decorationSize = QSize(iconSize, iconSize);
+    m_decorationSize = QSize(iconSize, iconSize);

 
     m_controller->setZoomInPossible(isZoomInPossible());
     m_controller->setZoomOutPossible(isZoomOutPossible());
 
     m_controller->setZoomInPossible(isZoomInPossible());
     m_controller->setZoomOutPossible(isZoomOutPossible());


@@ -549,4 +574,57 @@ KFileItem DolphinDetailsView::itemForIndex(const QModelIndex& index) const
     return dirModel->itemForIndex(dirIndex);
 }
 
     return dirModel->itemForIndex(dirIndex);
 }
 

+KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const
+{
+    KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;
+
+    switch (columnIndex) {
+    case DolphinModel::Size:         info = KFileItemDelegate::Size; break;
+    case DolphinModel::ModifiedTime: info = KFileItemDelegate::ModificationTime; break;
+    case DolphinModel::Permissions:  info = KFileItemDelegate::Permissions; break;
+    case DolphinModel::Owner:        info = KFileItemDelegate::Owner; break;
+    case DolphinModel::Group:        info = KFileItemDelegate::OwnerAndGroup; break;
+    case DolphinModel::Type:         info = KFileItemDelegate::FriendlyMimeType; break;
+    default: break;
+    }
+
+    return info;
+}
+
+void DolphinDetailsView::resizeColumns()
+{
+    // Using the resize mode QHeaderView::ResizeToContents is too slow (it takes
+    // around 3 seconds for each (!) resize operation when having > 10000 items).
+    // This gets a problem especially when opening large directories, where several
+    // resize operations are received for showing the currently available items during
+    // loading (the application hangs around 20 seconds when loading > 10000 items).
+
+    QHeaderView* headerView = header();
+    QFontMetrics fontMetrics(viewport()->font());
+
+    int columnWidth[KDirModel::ColumnCount];
+    columnWidth[KDirModel::Size] = fontMetrics.width("00000 Items");
+    columnWidth[KDirModel::ModifiedTime] = fontMetrics.width("0000-00-00 00:00");
+    columnWidth[KDirModel::Permissions] = fontMetrics.width("xxxxxxxxxx");
+    columnWidth[KDirModel::Owner] = fontMetrics.width("xxxxxxxxxx");
+    columnWidth[KDirModel::Group] = fontMetrics.width("xxxxxxxxxx");
+    columnWidth[KDirModel::Type] = fontMetrics.width("XXXX Xxxxxxx");
+
+    int requiredWidth = 0;
+    for (int i = KDirModel::Size; i <= KDirModel::Type; ++i) {
+        if (!isColumnHidden(i)) {
+            columnWidth[i] += 20; // provide a default gap
+            requiredWidth += columnWidth[i];
+            headerView->resizeSection(i, columnWidth[i]);
+        }
+    }
+
+    // resize the name column in a way that the whole available width is used
+    columnWidth[KDirModel::Name] = viewport()->width() - requiredWidth;
+    if (columnWidth[KDirModel::Name] < 120) {
+        columnWidth[KDirModel::Name] = 120;
+    }
+    headerView->resizeSection(KDirModel::Name, columnWidth[KDirModel::Name]);
+}
+

 #include "dolphindetailsview.moc"
 #include "dolphindetailsview.moc"