kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-17 15:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Do not hide the parent folder since we can now browse into it by simply clicking the link.

Browse source 
* Fixed index bug which caused the last information item to be deleted.
* Why make merge-sort more complicated than it is? ;)

svn path=/trunk/KDE/kdebase/apps/; revision=1080377
This commit is contained in:
Sebastian Trueg 2010-01-26 09:25:22 +00:00
parent 6c326f9962
commit 950d3ad78b
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/panels/information/kmetadatawidget.cpp
View file

@ -267,7 +267,7 @@ void KMetaDataWidget::Private::setRowVisible(QWidget* infoWidget, bool visible)
void KMetaDataWidget::Private::initMetaInfoSettings()
{
const int currentVersion = 1; // increase version, if the blacklist of disabled
const int currentVersion = 2; // increase version, if the blacklist of disabled
// properties should be updated
KConfig config("kmetainformationrc", KConfig::NoGlobals);
@ -283,7 +283,7 @@ void KMetaDataWidget::Private::initMetaInfoSettings()
static const char* const disabledProperties[] = {
"asText", "contentSize", "created", "depth", "description", "fileExtension",
"fileName", "fileSize", "hasTag", "isPartOf", "lastModified", "mimeType", "name",
"fileName", "fileSize", "hasTag", "lastModified", "mimeType", "name",
"numericRating", "parentUrl", "permissions", "plainTextContent", "owner",
"sourceModified", "url",
0 // mandatory last entry
@ -410,7 +410,7 @@ void KMetaDataWidget::Private::slotLoadingFinished()
}
// remove rows that are not needed anymore
for (int i = m_rows.count() - 1; i >= index; --i) {
for (int i = m_rows.count() - 1; i > index; --i) {
delete m_rows[i].label;
delete m_rows[i].infoWidget;
m_rows.pop_back();
@ -507,19 +507,12 @@ QList<KLoadMetaDataThread::Item>
height = item;
} else {
// insert the item sorted by the label
bool inserted = false;
int i = 0;
const int count = mergedItems.count();
while (!inserted && (i < count)) {
if (item.label < mergedItems[i].label) {
mergedItems.insert(i, item);
inserted = true;
}
++i;
}
if (!inserted) {
mergedItems.append(item);
int pos = 0;
while ( mergedItems.count() > pos &&
mergedItems[pos].label < item.label ) {
++pos;
}
mergedItems.insert( pos, item );
}
}