m_container(0),
m_toolTipManager(0),
m_selectionChangedTimer(0),
- m_currentItemIndex(-1),
+ m_currentItemUrl(),
m_restoredContentsPosition(),
m_createdItemUrl(),
- m_selectedItems(),
+ m_selectedUrls(),
m_versionControlObserver(0)
{
m_topLayout = new QVBoxLayout(this);
connect(m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SIGNAL(itemCountChanged()));
m_container = new DolphinItemListContainer(m_dirLister, this);
- QHash<QByteArray, int> visibleRoles;
- visibleRoles.insert("name", 0);
- m_container->setVisibleRoles(visibleRoles);
+ m_container->setVisibleRoles(QList<QByteArray>() << "name");
+ m_container->installEventFilter(this);
KItemListController* controller = m_container->controller();
controller->setSelectionBehavior(KItemListController::MultiSelection);
connect(controller, SIGNAL(itemActivated(int)),
this, SLOT(slotItemActivated(int)));
connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
- connect(controller, SIGNAL(contextMenuRequested(int,QPointF)), this, SLOT(slotContextMenuRequested(int,QPointF)));
+ 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)));
return m_mode;
}
+void DolphinView::setPreviewsShown(bool show)
+{
+ if (previewsShown() == show) {
+ return;
+ }
+
+ ViewProperties props(url());
+ props.setPreviewsShown(show);
+
+ m_container->setPreviewsShown(show);
+ emit previewsShownChanged(show);
+}
+
bool DolphinView::previewsShown() const
{
return m_container->previewsShown();
}
+void DolphinView::setHiddenFilesShown(bool show)
+{
+ if (m_dirLister->showingDotFiles() == show) {
+ return;
+ }
+
+ const KFileItemList itemList = selectedItems();
+ m_selectedUrls.clear();
+ m_selectedUrls = itemList.urlList();
+
+ ViewProperties props(url());
+ props.setHiddenFilesShown(show);
+
+ m_dirLister->setShowingDotFiles(show);
+ m_dirLister->emitChanges();
+ emit hiddenFilesShownChanged(show);
+}
+
bool DolphinView::hiddenFilesShown() const
{
return m_dirLister->showingDotFiles();
}
-bool DolphinView::categorizedSorting() const
+void DolphinView::setGroupedSorting(bool grouped)
{
- return false; //m_storedCategorizedSorting;
+ if (grouped == groupedSorting()) {
+ return;
+ }
+
+ ViewProperties props(url());
+ props.setGroupedSorting(grouped);
+ props.save();
+
+ m_container->controller()->model()->setGroupedSorting(grouped);
+
+ emit groupedSortingChanged(grouped);
+}
+
+bool DolphinView::groupedSorting() const
+{
+ return fileItemModel()->groupedSorting();
}
KFileItemList DolphinView::items() const
void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
{
- foreach (const KUrl& url, urls) {
- KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
- m_selectedItems.append(item);
- }
+ m_selectedUrls = urls;
}
void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
Qt::SortOrder DolphinView::sortOrder() const
{
- return Qt::AscendingOrder; // m_viewAccessor.proxyModel()->sortOrder();
+ KItemModelBase* model = fileItemModel();
+ return model->sortOrder();
}
void DolphinView::setSortFoldersFirst(bool foldersFirst)
bool DolphinView::sortFoldersFirst() const
{
- return true; // m_viewAccessor.proxyModel()->sortFoldersFirst();
+ KFileItemModel* model = fileItemModel();
+ return model->sortFoldersFirst();
}
void DolphinView::setAdditionalInfoList(const QList<AdditionalInfo>& info)
QByteArray viewState;
QDataStream saveStream(&viewState, QIODevice::WriteOnly);
saveState(saveStream);
- m_selectedItems= selectedItems();
+
+ const KFileItemList itemList = selectedItems();
+ m_selectedUrls.clear();
+ m_selectedUrls = itemList.urlList();
setUrl(url());
loadDirectory(url(), true);
}
}
-void DolphinView::setPreviewsShown(bool show)
-{
- if (previewsShown() == show) {
- return;
- }
-
- ViewProperties props(url());
- props.setPreviewsShown(show);
-
- m_container->setPreviewsShown(show);
- emit previewsShownChanged(show);
-}
-
-void DolphinView::setHiddenFilesShown(bool show)
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)
{
- if (m_dirLister->showingDotFiles() == show) {
- return;
- }
-
- m_selectedItems = selectedItems();
-
- ViewProperties props(url());
- props.setHiddenFilesShown(show);
-
- m_dirLister->setShowingDotFiles(show);
- m_dirLister->emitChanges();
- emit hiddenFilesShownChanged(show);
-}
+ switch (event->type()) {
+ case QEvent::FocusIn:
+ if (watched == m_container) {
+ setActive(true);
+ }
+ break;
-void DolphinView::setCategorizedSorting(bool categorized)
-{
- if (categorized == categorizedSorting()) {
- return;
+ default:
+ break;
}
- ViewProperties props(url());
- props.setCategorizedSorting(categorized);
- props.save();
-
- //m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
-
- emit categorizedSortingChanged(categorized);
-}
-
-void DolphinView::mouseReleaseEvent(QMouseEvent* event)
-{
- QWidget::mouseReleaseEvent(event);
- setActive(true);
-}
-
-void DolphinView::contextMenuEvent(QContextMenuEvent* event)
-{
- Q_UNUSED(event);
-
- const QPoint pos = m_container->mapFromGlobal(QCursor::pos());
- const KItemListView* view = m_container->controller()->view();
- if (view->itemAt(pos) < 0) {
- // Only open the context-menu if the cursor is above the viewport
- // (the context-menu for items is handled in slotContextMenuRequested())
- requestContextMenu(KFileItem(), url(), QList<QAction*>());
- }
+ return QWidget::eventFilter(watched, event);
}
void DolphinView::wheelEvent(QWheelEvent* event)
const int numSteps = numDegrees / 15;
setZoomLevel(zoomLevel() + numSteps);
+ event->accept();
+ } else {
+ event->ignore();
}
- event->accept();
}
void DolphinView::activate()
}
}
-void DolphinView::slotContextMenuRequested(int index, const QPointF& pos)
+void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
{
- Q_UNUSED(pos);
if (GeneralSettings::showToolTips()) {
m_toolTipManager->hideToolTip();
}
const KFileItem item = fileItemModel()->fileItem(index);
- emit requestContextMenu(item, url(), QList<QAction*>());
+ emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
+}
+
+void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
+{
+ if (GeneralSettings::showToolTips()) {
+ m_toolTipManager->hideToolTip();
+ }
+ emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList<QAction*>());
+}
+
+void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
+{
+ QWeakPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+
+ KItemListView* view = m_container->controller()->view();
+ const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
+
+ // Add all roles to the menu that can be shown or hidden by the user
+ const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
+ const QList<DolphinView::AdditionalInfo> keys = infoAccessor.keys();
+ foreach (const DolphinView::AdditionalInfo info, keys) {
+ const QByteArray& role = infoAccessor.role(info);
+ if (role != "name") {
+ const QString text = fileItemModel()->roleDescription(role);
+
+ QAction* action = menu.data()->addAction(text);
+ action->setCheckable(true);
+ action->setChecked(visibleRolesSet.contains(role));
+ action->setData(info);
+ }
+ }
+
+ QAction* action = menu.data()->exec(pos.toPoint());
+ if (action) {
+ // Show or hide the selected role
+ const DolphinView::AdditionalInfo info =
+ static_cast<DolphinView::AdditionalInfo>(action->data().toInt());
+
+ ViewProperties props(url());
+ QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
+
+ const QByteArray selectedRole = infoAccessor.role(info);
+ QList<QByteArray> visibleRoles = view->visibleRoles();
+
+ if (action->isChecked()) {
+ const int index = keys.indexOf(info) + 1;
+ visibleRoles.insert(index, selectedRole);
+ infoList.insert(index, info);
+ } else {
+ visibleRoles.removeOne(selectedRole);
+ infoList.removeOne(info);
+ }
+
+ view->setVisibleRoles(visibleRoles);
+ props.setAdditionalInfoList(infoList);
+ }
+
+ delete menu.data();
}
void DolphinView::slotItemExpansionToggleClicked(int index)
emit selectionChanged(selectedItems());
}
-void DolphinView::openContextMenu(const QPoint& pos,
- const QList<QAction*>& customActions)
-{
- KFileItem item;
- const int index = m_container->controller()->view()->itemAt(pos);
- if (index >= 0) {
- item = fileItemModel()->fileItem(index);
- }
-
- emit requestContextMenu(item, url(), customActions);
-}
-
void DolphinView::dropUrls(const KFileItem& destItem,
const KUrl& destPath,
QDropEvent* event)
ViewProperties props(url());
props.setSortOrder(order);
- //m_viewAccessor.proxyModel()->setSortOrder(order);
+ KItemModelBase* model = fileItemModel();
+ model->setSortOrder(order);
emit sortOrderChanged(order);
}
ViewProperties props(url());
props.setSortFoldersFirst(foldersFirst);
- //m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
+ KFileItemModel* model = fileItemModel();
+ model->setSortFoldersFirst(foldersFirst);
emit sortFoldersFirstChanged(foldersFirst);
}
void DolphinView::restoreState(QDataStream& stream)
{
// Restore the current item that had the keyboard focus
- stream >> m_currentItemIndex;
+ stream >> m_currentItemUrl;
// Restore the view position
stream >> m_restoredContentsPosition;
void DolphinView::saveState(QDataStream& stream)
{
// Save the current item that has the keyboard focus
- stream << m_container->controller()->selectionManager()->currentItem();
+ const int currentIndex = m_container->controller()->selectionManager()->currentItem();
+ if (currentIndex != -1) {
+ KFileItem item = fileItemModel()->fileItem(currentIndex);
+ KUrl currentItemUrl = item.url();
+ stream << currentItemUrl;
+ } else {
+ stream << KUrl();
+ }
// Save view position
const qreal x = m_container->horizontalScrollBar()->value();
void DolphinView::updateViewState()
{
- if (m_currentItemIndex >= 0) {
+ if (m_currentItemUrl != KUrl()) {
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
- selectionManager->setCurrentItem(m_currentItemIndex);
- m_currentItemIndex =-1;
+ const int currentIndex = fileItemModel()->index(m_currentItemUrl);
+ if (currentIndex != -1) {
+ selectionManager->setCurrentItem(currentIndex);
+ } else {
+ selectionManager->setCurrentItem(0);
+ }
+ m_currentItemUrl = KUrl();
}
if (!m_restoredContentsPosition.isNull()) {
m_container->verticalScrollBar()->setValue(y);
}
- if (!m_selectedItems.isEmpty()) {
+ if (!m_selectedUrls.isEmpty()) {
KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
QSet<int> selectedItems = selectionManager->selectedItems();
const KFileItemModel* model = fileItemModel();
- foreach (const KFileItem& selectedItem, m_selectedItems) {
- const int index = model->index(selectedItem);
+ foreach (const KUrl& url, m_selectedUrls) {
+ const int index = model->index(url);
if (index >= 0) {
selectedItems.insert(index);
}
}
selectionManager->setSelectedItems(selectedItems);
- m_selectedItems.clear();
+ m_selectedUrls.clear();
}
}
emit hiddenFilesShownChanged(hiddenFilesShown);
}
-/* m_storedCategorizedSorting = props.categorizedSorting();
- const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
- if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
- m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
- emit categorizedSortingChanged();
- }*/
+ KFileItemModel* model = fileItemModel();
+
+ const bool groupedSorting = props.groupedSorting();
+ if (groupedSorting != model->groupedSorting()) {
+ model->setGroupedSorting(groupedSorting);
+ emit groupedSortingChanged(groupedSorting);
+ }
const DolphinView::Sorting sorting = props.sorting();
- KItemModelBase* model = m_container->controller()->model();
const QByteArray newSortRole = sortRoleForSorting(sorting);
if (newSortRole != model->sortRole()) {
model->setSortRole(newSortRole);
emit sortingChanged(sorting);
}
-/*
+
const Qt::SortOrder sortOrder = props.sortOrder();
- if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) {
- m_viewAccessor.proxyModel()->setSortOrder(sortOrder);
+ if (sortOrder != model->sortOrder()) {
+ model->setSortOrder(sortOrder);
emit sortOrderChanged(sortOrder);
}
const bool sortFoldersFirst = props.sortFoldersFirst();
- if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
- m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
+ if (sortFoldersFirst != model->sortFoldersFirst()) {
+ model->setSortFoldersFirst(sortFoldersFirst);
emit sortFoldersFirstChanged(sortFoldersFirst);
}
-*/
+
const QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
if (infoList != m_additionalInfoList) {
const QList<DolphinView::AdditionalInfo> previousList = m_additionalInfoList;
{
const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
- QHash<QByteArray, int> visibleRoles;
- visibleRoles.insert("name", 0);
+ QList<QByteArray> visibleRoles;
+ visibleRoles.reserve(m_additionalInfoList.count() + 1);
+ visibleRoles.append("name");
- int index = 1;
foreach (AdditionalInfo info, m_additionalInfoList) {
- visibleRoles.insert(infoAccessor.role(info), index);
- ++index;
+ visibleRoles.append(infoAccessor.role(info));
}
m_container->setVisibleRoles(visibleRoles);
return sortHash.value(sortRole);
}
+void DolphinView::markUrlAsCurrent(const KUrl& url)
+{
+ m_currentItemUrl = url;
+}
+
#include "dolphinview.moc"
projects / dolphin.git / blobdiff