[Pkg-owncloud-commits] [owncloud-client] 86/115: Merge pull request #2075 from owncloud/use_folder_paused

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 988fe7077147e3de7ebf5e8b26cefa38240d9a86
Merge: 132fac8 d021752
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Aug 20 10:50:28 2014 +0200

    Merge pull request #2075 from owncloud/use_folder_paused
    
    Rework of the status icons in FolderMan and Folder objects.

 src/mirall/accountsettings.cpp    | 111 ++++++++++++++--------------
 src/mirall/accountsettings.h      |   2 +-
 src/mirall/folder.cpp             |  15 ++--
 src/mirall/folder.h               |   6 +-
 src/mirall/folderman.cpp          | 151 ++++++++++++++++++++------------------
 src/mirall/folderman.h            |   6 +-
 src/mirall/folderstatusmodel.cpp  |   3 +-
 src/mirall/folderstatusmodel.h    |   3 +-
 src/mirall/owncloudgui.cpp        |  31 +++++---
 src/mirall/owncloudpropagator.cpp |   8 ++
 src/mirall/settingsdialog.h       |   2 +-
 src/mirall/theme.cpp              |   3 +
 12 files changed, 189 insertions(+), 152 deletions(-)

diff --cc src/mirall/accountsettings.cpp
index ca2b49b,dadce71..9f8b84f
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@@ -158,14 -155,12 +158,14 @@@ void AccountSettings::slotFolderActivat
    } else {
        ui->_buttonAdd->setVisible(true);
    }
 -  ui->_buttonAdd->setEnabled(_account && _account->state() == Account::Connected);
 +  bool isConnected = _account && _account->state() == Account::Connected;
 +  ui->_buttonAdd->setEnabled(isConnected);
    ui->_buttonEnable->setEnabled( isValid );
 +  ui->_buttonSelectiveSync->setEnabled(isConnected && isValid);
  
    if ( isValid ) {
-     bool folderEnabled = _model->data( indx, FolderStatusDelegate::FolderSyncEnabled).toBool();
-     if ( folderEnabled ) {
+     bool folderPaused = _model->data( indx, FolderStatusDelegate::FolderSyncPaused).toBool();
+     if ( !folderPaused) {
        ui->_buttonEnable->setText( tr( "Pause" ) );
      } else {
        ui->_buttonEnable->setText( tr( "Resume" ) );
diff --cc src/mirall/folderman.cpp
index 5e57c5e,99ea901..15a8e59
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@@ -360,10 -358,9 +360,9 @@@ void FolderMan::slotSetFolderPaused( co
          slotScheduleSync(alias);
  
          // FIXME: Use MirallConfigFile
 -        QSettings settings(_folderConfigPath + QLatin1Char('/') + f->configFile(), QSettings::IniFormat);
 +        QSettings settings(f->configFile(), QSettings::IniFormat);
          settings.beginGroup(escapeAlias(f->alias()));
-         if (enable) {
+         if (!paused) {
              settings.remove("paused");
              _disabledFolders.remove(f);
          } else {
@@@ -589,10 -581,10 +585,10 @@@ void FolderMan::removeFolder( const QSt
          f->wipe();
  
          // can be removed if we are able to delete the folder object.
-         f->setSyncEnabled(false);
+         f->setSyncPaused(true);
  
          // remove the folder configuration
 -        QFile file( _folderConfigPath + QLatin1Char('/') + f->configFile() );
 +        QFile file(f->configFile() );
          if( file.exists() ) {
              qDebug() << "Remove folder config file " << file.fileName();
              file.remove();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git