#include <ktoggleaction.h>
#include <kurl.h>
-#include "dolphindropcontroller.h"
#include "dolphinmodel.h"
#include "dolphincolumnview.h"
#include "dolphincontroller.h"
#include "dolphiniconsview.h"
#include "dolphinsettings.h"
#include "dolphin_generalsettings.h"
+#include "draganddrophelper.h"
#include "folderexpander.h"
#include "renamedialog.h"
#include "tooltipmanager.h"
m_previewGenerator(0),
m_toolTipManager(0),
m_rootUrl(),
- m_currentItemUrl()
+ m_currentItemUrl(),
+ m_expandedViews()
{
m_topLayout = new QVBoxLayout(this);
m_topLayout->setSpacing(0);
this, SLOT(clearHoverInformation()));
connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)),
- this, SLOT(slotRedirection(KUrl, KUrl)));
+ this, SIGNAL(redirection(KUrl, KUrl)));
connect(m_dirLister, SIGNAL(completed()),
this, SLOT(restoreCurrentItem()));
DolphinView::~DolphinView()
{
+ deleteExpandedViews();
}
const KUrl& DolphinView::url() const
void DolphinView::refresh()
{
const bool oldActivationState = m_active;
+ const int oldZoomLevel = m_controller->zoomLevel();
m_active = true;
createView();
reload();
setActive(oldActivationState);
+ updateZoomLevel(oldZoomLevel);
}
void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
}
}
-void DolphinView::calculateItemCount(int& fileCount, int& folderCount) const
+void DolphinView::calculateItemCount(int& fileCount,
+ int& folderCount,
+ KIO::filesize_t& totalFileSize) const
{
foreach (const KFileItem& item, m_dirLister->items()) {
if (item.isDir()) {
++folderCount;
} else {
++fileCount;
+ totalFileSize += item.size();
}
}
}
QString DolphinView::statusBarText() const
-{
+{
+ QString text;
+ int folderCount = 0;
+ int fileCount = 0;
+ KIO::filesize_t totalFileSize = 0;
+
if (hasSelection()) {
// give a summary of the status of the selected files
- QString text;
const KFileItemList list = selectedItems();
if (list.isEmpty()) {
// when an item is triggered, it is temporary selected but selectedItems()
// will return an empty list
- return QString();
+ return text;
}
- int fileCount = 0;
- int folderCount = 0;
- KIO::filesize_t byteSize = 0;
KFileItemList::const_iterator it = list.begin();
const KFileItemList::const_iterator end = list.end();
while (it != end) {
++folderCount;
} else {
++fileCount;
- byteSize += item.size();
+ totalFileSize += item.size();
}
++it;
}
-
- if (folderCount > 0) {
- text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
- if (fileCount > 0) {
- text += ", ";
- }
- }
-
- if (fileCount > 0) {
- const QString sizeText(KIO::convertSize(byteSize));
- text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
+
+ const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
+ const QString filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);
+ if ((folderCount > 0) && (fileCount > 0)) {
+ text = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
+ foldersText, filesText, KIO::convertSize(totalFileSize));
+ } else if (fileCount > 0) {
+ text = i18nc("@info:status files (size)", "%1 (%2)", filesText, KIO::convertSize(totalFileSize));
+ } else {
+ Q_ASSERT(folderCount > 0);
+ text = foldersText;
}
- return text;
} else {
- // Give a summary of the status of the current folder.
- int folderCount = 0;
- int fileCount = 0;
- calculateItemCount(fileCount, folderCount);
- return KIO::itemsSummaryString(fileCount + folderCount,
- fileCount,
- folderCount,
- 0, false);
+ calculateItemCount(fileCount, folderCount, totalFileSize);
+ text = KIO::itemsSummaryString(fileCount + folderCount,
+ fileCount, folderCount,
+ totalFileSize, true);
}
+
+ return text;
}
void DolphinView::setUrl(const KUrl& url)
bool DolphinView::eventFilter(QObject* watched, QEvent* event)
{
- if ((watched == itemView()) && (event->type() == QEvent::FocusIn)) {
- m_controller->requestActivation();
+ switch (event->type()) {
+ case QEvent::FocusIn:
+ if (watched == itemView()) {
+ m_controller->requestActivation();
+ }
+ break;
+
+ case QEvent::MouseButtonPress:
+ if ((watched == itemView()->viewport()) && (m_expandedViews.count() > 0)) {
+ // Listening to a mousebutton press event to delete expanded views is a
+ // workaround, as it seems impossible for the FolderExpander to know when
+ // a dragging outside a view has been finished. However it works quite well:
+ // A mousebutton press event indicates that a drag operation must be
+ // finished already.
+ deleteExpandedViews();
+ }
+ break;
+
+ case QEvent::DragEnter:
+ if (watched == itemView()->viewport()) {
+ setActive(true);
+ }
+ break;
+
+ default:
+ break;
}
return QWidget::eventFilter(watched, event);
const KUrl& destPath,
QDropEvent* event)
{
- DolphinDropController::dropUrls(destItem, destPath, event, this);
+ DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
}
void DolphinView::updateSorting(DolphinView::Sorting sorting)
}
}
-void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
-{
- if (oldUrl == m_controller->url()) {
- m_controller->setUrl(newUrl);
- }
-}
-
void DolphinView::slotRequestUrlChange(const KUrl& url)
{
emit requestUrlChange(url);
}
}
+void DolphinView::enterDir(const QModelIndex& index, QAbstractItemView* view)
+{
+ // Deleting a view that is the root of a drag operation is not allowed, otherwise
+ // the dragging gets automatically cancelled by Qt. So before entering a new
+ // directory, the current view is remembered in m_expandedViews and deleted
+ // later when the drag operation has been finished (see DolphinView::eventFilter()).
+ m_expandedViews.append(view);
+ m_controller->triggerItem(index);
+}
+
void DolphinView::loadDirectory(const KUrl& url, bool reload)
{
if (!url.isValid()) {
Q_ASSERT(view != 0);
view->installEventFilter(this);
+ view->viewport()->installEventFilter(this);
if (m_mode != ColumnView) {
// Give the view the ability to auto-expand its directories on hovering
FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
folderExpander->setEnabled(enabled);
- connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
- m_controller, SLOT(triggerItem(const QModelIndex&)));
+ connect(folderExpander, SIGNAL(enterDir(const QModelIndex&, QAbstractItemView*)),
+ this, SLOT(enterDir(const QModelIndex&, QAbstractItemView*)));
}
m_controller->setItemView(view);
if (DolphinSettings::instance().generalSettings()->showToolTips()) {
m_toolTipManager = new ToolTipManager(view, m_proxyModel);
+ connect(m_controller, SIGNAL(hideToolTip()),
+ m_toolTipManager, SLOT(hideTip()));
}
m_topLayout->insertWidget(1, view);
m_topLayout->removeWidget(view);
view->close();
- view->deleteLater();
+
+ disconnect(view);
+ m_controller->disconnect(view);
+ view->disconnect();
+
+ bool deleteView = true;
+ foreach (const QAbstractItemView* expandedView, m_expandedViews) {
+ if (view == expandedView) {
+ // the current view got already expanded and must stay alive
+ // until the dragging has been completed
+ deleteView = false;
+ break;
+ }
+ }
+ if (deleteView) {
+ view->deleteLater();
+ }
view = 0;
+
m_iconsView = 0;
m_detailsView = 0;
m_columnView = 0;
return list;
}
+void DolphinView::deleteExpandedViews()
+{
+ const QAbstractItemView* view = itemView();
+ foreach (QAbstractItemView* expandedView, m_expandedViews) {
+ if (expandedView != view) {
+ expandedView->deleteLater();
+ }
+ }
+ m_expandedViews.clear();
+}
+
bool DolphinView::itemsExpandable() const
{
return (m_detailsView != 0) && m_detailsView->itemsExpandable();
projects / dolphin.git / blobdiff