#include "dolphin_folderspanelsettings.h"
#include "dolphin_generalsettings.h"
#include "treeviewcontextmenu.h"
+#include "foldersitemlistwidget.h"
+#include <views/renamedialog.h>
#include <kitemviews/kitemlistselectionmanager.h>
#include <kitemviews/kfileitemlistview.h>
#include <kitemviews/kfileitemlistwidget.h>
#include <kitemviews/kitemlistcontroller.h>
#include <kitemviews/kfileitemmodel.h>
-#include <KDirLister>
#include <KFileItem>
#include <konq_operations.h>
#include <QApplication>
#include <QBoxLayout>
+#include <QDropEvent>
+#include <QGraphicsSceneDragDropEvent>
#include <QGraphicsView>
#include <QPropertyAnimation>
#include <QTimer>
-#include <views/renamedialog.h>
+#include <views/draganddrophelper.h>
#include <KDebug>
FoldersPanel::FoldersPanel(QWidget* parent) :
Panel(parent),
m_updateCurrentItem(false),
- m_dirLister(0),
- m_controller(0)
+ m_controller(0),
+ m_model(0)
{
setLayoutDirection(Qt::LeftToRight);
}
m_controller->setView(0);
delete view;
}
-
- delete m_dirLister;
- m_dirLister = 0;
}
-void FoldersPanel::setHiddenFilesShown(bool show)
+void FoldersPanel::setShowHiddenFiles(bool show)
{
FoldersPanelSettings::setHiddenFilesShown(show);
- if (m_dirLister) {
- KFileItemModel* model = fileItemModel();
- const QSet<KUrl> expandedUrls = model->expandedUrls();
- m_dirLister->setShowingDotFiles(show);
- m_dirLister->openUrl(m_dirLister->url(), KDirLister::Reload);
- model->setExpanded(expandedUrls);
- }
+ m_model->setShowHiddenFiles(show);
}
-bool FoldersPanel::hiddenFilesShown() const
+bool FoldersPanel::showHiddenFiles() const
{
return FoldersPanelSettings::hiddenFilesShown();
}
void FoldersPanel::setAutoScrolling(bool enable)
{
- //m_treeView->setAutoHorizontalScroll(enable);
+ // TODO: Not supported yet in Dolphin 2.0
FoldersPanelSettings::setAutoScrolling(enable);
}
void FoldersPanel::rename(const KFileItem& item)
{
- // TODO: Inline renaming is not supported anymore in Dolphin 2.0
- if (false /* GeneralSettings::renameInline() */) {
- //const QModelIndex dirIndex = m_dolphinModel->indexForItem(item);
- //const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
- //m_treeView->edit(proxyIndex);
+ if (GeneralSettings::renameInline()) {
+ const int index = m_model->index(item);
+ m_controller->view()->editRole(index, "text");
} else {
RenameDialog* dialog = new RenameDialog(this, KFileItemList() << item);
dialog->setAttribute(Qt::WA_DeleteOnClose);
return false;
}
- if (m_dirLister) {
+ if (m_controller) {
loadTree(url());
}
return;
}
- if (!m_dirLister) {
- // Postpone the creating of the dir lister to the first show event.
- // This assures that no performance and memory overhead is given when the TreeView is not
- // used at all (see FoldersPanel::setUrl()).
- m_dirLister = new KDirLister();
- m_dirLister->setDirOnlyMode(true);
- m_dirLister->setAutoUpdate(true);
- m_dirLister->setMainWindow(window());
- m_dirLister->setDelayedMimeTypes(true);
- m_dirLister->setAutoErrorHandlingEnabled(false, this);
- m_dirLister->setShowingDotFiles(FoldersPanelSettings::hiddenFilesShown());
-
+ if (!m_controller) {
+ // Postpone the creating of the controller to the first show event.
+ // This assures that no performance and memory overhead is given when the folders panel is not
+ // used at all and stays invisible.
KFileItemListView* view = new KFileItemListView();
- view->setWidgetCreator(new KItemListWidgetCreator<KFileItemListWidget>());
-
- KItemListStyleOption styleOption = view->styleOption();
- styleOption.margin = 2;
- styleOption.iconSize = KIconLoader::SizeSmall;
- view->setStyleOption(styleOption);
-
- const qreal itemHeight = qMax(int(KIconLoader::SizeSmall), styleOption.fontMetrics.height());
- view->setItemSize(QSizeF(-1, itemHeight + 2 * styleOption.margin));
- view->setItemLayout(KFileItemListView::DetailsLayout);
+ view->setWidgetCreator(new KItemListWidgetCreator<FoldersItemListWidget>());
+ view->setSupportsItemExpanding(true);
// Set the opacity to 0 initially. The opacity will be increased after the loading of the initial tree
// has been finished in slotLoadingCompleted(). This prevents an unnecessary animation-mess when
// opening the folders panel.
view->setOpacity(0);
- KFileItemModel* model = new KFileItemModel(m_dirLister, this);
+ connect(view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+ this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+
+ m_model = new KFileItemModel(this);
+ m_model->setShowDirectoriesOnly(true);
+ m_model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown());
// Use a QueuedConnection to give the view the possibility to react first on the
// finished loading.
- connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection);
+ connect(m_model, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection);
- KItemListContainer* container = new KItemListContainer(this);
- m_controller = container->controller();
- m_controller->setView(view);
- m_controller->setModel(model);
+ m_controller = new KItemListController(m_model, view, this);
m_controller->setSelectionBehavior(KItemListController::SingleSelection);
+ m_controller->setAutoActivationBehavior(KItemListController::ExpansionOnly);
+ m_controller->setMouseDoubleClickAction(KItemListController::ActivateAndExpandItem);
+ m_controller->setAutoActivationDelay(750);
+ m_controller->setSingleClickActivation(true);
connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
+ connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
- // TODO: Check whether it makes sense to make an explicit API for KItemListContainer
- // to make the background transparent.
- container->setFrameShape(QFrame::NoFrame);
- QGraphicsView* graphicsView = qobject_cast<QGraphicsView*>(container->viewport());
- if (graphicsView) {
- // Make the background of the container transparent and apply the window-text color
- // to the text color, so that enough contrast is given for all color
- // schemes
- QPalette p = graphicsView->palette();
- p.setColor(QPalette::Active, QPalette::Text, p.color(QPalette::Active, QPalette::WindowText));
- p.setColor(QPalette::Inactive, QPalette::Text, p.color(QPalette::Inactive, QPalette::WindowText));
- p.setColor(QPalette::Disabled, QPalette::Text, p.color(QPalette::Disabled, QPalette::WindowText));
- graphicsView->setPalette(p);
- graphicsView->viewport()->setAutoFillBackground(false);
- }
+ KItemListContainer* container = new KItemListContainer(m_controller, this);
+ container->setEnabledFrame(false);
QVBoxLayout* layout = new QVBoxLayout(this);
layout->setMargin(0);
const int key = event->key();
if ((key == Qt::Key_Enter) || (key == Qt::Key_Return)) {
event->accept();
- //updateActiveView(m_treeView->currentIndex());
} else {
Panel::keyPressEvent(event);
}
void FoldersPanel::slotItemActivated(int index)
{
- const KFileItem item = fileItemModel()->fileItem(index);
+ const KFileItem item = m_model->fileItem(index);
if (!item.isNull()) {
- emit changeUrl(item.url(), Qt::LeftButton);
+ emit folderActivated(item.url());
}
}
void FoldersPanel::slotItemMiddleClicked(int index)
{
- const KFileItem item = fileItemModel()->fileItem(index);
+ const KFileItem item = m_model->fileItem(index);
if (!item.isNull()) {
- emit changeUrl(item.url(), Qt::MiddleButton);
+ emit folderMiddleClicked(item.url());
}
}
{
Q_UNUSED(pos);
- const KFileItem fileItem = fileItemModel()->fileItem(index);
+ const KFileItem fileItem = m_model->fileItem(index);
QWeakPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, fileItem);
contextMenu.data()->open();
}
}
+void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+{
+ if (index >= 0) {
+ KFileItem destItem = m_model->fileItem(index);
+ if (destItem.isNull()) {
+ return;
+ }
+
+ QDropEvent dropEvent(event->pos().toPoint(),
+ event->possibleActions(),
+ event->mimeData(),
+ event->buttons(),
+ event->modifiers());
+
+ const QString error = DragAndDropHelper::dropUrls(destItem, destItem.url(), &dropEvent);
+ if (!error.isEmpty()) {
+ emit errorMessage(error);
+ }
+ }
+}
+
+void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
+{
+ if (role == "text") {
+ const KFileItem item = m_model->fileItem(index);
+ const QString newName = value.toString();
+ if (!newName.isEmpty() && newName != item.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+ KonqOperations::rename(this, item.url(), newName);
+ }
+ }
+}
+
void FoldersPanel::slotLoadingCompleted()
{
if (m_controller->view()->opacity() == 0) {
return;
}
- const int index = fileItemModel()->index(url());
+ const int index = m_model->index(url());
updateCurrentItem(index);
m_updateCurrentItem = false;
}
-void FoldersPanel::slotHorizontalScrollBarMoved(int value)
-{
- Q_UNUSED(value);
- // Disable the auto-scrolling until the vertical scrollbar has
- // been moved by the user.
- //m_treeView->setAutoHorizontalScroll(false);
-}
-
-void FoldersPanel::slotVerticalScrollBarMoved(int value)
-{
- Q_UNUSED(value);
- // Enable the auto-scrolling again (it might have been disabled by
- // moving the horizontal scrollbar).
- //m_treeView->setAutoHorizontalScroll(FoldersPanelSettings::autoScrolling());
-}
-
void FoldersPanel::startFadeInAnimation()
{
QPropertyAnimation* anim = new QPropertyAnimation(m_controller->view(), "opacity", this);
void FoldersPanel::loadTree(const KUrl& url)
{
- Q_ASSERT(m_dirLister);
+ Q_ASSERT(m_controller);
m_updateCurrentItem = false;
baseUrl.setPath(QString('/'));
}
- if (m_dirLister->url() != baseUrl) {
+ if (m_model->directory() != baseUrl) {
m_updateCurrentItem = true;
- m_dirLister->stop();
- m_dirLister->openUrl(baseUrl, KDirLister::Reload);
+ m_model->refreshDirectory(baseUrl);
}
- KFileItemModel* model = fileItemModel();
- const int index = model->index(url);
+ const int index = m_model->index(url);
if (index >= 0) {
updateCurrentItem(index);
} else {
m_updateCurrentItem = true;
- model->setExpanded(QSet<KUrl>() << url);
+ m_model->expandParentDirectories(url);
// slotLoadingCompleted() will be invoked after the model has
// expanded the url
}
m_controller->view()->scrollToItem(index);
}
-KFileItemModel* FoldersPanel::fileItemModel() const
-{
- return static_cast<KFileItemModel*>(m_controller->model());
-}
-
#include "folderspanel.moc"
projects / dolphin.git / blobdiff