Improve padding in the Places View

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 2c91cd07a7a846b1d718cdf61f38736d0e54928c..e755e7281708a200527ea0c2a9f520fb39534ddf 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -216,6 +216,20 @@ QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const
     return viewContainers;
 }
 
     return viewContainers;
 }
 

+void DolphinMainWindow::setViewsWithInvalidPathsToHome()
+{
+    const QVector<DolphinViewContainer*> theViewContainers = viewContainers();
+    for (DolphinViewContainer *viewContainer : theViewContainers) {
+
+        // Only consider local dirs, not remote locations and abstract protocols
+        if (viewContainer->url().isLocalFile()) {
+            if (!QFileInfo::exists(viewContainer->url().toLocalFile())) {
+                viewContainer->setUrl(QUrl::fromLocalFile(QDir::homePath()));
+            }
+        }
+    }
+}
+

 void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)
 {
     m_tabWidget->openDirectories(dirs, splitView);
 void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)
 {
     m_tabWidget->openDirectories(dirs, splitView);


@@ -292,7 +306,7 @@ void DolphinMainWindow::changeUrl(const QUrl &url)
     updateViewActions();
     updateGoActions();
 
     updateViewActions();
     updateGoActions();
 

-    emit urlChanged(url);
+    Q_EMIT urlChanged(url);

 }
 
 void DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url)
 }
 
 void DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url)


@@ -327,7 +341,7 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
         compareFilesAction->setEnabled(false);
     }
 
         compareFilesAction->setEnabled(false);
     }
 

-    emit selectionChanged(selection);
+    Q_EMIT selectionChanged(selection);

 }
 
 void DolphinMainWindow::updateHistory()
 }
 
 void DolphinMainWindow::updateHistory()


@@ -413,7 +427,7 @@ void DolphinMainWindow::openInNewTab()
     const KFileItemList& list = m_activeViewContainer->view()->selectedItems();
     bool tabCreated = false;
 
     const KFileItemList& list = m_activeViewContainer->view()->selectedItems();
     bool tabCreated = false;
 

-    foreach (const KFileItem& item, list) {
+    for (const KFileItem& item : list) {

         const QUrl& url = DolphinView::openItemAsFolderUrl(item);
         if (!url.isEmpty()) {
             openNewTabAfterCurrentTab(url);
         const QUrl& url = DolphinView::openItemAsFolderUrl(item);
         if (!url.isEmpty()) {
             openNewTabAfterCurrentTab(url);


@@ -847,7 +861,8 @@ void DolphinMainWindow::replaceLocation()
 void DolphinMainWindow::togglePanelLockState()
 {
     const bool newLockState = !GeneralSettings::lockPanels();
 void DolphinMainWindow::togglePanelLockState()
 {
     const bool newLockState = !GeneralSettings::lockPanels();

-    foreach (QObject* child, children()) {
+    const auto childrenObjects = children();
+    for (QObject* child : childrenObjects) {

         DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);
         if (dock) {
             dock->setLocked(newLockState);
         DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);
         if (dock) {
             dock->setLocked(newLockState);


@@ -1247,7 +1262,7 @@ void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
     updateSearchAction();
 
     const QUrl url = viewContainer->url();
     updateSearchAction();
 
     const QUrl url = viewContainer->url();

-    emit urlChanged(url);
+    Q_EMIT urlChanged(url);

 }
 
 void DolphinMainWindow::tabCountChanged(int count)
 }
 
 void DolphinMainWindow::tabCountChanged(int count)


@@ -2069,7 +2084,8 @@ bool DolphinMainWindow::addActionToMenu(QAction* action, QMenu* menu)
     Q_ASSERT(menu);
 
     const KToolBar* toolBarWidget = toolBar();
     Q_ASSERT(menu);
 
     const KToolBar* toolBarWidget = toolBar();

-    foreach (const QWidget* widget, action->associatedWidgets()) {
+    const auto associatedWidgets = action->associatedWidgets();
+    for (const QWidget* widget : associatedWidgets) {

         if (widget == toolBarWidget) {
             return false;
         }
         if (widget == toolBarWidget) {
             return false;
         }


@@ -2092,7 +2108,7 @@ void DolphinMainWindow::refreshViews()
         updateWindowTitle();
     }
 
         updateWindowTitle();
     }
 

-    emit settingsChanged();
+    Q_EMIT settingsChanged();

 }
 
 void DolphinMainWindow::clearStatusBar()
 }
 
 void DolphinMainWindow::clearStatusBar()