diff options
| author | David Faure <[email protected]> | 2007-03-27 19:38:32 +0000 |
|---|---|---|
| committer | David Faure <[email protected]> | 2007-03-27 19:38:32 +0000 |
| commit | 623c19e042cd19c147bc27f50b62c22b4986e6b6 (patch) | |
| tree | a571cdd343919bdb8a051561f3858d2419a8bcfe /src/dolphinview.cpp | |
| parent | 6fecb341c2b4b5b73785fac245d56c3c6cb3683a (diff) | |
Added setters in urlnavigator to remove dependency on dolphinsettings.
Removed old unused kfileiconview.h header, fixed some unrelated missing includes due to that one being removed.
svn path=/trunk/KDE/kdebase/apps/; revision=647244
Diffstat (limited to 'src/dolphinview.cpp')
| -rw-r--r-- | src/dolphinview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 04b949a7d..88a2cff80 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -26,6 +26,8 @@ #include <QItemSelectionModel> #include <QMouseEvent> #include <QVBoxLayout> +#include <QTimer> +#include <QScrollBar> #include <kdirmodel.h> #include <kfileitemdelegate.h> @@ -53,6 +55,7 @@ #include "urlnavigator.h" #include "viewproperties.h" #include "dolphinsettings.h" +#include "dolphin_generalsettings.h" DolphinView::DolphinView(DolphinMainWindow* mainWindow, QWidget* parent, @@ -94,6 +97,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow, this, SLOT(updateCutItems())); m_urlNavigator = new UrlNavigator(DolphinSettings::instance().bookmarkManager(), url, this); + m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl()); + m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl()); m_urlNavigator->setShowHiddenFiles(showHiddenFiles); connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(loadDirectory(const KUrl&))); @@ -342,7 +347,6 @@ DolphinStatusBar* DolphinView::statusBar() const int DolphinView::contentsX() const { - return itemView()->horizontalScrollBar()->value(); } @@ -453,7 +457,7 @@ void DolphinView::goHome() void DolphinView::setUrlEditable(bool editable) { - m_urlNavigator->editUrl(editable); + m_urlNavigator->setUrlEditable(editable); } bool DolphinView::hasSelection() const |