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

Removed label on request of Jan.

Browse source
This commit is contained in:
Klaas Freitag 2013-08-15 12:17:01 +02:00
parent b309d333a6
commit 0e5bfc03ce
3 changed files with 14 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mirall/folder.cpp
View file

@ -285,7 +285,6 @@ void Folder::bubbleUpSyncResult()
foreach (const SyncFileItem &item, _syncResult.syncFileItemVector() ) {
if( item._instruction == CSYNC_INSTRUCTION_ERROR ) {
qDebug() << "Instruct error in the result list.";
slotCSyncError( tr("File %1: %2").arg(item._file).arg(item._errorString) );
} else {
if (item._dir == SyncFileItem::Down) {

54
src/mirall/itemprogressdialog.cpp
View file

@ -62,51 +62,25 @@ ItemProgressDialog::ItemProgressDialog(Application*, QWidget *parent) :
void ItemProgressDialog::setSyncResultStatus(const SyncResult& result )
{
QString folderMessage;
SyncResult::Status syncStatus = result.status();
switch( syncStatus ) {
case SyncResult::Undefined:
folderMessage = tr( "Undefined Folder State" );
break;
case SyncResult::NotYetStarted:
folderMessage = tr( "The folder waits to start syncing." );
break;
case SyncResult::SyncPrepare:
folderMessage = tr( "Determining which files to sync." );
break;
case SyncResult::Unavailable:
folderMessage = tr( "Server is currently not available." );
break;
case SyncResult::SyncRunning:
folderMessage = tr("Sync is running.");
break;
case SyncResult::Success:
folderMessage = tr("Last Sync was successful.");
break;
case SyncResult::Error:
folderMessage = tr( "Syncing Error." );
break;
case SyncResult::SetupError:
folderMessage = tr( "Setup Error." );
break;
case SyncResult::Problem:
folderMessage = tr( "Sync success, but warnings on individual files.");
break;
default:
folderMessage = tr( "Undefined Error State." );
}
_ui->_timelabel->setText(tr("%1").arg(folderMessage));
if( result.errorStrings().count() ) {
if( result.errorStrings().count() ) {
_ui->_errorLabel->setVisible(true);
_ui->_errorLabel->setTextFormat(Qt::RichText);
QString errStr;
foreach( QString err, result.errorStrings() ) {
errStr.append(QString("<p>%1</p>").arg(err));
QStringList errors = result.errorStrings();
int cnt = errors.size();
bool appendDots = false;
if( cnt > 3 ) {
cnt = 3;
appendDots = true;
}
for( int i = 0; i < cnt; i++) {
errStr.append(QString("%1<br/>").arg(errors.at(i)));
}
if( appendDots ) {
errStr.append(QString("..."));
}
_ui->_errorLabel->setText(errStr);
} else {
_ui->_errorLabel->setText(QString::null);

7
src/mirall/itemprogressdialog.ui
View file

@ -67,13 +67,6 @@
</column>
</widget>
</item>
<item>
<widget class="QLabel" name="_timelabel">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="_errorLabel">
<property name="text">