X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d1c5dc52a3ac4f83262d00d37a61f6bfb52d5bf4..87e8d0ba:/src/panels/places/placespanel.cpp diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index d42b75f5a..f7ca7d010 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -23,29 +23,50 @@ #include "placespanel.h" -#include +#include "dolphin_generalsettings.h" + +#include "global.h" +#include +#include "dolphindebug.h" #include -#include +#include #include +#include +#include #include -#include +#include +#include +#include +#include #include #include -#include -#include +#include +#include +#include #include #include +#include "placesitem.h" #include "placesitemeditdialog.h" #include "placesitemlistgroupheader.h" +#include "placesitemlistwidget.h" #include "placesitemmodel.h" +#include "placesview.h" #include +#include #include #include +#include PlacesPanel::PlacesPanel(QWidget* parent) : Panel(parent), - m_controller(0), - m_model(0) + m_controller(nullptr), + m_model(nullptr), + m_view(nullptr), + m_storageSetupFailedUrl(), + m_triggerStorageSetupButton(), + m_itemDropEventIndex(-1), + m_itemDropEventMimeData(nullptr), + m_itemDropEvent(nullptr) { } @@ -53,11 +74,34 @@ PlacesPanel::~PlacesPanel() { } +void PlacesPanel::proceedWithTearDown() +{ + m_model->proceedWithTearDown(); +} + bool PlacesPanel::urlChanged() { + if (!url().isValid() || url().scheme().contains(QStringLiteral("search"))) { + // Skip results shown by a search, as possible identical + // directory names are useless without parent-path information. + return false; + } + + if (m_controller) { + selectClosestItem(); + } + return true; } +void PlacesPanel::readSettings() +{ + if (m_controller) { + const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1; + m_controller->setAutoActivationDelay(delay); + } +} + void PlacesPanel::showEvent(QShowEvent* event) { if (event->spontaneous()) { @@ -71,17 +115,29 @@ void PlacesPanel::showEvent(QShowEvent* event) // used at all and stays invisible. m_model = new PlacesItemModel(this); m_model->setGroupedSorting(true); - m_model->setSortRole("group"); + connect(m_model, &PlacesItemModel::errorMessage, + this, &PlacesPanel::errorMessage); + connect(m_model, &PlacesItemModel::storageTearDownRequested, + this, &PlacesPanel::storageTearDownRequested); + connect(m_model, &PlacesItemModel::storageTearDownExternallyRequested, + this, &PlacesPanel::storageTearDownExternallyRequested); + + m_view = new PlacesView(); + m_view->setWidgetCreator(new KItemListWidgetCreator()); + m_view->setGroupHeaderCreator(new KItemListGroupHeaderCreator()); + + m_controller = new KItemListController(m_model, m_view, this); + m_controller->setSelectionBehavior(KItemListController::SingleSelection); + m_controller->setSingleClickActivationEnforced(true); - KStandardItemListView* view = new KStandardItemListView(); - view->setGroupHeaderCreator(new KItemListGroupHeaderCreator()); + readSettings(); - m_controller = new KItemListController(m_model, view, this); - m_controller->setSelectionBehavior(KItemListController::SingleSelection); - connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int))); - connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int))); - connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF))); - connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF))); + connect(m_controller, &KItemListController::itemActivated, this, &PlacesPanel::slotItemActivated); + connect(m_controller, &KItemListController::itemMiddleClicked, this, &PlacesPanel::slotItemMiddleClicked); + connect(m_controller, &KItemListController::itemContextMenuRequested, this, &PlacesPanel::slotItemContextMenuRequested); + connect(m_controller, &KItemListController::viewContextMenuRequested, this, &PlacesPanel::slotViewContextMenuRequested); + connect(m_controller, &KItemListController::itemDropEvent, this, &PlacesPanel::slotItemDropEvent); + connect(m_controller, &KItemListController::aboveItemDropEvent, this, &PlacesPanel::slotAboveItemDropEvent); KItemListContainer* container = new KItemListContainer(m_controller, this); container->setEnabledFrame(false); @@ -89,6 +145,8 @@ void PlacesPanel::showEvent(QShowEvent* event) QVBoxLayout* layout = new QVBoxLayout(this); layout->setMargin(0); layout->addWidget(container); + + selectClosestItem(); } Panel::showEvent(event); @@ -96,35 +154,32 @@ void PlacesPanel::showEvent(QShowEvent* event) void PlacesPanel::slotItemActivated(int index) { - const KUrl url = m_model->data(index).value("url").value(); - if (!url.isEmpty()) { - emit placeActivated(url); - } + triggerItem(index, Qt::LeftButton); } void PlacesPanel::slotItemMiddleClicked(int index) { - const KUrl url = m_model->data(index).value("url").value(); - if (!url.isEmpty()) { - emit placeMiddleClicked(url); - } + triggerItem(index, Qt::MiddleButton); } void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) { - const QHash data = m_model->data(index); - const QString label = data.value("text").toString(); + PlacesItem* item = m_model->placesItem(index); + if (!item) { + return; + } - KMenu menu(this); + QMenu menu(this); - QAction* emptyTrashAction = 0; - QAction* addAction = 0; - QAction* mainSeparator = 0; - QAction* editAction = 0; - QAction* tearDownAction = 0; - QAction* ejectAction = 0; + QAction* emptyTrashAction = nullptr; + QAction* editAction = nullptr; + QAction* teardownAction = nullptr; + QAction* ejectAction = nullptr; - const bool isDevice = !data.value("udi").toString().isEmpty(); + const QString label = item->text(); + + const bool isDevice = !item->udi().isEmpty(); + const bool isTrash = (item->url().scheme() == QLatin1String("trash")); if (isDevice) { ejectAction = m_model->ejectAction(index); if (ejectAction) { @@ -132,131 +187,296 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) menu.addAction(ejectAction); } - tearDownAction = m_model->tearDownAction(index); - if (tearDownAction) { - tearDownAction->setParent(&menu); - menu.addAction(tearDownAction); + teardownAction = m_model->teardownAction(index); + if (teardownAction) { + teardownAction->setParent(&menu); + menu.addAction(teardownAction); } - if (tearDownAction || ejectAction) { - mainSeparator = menu.addSeparator(); + if (teardownAction || ejectAction) { + menu.addSeparator(); } } else { - if (data.value("url").value() == KUrl("trash:/")) { - emptyTrashAction = menu.addAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash")); - KConfig trashConfig("trashrc", KConfig::SimpleConfig); - emptyTrashAction->setEnabled(!trashConfig.group("Status").readEntry("Empty", true)); + if (isTrash) { + emptyTrashAction = menu.addAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18nc("@action:inmenu", "Empty Trash")); + emptyTrashAction->setEnabled(item->icon() == QLatin1String("user-trash-full")); menu.addSeparator(); } - addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry...")); - mainSeparator = menu.addSeparator(); - editAction = menu.addAction(KIcon("document-properties"), i18nc("@item:inmenu", "Edit Entry '%1'...", label)); } - if (!addAction) { - addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry...")); + QAction* openInNewWindowAction = menu.addAction(QIcon::fromTheme("window-new"), i18nc("@item:inmenu", "Open in New Window")); + QAction* openInNewTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@item:inmenu", "Open in New Tab")); + if (!isDevice && !isTrash) { + menu.addSeparator(); + } + + if (!isDevice) { + editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit...")); + } + + QAction* removeAction = nullptr; + if (!isDevice && !item->isSystemItem()) { + removeAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@item:inmenu", "Remove")); } - QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide Entry '%1'", label)); + QAction* hideAction = menu.addAction(i18nc("@item:inmenu", "Hide")); hideAction->setCheckable(true); - //hideEntry->setChecked(data.value("hidden").toBool()); + hideAction->setChecked(item->isHidden()); - QAction* showAllAction = 0; - if (m_model->hiddenCount() > 0) { - if (!mainSeparator) { - mainSeparator = menu.addSeparator(); + buildGroupContextMenu(&menu, index); + + QAction* action = menu.exec(pos.toPoint()); + if (action) { + if (action == emptyTrashAction) { + emptyTrash(); + } else { + // The index might have changed if devices were added/removed while + // the context menu was open. + index = m_model->index(item); + if (index < 0) { + // The item is not in the model any more, probably because it was an + // external device that has been removed while the context menu was open. + return; + } + + if (action == editAction) { + editEntry(index); + } else if (action == removeAction) { + m_model->deleteItem(index); + } else if (action == hideAction) { + item->setHidden(hideAction->isChecked()); + } else if (action == openInNewWindowAction) { + Dolphin::openNewWindow({KFilePlacesModel::convertedUrl(m_model->data(index).value("url").toUrl())}, this); + } else if (action == openInNewTabAction) { + // TriggerItem does set up the storage first and then it will + // emit the slotItemMiddleClicked signal, because of Qt::MiddleButton. + triggerItem(index, Qt::MiddleButton); + } else if (action == teardownAction) { + m_model->requestTearDown(index); + } else if (action == ejectAction) { + m_model->requestEject(index); + } } + } + + selectClosestItem(); +} + +void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos) +{ + QMenu menu(this); + + QAction* addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry...")); + + QAction* showAllAction = nullptr; + if (m_model->hiddenCount() > 0) { showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries")); showAllAction->setCheckable(true); - //showAllEntries->setChecked(showAll) + showAllAction->setChecked(m_model->hiddenItemsShown()); } - QAction* removeAction = 0; - if (!isDevice) { - removeAction = menu.addAction(KIcon("edit-delete"), i18nc("@item:inmenu", "Remove Entry '%1'", label)); + buildGroupContextMenu(&menu, m_controller->indexCloseToMousePressedPosition()); + + QMenu* iconSizeSubMenu = new QMenu(i18nc("@item:inmenu", "Icon Size"), &menu); + + struct IconSizeInfo + { + int size; + const char* context; + const char* text; + }; + + const int iconSizeCount = 4; + static const IconSizeInfo iconSizes[iconSizeCount] = { + {KIconLoader::SizeSmall, I18N_NOOP2_NOSTRIP("Small icon size", "Small (%1x%2)")}, + {KIconLoader::SizeSmallMedium, I18N_NOOP2_NOSTRIP("Medium icon size", "Medium (%1x%2)")}, + {KIconLoader::SizeMedium, I18N_NOOP2_NOSTRIP("Large icon size", "Large (%1x%2)")}, + {KIconLoader::SizeLarge, I18N_NOOP2_NOSTRIP("Huge icon size", "Huge (%1x%2)")} + }; + + QMap iconSizeActionMap; + QActionGroup* iconSizeGroup = new QActionGroup(iconSizeSubMenu); + + for (int i = 0; i < iconSizeCount; ++i) { + const int size = iconSizes[i].size; + const QString text = i18nc(iconSizes[i].context, iconSizes[i].text, + size, size); + + QAction* action = iconSizeSubMenu->addAction(text); + iconSizeActionMap.insert(action, size); + action->setActionGroup(iconSizeGroup); + action->setCheckable(true); + action->setChecked(m_view->iconSize() == size); } + menu.addMenu(iconSizeSubMenu); + menu.addSeparator(); foreach (QAction* action, customContextMenuActions()) { menu.addAction(action); } QAction* action = menu.exec(pos.toPoint()); - if (!action) { - return; + if (action) { + if (action == addAction) { + addEntry(); + } else if (action == showAllAction) { + m_model->setHiddenItemsShown(showAllAction->isChecked()); + } else if (iconSizeActionMap.contains(action)) { + m_view->setIconSize(iconSizeActionMap.value(action)); + } } - if (action == emptyTrashAction) { - emptyTrash(); - } else if (action == addAction) { - addEntry(); - } else if (action == editAction) { - editEntry(index); - } else if (action == removeAction) { - } else if (action == hideAction) { - } else if (action == showAllAction) { - } else if (action == tearDownAction) { - } else if (action == ejectAction) { + selectClosestItem(); +} + +QAction *PlacesPanel::buildGroupContextMenu(QMenu *menu, int index) +{ + if (index == -1) { + return nullptr; } + + KFilePlacesModel::GroupType groupType = m_model->groupType(index); + QAction *hideGroupAction = menu->addAction(i18nc("@item:inmenu", "Hide Section '%1'", m_model->item(index)->group())); + hideGroupAction->setCheckable(true); + hideGroupAction->setChecked(m_model->isGroupHidden(groupType)); + + connect(hideGroupAction, &QAction::triggered, this, [this, groupType, hideGroupAction]{ + m_model->setGroupHidden(groupType, hideGroupAction->isChecked()); + }); + + return hideGroupAction; } -void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos) +void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) { - KMenu menu(this); + if (index < 0) { + return; + } - QAction* addAction = menu.addAction(KIcon("document-new"), i18nc("@item:inmenu", "Add Entry...")); - menu.addSeparator(); - foreach (QAction* action, customContextMenuActions()) { - menu.addAction(action); + const PlacesItem* destItem = m_model->placesItem(index); + + if (destItem->isSearchOrTimelineUrl()) { + return; } - QAction* action = menu.exec(pos.toPoint()); - if (action == addAction) { - addEntry(); + if (m_model->storageSetupNeeded(index)) { + connect(m_model, &PlacesItemModel::storageSetupDone, + this, &PlacesPanel::slotItemDropEventStorageSetupDone); + + m_itemDropEventIndex = index; + + // Make a full copy of the Mime-Data + m_itemDropEventMimeData = new QMimeData; + m_itemDropEventMimeData->setText(event->mimeData()->text()); + m_itemDropEventMimeData->setHtml(event->mimeData()->html()); + m_itemDropEventMimeData->setUrls(event->mimeData()->urls()); + m_itemDropEventMimeData->setImageData(event->mimeData()->imageData()); + m_itemDropEventMimeData->setColorData(event->mimeData()->colorData()); + + m_itemDropEvent = new QDropEvent(event->pos().toPoint(), + event->possibleActions(), + m_itemDropEventMimeData, + event->buttons(), + event->modifiers()); + + m_model->requestStorageSetup(index); + return; } + + QUrl destUrl = destItem->url(); + QDropEvent dropEvent(event->pos().toPoint(), + event->possibleActions(), + event->mimeData(), + event->buttons(), + event->modifiers()); + + slotUrlsDropped(destUrl, &dropEvent, this); +} + +void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success) +{ + disconnect(m_model, &PlacesItemModel::storageSetupDone, + this, &PlacesPanel::slotItemDropEventStorageSetupDone); + + if ((index == m_itemDropEventIndex) && m_itemDropEvent && m_itemDropEventMimeData) { + if (success) { + QUrl destUrl = m_model->placesItem(index)->url(); + slotUrlsDropped(destUrl, m_itemDropEvent, this); + } + + delete m_itemDropEventMimeData; + delete m_itemDropEvent; + + m_itemDropEventIndex = -1; + m_itemDropEventMimeData = nullptr; + m_itemDropEvent = nullptr; + } +} + +void PlacesPanel::slotAboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) +{ + m_model->dropMimeDataBefore(index, event->mimeData()); } -void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent) +void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* parent) { - Q_UNUSED(parent); - DragAndDropHelper::dropUrls(KFileItem(), dest, event); + KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent); + if (job) { + connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); }); + } } void PlacesPanel::slotTrashUpdated(KJob* job) { if (job->error()) { - // TODO: Show error-string inside Dolphin, don't use job->ui->showErrorMessage(). + emit errorMessage(job->errorString()); + } + // as long as KIO doesn't do this, do it ourselves + KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), nullptr, KNotification::DefaultEvent); +} + +void PlacesPanel::slotStorageSetupDone(int index, bool success) +{ + disconnect(m_model, &PlacesItemModel::storageSetupDone, + this, &PlacesPanel::slotStorageSetupDone); + + if (m_triggerStorageSetupButton == Qt::NoButton) { + return; + } + + if (success) { + Q_ASSERT(!m_model->storageSetupNeeded(index)); + triggerItem(index, m_triggerStorageSetupButton); + m_triggerStorageSetupButton = Qt::NoButton; + } else { + setUrl(m_storageSetupFailedUrl); + m_storageSetupFailedUrl = QUrl(); } - org::kde::KDirNotify::emitFilesAdded("trash:/"); } void PlacesPanel::emptyTrash() { - const QString text = i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."); - const bool del = KMessageBox::warningContinueCancel(window(), - text, - QString(), - KGuiItem(i18nc("@action:button", "Empty Trash"), - KIcon("user-trash")) - ) == KMessageBox::Continue; - if (del) { - QByteArray packedArgs; - QDataStream stream(&packedArgs, QIODevice::WriteOnly); - stream << int(1); - KIO::Job *job = KIO::special(KUrl("trash:/"), packedArgs); - KNotification::event("Trash: emptied", QString() , QPixmap() , 0, KNotification::DefaultEvent); - job->ui()->setWindow(parentWidget()); - connect(job, SIGNAL(result(KJob*)), SLOT(slotTrashUpdated(KJob*))); + KIO::JobUiDelegate uiDelegate; + uiDelegate.setWindow(window()); + if (uiDelegate.askDeleteConfirmation(QList(), KIO::JobUiDelegate::EmptyTrash, KIO::JobUiDelegate::DefaultConfirmation)) { + KIO::Job* job = KIO::emptyTrash(); + KJobWidgets::setWindow(job, window()); + connect(job, &KIO::Job::result, this, &PlacesPanel::slotTrashUpdated); } } void PlacesPanel::addEntry() { + const int index = m_controller->selectionManager()->currentItem(); + const QUrl url = m_model->data(index).value("url").toUrl(); + QPointer dialog = new PlacesItemEditDialog(this); - dialog->setCaption(i18nc("@title:window", "Add Places Entry")); + dialog->setWindowTitle(i18nc("@title:window", "Add Places Entry")); dialog->setAllowGlobal(true); + dialog->setUrl(url); if (dialog->exec() == QDialog::Accepted) { - // TODO + m_model->createPlacesItem(dialog->text(), dialog->url(), dialog->icon()); } delete dialog; @@ -264,19 +484,61 @@ void PlacesPanel::addEntry() void PlacesPanel::editEntry(int index) { - const QHash data = m_model->data(index); + QHash data = m_model->data(index); QPointer dialog = new PlacesItemEditDialog(this); - dialog->setCaption(i18nc("@title:window", "Edit Places Entry")); + dialog->setWindowTitle(i18nc("@title:window", "Edit Places Entry")); dialog->setIcon(data.value("iconName").toString()); dialog->setText(data.value("text").toString()); - dialog->setUrl(data.value("url").value()); + dialog->setUrl(data.value("url").toUrl()); dialog->setAllowGlobal(true); if (dialog->exec() == QDialog::Accepted) { - // TODO + PlacesItem* oldItem = m_model->placesItem(index); + if (oldItem) { + oldItem->setText(dialog->text()); + oldItem->setUrl(dialog->url()); + oldItem->setIcon(dialog->icon()); + m_model->refresh(); + } } delete dialog; } -#include "placespanel.moc" +void PlacesPanel::selectClosestItem() +{ + const int index = m_model->closestItem(url()); + KItemListSelectionManager* selectionManager = m_controller->selectionManager(); + selectionManager->setCurrentItem(index); + selectionManager->clearSelection(); + selectionManager->setSelected(index); +} + +void PlacesPanel::triggerItem(int index, Qt::MouseButton button) +{ + const PlacesItem* item = m_model->placesItem(index); + if (!item) { + return; + } + + if (m_model->storageSetupNeeded(index)) { + m_triggerStorageSetupButton = button; + m_storageSetupFailedUrl = url(); + + connect(m_model, &PlacesItemModel::storageSetupDone, + this, &PlacesPanel::slotStorageSetupDone); + + m_model->requestStorageSetup(index); + } else { + m_triggerStorageSetupButton = Qt::NoButton; + + const QUrl url = m_model->data(index).value("url").toUrl(); + if (!url.isEmpty()) { + if (button == Qt::MiddleButton) { + emit placeMiddleClicked(KFilePlacesModel::convertedUrl(url)); + } else { + emit placeActivated(KFilePlacesModel::convertedUrl(url)); + } + } + } +}