due to the recent tagging freeze this commit contains several fixes in one:

* the filterbar now also filters directories (works also in the column-view :-))

* The "Additional Information" menu entry now also works for showing/hiding the columns of the details view. This also implies that the columns for the details view can now be adjusted per directory -> we have now a consistent behavior between the icons view and details view. Still open: the view properties dialog must be fixed

* Don't show a "Nepomuk not available" error message when starting Dolphin and Nepomuk is not available.

* Fix issue that the information panel blocked the application because of parsing the full meta data of a huge file.

svn path=/trunk/KDE/kdebase/apps/; revision=729704

1 files changed, 7 insertions, 2 deletions

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 4dbf16eaa..d99b0749f 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -252,7 +252,10 @@ void ViewPropertiesDialog::slotViewModeChanged(int index)
 
     const bool iconsViewEnabled = (m_viewProps->viewMode() == DolphinView::IconsView);
     m_showInGroups->setEnabled(iconsViewEnabled);
-    m_additionalInfo->setEnabled(iconsViewEnabled);
+
+    // TODO: a different approach is required now due to having a lot more additional infos
+    m_additionalInfo->setEnabled(false);
+    //m_additionalInfo->setEnabled(iconsViewEnabled);
 }
 
 void ViewPropertiesDialog::slotSortingChanged(int index)
@@ -410,7 +413,9 @@ void ViewPropertiesDialog::loadSettings()
 
     const int addInfoIndex = m_additionalInfo->findData(info);
     m_additionalInfo->setCurrentIndex(addInfoIndex);
-    m_additionalInfo->setEnabled(iconsViewEnabled);
+    // TODO: a different approach is required now due to having a lot more additional infos
+    m_additionalInfo->setEnabled(false);
+    //m_additionalInfo->setEnabled(iconsViewEnabled);
 
     // load show preview, show in groups and show hidden files settings
     m_showPreview->setChecked(m_viewProps->showPreview());