#include "dolphinsettings.h"
#include "dolphinsortfilterproxymodel.h"
#include "draganddrophelper.h"
+#include "selectionmanager.h"
#include "viewproperties.h"
#include "dolphin_detailsmodesettings.h"
+#include "dolphin_generalsettings.h"
#include <kdirmodel.h>
#include <klocale.h>
DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
QTreeView(parent),
+ m_autoResize(true),
m_controller(controller),
- m_clearAdditionalInfo(false),
+ m_font(),
+ m_decorationSize(),
m_dragging(false),
m_showElasticBand(false),
m_elasticBandOrigin(),
headerView->setContextMenuPolicy(Qt::CustomContextMenu);
connect(headerView, SIGNAL(customContextMenuRequested(const QPoint&)),
this, SLOT(configureColumns(const QPoint&)));
+ connect(headerView, SIGNAL(sectionResized(int, int, int)),
+ this, SLOT(slotHeaderSectionResized(int, int, int)));
+ connect(headerView, SIGNAL(sectionHandleDoubleClicked(int)),
+ this, SLOT(disableAutoResizing()));
connect(parent, SIGNAL(sortingChanged(DolphinView::Sorting)),
this, SLOT(setSortIndicatorSection(DolphinView::Sorting)));
if (KGlobalSettings::singleClick()) {
connect(this, SIGNAL(clicked(const QModelIndex&)),
this, SLOT(triggerItem(const QModelIndex&)));
+ if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) {
+ SelectionManager* selManager = new SelectionManager(this);
+ connect(selManager, SIGNAL(selectionChanged()),
+ this, SLOT(requestActivation()));
+ }
} else {
connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
this, SLOT(triggerItem(const QModelIndex&)));
this, SLOT(zoomIn()));
connect(controller, SIGNAL(zoomOut()),
this, SLOT(zoomOut()));
- connect(controller->dolphinView(), SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+ connect(controller->dolphinView(), SIGNAL(additionalInfoChanged()),
this, SLOT(updateColumnVisibility()));
// apply the details mode settings to the widget
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.
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::mouseMoveEvent(QMouseEvent* event)
{
- QTreeView::mouseMoveEvent(event);
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();
+ } else {
+ QTreeView::mouseMoveEvent(event);
}
}
}
setDirtyRegion(m_dropRect);
}
+
+ if (event->mimeData()->hasUrls()) {
+ // accept url drops, independently from the destination item
+ event->acceptProposedAction();
+ }
}
void DolphinDetailsView::dropEvent(QDropEvent* event)
// 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);
- DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush);
+ const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
+ DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);
}
}
void DolphinDetailsView::resizeEvent(QResizeEvent* event)
{
QTreeView::resizeEvent(event);
-
- // 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)) {
+ if (m_autoResize) {
resizeColumns();
}
}
-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)
{
QHeaderView* headerView = header();
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
void DolphinDetailsView::updateColumnVisibility()
{
- KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
- 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.
- list.clear();
- list.append(KFileItemDelegate::Size);
- list.append(KFileItemDelegate::ModificationTime);
- m_controller->indicateAdditionalInfoChange(list);
- m_clearAdditionalInfo = true;
- }
-
+ const KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
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();
}
+void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize, int newSize)
+{
+ Q_UNUSED(logicalIndex);
+ Q_UNUSED(oldSize);
+ Q_UNUSED(newSize);
+ if (QApplication::mouseButtons() & Qt::LeftButton) {
+ disableAutoResizing();
+ }
+}
+
+void DolphinDetailsView::disableAutoResizing()
+{
+ m_autoResize = false;
+}
+
+void DolphinDetailsView::requestActivation()
+{
+ m_controller->requestActivation();
+}
+
bool DolphinDetailsView::isZoomInPossible() const
{
DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
{
DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
const int iconSize = settings->iconSize();
- m_viewOptions.decorationSize = QSize(iconSize, iconSize);
+ setIconSize(QSize(iconSize, iconSize));
+ m_decorationSize = QSize(iconSize, iconSize);
m_controller->setZoomInPossible(isZoomInPossible());
m_controller->setZoomOutPossible(isZoomOutPossible());
projects / dolphin.git / blobdiff