mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 05:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not show the frame around the progress.

Browse source
This commit is contained in:
Klaas Freitag 2013-07-19 11:07:47 +02:00
parent 3b00dfebed
commit 5fa7e48c24
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mirall/folderstatusmodel.cpp
View file

@ -235,9 +235,9 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
progressRect.setRight( option.rect.right()-aliasMargin); progressRect.setRight( option.rect.right()-aliasMargin);
painter->save(); painter->save();
painter->setBrush( option.palette.brightText() ); // painter->setBrush( option.palette.brightText() );
// painter->setPen( QColor(0x06, 0x46, 0x06)); // painter->drawRoundedRect( progressRect, 2, 2 ); // do not draw the box.
painter->drawRoundedRect( progressRect, 2, 2 );
painter->setFont(progressFont); painter->setFont(progressFont);
QRect fileNameRect; QRect fileNameRect;
@ -248,17 +248,17 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
QString pText = subFm.elidedText( tr("File %1: ").arg(syncFile), Qt::ElideLeft, fileNameRect.width()); QString pText = subFm.elidedText( tr("File %1: ").arg(syncFile), Qt::ElideLeft, fileNameRect.width());
painter->drawText(fileNameRect, pText); painter->drawText(fileNameRect, pText);
painter->restore();
// Sizes-Text // Sizes-Text
QString s1 = Utility::octetsToString( progressBytes2 ); QString s1 = Utility::octetsToString( progressBytes2 );
QRect octetRect = subFm.boundingRect( tr("%1 of %2").arg(s1).arg(s1) ); QRect octetRect = subFm.boundingRect( tr("%1 of %2").arg(s1).arg(s1) );
int progressTextWidth = octetRect.width()+20;
QRect pBRect; QRect pBRect;
pBRect.setTop( fileNameRect.bottom() + margin ); pBRect.setTop( fileNameRect.bottom() + margin );
pBRect.setLeft( fileNameRect.left()); pBRect.setLeft( fileNameRect.left());
pBRect.setHeight(barHeight); pBRect.setHeight(barHeight);
pBRect.setWidth( fileNameRect.width() - octetRect.width()-margin ); pBRect.setWidth( fileNameRect.width() - progressTextWidth - margin );
QStyleOptionProgressBarV2 pBarOpt; QStyleOptionProgressBarV2 pBarOpt;
pBarOpt.state = option.state | QStyle::State_Horizontal; pBarOpt.state = option.state | QStyle::State_Horizontal;
@ -276,11 +276,12 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
sizeRect.setHeight(pBRect.height()); sizeRect.setHeight(pBRect.height());
sizeRect.setLeft(pBRect.right() + margin); sizeRect.setLeft(pBRect.right() + margin);
sizeRect.setWidth( octetRect.width() ); sizeRect.setWidth( progressTextWidth );
QString ps1 = Utility::octetsToString( progressBytes1 ); QString ps1 = Utility::octetsToString( progressBytes1 );
QString ps2 = Utility::octetsToString( progressBytes2 ); QString ps2 = Utility::octetsToString( progressBytes2 );
painter->drawText(sizeRect, tr("%1 of %2").arg(ps1).arg(ps2)); painter->drawText(sizeRect, tr("%1 of %2").arg(ps1).arg(ps2));
painter->restore();
} }
// painter->drawText(lastSyncRect, tr("Last Sync: %1").arg( statusText )); // painter->drawText(lastSyncRect, tr("Last Sync: %1").arg( statusText ));