X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/496872dddcd6f50ba8addaf16b6b0d5c8f52bc71..51e6281fe8c5ef2912a2400a7e5e95a4e721451d:/src/viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 102629875..05b4a4838 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -282,7 +282,19 @@ void ViewPropertiesDialog::markAsDirty()
 
 void ViewPropertiesDialog::configureAdditionalInfo()
 {
-    const KFileItemDelegate::InformationList info = m_viewProps->additionalInfo();
+    KFileItemDelegate::InformationList info = m_viewProps->additionalInfo();
+    const bool useDefaultInfo = (m_viewProps->viewMode() == DolphinView::DetailsView) &&
+                                (info.isEmpty() || info.contains(KFileItemDelegate::NoInformation));
+    if (useDefaultInfo) {
+        // Using the details view without any additional information (-> additional column)
+        // makes no sense and leads to a usability problem as no viewport area is available
+        // anymore. Hence as fallback provide at least a size and date column.
+        info.clear();
+        info.append(KFileItemDelegate::Size);
+        info.append(KFileItemDelegate::ModificationTime);
+        m_viewProps->setAdditionalInfo(info);
+    }
+
     AdditionalInfoDialog dialog(this, info);
     if (dialog.exec() == QDialog::Accepted) {
         m_viewProps->setAdditionalInfo(dialog.additionalInfo());
@@ -339,7 +351,7 @@ void ViewPropertiesDialog::applyViewProperties()
 
     m_isDirty = false;
 
-    if (m_useAsDefault->isChecked()) {
+    if (m_useAsDefault && m_useAsDefault->isChecked()) {
         // For directories where no .directory file is available, the .directory
         // file stored for the global view properties is used as fallback. To update
         // this file we temporary turn on the global view properties mode.