diff options
| -rw-r--r-- | src/dolphincolumnview.h | 8 | ||||
| -rw-r--r-- | src/dolphincolumnviewcontainer.cpp | 12 | ||||
| -rw-r--r-- | src/dolphincolumnviewcontainer.h | 2 | ||||
| -rw-r--r-- | src/dolphinview.cpp | 3 |
4 files changed, 12 insertions, 13 deletions
diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h index d2354a9ad..c742b46cf 100644 --- a/src/dolphincolumnview.h +++ b/src/dolphincolumnview.h @@ -65,13 +65,13 @@ public: * of the shown directory, it does not trigger a loading of the model. */ void setChildUrl(const KUrl& url); - const KUrl& childUrl() const; + KUrl childUrl() const; /** Sets the directory URL that is shown inside the column widget. */ void setUrl(const KUrl& url); /** Returns the directory URL that is shown inside the column widget. */ - const KUrl& url() const; + KUrl url() const; /** * Updates the background color dependent from the activation state @@ -149,7 +149,7 @@ inline void DolphinColumnView::setChildUrl(const KUrl& url) m_childUrl = url; } -inline const KUrl& DolphinColumnView::childUrl() const +inline KUrl DolphinColumnView::childUrl() const { return m_childUrl; } @@ -162,7 +162,7 @@ inline void DolphinColumnView::setUrl(const KUrl& url) } } -inline const KUrl& DolphinColumnView::url() const +inline KUrl DolphinColumnView::url() const { return m_url; } diff --git a/src/dolphincolumnviewcontainer.cpp b/src/dolphincolumnviewcontainer.cpp index 08de897ab..fb8e5444c 100644 --- a/src/dolphincolumnviewcontainer.cpp +++ b/src/dolphincolumnviewcontainer.cpp @@ -48,8 +48,8 @@ DolphinColumnViewContainer::DolphinColumnViewContainer(QWidget* parent, setFrameShape(QFrame::NoFrame); setLayoutDirection(Qt::LeftToRight); - connect(this, SIGNAL(viewportEntered()), - controller, SLOT(emitViewportEntered())); + //connect(this, SIGNAL(viewportEntered()), + // controller, SLOT(emitViewportEntered())); connect(controller, SIGNAL(activationChanged(bool)), this, SLOT(updateColumnsBackground(bool))); @@ -83,12 +83,12 @@ QAbstractItemView* DolphinColumnViewContainer::activeColumn() const return m_columns[m_index]; } -bool DolphinColumnViewContainer::showColumn(const KUrl& url) +void DolphinColumnViewContainer::showColumn(const KUrl& url) { if (!rootUrl().isParentOf(url)) { removeAllColumns(); m_columns[0]->setUrl(url); - return false; + return; } int columnIndex = 0; @@ -97,7 +97,7 @@ bool DolphinColumnViewContainer::showColumn(const KUrl& url) // the column represents already the requested URL, hence activate it requestActivation(column); layoutColumns(); - return false; + return; } else if (!column->url().isParentOf(url)) { // the column is no parent of the requested URL, hence // just delete all remaining columns @@ -168,8 +168,6 @@ bool DolphinColumnViewContainer::showColumn(const KUrl& url) m_index = columnIndex; m_columns[m_index]->setActive(true); assureVisibleActiveColumn(); - - return true; } void DolphinColumnViewContainer::mousePressEvent(QMouseEvent* event) diff --git a/src/dolphincolumnviewcontainer.h b/src/dolphincolumnviewcontainer.h index 0d8c87b16..10c2905fa 100644 --- a/src/dolphincolumnviewcontainer.h +++ b/src/dolphincolumnviewcontainer.h @@ -56,7 +56,7 @@ public: * Shows the column which represents the URL \a url. If the column * is already shown, it gets activated, otherwise it will be created. */ - bool showColumn(const KUrl& url); + void showColumn(const KUrl& url); signals: /** diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index bae7c40f9..6db79452c 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -1302,7 +1302,7 @@ void DolphinView::createView() Q_ASSERT(view != 0); view->installEventFilter(this); view->viewport()->installEventFilter(this); - setFocusProxy(view); + /* TODO: enable folder expanding again later @@ -1357,6 +1357,7 @@ void DolphinView::createView() connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(emitContentsMoved())); + setFocusProxy(m_viewAccessor.layoutTarget()); m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget()); } |