Differential D22149 Diff 63750 src/dolphincontextmenu.cpp

Changeset View

Standalone View

src/dolphincontextmenu.cpp

Context not available.
192	QAction* openParentAction = nullptr;	192		QAction* openParentAction = nullptr;
193	QAction* openParentInNewWindowAction = nullptr;	193		QAction* openParentInNewWindowAction = nullptr;
194	QAction* openParentInNewTabAction = nullptr;	194		QAction* openParentInNewTabAction = nullptr;
195	QAction* addToPlacesAction = nullptr;
196	const KFileItemListProperties& selectedItemsProps = selectedItemsProperties();	195		const KFileItemListProperties& selectedItemsProps = selectedItemsProperties();
197		196
198	KFileItemActions fileItemActions;	197		KFileItemActions fileItemActions;
Context not available.
210		209
211	// insert 'Add to Places' entry	210		// insert 'Add to Places' entry
212	if (!placeExists(m_fileInfo.url())) {	211		if (!placeExists(m_fileInfo.url())) {
213	addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),	212		addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
214	i18nc("@action:inmenu Add selected folder to places",
215	"Add to Places"));
216	}	213		}
217		214
218	addSeparator();	215		addSeparator();
Context not available.
314		311
315	QAction* activatedAction = exec(m_pos);	312		QAction* activatedAction = exec(m_pos);
316	if (activatedAction) {	313		if (activatedAction) {
317	if (activatedAction == addToPlacesAction) {	314		if (activatedAction == openParentAction) {
318	const QUrl selectedUrl(m_fileInfo.url());
319	if (selectedUrl.isValid()) {
320	PlacesItemModel model;
321	const QString text = selectedUrl.fileName();
322	model.createPlacesItem(text, selectedUrl, KIO::iconNameForUrl(selectedUrl));
323	}
324	} else if (activatedAction == openParentAction) {
325	m_command = OpenParentFolder;	315		m_command = OpenParentFolder;
326	} else if (activatedAction == openParentInNewWindowAction) {	316		} else if (activatedAction == openParentInNewWindowAction) {
327	m_command = OpenParentFolderInNewWindow;	317		m_command = OpenParentFolderInNewWindow;
Context not available.
365	addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab")));	355		addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab")));
366		356
367	// Insert 'Add to Places' entry if exactly one item is selected	357		// Insert 'Add to Places' entry if exactly one item is selected
368	QAction* addToPlacesAction = nullptr;
369	if (!placeExists(m_mainWindow->activeViewContainer()->url())) {	358		if (!placeExists(m_mainWindow->activeViewContainer()->url())) {
370	addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")),	359		addAction(m_mainWindow->actionCollection()->action(QStringLiteral("add_to_places")));
371	i18nc("@action:inmenu Add current folder to places", "Add to Places"));
372	}	360		}
373		361
374	addSeparator();	362		addSeparator();
Context not available.
397	addShowMenuBarAction();	385		addShowMenuBarAction();
398		386
399	QAction* action = exec(m_pos);	387		QAction* action = exec(m_pos);
			elvisangelaccioUnsubmitted Done The `action` variable is no longer used, please remove it. elvisangelaccio: The `action` variable is no longer used, please remove it.
400	if (addToPlacesAction && (action == addToPlacesAction)) {
401	const DolphinViewContainer* container = m_mainWindow->activeViewContainer();
402	const QUrl url = container->url();
403	if (url.isValid()) {
404	PlacesItemModel model;
405	QString icon;
406	if (container->isSearchModeEnabled()) {
407	icon = QStringLiteral("folder-saved-search-symbolic");
408	} else {
409	icon = KIO::iconNameForUrl(url);
410	}
411	model.createPlacesItem(container->placesText(), url, icon);
412	}
413	}
414	}	388		}
415		389
416	void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties& properties)	390		void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties& properties)
Context not available.