kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Fixed issue that the view properties have not been used for the home directory when starting Dolphin. Also some (very minor) updates have been done regarding the coding guidelines (I'm a nasty nitpicker ;-)).

Browse Source 
svn path=/trunk/playground/utils/dolphin/; revision=620962
This commit is contained in:
Peter Penz 2007-01-07 21:28:41 +00:00
parent b4543ce170
commit fededebd08
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/dolphinview.cpp
View File

@ -138,7 +138,7 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow,
connect(m_iconsView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
this, SLOT(emitSelectionChangedSignal()));
startDirLister(m_urlNavigator->url());
loadDirectory(m_urlNavigator->url());
}
DolphinView::~DolphinView()
@ -479,21 +479,19 @@ bool DolphinView::hasSelection() const
return m_iconsView->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() );
// Our view has a selection, we will map them back to the DirModel
// and then fill the KFileItemList.
assert(m_iconsView && m_iconsView->selectionModel());
const QItemSelection selection = m_proxyModel->mapSelectionToSource( m_iconsView->selectionModel()->selection() );
const QItemSelection selection = m_proxyModel->mapSelectionToSource(m_iconsView->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) {
@ -969,14 +967,12 @@ void DolphinView::slotChangeNameFilter(const QString& nameFilter)
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();