#include "dolphinview.h"
-#include <QItemSelectionModel>
-#include <Q3ValueList>
+#include <assert.h>
+
#include <QDropEvent>
+#include <QItemSelectionModel>
#include <QMouseEvent>
#include <QVBoxLayout>
#include <kdirmodel.h>
#include <kfileitemdelegate.h>
-#include <kurl.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/renamedialog.h>
#include <kmimetyperesolver.h>
-#include <assert.h>
+#include <konq_operations.h>
+#include <kurl.h>
-#include "urlnavigator.h"
#include "dolphinstatusbar.h"
#include "dolphinmainwindow.h"
#include "dolphindirlister.h"
#include "dolphinsortfilterproxymodel.h"
-#include "viewproperties.h"
#include "dolphindetailsview.h"
#include "dolphiniconsview.h"
#include "dolphincontextmenu.h"
-#include "undomanager.h"
-#include "renamedialog.h"
-#include "progressindicator.h"
#include "filterbar.h"
+#include "renamedialog.h"
+#include "urlnavigator.h"
+#include "viewproperties.h"
-DolphinView::DolphinView(DolphinMainWindow *mainWindow,
- QWidget *parent,
+DolphinView::DolphinView(DolphinMainWindow* mainWindow,
+ QWidget* parent,
const KUrl& url,
Mode mode,
bool showHiddenFiles) :
QWidget(parent),
- m_refreshing(false),
m_showProgress(false),
m_mode(mode),
m_iconSize(0),
m_topLayout(0),
m_urlNavigator(0),
m_iconsView(0),
+ m_detailsView(0),
m_filterBar(0),
m_statusBar(0),
m_dirModel(0),
m_dirLister->setAutoUpdate(true);
m_dirLister->setMainWindow(this);
m_dirLister->setShowingDotFiles(showHiddenFiles);
+ m_dirLister->setDelayedMimeTypes(true);
+
connect(m_dirLister, SIGNAL(clear()),
- this, SLOT(slotClear()));
+ this, SLOT(updateStatusBar()));
connect(m_dirLister, SIGNAL(percent(int)),
- this, SLOT(slotPercent(int)));
+ this, SLOT(updateProgress(int)));
connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),
- this, SLOT(slotDeleteItem(KFileItem*)));
+ this, SLOT(updateStatusBar()));
connect(m_dirLister, SIGNAL(completed()),
- this, SLOT(slotCompleted()));
+ this, SLOT(updateItemCount()));
connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
- this, SLOT(slotInfoMessage(const QString&)));
+ this, SLOT(showInfoMessage(const QString&)));
connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
- this, SLOT(slotErrorMessage(const QString&)));
-
- m_iconsView = new DolphinIconsView(this);
- applyModeToView();
+ this, SLOT(showErrorMessage(const QString&)));
m_dirModel = new KDirModel();
m_dirModel->setDirLister(m_dirLister);
m_proxyModel = new DolphinSortFilterProxyModel(this);
m_proxyModel->setSourceModel(m_dirModel);
- m_iconsView->setModel(m_proxyModel);
-
- KFileItemDelegate* delegate = new KFileItemDelegate(this);
- delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
- m_iconsView->setItemDelegate(delegate);
-
- m_dirLister->setDelayedMimeTypes(true);
- new KMimeTypeResolver(m_iconsView, m_dirModel);
+ createView();
m_iconSize = K3Icon::SizeMedium;
m_filterBar = new FilterBar(this);
m_filterBar->hide();
connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
- this, SLOT(slotChangeNameFilter(const QString&)));
- connect(m_filterBar, SIGNAL(closed()),
+ this, SLOT(changeNameFilter(const QString&)));
+ connect(m_filterBar, SIGNAL(closeRequest()),
this, SLOT(closeFilterBar()));
m_topLayout->addWidget(m_urlNavigator);
- m_topLayout->addWidget(m_iconsView);
+ m_topLayout->addWidget(itemView());
m_topLayout->addWidget(m_filterBar);
m_topLayout->addWidget(m_statusBar);
- connect(m_iconsView, SIGNAL(clicked(const QModelIndex&)),
- this, SLOT(triggerItem(const QModelIndex&)));
- connect(m_iconsView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
- this, SLOT(emitSelectionChangedSignal()));
-
- startDirLister(m_urlNavigator->url());
+ loadDirectory(m_urlNavigator->url());
}
DolphinView::~DolphinView()
void DolphinView::setMode(Mode mode)
{
if (mode == m_mode) {
- return; // the wished mode is already set
+ return; // the wished mode is already set
}
m_mode = mode;
ViewProperties props(m_urlNavigator->url());
props.setViewMode(m_mode);
- applyModeToView();
+ createView();
startDirLister(m_urlNavigator->url());
emit modeChanged();
DolphinStatusBar::Error);
}
else {
- UndoManager& undoMan = UndoManager::instance();
- undoMan.beginMacro();
+ // TODO: check how this can be integrated into KonqUndoManager/KonqOperations
+
+ //UndoManager& undoMan = UndoManager::instance();
+ //undoMan.beginMacro();
assert(newName.contains('#'));
const int urlsCount = urls.count();
- ProgressIndicator* progressIndicator =
- new ProgressIndicator(mainWindow(),
- i18n("Renaming items..."),
- i18n("Renaming finished."),
- urlsCount);
// iterate through all selected items and rename them...
const int replaceIndex = newName.indexOf('#');
assert(replaceIndex >= 0);
for (int i = 0; i < urlsCount; ++i) {
const KUrl& source = urls[i];
+ QString number;
+ number.setNum(i + 1);
+
QString name(newName);
- name.replace(replaceIndex, 1, renameIndexPresentation(i + 1, urlsCount));
+ name.replace(replaceIndex, 1, number);
if (source.fileName() != name) {
KUrl dest(source.upUrl());
const bool destExists = KIO::NetAccess::exists(dest, false, view);
if (destExists) {
- delete progressIndicator;
- progressIndicator = 0;
view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).",name),
DolphinStatusBar::Error);
break;
else if (KIO::NetAccess::file_move(source, dest)) {
// TODO: From the users point of view he executed one 'rename n files' operation,
// but internally we store it as n 'rename 1 file' operations for the undo mechanism.
- DolphinCommand command(DolphinCommand::Rename, source, dest);
- undoMan.addCommand(command);
+ //DolphinCommand command(DolphinCommand::Rename, source, dest);
+ //undoMan.addCommand(command);
}
}
-
- progressIndicator->execOperation();
}
- delete progressIndicator;
- progressIndicator = 0;
- undoMan.endMacro();
+ //undoMan.endMacro();
}
}
else {
startDirLister(m_urlNavigator->url());
}
-void DolphinView::updateStatusBar()
-{
- // As the item count information is less important
- // in comparison with other messages, it should only
- // be shown if:
- // - the status bar is empty or
- // - shows already the item count information or
- // - shows only a not very important information
- // - if any progress is given don't show the item count info at all
- const QString msg(m_statusBar->message());
- const bool updateStatusBarMsg = (msg.isEmpty() ||
- (msg == m_statusBar->defaultText()) ||
- (m_statusBar->type() == DolphinStatusBar::Information)) &&
- (m_statusBar->progress() == 100);
-
- const QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
- m_statusBar->setDefaultText(text);
-
- if (updateStatusBarMsg) {
- m_statusBar->setMessage(text, DolphinStatusBar::Default);
- }
-}
-
void DolphinView::emitRequestItemInfo(const KUrl& url)
{
emit requestItemInfo(url);
m_urlNavigator->editUrl(editable);
}
-const Q3ValueList<UrlNavigator::HistoryElem> DolphinView::urlHistory(int& index) const
+const QLinkedList<UrlNavigator::HistoryElem> DolphinView::urlHistory(int& index) const
{
return m_urlNavigator->history(index);
}
bool DolphinView::hasSelection() const
{
- return m_iconsView->selectionModel()->hasSelection();
+ return itemView()->selectionModel()->hasSelection();
}
-/*
- * Our view has a selection, we will map them back to the DirModel
- * and then fill the KFileItemList
- */
KFileItemList DolphinView::selectedItems() const
{
- assert( m_iconsView && m_iconsView->selectionModel() );
+ const QAbstractItemView* view = itemView();
+
+ // Our view has a selection, we will map them back to the DirModel
+ // and then fill the KFileItemList.
+ assert((view != 0) && (view->selectionModel() != 0));
- const QItemSelection selection = m_proxyModel->mapSelectionToSource( m_iconsView->selectionModel()->selection() );
+ const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
KFileItemList itemList;
const QModelIndexList indexList = selection.indexes();
QModelIndexList::const_iterator end = indexList.end();
for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
- assert( (*it).isValid() );
+ assert((*it).isValid());
KFileItem* item = m_dirModel->itemForIndex(*it);
if (item != 0) {
return urls;
}
-const KFileItem* DolphinView::currentFileItem() const
+KFileItem* DolphinView::fileItem(const QModelIndex index) const
{
- return 0; // fileView()->currentFileItem();
+ const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
+ return m_dirModel->itemForIndex(dirModelIndex);
}
void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos)
ok = KIO::NetAccess::file_move(source, dest);
}
+ const QString destFileName = dest.fileName();
if (ok) {
- m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), dest.fileName()),
+ m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), destFileName),
DolphinStatusBar::OperationCompleted);
- DolphinCommand command(DolphinCommand::Rename, source, dest);
- UndoManager::instance().addCommand(command);
+ KonqOperations::rename(this, source, destFileName);
}
else {
- m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), dest.fileName()),
+ m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName),
DolphinStatusBar::Error);
reload();
}
startDirLister(m_urlNavigator->url(), true);
}
-void DolphinView::slotUrlListDropped(QDropEvent* /* event */,
- const KUrl::List& urls,
- const KUrl& url)
+void DolphinView::declareViewActive()
{
- KUrl destination(url);
- if (destination.isEmpty()) {
- destination = m_urlNavigator->url();
- }
- else {
- // Check whether the destination Url is a directory. If this is not the
- // case, use the navigator Url as destination (otherwise the destination,
- // which represents a file, would be replaced by a copy- or move-operation).
- KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, destination);
- if (!fileItem.isDir()) {
- destination = m_urlNavigator->url();
- }
- }
-
- mainWindow()->dropUrls(urls, destination);
+ mainWindow()->setActiveView( this );
}
void DolphinView::mouseReleaseEvent(QMouseEvent* event)
const Mode mode = props.viewMode();
if (m_mode != mode) {
m_mode = mode;
- applyModeToView();
+ createView();
emit modeChanged();
}
startDirLister(url);
emit urlChanged(url);
+
+ m_statusBar->clear();
}
void DolphinView::triggerItem(const QModelIndex& index)
// 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).
- //m_dirLister->stop();
- //m_dirLister->openUrl(item->url());
- //return;
-
const QString localPath(item->localPath());
if (localPath.isEmpty()) {
setUrl(item->url());
}
}
-void DolphinView::slotPercent(int percent)
+void DolphinView::updateProgress(int percent)
{
if (m_showProgress) {
m_statusBar->setProgress(percent);
}
}
-void DolphinView::slotClear()
-{
- //fileView()->clearView();
- updateStatusBar();
-}
-
-void DolphinView::slotDeleteItem(KFileItem* item)
-{
- //fileView()->removeItem(item);
- updateStatusBar();
-}
-
-void DolphinView::slotCompleted()
+void DolphinView::updateItemCount()
{
- m_refreshing = true;
-
- //KFileView* view = fileView();
- //view->clearView();
-
- // TODO: in Qt4 the code should get a lot
- // simpler and nicer due to Interview...
- /*if (m_iconsView != 0) {
- m_iconsView->beginItemUpdates();
- }
- if (m_iconsView != 0) {
- m_iconsView->beginItemUpdates();
- }*/
-
if (m_showProgress) {
m_statusBar->setProgressText(QString::null);
m_statusBar->setProgress(100);
while (it != end) {
KFileItem* item = *it;
- //view->insertItem(item);
if (item->isDir()) {
++m_folderCount;
}
}
updateStatusBar();
-
- /*if (m_iconsView != 0) {
- // Prevent a flickering of the icon view widget by giving a small
- // timeslot to swallow asynchronous update events.
- m_iconsView->setUpdatesEnabled(false);
- QTimer::singleShot(10, this, SLOT(slotDelayedUpdate()));
- }
-
- if (m_iconsView != 0) {
- m_iconsView->endItemUpdates();
- m_refreshing = false;
- }*/
}
-void DolphinView::slotInfoMessage(const QString& msg)
+void DolphinView::showInfoMessage(const QString& msg)
{
m_statusBar->setMessage(msg, DolphinStatusBar::Information);
}
-void DolphinView::slotErrorMessage(const QString& msg)
+void DolphinView::showErrorMessage(const QString& msg)
{
m_statusBar->setMessage(msg, DolphinStatusBar::Error);
}
-void DolphinView::slotGrabActivation()
-{
- mainWindow()->setActiveView(this);
-}
-
void DolphinView::emitSelectionChangedSignal()
{
emit selectionChanged();
emit showFilterBarChanged(false);
}
-void DolphinView::slotContentsMoving(int x, int y)
-{
- if (!m_refreshing) {
- // Only emit a 'contents moved' signal if the user
- // moved the content by adjusting the sliders. Adjustments
- // resulted by refreshing a directory should not be respected.
- emit contentsMoved(x, y);
- }
-}
-
void DolphinView::startDirLister(const KUrl& url, bool reload)
{
if (!url.isValid()) {
m_statusBar->setProgress(0);
}
- m_refreshing = true;
m_dirLister->stop();
m_dirLister->openUrl(url, false, reload);
}
return text;
}
-QString DolphinView::renameIndexPresentation(int index, int itemCount) const
-{
- // assure that the string reprentation for all indicess have the same
- // number of characters based on the given number of items
- QString str(QString::number(index));
- int chrCount = 1;
- while (itemCount >= 10) {
- ++chrCount;
- itemCount /= 10;
- }
- str.reserve(chrCount);
-
- const int insertCount = chrCount - str.length();
- for (int i = 0; i < insertCount; ++i) {
- str.insert(0, '0');
- }
- return str;
-}
-
-void DolphinView::slotShowFilterBar(bool show)
+void DolphinView::showFilterBar(bool show)
{
assert(m_filterBar != 0);
if (show) {
}
}
-void DolphinView::declareViewActive()
+void DolphinView::updateStatusBar()
{
- mainWindow()->setActiveView( this );
+ // As the item count information is less important
+ // in comparison with other messages, it should only
+ // be shown if:
+ // - the status bar is empty or
+ // - shows already the item count information or
+ // - shows only a not very important information
+ // - if any progress is given don't show the item count info at all
+ const QString msg(m_statusBar->message());
+ const bool updateStatusBarMsg = (msg.isEmpty() ||
+ (msg == m_statusBar->defaultText()) ||
+ (m_statusBar->type() == DolphinStatusBar::Information)) &&
+ (m_statusBar->progress() == 100);
+
+ const QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
+ m_statusBar->setDefaultText(text);
+
+ if (updateStatusBarMsg) {
+ m_statusBar->setMessage(text, DolphinStatusBar::Default);
+ }
}
-void DolphinView::slotChangeNameFilter(const QString& nameFilter)
+void DolphinView::changeNameFilter(const QString& nameFilter)
{
// The name filter of KDirLister does a 'hard' filtering, which
// means that only the items are shown where the names match
adjustedFilter.insert(0, '*');
adjustedFilter.append('*');
-/*
- * Use the ProxyModel to filter:
- * This code is #ifdefed as setNameFilter behaves
- * slightly different than the QSortFilterProxyModel
- * as it will not remove directories. I will ask
- * our beloved usability experts for input
- * -- z.
- */
+ // Use the ProxyModel to filter:
+ // This code is #ifdefed as setNameFilter behaves
+ // slightly different than the QSortFilterProxyModel
+ // as it will not remove directories. I will ask
+ // our beloved usability experts for input
+ // -- z.
#if 0
m_dirLister->setNameFilter(adjustedFilter);
m_dirLister->emitChanges();
#endif
}
-void DolphinView::applyModeToView()
+void DolphinView::createView()
{
- m_iconsView->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ // delete current view
+ QAbstractItemView* view = itemView();
+ if (view != 0) {
+ m_topLayout->removeWidget(view);
+ view->close();
+ view->deleteLater();
+ m_iconsView = 0;
+ m_detailsView = 0;
+ }
+
+ assert(m_iconsView == 0);
+ assert(m_detailsView == 0);
- // TODO: the following code just tries to test some QListView capabilities
+ // ... and recreate it representing the current mode
switch (m_mode) {
case IconsView:
+ m_iconsView = new DolphinIconsView(this);
m_iconsView->setViewMode(QListView::IconMode);
m_iconsView->setSpacing(32);
- // m_iconsView->setAlternatingRowColors(false);
- // m_iconsView->setGridSize(QSize(128, 64));
+ view = m_iconsView;
+ // TODO: read out view settings
break;
case DetailsView:
- m_iconsView->setViewMode(QListView::ListMode);
- m_iconsView->setSpacing(0);
- // m_iconsView->setAlternatingRowColors(true);
- // m_iconsView->setGridSize(QSize(256, 24));
+ m_detailsView = new DolphinDetailsView(this);
+ view = m_detailsView;
+ // TODO: read out view settings
break;
}
+
+ view->setModel(m_proxyModel);
+
+ view->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+ KFileItemDelegate* delegate = new KFileItemDelegate(this);
+ delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
+ view->setItemDelegate(delegate);
+
+ new KMimeTypeResolver(view, m_dirModel);
+
+ connect(view, SIGNAL(clicked(const QModelIndex&)),
+ this, SLOT(triggerItem(const QModelIndex&)));
+ connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+ this, SLOT(emitSelectionChangedSignal()));
+
+ m_topLayout->insertWidget(1, view);
}
int DolphinView::columnIndex(Sorting sorting) const
void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
{
- QItemSelectionModel* selectionModel = m_iconsView->selectionModel();
+ QItemSelectionModel* selectionModel = itemView()->selectionModel();
const QAbstractItemModel* itemModel = selectionModel->model();
const QModelIndex topLeft = itemModel->index(0, 0);
selectionModel->select(selection, flags);
}
+QAbstractItemView* DolphinView::itemView() const
+{
+ assert((m_iconsView == 0) || (m_detailsView == 0));
+ if (m_detailsView != 0) {
+ return m_detailsView;
+ }
+ return m_iconsView;
+}
+
#include "dolphinview.moc"
projects / dolphin.git / blobdiff