diff options
| -rw-r--r-- | src/gvcore/filethumbnailviewitem.cpp | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp index d017140..c3f7e69 100644 --- a/src/gvcore/filethumbnailviewitem.cpp +++ b/src/gvcore/filethumbnailviewitem.cpp @@ -204,46 +204,45 @@ void FileThumbnailViewItem::updateLines() { mLines.clear(); if (!mFileItem) return; + bool showName, showDate, showImageSize, showFilesize; + bool isDir=mFileItem->isDir(); + if (iconView()->itemTextPos()==TQIconView::Right) { // Text is on the right, show everything - - time_t time = TimeUtils::getTime(mFileItem); - mLines.append( new WrappedLine(this, mFileItem->name()) ); - mLines.append( new CroppedLine(this, TimeUtils::formatTime(time)) ); - if (mImageSize.isValid()) { - TQString txt=TQString::number(mImageSize.width())+"x"+TQString::number(mImageSize.height()); - mLines.append( new CroppedLine(this, txt) ); - } - if (!isDir) { - mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) ); - } - + showName = true; + showDate = true; + showImageSize = true; + showFilesize = !isDir; } else { // Text is below the icon, only show details selected in // view->itemDetails() FileThumbnailView *view=static_cast<FileThumbnailView*>(iconView()); int details=view->itemDetails(); bool isImage=!Archive::fileItemIsDirOrArchive(mFileItem); - - if (!isImage || (details & FileThumbnailView::FILENAME)) { - mLines.append( new WrappedLine(this, mFileItem->name()) ); - } - if (details & FileThumbnailView::FILEDATE) { - time_t time = TimeUtils::getTime(mFileItem); - mLines.append( new CroppedLine(this, TimeUtils::formatTime(time)) ); - } - if (details & FileThumbnailView::IMAGESIZE) { - TQString txt; - if (mImageSize.isValid()) { - txt=TQString::number(mImageSize.width())+"x"+TQString::number(mImageSize.height()); - } - mLines.append( new CroppedLine(this, txt) ); - } - if (!isDir && (details & FileThumbnailView::FILESIZE)) { - mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) ); - } + showName = !isImage || ( details & FileThumbnailView::FILENAME ); + showDate = ( details & FileThumbnailView::FILEDATE ); + showImageSize = ( details & FileThumbnailView::IMAGESIZE ); + showFilesize = !isDir && ( details & FileThumbnailView::FILESIZE ); + } + + if (showName) { + mLines.append( new WrappedLine(this, mFileItem->name()) ); + } + if (showDate) { + time_t time = TimeUtils::getTime(mFileItem); + mLines.append( new CroppedLine(this, TimeUtils::formatTime(time)) ); + } + if (showImageSize) { + TQString txt; + if (mImageSize.isValid()) { + txt=TQString::number(mImageSize.width())+"x"+TQString::number(mImageSize.height()); + } + mLines.append( new CroppedLine(this, txt) ); + } + if (showFilesize) { + mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) ); } calcRect(); |