fixed issue that when using "Use common view properties for all folders" the view...

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index af79d084572b85706bd48ff0ad97307723a51d19..68b288b0b96f2375e499e98315f61ce49c4904cc 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,8 @@
 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_clearAdditionalInfo(false),
     m_dragging(false),
     m_showElasticBand(false),


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


@@ -105,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.


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


@@ -166,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)


@@ -217,6 +214,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()) {


@@ -250,7 +252,8 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
         m_dragging = false;
     } else {
         m_dragging = true;
         m_dragging = false;
     } else {
         m_dragging = true;

-        if (itemForIndex(index).isDir()) {
+        const KFileItem item = itemForIndex(index);
+        if (!item.isNull() && item.isDir()) {

             m_dropRect = visualRect(index);
         } else {
             m_dropRect.setSize(QSize()); // set as invalid
             m_dropRect = visualRect(index);
         } else {
             m_dropRect.setSize(QSize()); // set as invalid


@@ -298,8 +301,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(viewport(), m_dropRect, brush);

     }
 }
 
     }
 }
 


@@ -321,32 +324,13 @@ 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);
-        }
-
-        if (headerWidth < availableWidth) {
-            headerView->setResizeMode(QHeaderView::ResizeToContents);
-            headerView->setResizeMode(0, QHeaderView::Stretch);
-        }
+    // 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();

     }
 }
 
     }
 }
 


@@ -359,7 +343,7 @@ void DolphinDetailsView::closeEvent(QCloseEvent* event)
         KFileItemDelegate::InformationList info;
         info.append(KFileItemDelegate::NoInformation);
         m_controller->indicateAdditionalInfoChange(info);
         KFileItemDelegate::InformationList info;
         info.append(KFileItemDelegate::NoInformation);
         m_controller->indicateAdditionalInfoChange(info);

-        m_clearAdditionalInfo = true;
+        m_clearAdditionalInfo = false;

     }
     QTreeView::closeEvent(event);
 }
     }
     QTreeView::closeEvent(event);
 }


@@ -512,6 +496,8 @@ void DolphinDetailsView::updateColumnVisibility()
             m_clearAdditionalInfo = false;
         }
     }
             m_clearAdditionalInfo = false;
         }
     }

+
+    resizeColumns();

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


@@ -530,7 +516,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());


@@ -581,4 +567,40 @@ KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex
     return info;
 }
 
     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"