Differential D7847 Diff 20181 src/dolphinmainwindow.cpp

Changeset View

Standalone View

View Options

src/dolphinmainwindow.cpp

Context not available.
99 m_settingsDialog(), 99​ m_settingsDialog(),
100 m_controlButton(0), 100​ m_controlButton(0),
101 m_updateToolBarTimer(0), 101​ m_updateToolBarTimer(0),
102 m_lastHandleUrlStatJob(0) 102​ m_lastHandleUrlStatJob(0),
103​ m_terminalPanel(0),
104​ m_placesPanel(0),
105​ m_tearDownFromPlacesRequested(false)
103{ 106​{
104 Q_INIT_RESOURCE(dolphin); 107​ Q_INIT_RESOURCE(dolphin);
105 108​
Context not available.
247 250​
248void DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url) 251​void DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url)
249{ 252​{
253​ if (m_tearDownFromPlacesRequested && url.toString() == QStringLiteral("file://") + QDir::homePath()) {
elvisangelaccioUnsubmitted
Done

Please use QUrl::fromLocalFile().

elvisangelaccio: Please use `QUrl::fromLocalFile()`.
254​ m_placesPanel->proceedWithTearDown();
255​ m_tearDownFromPlacesRequested = false;
256​ }
257​
250 m_activeViewContainer->setAutoGrabFocus(false); 258​ m_activeViewContainer->setAutoGrabFocus(false);
251 changeUrl(url); 259​ changeUrl(url);
252 m_activeViewContainer->setAutoGrabFocus(true); 260​ m_activeViewContainer->setAutoGrabFocus(true);
Context not available.
994 setWindowTitle(schemePrefix + fileName); 1002​ setWindowTitle(schemePrefix + fileName);
995} 1003​}
996 1004​
1005​void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString &mountPath)
1006​{
1007​ if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
1008​ m_tearDownFromPlacesRequested = true;
1009​ m_terminalPanel->goHome();
1010​ // m_placesPanel->proceedWithTearDown() will be called in slotTerminalDirectoryChanged
1011​ } else {
zhigalinUnsubmitted
Done

It really should be inside else?

zhigalin: It really should be inside `else`?
martonmiklosAuthorUnsubmitted
Done

Yes.

The purpose of this condition is basically delaying the call of proceedWithTearDown() when the terminal is visible until the terminal changed back to the home folder.

If the terminal was visible the proceedWithTearDown will be called after the terminal successfully cd-ed back to the home directory: in the DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url) see line 253.

