Changeset View
Changeset View
Standalone View
Standalone View
src/dolphincontextmenu.cpp
| Show First 20 Lines • Show All 186 Lines • ▼ Show 20 Line(s) | 186 | { | |||
|---|---|---|---|---|---|
| 187 | Q_ASSERT(!m_fileInfo.isNull()); | 187 | Q_ASSERT(!m_fileInfo.isNull()); | ||
| 188 | 188 | | |||
| 189 | QAction* openParentAction = nullptr; | 189 | QAction* openParentAction = nullptr; | ||
| 190 | QAction* openParentInNewWindowAction = nullptr; | 190 | QAction* openParentInNewWindowAction = nullptr; | ||
| 191 | QAction* openParentInNewTabAction = nullptr; | 191 | QAction* openParentInNewTabAction = nullptr; | ||
| 192 | QAction* addToPlacesAction = nullptr; | 192 | QAction* addToPlacesAction = nullptr; | ||
| 193 | const KFileItemListProperties& selectedItemsProps = selectedItemsProperties(); | 193 | const KFileItemListProperties& selectedItemsProps = selectedItemsProperties(); | ||
| 194 | 194 | | |||
| 195 | KFileItemActions fileItemActions; | ||||
| 196 | fileItemActions.setItemListProperties(selectedItemsProps); | ||||
| 197 | | ||||
| 195 | if (m_selectedItems.count() == 1) { | 198 | if (m_selectedItems.count() == 1) { | ||
| 196 | if (m_fileInfo.isLink()) { | | |||
| 197 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target"))); | | |||
| 198 | addSeparator(); | | |||
| 199 | } | | |||
| 200 | if (m_fileInfo.isDir()) { | 199 | if (m_fileInfo.isDir()) { | ||
| 200 | // insert 'Open in new window' and 'Open in new tab' entries | ||||
| 201 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window"))); | ||||
| 202 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab"))); | ||||
| 203 | | ||||
| 204 | // Insert 'Open With' entries | ||||
| 205 | addOpenWithActions(fileItemActions); | ||||
| 206 | | ||||
| 207 | // insert 'Add to Places' entry | ||||
| 208 | if (!placeExists(m_fileInfo.url())) { | ||||
| 209 | addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")), | ||||
| 210 | i18nc("@action:inmenu Add selected folder to places", | ||||
| 211 | "Add to Places")); | ||||
| 212 | } | ||||
| 213 | | ||||
| 214 | addSeparator(); | ||||
| 215 | | ||||
| 201 | // setup 'Create New' menu | 216 | // set up 'Create New' menu | ||
| 202 | DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow); | 217 | DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow); | ||
elvisangelaccio: In the folder case I'd put "Open With" after these actions, without a separator.
On Windows… | |||||
| 203 | const DolphinView* view = m_mainWindow->activeViewContainer()->view(); | 218 | const DolphinView* view = m_mainWindow->activeViewContainer()->view(); | ||
| 204 | newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); | 219 | newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); | ||
| 205 | newFileMenu->checkUpToDate(); | 220 | newFileMenu->checkUpToDate(); | ||
| 206 | newFileMenu->setPopupFiles(m_fileInfo.url()); | 221 | newFileMenu->setPopupFiles(m_fileInfo.url()); | ||
| 207 | newFileMenu->setEnabled(selectedItemsProps.supportsWriting()); | 222 | newFileMenu->setEnabled(selectedItemsProps.supportsWriting()); | ||
| 208 | connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); | 223 | connect(newFileMenu, &DolphinNewFileMenu::fileCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); | ||
| 209 | connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); | 224 | connect(newFileMenu, &DolphinNewFileMenu::directoryCreated, newFileMenu, &DolphinNewFileMenu::deleteLater); | ||
| 210 | 225 | | |||
| 211 | QMenu* menu = newFileMenu->menu(); | 226 | QMenu* menu = newFileMenu->menu(); | ||
| 212 | menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); | 227 | menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); | ||
| 213 | menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); | 228 | menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); | ||
| 214 | addMenu(menu); | 229 | addMenu(menu); | ||
| 215 | addSeparator(); | | |||
| 216 | | ||||
| 217 | // insert 'Open in new window' and 'Open in new tab' entries | | |||
| 218 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window"))); | | |||
| 219 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab"))); | | |||
| 220 | | ||||
| 221 | // insert 'Add to Places' entry | | |||
| 222 | if (!placeExists(m_fileInfo.url())) { | | |||
| 223 | addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")), | | |||
| 224 | i18nc("@action:inmenu Add selected folder to places", | | |||
| 225 | "Add to Places")); | | |||
| 226 | } | | |||
| 227 | 230 | | |||
| 228 | addSeparator(); | 231 | addSeparator(); | ||
| 229 | } else if (m_baseUrl.scheme().contains(QStringLiteral("search")) || m_baseUrl.scheme().contains(QStringLiteral("timeline"))) { | 232 | } else if (m_baseUrl.scheme().contains(QStringLiteral("search")) || m_baseUrl.scheme().contains(QStringLiteral("timeline"))) { | ||
| 230 | openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), | 233 | openParentAction = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), | ||
| 231 | i18nc("@action:inmenu", | 234 | i18nc("@action:inmenu", | ||
| 232 | "Open Path"), | 235 | "Open Path"), | ||
| 233 | this); | 236 | this); | ||
| 234 | addAction(openParentAction); | 237 | addAction(openParentAction); | ||
| 235 | 238 | | |||
| 236 | openParentInNewWindowAction = new QAction(QIcon::fromTheme(QStringLiteral("window-new")), | 239 | openParentInNewWindowAction = new QAction(QIcon::fromTheme(QStringLiteral("window-new")), | ||
| 237 | i18nc("@action:inmenu", | 240 | i18nc("@action:inmenu", | ||
| 238 | "Open Path in New Window"), | 241 | "Open Path in New Window"), | ||
| 239 | this); | 242 | this); | ||
| 240 | addAction(openParentInNewWindowAction); | 243 | addAction(openParentInNewWindowAction); | ||
| 241 | 244 | | |||
| 242 | openParentInNewTabAction = new QAction(QIcon::fromTheme(QStringLiteral("tab-new")), | 245 | openParentInNewTabAction = new QAction(QIcon::fromTheme(QStringLiteral("tab-new")), | ||
| 243 | i18nc("@action:inmenu", | 246 | i18nc("@action:inmenu", | ||
| 244 | "Open Path in New Tab"), | 247 | "Open Path in New Tab"), | ||
| 245 | this); | 248 | this); | ||
| 246 | addAction(openParentInNewTabAction); | 249 | addAction(openParentInNewTabAction); | ||
| 247 | 250 | | |||
| 248 | addSeparator(); | 251 | addSeparator(); | ||
| 249 | } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) { | 252 | } else if (!DolphinView::openItemAsFolderUrl(m_fileInfo).isEmpty()) { | ||
| 253 | // Insert 'Open With" entries | ||||
| 254 | addOpenWithActions(fileItemActions); | ||||
| 255 | | ||||
| 250 | // insert 'Open in new window' and 'Open in new tab' entries | 256 | // insert 'Open in new window' and 'Open in new tab' entries | ||
| 251 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window"))); | 257 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_window"))); | ||
| 252 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab"))); | 258 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tab"))); | ||
| 253 | 259 | | |||
| 254 | addSeparator(); | 260 | addSeparator(); | ||
| 261 | } else { | ||||
| 262 | // Insert 'Open With" entries | ||||
| 263 | addOpenWithActions(fileItemActions); | ||||
| 264 | } | ||||
| 265 | if (m_fileInfo.isLink()) { | ||||
| 266 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("show_target"))); | ||||
| 267 | addSeparator(); | ||||
| 255 | } | 268 | } | ||
| 256 | } else { | 269 | } else { | ||
| 257 | bool selectionHasOnlyDirs = true; | 270 | bool selectionHasOnlyDirs = true; | ||
| 258 | foreach (const KFileItem& item, m_selectedItems) { | 271 | foreach (const KFileItem& item, m_selectedItems) { | ||
| 259 | const QUrl& url = DolphinView::openItemAsFolderUrl(item); | 272 | const QUrl& url = DolphinView::openItemAsFolderUrl(item); | ||
| 260 | if (url.isEmpty()) { | 273 | if (url.isEmpty()) { | ||
| 261 | selectionHasOnlyDirs = false; | 274 | selectionHasOnlyDirs = false; | ||
| 262 | break; | 275 | break; | ||
| 263 | } | 276 | } | ||
| 264 | } | 277 | } | ||
| 265 | 278 | | |||
| 266 | if (selectionHasOnlyDirs) { | 279 | if (selectionHasOnlyDirs) { | ||
| 267 | // insert 'Open in new tab' entry | 280 | // insert 'Open in new tab' entry | ||
| 268 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs"))); | 281 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("open_in_new_tabs"))); | ||
| 269 | addSeparator(); | | |||
| 270 | } | 282 | } | ||
| 283 | // Insert 'Open With" entries | ||||
| 284 | addOpenWithActions(fileItemActions); | ||||
| 271 | } | 285 | } | ||
| 272 | 286 | | |||
| 273 | insertDefaultItemActions(selectedItemsProps); | 287 | insertDefaultItemActions(selectedItemsProps); | ||
| 274 | 288 | | |||
| 275 | addSeparator(); | 289 | addSeparator(); | ||
| 276 | 290 | | |||
| 277 | KFileItemActions fileItemActions; | | |||
| 278 | fileItemActions.setItemListProperties(selectedItemsProps); | | |||
| 279 | addServiceActions(fileItemActions); | 291 | addServiceActions(fileItemActions); | ||
elvisangelaccio: This is now already called at line 196. | |||||
| 280 | 292 | | |||
| 281 | fileItemActions.addPluginActionsTo(this); | 293 | fileItemActions.addPluginActionsTo(this); | ||
| 282 | 294 | | |||
| 283 | addVersionControlPluginActions(); | 295 | addVersionControlPluginActions(); | ||
| 284 | 296 | | |||
| 285 | // insert 'Copy To' and 'Move To' sub menus | 297 | // insert 'Copy To' and 'Move To' sub menus | ||
| 286 | if (GeneralSettings::showCopyMoveMenu()) { | 298 | if (GeneralSettings::showCopyMoveMenu()) { | ||
| 287 | m_copyToMenu.setUrls(m_selectedItems.urlList()); | 299 | m_copyToMenu.setUrls(m_selectedItems.urlList()); | ||
| Show All 31 Lines | 329 | { | |||
| 319 | KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); | 331 | KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu(); | ||
| 320 | const DolphinView* view = m_mainWindow->activeViewContainer()->view(); | 332 | const DolphinView* view = m_mainWindow->activeViewContainer()->view(); | ||
| 321 | newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); | 333 | newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown()); | ||
| 322 | newFileMenu->checkUpToDate(); | 334 | newFileMenu->checkUpToDate(); | ||
| 323 | newFileMenu->setPopupFiles(m_baseUrl); | 335 | newFileMenu->setPopupFiles(m_baseUrl); | ||
| 324 | addMenu(newFileMenu->menu()); | 336 | addMenu(newFileMenu->menu()); | ||
| 325 | addSeparator(); | 337 | addSeparator(); | ||
| 326 | 338 | | |||
| 339 | // Insert 'Open With' entries | ||||
| 340 | const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem()); | ||||
| 341 | KFileItemActions fileItemActions; | ||||
| 342 | fileItemActions.setItemListProperties(baseUrlProperties); | ||||
| 343 | addOpenWithActions(fileItemActions); | ||||
| 344 | | ||||
| 327 | // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and | 345 | // Insert 'New Window' and 'New Tab' entries. Don't use "open_in_new_window" and | ||
| 328 | // "open_in_new_tab" here, as the current selection should get ignored. | 346 | // "open_in_new_tab" here, as the current selection should get ignored. | ||
| 329 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_window"))); | 347 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_window"))); | ||
| 330 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab"))); | 348 | addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab"))); | ||
| 331 | 349 | | |||
| 332 | // Insert 'Add to Places' entry if exactly one item is selected | 350 | // Insert 'Add to Places' entry if exactly one item is selected | ||
| 333 | QAction* addToPlacesAction = nullptr; | 351 | QAction* addToPlacesAction = nullptr; | ||
| 334 | if (!placeExists(m_mainWindow->activeViewContainer()->url())) { | 352 | if (!placeExists(m_mainWindow->activeViewContainer()->url())) { | ||
| 335 | addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")), | 353 | addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")), | ||
| 336 | i18nc("@action:inmenu Add current folder to places", "Add to Places")); | 354 | i18nc("@action:inmenu Add current folder to places", "Add to Places")); | ||
| 337 | } | 355 | } | ||
| 338 | 356 | | |||
| 339 | addSeparator(); | 357 | addSeparator(); | ||
| 340 | 358 | | |||
| 341 | QAction* pasteAction = createPasteAction(); | 359 | QAction* pasteAction = createPasteAction(); | ||
| 342 | addAction(pasteAction); | 360 | addAction(pasteAction); | ||
| 343 | addSeparator(); | 361 | addSeparator(); | ||
| 344 | 362 | | |||
| 345 | // Insert service actions | 363 | // Insert service actions | ||
| 346 | const KFileItemListProperties baseUrlProperties(KFileItemList() << baseFileItem()); | | |||
| 347 | KFileItemActions fileItemActions; | | |||
| 348 | fileItemActions.setItemListProperties(baseUrlProperties); | | |||
| 349 | addServiceActions(fileItemActions); | 364 | addServiceActions(fileItemActions); | ||
| 350 | 365 | | |||
| 351 | fileItemActions.addPluginActionsTo(this); | 366 | fileItemActions.addPluginActionsTo(this); | ||
| 352 | 367 | | |||
| 353 | addVersionControlPluginActions(); | 368 | addVersionControlPluginActions(); | ||
| 354 | 369 | | |||
| 355 | addCustomActions(); | 370 | addCustomActions(); | ||
| 356 | 371 | | |||
| ▲ Show 20 Lines • Show All 107 Lines • ▼ Show 20 Line(s) | |||||
| 464 | KFileItem DolphinContextMenu::baseFileItem() | 479 | KFileItem DolphinContextMenu::baseFileItem() | ||
| 465 | { | 480 | { | ||
| 466 | if (!m_baseFileItem) { | 481 | if (!m_baseFileItem) { | ||
| 467 | m_baseFileItem = new KFileItem(m_baseUrl); | 482 | m_baseFileItem = new KFileItem(m_baseUrl); | ||
| 468 | } | 483 | } | ||
| 469 | return *m_baseFileItem; | 484 | return *m_baseFileItem; | ||
| 470 | } | 485 | } | ||
| 471 | 486 | | |||
| 472 | void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions) | 487 | void DolphinContextMenu::addOpenWithActions(KFileItemActions& fileItemActions) | ||
| 473 | { | 488 | { | ||
| 474 | fileItemActions.setParentWidget(m_mainWindow); | 489 | fileItemActions.setParentWidget(m_mainWindow); | ||
| 475 | 490 | | |||
| 476 | // insert 'Open With...' action or sub menu | 491 | // insert 'Open With...' action or sub menu | ||
| 477 | fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != '%1'").arg(qApp->desktopFileName())); | 492 | fileItemActions.addOpenWithActionsTo(this, QStringLiteral("DesktopEntryName != '%1'").arg(qApp->desktopFileName())); | ||
| 493 | } | ||||
| 494 | | ||||
| 495 | void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions) | ||||
| 496 | { | ||||
| 497 | fileItemActions.setParentWidget(m_mainWindow); | ||||
This refactoring removes the "Open With" submenu from the viewport context menu. elvisangelaccio: This refactoring removes the "Open With" submenu from the viewport context menu. | |||||
| 478 | 498 | | |||
| 479 | // insert 'Actions' sub menu | 499 | // insert 'Actions' sub menu | ||
| 480 | fileItemActions.addServiceActionsTo(this); | 500 | fileItemActions.addServiceActionsTo(this); | ||
| 481 | } | 501 | } | ||
The addServiceActions() function doesn't make sense anymore. We can move the fileItemActions.setParentWidget(m_mainWindow) call after we define the fileItemActions object, so we can even remove this line from the new addOpenWithActions() function. Then we can just call fileItemActions.addServiceActionsTo(this) instead of calling addServiceActions(). elvisangelaccio: The `addServiceActions()` function doesn't make sense anymore. We can move the `fileItemActions. | |||||
| 482 | 502 | | |||
| 483 | void DolphinContextMenu::addVersionControlPluginActions() | 503 | void DolphinContextMenu::addVersionControlPluginActions() | ||
| 484 | { | 504 | { | ||
| 485 | const DolphinView* view = m_mainWindow->activeViewContainer()->view(); | 505 | const DolphinView* view = m_mainWindow->activeViewContainer()->view(); | ||
| 486 | const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems); | 506 | const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems); | ||
| 487 | if (!versionControlActions.isEmpty()) { | 507 | if (!versionControlActions.isEmpty()) { | ||
| 488 | addActions(versionControlActions); | 508 | addActions(versionControlActions); | ||
| 489 | addSeparator(); | 509 | addSeparator(); | ||
| 490 | } | 510 | } | ||
| 491 | } | 511 | } | ||
| 492 | 512 | | |||
| 493 | void DolphinContextMenu::addCustomActions() | 513 | void DolphinContextMenu::addCustomActions() | ||
| 494 | { | 514 | { | ||
| 495 | addActions(m_customActions); | 515 | addActions(m_customActions); | ||
| 496 | } | 516 | } | ||
| 497 | 517 | | |||
In the folder case I'd put "Open With" after these actions, without a separator.
On Windows "Open With" is always at the end of the first section, before the first separator.