Revert my last commit, it's not quite working

svn path=/trunk/KDE/kdebase/apps/; revision=744406
This commit is contained in:
John Tapsell 2007-12-03 13:10:55 +00:00
parent e80f077357
commit f4614fd066
4 changed files with 10 additions and 26 deletions

View file

@ -554,19 +554,4 @@ void DolphinColumnView::removeAllColumns()
assureVisibleActiveColumn();
}
void DolphinColumnView::setModel ( QAbstractItemModel * model )
{
QAbstractItemView::setModel(model);
if(m_columns[0]) {
m_columns[0]->setModel(model);
m_columns[0]->setSelectionModel(selectionModel());
}
}
void DolphinColumnView::setSelectionModel ( QItemSelectionModel * selectionModel )
{
if(m_columns[0])
m_columns[0]->setSelectionModel(selectionModel);
QAbstractItemView::setSelectionModel(selectionModel);
}
#include "dolphincolumnview.moc"

View file

@ -103,8 +103,6 @@ protected:
virtual void mousePressEvent(QMouseEvent* event);
virtual void resizeEvent(QResizeEvent* event);
virtual void setSelectionModel ( QItemSelectionModel * selectionModel );
virtual void setModel ( QAbstractItemModel * model );
private slots:
void zoomIn();

View file

@ -115,16 +115,18 @@ DolphinColumnWidget::DolphinColumnWidget(QWidget* parent,
m_dirLister->setShowingDotFiles(showHiddenFiles);
connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
this, SLOT(generatePreviews(const KFileItemList&)));
}
void DolphinColumnWidget::setModel ( QAbstractItemModel * model )
{
m_proxyModel = dynamic_cast<DolphinSortFilterProxyModel *>(model);
if(m_proxyModel)
m_dolphinModel = dynamic_cast<DolphinModel *>(m_proxyModel->sourceModel());
m_dolphinModel = new DolphinModel(this);
m_dolphinModel->setDirLister(m_dirLister);
m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
m_proxyModel = new DolphinSortFilterProxyModel(this);
m_proxyModel->setSourceModel(m_dolphinModel);
setModel(m_proxyModel);
new KMimeTypeResolver(this, m_dolphinModel);
m_dirLister->openUrl(m_url, KDirLister::NoFlags);
QListView::setModel(m_proxyModel);
m_dirLister->openUrl(url, KDirLister::NoFlags);
}
DolphinColumnWidget::~DolphinColumnWidget()

View file

@ -89,7 +89,6 @@ public:
* which contain the given filter string will be shown.
*/
void setNameFilter(const QString& nameFilter);
virtual void setModel ( QAbstractItemModel * model );
protected:
virtual QStyleOptionViewItem viewOptions() const;