Changeset View
Changeset View
Standalone View
Standalone View
src/dolphinmainwindow.cpp
| Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s) | |||||
| 55 | #include <KJobWidgets> | 55 | #include <KJobWidgets> | ||
| 56 | #include <KLocalizedString> | 56 | #include <KLocalizedString> | ||
| 57 | #include <KMessageBox> | 57 | #include <KMessageBox> | ||
| 58 | #include <KProtocolInfo> | 58 | #include <KProtocolInfo> | ||
| 59 | #include <KProtocolManager> | 59 | #include <KProtocolManager> | ||
| 60 | #include <KRun> | 60 | #include <KRun> | ||
| 61 | #include <KShell> | 61 | #include <KShell> | ||
| 62 | #include <KStandardAction> | 62 | #include <KStandardAction> | ||
| 63 | #include <KStartupInfo> | ||||
| 63 | #include <KToggleAction> | 64 | #include <KToggleAction> | ||
| 64 | #include <KToolBar> | 65 | #include <KToolBar> | ||
| 65 | #include <KToolInvocation> | 66 | #include <KToolInvocation> | ||
| 66 | #include <KUrlComboBox> | 67 | #include <KUrlComboBox> | ||
| 67 | #include <KUrlNavigator> | 68 | #include <KUrlNavigator> | ||
| 69 | #include <KWindowSystem> | ||||
| 68 | 70 | | |||
| 69 | #include <QApplication> | 71 | #include <QApplication> | ||
| 70 | #include <QClipboard> | 72 | #include <QClipboard> | ||
| 71 | #include <QCloseEvent> | 73 | #include <QCloseEvent> | ||
| 72 | #include <QDialog> | 74 | #include <QDialog> | ||
| 73 | #include <QFileInfo> | 75 | #include <QFileInfo> | ||
| 74 | #include <QLineEdit> | 76 | #include <QLineEdit> | ||
| 75 | #include <QMenu> | 77 | #include <QMenu> | ||
| ▲ Show 20 Lines • Show All 102 Lines • ▼ Show 20 Line(s) | 105 | { | |||
| 178 | connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked); | 180 | connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked); | ||
| 179 | toolBar()->installEventFilter(middleClickEventFilter); | 181 | toolBar()->installEventFilter(middleClickEventFilter); | ||
| 180 | } | 182 | } | ||
| 181 | 183 | | |||
| 182 | DolphinMainWindow::~DolphinMainWindow() | 184 | DolphinMainWindow::~DolphinMainWindow() | ||
| 183 | { | 185 | { | ||
| 184 | } | 186 | } | ||
| 185 | 187 | | |||
| 186 | void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView) | 188 | void DolphinMainWindow::openDirectories(const QStringList& dirs, bool splitView) | ||
| 187 | { | 189 | { | ||
| 188 | m_tabWidget->openDirectories(dirs, splitView); | 190 | m_tabWidget->openDirectories(QUrl::fromStringList(dirs), splitView); | ||
| 189 | } | 191 | } | ||
| 190 | 192 | | |||
| 191 | void DolphinMainWindow::openFiles(const QList<QUrl>& files, bool splitView) | 193 | void DolphinMainWindow::openFiles(const QStringList& files, bool splitView) | ||
| 192 | { | 194 | { | ||
| 193 | m_tabWidget->openFiles(files, splitView); | 195 | m_tabWidget->openFiles(QUrl::fromStringList(files), splitView); | ||
elvisangelaccio: Coding style: we don't usually use `this->` since it's implicit. | |||||
| 196 | } | ||||
| 197 | | ||||
| 198 | void DolphinMainWindow::activateWindow() | ||||
| 199 | { | ||||
| 200 | KStartupInfo::setNewStartupId(window(), KStartupInfo::startupId()); | ||||
Please use KWindowSystem::activateWindow() instead. Normal applications are not supposed to call forceActiveWindow(). And I'd call this method activateWindow() as well, rather than tryRaise(). elvisangelaccio: Please use `KWindowSystem::activateWindow()` instead. Normal applications are not supposed to… | |||||
The problem with activateWindow() is that it doesn't raise the file manager - only a yellow background is put on the taskbar of the dolphin instance that the tab was opened to. In the current version of Dolphin, when we ask to open a folder in an external application a new instance of dolphin is opened, hence why it is raised to the top. For me not being able to raise the window to the top creates a bad UX as usually they want to see the folder they opened straight away, instead of having to click for the file manager after they've asked to see the folder. I think we should open this up for discussion. feverfew: The problem with `activateWindow()` is that it doesn't raise the file manager - only a yellow… | |||||
Well, the documentation is pretty clear: There are two ways how to activate a window, by calling activateWindow() and forceActiveWindow(). Generally, applications shouldn't make attempts to explicitly activate their windows, and instead let the user to activate them. In the special cases where this may be needed, applications should use activateWindow(). Window manager may consider whether this request wouldn't result in focus stealing, which would be obtrusive, and may refuse the request. The usage of forceActiveWindow() is meant only for pagers and similar tools, which represent direct user actions related to window manipulation. Except for rare cases, this request will be always honored, and normal applications are forbidden to use it. If this results in a bad UX, it should be probably addressed in plasma. elvisangelaccio: Well, the documentation is pretty clear:
```
There are two ways how to activate a window, by… | |||||
| 201 | KWindowSystem::activateWindow(window()->effectiveWinId()); | ||||
| 194 | } | 202 | } | ||
| 195 | 203 | | |||
| 196 | void DolphinMainWindow::showCommand(CommandType command) | 204 | void DolphinMainWindow::showCommand(CommandType command) | ||
| 197 | { | 205 | { | ||
| 198 | DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); | 206 | DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); | ||
| 199 | switch (command) { | 207 | switch (command) { | ||
| 200 | case KIO::FileUndoManager::Copy: | 208 | case KIO::FileUndoManager::Copy: | ||
| 201 | statusBar->setText(i18nc("@info:status", "Successfully copied.")); | 209 | statusBar->setText(i18nc("@info:status", "Successfully copied.")); | ||
| ▲ Show 20 Lines • Show All 1477 Lines • ▼ Show 20 Line(s) | 1685 | { | |||
| 1679 | if (mainWin) { | 1687 | if (mainWin) { | ||
| 1680 | DolphinViewContainer* container = mainWin->activeViewContainer(); | 1688 | DolphinViewContainer* container = mainWin->activeViewContainer(); | ||
| 1681 | container->showMessage(job->errorString(), DolphinViewContainer::Error); | 1689 | container->showMessage(job->errorString(), DolphinViewContainer::Error); | ||
| 1682 | } else { | 1690 | } else { | ||
| 1683 | KIO::FileUndoManager::UiInterface::jobError(job); | 1691 | KIO::FileUndoManager::UiInterface::jobError(job); | ||
| 1684 | } | 1692 | } | ||
| 1685 | } | 1693 | } | ||
| 1686 | 1694 | | |||
| 1695 | bool DolphinMainWindow::isUrlOpen(const QString& url) { | ||||
elvisangelaccio: Coding style: opening brace should go to next line | |||||
| 1696 | if (m_tabWidget->getIndexByURL(QUrl(url)) >= 0) { | ||||
| 1697 | return true; | ||||
elvisangelaccio: We should use `QUrl::fromUserInput()` here. | |||||
| 1698 | } else { | ||||
| 1699 | return false; | ||||
| 1700 | } | ||||
| 1701 | } | ||||
| 1702 | | ||||
Coding style: we don't usually use this-> since it's implicit.