#include <QTimer>
#include <QScrollBar>
+#include <kcolorscheme.h>
#include <kdirmodel.h>
#include <kdirlister.h>
#include <kfileitemdelegate.h>
-#include <kglobalsettings.h>
#include <klocale.h>
#include <kiconeffect.h>
#include <kio/netaccess.h>
const KUrl& url,
KDirLister* dirLister,
KDirModel* dirModel,
- DolphinSortFilterProxyModel* proxyModel,
- Mode mode) :
+ DolphinSortFilterProxyModel* proxyModel) :
QWidget(parent),
m_active(true),
- m_blockContentsMovedSignal(false),
+ m_loadingDirectory(false),
m_initializeColumnView(false),
- m_mode(mode),
+ m_mode(DolphinView::IconsView),
m_topLayout(0),
m_controller(0),
m_iconsView(0),
m_controller = new DolphinController(this);
m_controller->setUrl(url);
+ connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+ this, SIGNAL(urlChanged(const KUrl&)));
connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
this, SLOT(openContextMenu(const QPoint&)));
connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)),
connect(m_controller, SIGNAL(viewportEntered()),
this, SLOT(clearHoverInformation()));
- createView();
+ applyViewProperties(url);
m_topLayout->addWidget(itemView());
}
m_active = active;
- QColor color = KGlobalSettings::baseColor();
+ QColor color = KColorScheme(KColorScheme::View).background();
if (active) {
emit urlChanged(url());
emit selectionChanged(selectedItems());
// to go back to the root URL of the column view automatically.
// Otherwise there it would not be possible to turn off the column view
// without focusing the first column.
- // TODO: reactivate again after DolphinView/DolphinViewController split works
- //setUrl(m_dirLister->url());
- //m_controller->setUrl(m_dirLister->url());
+ setUrl(m_dirLister->url());
+ m_controller->setUrl(m_dirLister->url());
}
- ViewProperties props(url());
+ const KUrl viewPropsUrl = viewPropertiesUrl();
+ ViewProperties props(viewPropsUrl);
props.setViewMode(m_mode);
createView();
- startDirLister(url());
+ startDirLister(viewPropsUrl);
emit modeChanged();
}
void DolphinView::setShowPreview(bool show)
{
- ViewProperties props(url());
+ const KUrl viewPropsUrl = viewPropertiesUrl();
+ ViewProperties props(viewPropsUrl);
props.setShowPreview(show);
m_controller->setShowPreview(show);
emit showPreviewChanged();
- startDirLister(url(), true);
+ startDirLister(viewPropsUrl, true);
}
bool DolphinView::showPreview() const
return;
}
- ViewProperties props(url());
+ const KUrl viewPropsUrl = viewPropertiesUrl();
+ ViewProperties props(viewPropsUrl);
props.setShowHiddenFiles(show);
m_dirLister->setShowingDotFiles(show);
emit showHiddenFilesChanged();
- startDirLister(url(), true);
+ startDirLister(viewPropsUrl, true);
}
bool DolphinView::showHiddenFiles() const
delete categorizer;
}
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setCategorizedSorting(categorized);
props.save();
view->horizontalScrollBar()->setValue(x);
view->verticalScrollBar()->setValue(y);
- m_blockContentsMovedSignal = false;
+ m_loadingDirectory = false;
}
QPoint DolphinView::contentsPosition() const
void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
{
- ViewProperties props(url());
+ const KUrl viewPropsUrl = viewPropertiesUrl();
+ ViewProperties props(viewPropsUrl);
props.setAdditionalInfo(info);
m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);
m_fileItemDelegate->setAdditionalInformation(info);
emit additionalInfoChanged(info);
- startDirLister(url(), true);
+ startDirLister(viewPropsUrl, true);
}
KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
void DolphinView::refresh()
{
createView();
+ applyViewProperties(m_controller->url());
reload();
}
+void DolphinView::setUrl(const KUrl& url)
+{
+ if (m_controller->url() == url) {
+ return;
+ }
+
+ m_controller->setUrl(url);
+
+ applyViewProperties(url);
+
+ startDirLister(url);
+ emit urlChanged(url);
+}
+
void DolphinView::mouseReleaseEvent(QMouseEvent* event)
{
QWidget::mouseReleaseEvent(event);
return;
}
- // Prefer the local path over the URL. This assures that the
- // volume space information is correct. Assuming that the URL is media:/sda1,
- // and the local path is /windows/C: For the URL the space info is related
- // to the root partition (and hence wrong) and for the local path the space
- // info is related to the windows partition (-> correct).
- const QString localPath(item->localPath());
- KUrl url;
- if (localPath.isEmpty()) {
- url = item->url();
- } else {
- url = localPath;
- }
+ // The stuff below should be moved to ViewContainer and be just a signal?
+
+ // Prefer the local path over the URL.
+ bool isLocal;
+ KUrl url = item->mostLocalUrl(isLocal);
if (item->isDir()) {
setUrl(url);
if (!url.isValid()) {
const QString location(url.pathOrUrl());
if (location.isEmpty()) {
- emit errorMessage(i18n("The location is empty."));
+ emit errorMessage(i18nc("@info:status", "The location is empty."));
} else {
- emit errorMessage(i18n("The location '%1' is invalid.", location));
+ emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));
}
return;
}
m_cutItemsCache.clear();
- m_blockContentsMovedSignal = true;
+ m_loadingDirectory = true;
m_dirLister->stop();
}
}
-void DolphinView::setUrl(const KUrl& url)
+KUrl DolphinView::viewPropertiesUrl() const
{
- if (m_controller->url() == url) {
- return;
+ if (isColumnViewActive()) {
+ return m_dirLister->url();
}
- m_controller->setUrl(url);
+ return url();
+}
+
+void DolphinView::applyViewProperties(const KUrl& url)
+{
+ if (isColumnViewActive() && m_dirLister->url().isParentOf(url)) {
+ // The column view is active, hence don't apply the view properties
+ // of sub directories (represented by columns) to the view. The
+ // view always represents the properties of the first column.
+ return;
+ }
const ViewProperties props(url);
const Mode mode = props.viewMode();
- bool changeMode = (m_mode != mode);
- if (changeMode && isColumnViewActive()) {
- // The column view is active. Only change the
- // mode if the current URL is no child of the column view.
- if (m_dirLister->url().isParentOf(url)) {
- changeMode = false;
- }
- }
-
- if (changeMode) {
+ if (m_mode != mode) {
m_mode = mode;
createView();
emit modeChanged();
m_initializeColumnView = true;
}
}
+ if (itemView() == 0) {
+ createView();
+ }
+ Q_ASSERT(itemView() != 0);
+ Q_ASSERT(m_fileItemDelegate != 0);
const bool showHiddenFiles = props.showHiddenFiles();
if (showHiddenFiles != m_dirLister->showingDotFiles()) {
m_controller->setShowPreview(showPreview);
emit showPreviewChanged();
}
-
- startDirLister(url);
- emit urlChanged(url);
}
void DolphinView::changeSelection(const KFileItemList& selection)
void DolphinView::updateSorting(DolphinView::Sorting sorting)
{
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setSorting(sorting);
m_proxyModel->setSorting(sorting);
void DolphinView::updateSortOrder(Qt::SortOrder order)
{
- ViewProperties props(url());
+ ViewProperties props(viewPropertiesUrl());
props.setSortOrder(order);
m_proxyModel->setSortOrder(order);
void DolphinView::emitContentsMoved()
{
- if (!m_blockContentsMovedSignal) {
+ // only emit the contents moved signal if:
+ // - no directory loading is ongoing (this would reset the contents position
+ // always to (0, 0))
+ // - if the Column View is active: the column view does an automatic
+ // positioning during the loading operation, which must be remembered
+ if (!m_loadingDirectory || isColumnViewActive()) {
const QPoint pos(contentsPosition());
emit contentsMoved(pos.x(), pos.y());
}
const KFileItem* item = fileItem(index);
if (item != 0) {
- emit requestItemInfo(item->url());
+ emit requestItemInfo(*item);
}
}
void DolphinView::clearHoverInformation()
{
- emit requestItemInfo(KUrl());
+ emit requestItemInfo(KFileItem());
}
projects / dolphin.git / blobdiff