From f11c699fa203dd2cde0e85c63a6d186e3fa6a3de Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 26 Oct 2007 17:36:16 +0000 Subject: 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 --- src/dolphincolumnview.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/dolphincolumnview.cpp') diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 45fa68a3f..d806ad8b2 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -48,7 +48,8 @@ DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* control m_contentX(0), m_columns(), m_emptyViewport(0), - m_animation(0) + m_animation(0), + m_nameFilter() { Q_ASSERT(controller != 0); @@ -145,14 +146,17 @@ void DolphinColumnView::setRootUrl(const KUrl& url) void DolphinColumnView::setNameFilter(const QString& nameFilter) { - foreach (DolphinColumnWidget* column, m_columns) { - column->setNameFilter(nameFilter); + if (nameFilter != m_nameFilter) { + m_nameFilter = nameFilter; + foreach (DolphinColumnWidget* column, m_columns) { + column->setNameFilter(nameFilter); + } } } QString DolphinColumnView::nameFilter() const { - return activeColumn()->nameFilter(); + return m_nameFilter; } KUrl DolphinColumnView::rootUrl() const -- cgit v1.3