[Pkg-owncloud-commits] [owncloud-client] 195/498: Merge remote-tracking branch 'origin/1.8'

[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 29fecb029ea2f533df52d0c86d93ed633f35d397
Merge: 494f08d 13a15a6
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Jun 25 12:26:04 2015 +0200

    Merge remote-tracking branch 'origin/1.8'
    
     Conflicts:
    	VERSION.cmake
            src/gui/accountsettings.cpp
    	src/gui/accountsettings.h

 ChangeLog                                      |   6 +-
 csync/src/csync_statedb.c                      |  16 +
 src/gui/accountsettings.cpp                    |  12 +
 src/gui/accountsettings.h                      |   1 +
 src/gui/creds/shibboleth/shibbolethwebview.cpp |   3 +-
 src/gui/generalsettings.cpp                    |   1 +
 src/libsync/account.cpp                        |  14 +-
 src/libsync/account.h                          |   1 +
 src/libsync/syncjournaldb.cpp                  |  33 +-
 src/libsync/syncjournaldb.h                    |  10 +
 sync-exclude.lst                               |   2 +-
 translations/client_ca.ts                      |  34 +-
 translations/client_cs.ts                      |  34 +-
 translations/client_de.ts                      |  34 +-
 translations/client_el.ts                      |  34 +-
 translations/client_en.ts                      |  34 +-
 translations/client_es.ts                      |  34 +-
 translations/client_es_AR.ts                   |  34 +-
 translations/client_et.ts                      |  34 +-
 translations/client_eu.ts                      |  34 +-
 translations/client_fa.ts                      |  34 +-
 translations/client_fi.ts                      |  34 +-
 translations/client_fr.ts                      |  38 +-
 translations/client_gl.ts                      |  36 +-
 translations/client_hu.ts                      |  34 +-
 translations/client_it.ts                      |  34 +-
 translations/client_ja.ts                      |  34 +-
 translations/client_nb_NO.ts                   |  34 +-
 translations/client_nl.ts                      |  34 +-
 translations/client_pl.ts                      |  34 +-
 translations/client_pt.ts                      |  38 +-
 translations/client_pt_BR.ts                   |  34 +-
 translations/client_ru.ts                      |  48 +-
 translations/client_sk.ts                      |  64 +-
 translations/client_sl.ts                      | 143 ++---
 translations/client_sr.ts                      |  34 +-
 translations/client_sv.ts                      |  34 +-
 translations/client_th.ts                      | 774 +++++++++++++------------
 translations/client_tr.ts                      |  34 +-
 translations/client_uk.ts                      |  34 +-
 translations/client_zh_CN.ts                   |  34 +-
 translations/client_zh_TW.ts                   |  34 +-
 42 files changed, 1067 insertions(+), 989 deletions(-)

diff --cc src/gui/accountsettings.cpp
index 74a7aba,f1fa0d8..640f1f8
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@@ -272,6 -385,31 +272,18 @@@ void AccountSettings::slotResetCurrentF
      }
  }
  
 -void AccountSettings::slotSelectiveSync()
 -{
 -    QModelIndex selected = ui->_folderList->selectionModel()->currentIndex();
 -    if( selected.isValid() ) {
 -        QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString();
 -        FolderMan *folderMan = FolderMan::instance();
 -        Folder *f = folderMan->folder(alias);
 -        if (f) {
 -            (new SelectiveSyncDialog(AccountManager::instance()->account(), f, this))->open();
 -        }
 -    }
 -}
 -
+ void AccountSettings::slotForceRemoteDiscoveryOnFolders()
+ {
+     FolderMan* folders = FolderMan::instance();
+     foreach (Folder* folder, folders->map()) {
+         if (folder->accountState() != _accountState) {
+             continue;
+         }
+ 
+         folder->journalDb()->forceRemoteDiscoveryNextSync();
+     }
+ }
+ 
  void AccountSettings::slotDoubleClicked( const QModelIndex& indx )
  {
      if( ! indx.isValid() ) return;
diff --cc src/gui/accountsettings.h
index 2f7b732,a6be960..dd6438d
--- a/src/gui/accountsettings.h
+++ b/src/gui/accountsettings.h
@@@ -73,10 -80,15 +73,11 @@@ protected slots
      void slotResetCurrentFolder();
      void slotFolderWizardAccepted();
      void slotFolderWizardRejected();
 -    void slotOpenAccountWizard();
 -    void slotHideProgress();
 -    void slotSelectiveSync();
 +    void slotDeleteAccount();
 +    void refreshSelectiveSyncStatus();
+     void slotForceRemoteDiscoveryOnFolders();
  
  private:
 -    QString shortenFilename( const QString& folder, const QString& file ) const;
 -    void folderToModelItem(QStandardItem *, Folder * , bool accountConnected);
 -    QStandardItem* itemForFolder(const QString& );
      void showConnectionLabel( const QString& message, const QString& tooltip = QString() );
  
      Ui::AccountSettings *ui;
diff --cc src/gui/generalsettings.cpp
index 5ee97fe,2c63770..320982c
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@@ -125,24 -119,4 +125,25 @@@ void GeneralSettings::slotToggleOptiona
      cfgFile.setOptionalDesktopNotifications(enable);
  }
  
 +void GeneralSettings::slotIgnoreFilesEditor()
 +{
 +    if (_ignoreEditor.isNull()) {
 +        _ignoreEditor = new IgnoreListEditor(this);
++        connect(_ignoreEditor, SIGNAL(accepted()), SLOT(slotForceRemoteDiscoveryOnFolders()));
 +        _ignoreEditor->setAttribute( Qt::WA_DeleteOnClose, true );
 +        _ignoreEditor->open();
 +    } else {
 +        ownCloudGui::raiseDialog(_ignoreEditor);
 +    }
 +}
 +
 +void GeneralSettings::slotOpenAccountWizard()
 +{
 +    if (QSystemTrayIcon::isSystemTrayAvailable()) {
 +        topLevelWidget()->close();
 +    }
 +    OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), 0);
 +}
 +
 +
  } // namespace OCC

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