#include "dolphin_detailsmodesettings.h"
+#include <kdirmodel.h>
#include <klocale.h>
#include <kmenu.h>
+#include <QAbstractProxyModel>
#include <QAction>
#include <QApplication>
#include <QHeaderView>
// RETURN-key in keyPressEvent().
if (KGlobalSettings::singleClick()) {
connect(this, SIGNAL(clicked(const QModelIndex&)),
- this, SLOT(slotItemActivated(const QModelIndex&)));
+ this, SLOT(triggerItem(const QModelIndex&)));
} else {
connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
- this, SLOT(slotItemActivated(const QModelIndex&)));
+ this, SLOT(triggerItem(const QModelIndex&)));
}
connect(this, SIGNAL(entered(const QModelIndex&)),
this, SLOT(slotEntered(const QModelIndex&)));
this, SLOT(zoomIn()));
connect(controller, SIGNAL(zoomOut()),
this, SLOT(zoomOut()));
+ connect(controller->dolphinView(), SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+ this, SLOT(updateColumnVisibility()));
// apply the details mode settings to the widget
const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
#endif
updateDecorationSize();
+
+ setFocus();
}
DolphinDetailsView::~DolphinDetailsView()
headerView->setResizeMode(0, QHeaderView::Stretch);
headerView->setMovable(false);
- // hide columns if this is indicated by the settings
- const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
- Q_ASSERT(settings != 0);
- if (!settings->showDate()) {
- hideColumn(DolphinModel::ModifiedTime);
- }
-
- if (!settings->showPermissions()) {
- hideColumn(DolphinModel::Permissions);
- }
-
- if (!settings->showOwner()) {
- hideColumn(DolphinModel::Owner);
- }
-
- if (!settings->showGroup()) {
- hideColumn(DolphinModel::Group);
- }
-
- if (!settings->showType()) {
- hideColumn(DolphinModel::Type);
- }
+ updateColumnVisibility();
hideColumn(DolphinModel::Rating);
hideColumn(DolphinModel::Tags);
void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
{
- m_controller->triggerActivation();
+ m_controller->requestActivation();
QTreeView::mousePressEvent(event);
m_dragging = false;
} else {
m_dragging = true;
- m_dropRect = visualRect(index);
+ if (itemForIndex(index).isDir()) {
+ m_dropRect = visualRect(index);
+ } else {
+ m_dropRect.setSize(QSize()); // set as invalid
+ }
setDirtyRegion(m_dropRect);
}
}
const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
if (!urls.isEmpty()) {
event->acceptProposedAction();
+ const QModelIndex index = indexAt(event->pos());
+ KFileItem item;
+ if (index.isValid() && (index.column() == DolphinModel::Name)) {
+ item = itemForIndex(index);
+ }
m_controller->indicateDroppedUrls(urls,
m_controller->url(),
- indexAt(event->pos()),
- event->source());
+ item);
}
QTreeView::dropEvent(event);
m_dragging = false;
const QItemSelectionModel* selModel = selectionModel();
const QModelIndex currentIndex = selModel->currentIndex();
- const bool triggerItem = currentIndex.isValid()
- && (event->key() == Qt::Key_Return)
- && (selModel->selectedIndexes().count() <= 1);
- if (triggerItem) {
- m_controller->triggerItem(currentIndex);
+ const bool trigger = currentIndex.isValid()
+ && (event->key() == Qt::Key_Return)
+ && (selModel->selectedIndexes().count() <= 1);
+ if (trigger) {
+ triggerItem(currentIndex);
}
}
const QPoint pos = viewport()->mapFromGlobal(QCursor::pos());
const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);
if (pos.x() < nameColumnWidth) {
- m_controller->emitItemEntered(index);
+ m_controller->emitItemEntered(itemForIndex(index));
}
else {
m_controller->emitViewportEntered();
setDirtyRegion(dirtyRegion);
}
+QRect DolphinDetailsView::elasticBandRect() const
+{
+ const QPoint pos(contentsPos());
+ const QPoint topLeft(m_elasticBandOrigin.x() - pos.x(), m_elasticBandOrigin.y() - pos.y());
+ return QRect(topLeft, m_elasticBandDestination).normalized();
+}
+
void DolphinDetailsView::zoomIn()
{
if (isZoomInPossible()) {
}
}
-void DolphinDetailsView::slotItemActivated(const QModelIndex& index)
+void DolphinDetailsView::triggerItem(const QModelIndex& index)
{
+ const KFileItem item = itemForIndex(index);
if (index.isValid() && (index.column() == KDirModel::Name)) {
- m_controller->triggerItem(index);
+ m_controller->triggerItem(item);
} else {
clearSelection();
- m_controller->emitItemEntered(index);
+ m_controller->emitItemEntered(item);
}
}
popup.addTitle(i18nc("@title:menu", "Columns"));
QHeaderView* headerView = header();
- for (int i = DolphinModel::ModifiedTime; i <= DolphinModel::Type; ++i) {
+ for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) {
const int logicalIndex = headerView->logicalIndex(i);
const QString text = model()->headerData(i, Qt::Horizontal).toString();
QAction* action = popup.addAction(text);
QAction* activatedAction = popup.exec(header()->mapToGlobal(pos));
if (activatedAction != 0) {
const bool show = activatedAction->isChecked();
- DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
- Q_ASSERT(settings != 0);
-
- // remember the changed column visibility in the settings
const int columnIndex = activatedAction->data().toInt();
+
+ KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
+ KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;
switch (columnIndex) {
- case DolphinModel::ModifiedTime: settings->setShowDate(show); break;
- case DolphinModel::Permissions: settings->setShowPermissions(show); break;
- case DolphinModel::Owner: settings->setShowOwner(show); break;
- case DolphinModel::Group: settings->setShowGroup(show); break;
- case DolphinModel::Type: settings->setShowType(show); break;
+ 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;
}
- // apply the changed column visibility
if (show) {
- showColumn(columnIndex);
+ Q_ASSERT(!list.contains(info));
+ list.append(info);
} else {
- hideColumn(columnIndex);
+ Q_ASSERT(list.contains(info));
+ const int index = list.indexOf(info);
+ list.removeAt(index);
}
+
+ m_controller->indicateAdditionalInfoChange(list);
+ setColumnHidden(columnIndex, !show);
+ }
+}
+
+void DolphinDetailsView::updateColumnVisibility()
+{
+ KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
+ if (list.isEmpty() || list.contains(KFileItemDelegate::NoInformation)) {
+ // 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);
}
+
+ 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));
}
bool DolphinDetailsView::isZoomInPossible() const
return QPoint(0, y);
}
-QRect DolphinDetailsView::elasticBandRect() const
-{
- const QPoint pos(contentsPos());
- const QPoint topLeft(m_elasticBandOrigin.x() - pos.x(), m_elasticBandOrigin.y() - pos.y());
- return QRect(topLeft, m_elasticBandDestination).normalized();
-}
-
-static bool isValidNameIndex(const QModelIndex& index)
+KFileItem DolphinDetailsView::itemForIndex(const QModelIndex& index) const
{
- return index.isValid() && (index.column() == KDirModel::Name);
+ QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(model());
+ KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
+ const QModelIndex dirIndex = proxyModel->mapToSource(index);
+ return dirModel->itemForIndex(dirIndex);
}
#include "dolphindetailsview.moc"
projects / dolphin.git / blobdiff