Some refactoring of FileThumbnailViewItem::updateLines()

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

src/gvcore/filethumbnailviewitem.cpp

@@ -204,21 +204,16 @@ 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
-
+		showName = true;
-		time_t time = TimeUtils::getTime(mFileItem);
+		showDate = true;
-		mLines.append( new WrappedLine(this, mFileItem->name()) );
+		showImageSize = true;
-		mLines.append( new CroppedLine(this, TimeUtils::formatTime(time)) );
+		showFilesize = !isDir;
-		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())) );
-		}
-
 	} else {
 		// Text is below the icon, only show details selected in
 		// view->itemDetails()
@@ -226,24 +221,28 @@ void FileThumbnailViewItem::updateLines() {
 		int details=view->itemDetails();
 		bool isImage=!Archive::fileItemIsDirOrArchive(mFileItem);
 
-		if (!isImage || (details & FileThumbnailView::FILENAME)) {
+		showName      = !isImage || ( details & FileThumbnailView::FILENAME  );
-			mLines.append( new WrappedLine(this, mFileItem->name()) );
+		showDate      =             ( details & FileThumbnailView::FILEDATE  );
-		}
+		showImageSize =             ( details & FileThumbnailView::IMAGESIZE );
-		if (details & FileThumbnailView::FILEDATE) {
+		showFilesize  = !isDir   && ( details & FileThumbnailView::FILESIZE  );
-			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())) );
-		}
 
+	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();