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/dolphincontroller.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/dolphincontroller.cpp') diff --git a/src/dolphincontroller.cpp b/src/dolphincontroller.cpp index 2a9e8423d..ebd85e021 100644 --- a/src/dolphincontroller.cpp +++ b/src/dolphincontroller.cpp @@ -21,14 +21,15 @@ #include -DolphinController::DolphinController(QObject* parent) : - QObject(parent), +DolphinController::DolphinController(DolphinView* dolphinView) : + QObject(dolphinView), m_showHiddenFiles(false), m_showPreview(false), m_zoomInPossible(false), m_zoomOutPossible(false), - m_additionalInfoCount(0), - m_url() +//m_additionalInfoCount(0), + m_url(), + m_dolphinView(dolphinView) { } @@ -64,10 +65,10 @@ void DolphinController::requestActivation() void DolphinController::indicateDroppedUrls(const KUrl::List& urls, const KUrl& destPath, - const QModelIndex& destIndex, + const KFileItem& destItem, QWidget* source) { - emit urlsDropped(urls, destPath, destIndex, source); + emit urlsDropped(urls, destPath, destItem, source); } @@ -81,6 +82,11 @@ void DolphinController::indicateSortOrderChange(Qt::SortOrder order) emit sortOrderChanged(order); } +void DolphinController::indicateAdditionalInfoChange(const KFileItemDelegate::InformationList& info) +{ + emit additionalInfoChanged(info); +} + void DolphinController::setShowHiddenFiles(bool show) { if (m_showHiddenFiles != show) { @@ -97,13 +103,13 @@ void DolphinController::setShowPreview(bool show) } } -void DolphinController::setAdditionalInfoCount(int count) +/*void DolphinController::setAdditionalInfoCount(int count) { if (m_additionalInfoCount != count) { m_additionalInfoCount = count; emit additionalInfoCountChanged(count); } -} +}*/ void DolphinController::indicateActivationChange(bool active) { -- cgit v1.3