mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Two patches sent by Alvaro Soliverez <asoliverez@kde.org>:

Browse source 
- fixed refresh of the folder list in the status dialog
- show enabled status in the status dialog
This commit is contained in:
Klaas Freitag 2011-12-25 21:55:29 +01:00
parent 0c9c2962c2
commit bb2baeb1d2
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mirall/application.cpp
View file

@ -146,12 +146,14 @@ void Application::slotTrayClicked( QSystemTrayIcon::ActivationReason reason )
qDebug() << "No configured folders yet, start the Owncloud integration dialog.";
_owncloudSetup->startWizard();
} else {
_statusDialog->setFolderList( _folderMap );
_statusDialog->setOCUrl( QUrl( _owncloudSetup->ownCloudUrl()));
_statusDialog->show();
}
restoreEnabledFolders();
if ( !_folderMap.isEmpty() && _statusDialog->isVisible() ) {
_statusDialog->setFolderList( _folderMap );
}
}
}

20
src/mirall/statusdialog.cpp
View file

@ -34,7 +34,7 @@ FolderViewDelegate::~FolderViewDelegate()
QSize FolderViewDelegate::sizeHint(const QStyleOptionViewItem & option ,
const QModelIndex & index) const
{
int h = 64; // height 64 + 4px margin top and down
int h = 70; // height 64 + 4px margin top and down
int w = 0;
QString p = qvariant_cast<QString>(index.data(FolderPathRole));
@ -56,7 +56,7 @@ void FolderViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
QFont subFont = QApplication::font();
//font.setPixelSize(font.weight()+);
font.setBold(true);
subFont.setWeight(subFont.weight()-2);
subFont.setWeight(subFont.weight() - 4);
QFontMetrics fm(font);
QIcon icon = qvariant_cast<QIcon>(index.data(FolderIconRole));
@ -64,27 +64,32 @@ void FolderViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
QString aliasText = qvariant_cast<QString>(index.data(FolderNameRole));
QString pathText = qvariant_cast<QString>(index.data(FolderPathRole));
QString statusText = qvariant_cast<QString>(index.data(FolderStatus));
bool syncEnabled = index.data(FolderSyncEnabled).toBool();
QString syncStatus = syncEnabled? tr( "Enabled" ) : tr( "Disabled" );
QSize iconsize(48,48); // = icon.actualSize(option.decorationSize);
QRect headerRect = option.rect;
QRect subheaderRect = option.rect;
QRect iconRect = subheaderRect;
QRect iconRect = option.rect;
iconRect.setRight(iconsize.width()+30);
iconRect.setTop(iconRect.top()+5);
headerRect.setLeft(iconRect.right());
subheaderRect.setLeft(iconRect.right());
headerRect.setTop(headerRect.top()+5);
headerRect.setBottom(headerRect.top()+fm.height());
QRect subheaderRect = headerRect;
subheaderRect.setTop(headerRect.bottom());
QFontMetrics fmSub( subFont );
subheaderRect.setBottom(subheaderRect.top()+fmSub.height());
QRect statusRect = subheaderRect;
statusRect.setTop( subheaderRect.bottom() + 2 );
statusRect.setTop( subheaderRect.bottom() + 5);
statusRect.setBottom( statusRect.top() + fmSub.height());
QRect lastSyncRect = statusRect;
lastSyncRect.setTop( statusRect.bottom());
lastSyncRect.setBottom( lastSyncRect.top() + fmSub.height());
//painter->drawPixmap(QPoint(iconRect.right()/2,iconRect.top()/2),icon.pixmap(iconsize.width(),iconsize.height()));
painter->drawPixmap(QPoint(iconRect.left()+15,iconRect.top()),icon.pixmap(iconsize.width(),iconsize.height()));
@ -96,7 +101,8 @@ void FolderViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
painter->setFont(subFont);
painter->drawText(subheaderRect.left(),subheaderRect.top()+17, pathText);
painter->drawText(statusRect, tr("Status: %1").arg( statusText ));
painter->drawText(lastSyncRect, tr("Last Sync: %1").arg( statusText ));
painter->drawText(statusRect, tr("Sync Status: %1").arg( syncStatus ));
painter->restore();
}