X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/abf8f1917d1ef044cf732eb873ce28bf805f27af..72e83bb42ab8bf9c54fbb866371aa0a6f26872f2:/src/dolphindetailsview.cpp diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 24692b5a8..dc05ef3ea 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -20,27 +20,35 @@ #include "dolphindetailsview.h" -#include "dolphinmainwindow.h" +#include "dolphincontroller.h" +#include "dolphinsettings.h" #include "dolphinsortfilterproxymodel.h" -#include "dolphinview.h" #include "viewproperties.h" -#include +#include "dolphin_detailsmodesettings.h" + #include +#include + #include -DolphinDetailsView::DolphinDetailsView(DolphinView* parent) : +DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) : QTreeView(parent), - m_dolphinView(parent) + m_controller(controller) { - assert(parent != 0); + Q_ASSERT(controller != 0); setAcceptDrops(true); setRootIsDecorated(false); setSortingEnabled(true); setUniformRowHeights(true); + setSelectionBehavior(SelectItems); + setDragDropMode(QAbstractItemView::DragDrop); + setDropIndicatorShown(false); + + viewport()->setAttribute(Qt::WA_Hover); - const ViewProperties props(parent->url()); + const ViewProperties props(controller->url()); setSortIndicatorSection(props.sorting()); setSortIndicatorOrder(props.sortOrder()); @@ -51,6 +59,29 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) : this, SLOT(setSortIndicatorSection(DolphinView::Sorting))); connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(setSortIndicatorOrder(Qt::SortOrder))); + + connect(this, SIGNAL(clicked(const QModelIndex&)), + controller, SLOT(triggerItem(const QModelIndex&))); + connect(this, SIGNAL(activated(const QModelIndex&)), + controller, SLOT(triggerItem(const QModelIndex&))); + + connect(controller, SIGNAL(zoomIn()), + this, SLOT(zoomIn())); + connect(controller, SIGNAL(zoomOut()), + this, SLOT(zoomOut())); + + // 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; + + updateDecorationSize(); } DolphinDetailsView::~DolphinDetailsView() @@ -67,43 +98,45 @@ bool DolphinDetailsView::event(QEvent* event) headerView->setStretchLastSection(false); headerView->setResizeMode(QHeaderView::ResizeToContents); headerView->setResizeMode(0, QHeaderView::Stretch); + + // hide columns if this is indicated by the settings + const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); + Q_ASSERT(settings != 0); + if (!settings->showDate()) { + hideColumn(KDirModel::ModifiedTime); + } + + if (!settings->showPermissions()) { + hideColumn(KDirModel::Permissions); + } + + if (!settings->showOwner()) { + hideColumn(KDirModel::Owner); + } + + if (!settings->showGroup()) { + hideColumn(KDirModel::Group); + } } return QTreeView::event(event); } + QStyleOptionViewItem DolphinDetailsView::viewOptions() const { - return QTreeView::viewOptions(); - - // TODO: the view options should been read from the settings; - // the following code is just for testing... - //QStyleOptionViewItem options = QTreeView::viewOptions(); - //options.decorationAlignment = Qt::AlignRight; - //options.decorationPosition = QStyleOptionViewItem::Right; - //options.decorationSize = QSize(100, 100); - //options.showDecorationSelected = true; - //options.state = QStyle::State_MouseOver; - //return options; + return m_viewOptions; } void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event) { QTreeView::contextMenuEvent(event); - - KFileItem* item = 0; - - const QModelIndex index = indexAt(event->pos()); - if (index.isValid()) { - item = m_dolphinView->fileItem(index); - } - - m_dolphinView->openContextMenu(item, event->globalPos()); + m_controller->triggerContextMenuRequest(event->pos()); } void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event) { QTreeView::mouseReleaseEvent(event); - m_dolphinView->declareViewActive(); + m_controller->triggerActivation(); } void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event) @@ -118,12 +151,11 @@ void DolphinDetailsView::dropEvent(QDropEvent* event) const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (!urls.isEmpty()) { event->acceptProposedAction(); - - // TODO: handle dropping above a directory - - const KUrl& destination = m_dolphinView->url(); - m_dolphinView->mainWindow()->dropUrls(urls, destination); + m_controller->indicateDroppedUrls(urls, + indexAt(event->pos()), + event->source()); } + QTreeView::dropEvent(event); } void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting) @@ -141,23 +173,63 @@ void DolphinDetailsView::setSortIndicatorOrder(Qt::SortOrder sortOrder) void DolphinDetailsView::synchronizeSortingState(int column) { // The sorting has already been changed in QTreeView if this slot is - // invoked, but Dolphin was not informed about this. This is bypassed by changing - // the sorting and sort order to a temporary other value and readjust it again. + // invoked, but Dolphin is not informed about this. DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(column); const Qt::SortOrder sortOrder = header()->sortIndicatorOrder(); + m_controller->indicateSortingChange(sorting); + m_controller->indicateSortOrderChange(sortOrder); +} + +void DolphinDetailsView::zoomIn() +{ + if (isZoomInPossible()) { + DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); + // TODO: get rid of K3Icon sizes + switch (settings->iconSize()) { + case K3Icon::SizeSmall: settings->setIconSize(K3Icon::SizeMedium); break; + case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break; + default: Q_ASSERT(false); break; + } + updateDecorationSize(); + } +} + +void DolphinDetailsView::zoomOut() +{ + if (isZoomOutPossible()) { + DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); + // TODO: get rid of K3Icon sizes + switch (settings->iconSize()) { + case K3Icon::SizeLarge: settings->setIconSize(K3Icon::SizeMedium); break; + case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break; + default: Q_ASSERT(false); break; + } + updateDecorationSize(); + } +} + +bool DolphinDetailsView::isZoomInPossible() const +{ + DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); + return settings->iconSize() < K3Icon::SizeLarge; +} + +bool DolphinDetailsView::isZoomOutPossible() const +{ + DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); + return settings->iconSize() > K3Icon::SizeSmall; +} + +void DolphinDetailsView::updateDecorationSize() +{ + DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); + const int iconSize = settings->iconSize(); + m_viewOptions.decorationSize = QSize(iconSize, iconSize); + + m_controller->setZoomInPossible(isZoomInPossible()); + m_controller->setZoomOutPossible(isZoomOutPossible()); - // temporary adjust the sorting and sort order to different values... - const DolphinView::Sorting tempSorting = (sorting == DolphinView::SortByName) ? - DolphinView::SortBySize : - DolphinView::SortByName; - m_dolphinView->setSorting(tempSorting); - const Qt::SortOrder tempSortOrder = (sortOrder == Qt::Ascending) ? - Qt::Descending : Qt::Ascending; - m_dolphinView->setSortOrder(tempSortOrder); - - // ... so that setting them again results in storing the new setting. - m_dolphinView->setSorting(sorting); - m_dolphinView->setSortOrder(sortOrder); + doItemsLayout(); } #include "dolphindetailsview.moc"