Merge remote-tracking branch 'origin/2.9'

28 files changed, 36 insertions, 33 deletions

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 016b786f0..2ac102159 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -247,7 +247,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
     QModelIndex index = tv->indexAt(pos);
     if (!index.isValid()) {
         return;
-    } else if (!(index.flags() & Qt::ItemIsEnabled)) {
+    } else if (!_model->data(index, FolderStatusDelegate::IsReady).toBool()) {
         QMenu *menu = new QMenu(tv);
         menu->setAttribute(Qt::WA_DeleteOnClose);
         removeFolderAction(menu);
diff --git a/src/gui/folderstatusdelegate.h b/src/gui/folderstatusdelegate.h
index d919e646a..ab207300f 100644
--- a/src/gui/folderstatusdelegate.h
+++ b/src/gui/folderstatusdelegate.h
@@ -47,8 +47,9 @@ public:
 
         AddButton, // 1 = enabled; 2 = disabled
         FolderSyncText,
-        DataRoleCount
+        DataRoleCount,
 
+        IsReady // boolean
     };
     void paint(QPainter *, const QStyleOptionViewItem &, const QModelIndex &) const override;
     QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override;
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 8e3caece7..6f2f40fe5 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -107,11 +107,10 @@ Qt::ItemFlags FolderStatusModel::flags(const QModelIndex &index) const
         return nullptr;
     }
 
-    auto flags = Qt::ItemIsEnabled;
-    if (_folders.size() > index.row()) {
-        const SubFolderInfo &folderInfo = _folders.at(index.row());
-        flags = folderInfo._folder->isReady() ? Qt::ItemIsEnabled : Qt::NoItemFlags;
-    }
+    // Always enable the item. If it isn't enabled, it cannot be in the selection model, so all
+    // actions from the context menu and the pop-up menu will have some other model index than the
+    // one under the mouse cursor!
+    const auto flags = Qt::ItemIsEnabled;
 
     switch (classify(index)) {
     case AddButton: {
@@ -271,6 +270,8 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
         return progress._overallSyncString;
     case FolderStatusDelegate::FolderSyncText:
         return tr("Local folder: %1").arg(f->shortGuiLocalPath());
+    case FolderStatusDelegate::IsReady:
+        return f->isReady();
     }
     return QVariant();
 }
diff --git a/src/gui/libcloudproviders/libcloudproviders.cmake b/src/gui/libcloudproviders/libcloudproviders.cmake
index 719d6e3e7..90a628da1 100644
--- a/src/gui/libcloudproviders/libcloudproviders.cmake
+++ b/src/gui/libcloudproviders/libcloudproviders.cmake
@@ -31,7 +31,7 @@ if(WITH_LIBCLOUDPROVIDERS)
     configure_file(libcloudproviders/cloud-provider.ini.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_CLOUDPROVIDERS_DBUS_NAME}.ini)
     install(
         FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_CLOUDPROVIDERS_DBUS_NAME}.ini
-        DESTINATION "${DATADIR}/cloud-providers")
+        DESTINATION "${DATA_INSTALL_DIR}/cloud-providers")
 
     message("Building with libcloudproviders")
 elseif(UNIX AND NOT APPLE)
diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 3aad0f75c..1b72e2c18 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -336,6 +336,7 @@ bool SettingsDialog::nativeEvent(const QByteArray &eventType, void *message, lon
     // so they never receive WM_ENDSESSION
     // Capture the event and go down in style
     if (msg->message == WM_QUERYENDSESSION || msg->message == WM_ENDSESSION) {
+        qCInfo(lcApplication) << "Shutting down" << *msg;
         QTimer::singleShot(0, ocApp(), Application::quit);
     }
     return false;
diff --git a/translations/client_ar.ts b/translations/client_ar.ts
index 4773153ab..9ad7bf1d6 100644
--- a/translations/client_ar.ts
+++ b/translations/client_ar.ts
@@ -3249,7 +3249,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>هل أنت متأكد من رغبتك في إنهاء %1؟</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>حساب</translation>
     </message>
diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts
index add6a4bef..f1db431f4 100644
--- a/translations/client_bg_BG.ts
+++ b/translations/client_bg_BG.ts
@@ -3245,7 +3245,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>Наистина ли искате да излезете от %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Профил</translation>
     </message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index dbae1e8ea..bf99a19b0 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -3229,7 +3229,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>Jste si jistí, že chcete skončit %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 4316e2100..26ff5f6a8 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -2367,7 +2367,7 @@ for additional privileges during the process.</source>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="166"/>
         <source>&lt;p&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;&lt;strong&gt;Achtung:&lt;/strong&gt; Der lokale Ordner ist nicht leer. Bitte wählen Sie eine entsprechende Lösung!&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
@@ -2793,7 +2793,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
     <message>
         <location filename="../src/libsync/propagatorjobs.cpp" line="156"/>
         <source>Can not create local folder %1 because of a local file name clash with %2</source>
-        <translation type="unfinished"/>
+        <translation>Der lokale Ordner %1 konnte aufgrund eines Namenkonfliktes mit %2 nicht erstellt werden</translation>
     </message>
     <message>
         <location filename="../src/libsync/propagatorjobs.cpp" line="175"/>
@@ -3245,7 +3245,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
         <translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Benutzerkonto</translation>
     </message>
diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts
index c09b120fd..b71e63042 100644
--- a/translations/client_de_CH.ts
+++ b/translations/client_de_CH.ts
@@ -3241,7 +3241,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
         <translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index 7719c080f..c401192a5 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -3245,7 +3245,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Λογαριασμός</translation>
     </message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index b3ede1803..3ebea5d60 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -3249,7 +3249,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index 0527e25a9..9ef5b3491 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -3236,7 +3236,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 94f7601c9..cf2794988 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -3247,7 +3247,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
         <translation>¿Estás seguro de querer salir de %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index d8e2a7f1e..6a43f8531 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -3250,7 +3250,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
         <translation>Êtes-vous sûr de vouloir quitter %1 ?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 4e249fcc6..ea9f250bd 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -3250,7 +3250,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
         <translation>Confirma que quere saír de %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
diff --git a/translations/client_he.ts b/translations/client_he.ts
index aff055b08..935137f43 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -3249,7 +3249,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>האם ברצונך באמת לסגור %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>חשבון</translation>
     </message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 9b8807c0d..91c723d15 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -3244,7 +3244,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo
         <translation>Sei sicuro di voler terminare %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
diff --git a/translations/client_ko.ts b/translations/client_ko.ts
index f940420fe..5a130bc06 100644
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -3228,7 +3228,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>%1 을(를) 종료하고 싶습니까?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>계정</translation>
     </message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index dccd2a8e6..d67c81181 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -3254,7 +3254,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d
         <translation>Weet je zeker dat je %1 wilt afsluiten?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 8c7cc19b9..b73cd4864 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -3235,7 +3235,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>Czy na pewno chcesz zamknąć %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index df255aaea..076cf0c8c 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -3249,7 +3249,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
         <translation>Você tem certeza que deseja sair %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 14c4c7bfe..3f8dba4d3 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -3250,7 +3250,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>Вы уверены, что хотите выйти из?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Уч.запись</translation>
     </message>
diff --git a/translations/client_sq.ts b/translations/client_sq.ts
index e4de3f445..79d29cf2c 100644
--- a/translations/client_sq.ts
+++ b/translations/client_sq.ts
@@ -3252,7 +3252,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju
         <translation>Jeni i sigurt se doni të dilet nga %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Llogari</translation>
     </message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 428dfa603..3e8914d5a 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -3244,7 +3244,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>แน่ใจหรือไม่ว่าคุณต้องการออกจาก %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>บัญชี</translation>
     </message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 1e2dbb0a4..1c4d0f969 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -3247,7 +3247,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka
         <translation>%1 çıkmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>Hesap</translation>
     </message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 425374ece..c7f039373 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -3229,7 +3229,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>你确定要退出 %1 吗？</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>账户</translation>
     </message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index 794206f61..c77bfd0d0 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -3249,7 +3249,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
         <translation>您確定您要退出嗎 %1?</translation>
     </message>
     <message>
-        <location filename="../src/gui/settingsdialog.cpp" line="363"/>
+        <location filename="../src/gui/settingsdialog.cpp" line="380"/>
         <source>Account</source>
         <translation>帳號</translation>
     </message>