From 148bdfdcd6188dd9fa04a38e3821448fc486ab11 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 15 Aug 2013 08:14:05 +0200 Subject: [PATCH] Some minor cleanups. --- src/mirall/accountsettings.cpp | 11 ++++------- src/mirall/folder.cpp | 1 - src/mirall/theme.cpp | 4 +++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index 9ca37c91ce..795e6b1a25 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -139,6 +139,7 @@ void AccountSettings::slotFolderWizardAccepted() folderMan->slotScheduleAllFolders(); emit folderChanged(); } + buttonsSetEnabled(); } void AccountSettings::slotFolderWizardRejected() @@ -306,9 +307,10 @@ void AccountSettings::setFolderList( const Folder::Map &folders ) slotAddFolder( f ); } - QModelIndex idx = _model->index(0, 0); - if (idx.isValid()) + QModelIndex idx = _model->index(0, 0); + if (idx.isValid()) { ui->_folderList->setCurrentIndex(idx); + } buttonsSetEnabled(); } @@ -394,11 +396,6 @@ void AccountSettings::slotUpdateFolderState( Folder *folder ) item = _model->item( ++row ); } -#if 0 - if( !_fileItemDialog.isNull() && _fileItemDialog->isVisible() ) { - _fileItemDialog->setSyncResult( FolderMan::instance()->syncResult(folder) ); - } -#endif if( item ) { folderToModelItem( item, folder ); } else { diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 9ef7bdaa33..96f259cc93 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -600,7 +600,6 @@ void Folder::slotCSyncFinished() if (_csyncError) { _syncResult.setStatus(SyncResult::Error); - qDebug() << " ** error Strings: " << _errors; _syncResult.setErrorStrings( _errors ); qDebug() << " * owncloud csync thread finished with error"; diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp index 7b09ba4a87..2ba8c413ea 100644 --- a/src/mirall/theme.cpp +++ b/src/mirall/theme.cpp @@ -237,7 +237,9 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const case SyncResult::Success: statusIcon = QLatin1String("state-ok"); break; - case SyncResult::Problem: // Jan wants this. + case SyncResult::Problem: + statusIcon = QLatin1String("state-information"); + break; case SyncResult::Error: case SyncResult::SetupError: statusIcon = QLatin1String("state-error"); // FIXME: Use state-problem once we have an icon.