martonmiklos: Yes. The purpose of this condition is basically delaying the call of proceedWithTearDown()…
1012​ m_placesPanel->proceedWithTearDown();
1013​ }
1014​}
1015​
1016​void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString & mountPath)
1017​{
1018​ if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) {
1019​ m_tearDownFromPlacesRequested = false;
1020​ m_terminalPanel->goHome();
1021​ }
1022​}
1023​
997void DolphinMainWindow::setupActions() 1024​void DolphinMainWindow::setupActions()
998{ 1025​{
999 // setup 'File' menu 1026​ // setup 'File' menu
Context not available.
1246 terminalDock->setLocked(lock); 1273​ terminalDock->setLocked(lock);
1247 terminalDock->setObjectName(QStringLiteral("terminalDock")); 1274​ terminalDock->setObjectName(QStringLiteral("terminalDock"));
1248 terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); 1275​ terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
1249 TerminalPanel* terminalPanel = new TerminalPanel(terminalDock); 1276​ m_terminalPanel = new TerminalPanel(terminalDock);
1250 terminalPanel->setCustomContextMenuActions({lockLayoutAction}); 1277​ m_terminalPanel->setCustomContextMenuActions({lockLayoutAction});
1251 terminalDock->setWidget(terminalPanel); 1278​ terminalDock->setWidget(m_terminalPanel);
1252 1279​
1253 connect(terminalPanel, &TerminalPanel::hideTerminalPanel, terminalDock, &DolphinDockWidget::hide); 1280​ connect(m_terminalPanel, &TerminalPanel::hideTerminalPanel, terminalDock, &DolphinDockWidget::hide);
1254 connect(terminalPanel, &TerminalPanel::changeUrl, this, &DolphinMainWindow::slotTerminalDirectoryChanged); 1281​ connect(m_terminalPanel, &TerminalPanel::changeUrl, this, &DolphinMainWindow::slotTerminalDirectoryChanged);
1255 connect(terminalDock, &DolphinDockWidget::visibilityChanged, 1282​ connect(terminalDock, &DolphinDockWidget::visibilityChanged,
1256 terminalPanel, &TerminalPanel::dockVisibilityChanged); 1283​ m_terminalPanel, &TerminalPanel::dockVisibilityChanged);
1257 1284​
1258 QAction* terminalAction = terminalDock->toggleViewAction(); 1285​ QAction* terminalAction = terminalDock->toggleViewAction();
1259 createPanelAction(QIcon::fromTheme(QStringLiteral("utilities-terminal")), Qt::Key_F4, terminalAction, QStringLiteral("show_terminal_panel")); 1286​ createPanelAction(QIcon::fromTheme(QStringLiteral("utilities-terminal")), Qt::Key_F4, terminalAction, QStringLiteral("show_terminal_panel"));
1260 1287​
1261 addDockWidget(Qt::BottomDockWidgetArea, terminalDock); 1288​ addDockWidget(Qt::BottomDockWidgetArea, terminalDock);
1262 connect(this, &DolphinMainWindow::urlChanged, 1289​ connect(this, &DolphinMainWindow::urlChanged,
1263 terminalPanel, &TerminalPanel::setUrl); 1290​ m_terminalPanel, &TerminalPanel::setUrl);
1264 1291​
1265 if (GeneralSettings::version() < 200) { 1292​ if (GeneralSettings::version() < 200) {
1266 terminalDock->hide(); 1293​ terminalDock->hide();
Context not available.
1279 placesDock->setObjectName(QStringLiteral("placesDock")); 1306​ placesDock->setObjectName(QStringLiteral("placesDock"));
1280 placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); 1307​ placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
1281 1308​
1282 PlacesPanel* placesPanel = new PlacesPanel(placesDock); 1309​ m_placesPanel = new PlacesPanel(placesDock);
1283 placesPanel->setCustomContextMenuActions({lockLayoutAction}); 1310​ m_placesPanel->setCustomContextMenuActions({lockLayoutAction});
1284 placesDock->setWidget(placesPanel); 1311​ placesDock->setWidget(m_placesPanel);
1285 1312​
1286 QAction* placesAction = placesDock->toggleViewAction(); 1313​ QAction *placesAction = placesDock->toggleViewAction();
1287 createPanelAction(QIcon::fromTheme(QStringLiteral("bookmarks")), Qt::Key_F9, placesAction, QStringLiteral("show_places_panel")); 1314​ createPanelAction(QIcon::fromTheme(QStringLiteral("bookmarks")), Qt::Key_F9, placesAction, QStringLiteral("show_places_panel"));
1288 1315​
1289 addDockWidget(Qt::LeftDockWidgetArea, placesDock); 1316​ addDockWidget(Qt::LeftDockWidgetArea, placesDock);
1290 connect(placesPanel, &PlacesPanel::placeActivated, 1317​ connect(m_placesPanel, &PlacesPanel::placeActivated,
1291 this, &DolphinMainWindow::slotPlaceActivated); 1318​ this, &DolphinMainWindow::slotPlaceActivated);
1292 connect(placesPanel, &PlacesPanel::placeMiddleClicked, 1319​ connect(m_placesPanel, &PlacesPanel::placeMiddleClicked,
1293 this, &DolphinMainWindow::openNewTab); 1320​ this, &DolphinMainWindow::openNewTab);
1294 connect(placesPanel, &PlacesPanel::errorMessage, 1321​ connect(m_placesPanel, &PlacesPanel::errorMessage,
1295 this, &DolphinMainWindow::showErrorMessage); 1322​ this, &DolphinMainWindow::showErrorMessage);
1296 connect(this, &DolphinMainWindow::urlChanged, 1323​ connect(this, &DolphinMainWindow::urlChanged,
1297 placesPanel, &PlacesPanel::setUrl); 1324​ m_placesPanel, &PlacesPanel::setUrl);
1298 connect(placesDock, &DolphinDockWidget::visibilityChanged, 1325​ connect(placesDock, &DolphinDockWidget::visibilityChanged,
1299 m_tabWidget, &DolphinTabWidget::slotPlacesPanelVisibilityChanged); 1326​ m_tabWidget, &DolphinTabWidget::slotPlacesPanelVisibilityChanged);
1300 connect(this, &DolphinMainWindow::settingsChanged, 1327​ connect(this, &DolphinMainWindow::settingsChanged,
1301 placesPanel, &PlacesPanel::readSettings); 1328​ m_placesPanel, &PlacesPanel::readSettings);
1302 1329​ connect(m_placesPanel, &PlacesPanel::storageTearDownRequested,
1303 m_tabWidget->slotPlacesPanelVisibilityChanged(placesPanel->isVisible()); 1330​ this, &DolphinMainWindow::slotStorageTearDownFromPlacesRequested);
1331​ connect(m_placesPanel, &PlacesPanel::storageTearDownExternallyRequested,
1332​ this, &DolphinMainWindow::slotStorageTearDownExternallyRequested);
1333​ m_tabWidget->slotPlacesPanelVisibilityChanged(m_placesPanel->isVisible());
1304 1334​
1305 // Add actions into the "Panels" menu 1335​ // Add actions into the "Panels" menu
1306 KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this); 1336​ KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
Context not available.