KItemListController* controller = m_container->controller();
controller->setSelectionBehavior(KItemListController::MultiSelection);
- connect(controller, SIGNAL(itemActivated(int)),
- this, SLOT(slotItemActivated(int)));
+ if (GeneralSettings::autoExpandFolders()) {
+ controller->setAutoActivationDelay(750);
+ }
+ connect(controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
+ connect(controller, SIGNAL(itemsActivated(QSet<int>)), this, SLOT(slotItemsActivated(QSet<int>)));
connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));
- connect(controller, SIGNAL(itemExpansionToggleClicked(int)), this, SLOT(slotItemExpansionToggleClicked(int)));
connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
}
+ KItemListView* view = controller->view();
+ connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
+ this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
+ connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
+ this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
+
KItemListSelectionManager* selectionManager = controller->selectionManager();
connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));
ViewProperties props(url());
props.setHiddenFilesShown(show);
- m_dirLister->setShowingDotFiles(show);
- m_dirLister->emitChanges();
+ fileItemModel()->setShowHiddenFiles(show);
emit hiddenFilesShownChanged(show);
}
for (int index = 0; index < model->count(); index++) {
const KFileItem item = model->fileItem(index);
- if (pattern.exactMatch(item.name())) {
+ if (pattern.exactMatch(item.text())) {
// An alternative approach would be to store the matching items in a QSet<int> and
// select them in one go after the loop, but we'd need a new function
// KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)
void DolphinView::refresh()
{
- const bool oldActivationState = m_active;
- const int oldZoomLevel = zoomLevel();
- m_active = true;
-
+ GeneralSettings::self()->readConfig();
+ m_container->refresh();
applyViewProperties();
- reload();
-
- setActive(oldActivationState);
- updateZoomLevel(oldZoomLevel);
}
void DolphinView::setNameFilter(const QString& nameFilter)
{
- Q_UNUSED(nameFilter);
- //m_viewModeController->setNameFilter(nameFilter);
+ fileItemModel()->setNameFilter(nameFilter);
}
QString DolphinView::nameFilter() const
{
- return QString(); //m_viewModeController->nameFilter();
+ return fileItemModel()->nameFilter();
}
void DolphinView::calculateItemCount(int& fileCount,
void DolphinView::slotItemActivated(int index)
{
- Q_UNUSED(index);
+ const KFileItem item = fileItemModel()->fileItem(index);
+ if (!item.isNull()) {
+ emit itemActivated(item);
+ }
+}
- const KFileItemList items = selectedItems();
- if (items.isEmpty()) {
- return;
+void DolphinView::slotItemsActivated(const QSet<int>& indexes)
+{
+ Q_ASSERT(indexes.count() >= 2);
+
+ KFileItemList items;
+
+ KFileItemModel* model = fileItemModel();
+ QSetIterator<int> it(indexes);
+ while (it.hasNext()) {
+ const int index = it.next();
+ items.append(model->fileItem(index));
}
- if (items.count() == 1) {
- emit itemActivated(items.at(0)); // caught by DolphinViewContainer or DolphinPart
- } else {
- foreach (const KFileItem& item, items) {
- if (item.isDir()) {
- emit tabRequested(item.url());
- } else {
- emit itemActivated(item);
- }
+ foreach (const KFileItem& item, items) {
+ if (item.isDir()) {
+ emit tabRequested(item.url());
+ } else {
+ emit itemActivated(item);
}
}
}
delete menu.data();
}
-void DolphinView::slotItemExpansionToggleClicked(int index)
-{
- // TODO: When doing a model->setExpanded(false) it should
- // be checked here whether the current index is part of the
- // closed sub-tree. If this is the case, the current index
- // should be adjusted to the parent index.
- KFileItemModel* model = fileItemModel();
- const bool expanded = model->isExpanded(index);
- model->setExpanded(index, !expanded);
-}
-
void DolphinView::slotItemHovered(int index)
{
const KFileItem item = fileItemModel()->fileItem(index);
if (GeneralSettings::showToolTips()) {
- QRectF itemRect = m_container->controller()->view()->itemRect(index);
+ QRectF itemRect = m_container->controller()->view()->itemContextRect(index);
const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
itemRect.moveTo(pos);
event->buttons(),
event->modifiers());
- DragAndDropHelper::dropUrls(destItem, url(), &dropEvent, this);
+ const QString error = DragAndDropHelper::dropUrls(destItem, url(), &dropEvent);
+ if (!error.isEmpty()) {
+ emit errorMessage(error);
+ }
}
void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
const int currentIndex = m_container->controller()->selectionManager()->currentItem();
if (currentIndex != -1) {
KFileItem item = fileItemModel()->fileItem(currentIndex);
+ Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist
KUrl currentItemUrl = item.url();
stream << currentItemUrl;
} else {
}
}
+void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous)
+{
+ Q_UNUSED(previous);
+ Q_ASSERT(fileItemModel()->sortOrder() == current);
+
+ ViewProperties props(url());
+ props.setSortOrder(current);
+
+ emit sortOrderChanged(current);
+}
+
+void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)
+{
+ Q_UNUSED(previous);
+ Q_ASSERT(fileItemModel()->sortRole() == current);
+
+ ViewProperties props(url());
+ const Sorting sorting = sortingForSortRole(current);
+ props.setSorting(sorting);
+
+ emit sortingChanged(sorting);
+}
+
KFileItemModel* DolphinView::fileItemModel() const
{
return static_cast<KFileItemModel*>(m_container->controller()->model());
m_container->beginTransaction();
const ViewProperties props(url());
+ KFileItemModel* model = fileItemModel();
const Mode mode = props.viewMode();
if (m_mode != mode) {
+ // Prevent an animated transition of the position and size of the items when switching
+ // the view-mode by temporary clearing the model and updating it again after the view mode
+ // has been modified.
+ const bool restoreModel = (model->count() > 0);
+ if (restoreModel) {
+ const int currentItemIndex = m_container->controller()->selectionManager()->currentItem();
+ if (currentItemIndex >= 0) {
+ m_currentItemUrl = model->fileItem(currentItemIndex).url();
+ }
+ m_selectedUrls = selectedItems().urlList();
+ model->clear();
+ }
+
const Mode previousMode = m_mode;
m_mode = mode;
if (m_container->zoomLevel() != oldZoomLevel) {
emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
}
+
+ if (restoreModel) {
+ loadDirectory(url());
+ }
}
const bool hiddenFilesShown = props.hiddenFilesShown();
- if (hiddenFilesShown != m_dirLister->showingDotFiles()) {
- m_dirLister->setShowingDotFiles(hiddenFilesShown);
- m_dirLister->emitChanges();
+ if (hiddenFilesShown != model->showHiddenFiles()) {
+ model->setShowHiddenFiles(hiddenFilesShown);
emit hiddenFilesShownChanged(hiddenFilesShown);
}
- KFileItemModel* model = fileItemModel();
-
const bool groupedSorting = props.groupedSorting();
if (groupedSorting != model->groupedSorting()) {
model->setGroupedSorting(groupedSorting);
KonqOperations::doPaste(this, url);
}
-void DolphinView::updateZoomLevel(int oldZoomLevel)
-{
- Q_UNUSED(oldZoomLevel);
- /* const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
- if (oldZoomLevel != newZoomLevel) {
- m_viewModeController->setZoomLevel(newZoomLevel);
- emit zoomLevelChanged(newZoomLevel);
- }*/
-}
-
KUrl::List DolphinView::simplifiedSelectedUrls() const
{
KUrl::List urls;
projects / dolphin.git / blobdiff