From 8f616969ab482c72092cb7c037a91292a0f159e1 Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Thu, 26 Sep 2019 04:59:17 +0200 Subject: [PATCH 1/2] Fix White Window issue on Windows after Qt 5.12.4 upgrade Qt 5.12.4 seems to introduce a new bug on Windows, causing the settings window to not be redrawn when re-opening it, for example by clicking at the tray icon. As a workaround this fix starts a 100 ms timer to be fired once upon QDialog::showEvent is called. Signed-off-by: Michael Schuster --- src/gui/settingsdialog.cpp | 17 +++++++++++++++++ src/gui/settingsdialog.h | 12 ++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index e91b96853..841e8bbb2 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -168,6 +168,23 @@ void SettingsDialog::changeEvent(QEvent *e) QDialog::changeEvent(e); } +// FIX - White Window issue on Windows after Qt 5.12.4 upgrade /////////////////////////////// +#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4))) +void SettingsDialog::showEvent(QShowEvent *e) +{ + QDialog::showEvent(e); + + QTimer::singleShot(100, this, &SettingsDialog::timerShowEvent); +} + +void SettingsDialog::timerShowEvent() +{ + update(); + repaint(); +} +#endif +// FIX - White Window issue on Windows after Qt 5.12.4 upgrade /////////////////////////////// + void SettingsDialog::slotSwitchPage(QAction *action) { _ui->stack->setCurrentWidget(_actionGroupWidgets.value(action)); diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index 97d15c03c..6ae5f8896 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -68,10 +68,22 @@ protected: void accept() override; void changeEvent(QEvent *) override; + // FIX - White Window issue on Windows after Qt 5.12.4 upgrade /////////////////////////////// + #if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4))) + void showEvent(QShowEvent *) override; + #endif + // FIX - White Window issue on Windows after Qt 5.12.4 upgrade /////////////////////////////// + private slots: void accountAdded(AccountState *); void accountRemoved(AccountState *); + // FIX - White Window issue on Windows after Qt 5.12.4 upgrade /////////////////////////////// + #if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4))) + void timerShowEvent(); + #endif + // FIX - White Window issue on Windows after Qt 5.12.4 upgrade /////////////////////////////// + private: void customizeStyle(); void activityAdded(AccountState *); From 5d3a8e3725224e017cedcecc218d58acf5f9cc1d Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 26 Sep 2019 03:03:05 +0000 Subject: [PATCH 2/2] [tx-robot] updated from transifex --- translations/client_de.ts | 17 +++++++++++------ translations/client_es.ts | 17 +++++++++++------ translations/client_fr.ts | 8 ++++---- translations/client_gl.ts | 17 +++++++++++------ translations/client_it.ts | 17 +++++++++++------ translations/client_pl.ts | 17 +++++++++++------ translations/client_sv.ts | 17 +++++++++++------ translations/client_tr.ts | 17 +++++++++++------ 8 files changed, 81 insertions(+), 46 deletions(-) diff --git a/translations/client_de.ts b/translations/client_de.ts index 4be27e1e2..781875a8b 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -976,29 +976,34 @@ Dies bedeutet, dass der Synchronisierungs-Client lokale Änderungen möglicherwe These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Alle Dateien im Synchronisationsordner '%1' wurden auf dem Server gelöscht. +Diese Löschung wird in Ihren lokalen Synchronisationsordner übernommen. Dadurch sind die Dateien nicht mehr verfügbar, falls Sie keine Möglichkeit zur Wiederherstellung haben. +Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder zum Server synchronisiert. Dies geschieht jedoch nur, soweit Sie die Rechte hierzu haben. +Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer. All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now. - + Alle Dateien wurden aus Ihrem lokalen Synchronisationsverzeichnis '%1' gelöscht. +Diese Dateien werden auch vom Server gelöscht werden und sind dann auch auf Ihren anderen Geräten verfügbar, sofern sie nicht wiederhergestellt werden. +Wenn die Aktion unbeabsichtigt war, können Sie die gelöschten Danten nun wiederherstellen. Delete all files? - + Alle Dateien löschen? Delete all files - + Alle Dateien löschen Restore deleted files - + Gelöschte Dateien wiederherstellen @@ -2971,7 +2976,7 @@ Es ist nicht ratsam, sie zu benutzen. Share via - + Teilen mittels diff --git a/translations/client_es.ts b/translations/client_es.ts index 00045ffa0..15c13db0c 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -976,29 +976,34 @@ Esto significa que el cliente de sincronización podría no subir inmediatamente These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Todos los archivos en la carpeta de sincronización '%1' han sido eliminados en el servidor. +Esta eliminación se sincronizará con tu carpeta local sincronizada, haciendo que esos archivos ya no estén disponibles a no ser que tengas derecho a restaurarlos. +Si decides restaurar los archivos, volverán a sincronizarse con el servidor si tienes derecho a hacer esto. +Si decides eliminar los archivos, ya no los tendrás disponibles, a no ser que seas el propietario. All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now. - + Todos los archivos han sido eliminados de tu carpeta local sincronizada '%1'. +Estos archivos se eliminarán del servidor y no estarán disponibles en tus otros dispositivos si no se restauran. +Si no querías realizar esta acción, puedes recuperar ahora los datos perdidos. Delete all files? - + ¿Eliminar todos los archivos? Delete all files - + Eliminar todos los archivos Restore deleted files - + Recuperar archivos eliminados @@ -2971,7 +2976,7 @@ No se recomienda usarla. Share via - + Compartir vía diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 89106aff0..916f7902f 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -990,17 +990,17 @@ If this action was unintended you can restore the lost data now. Delete all files? - + Supprimer tous les fichiers ? Delete all files - + Supprimer tous les fichiers Restore deleted files - + Restaurer les fichiers supprimés @@ -2975,7 +2975,7 @@ Il est déconseillé de l'utiliser. Share via - + Partager via diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 145a57e4e..14a5d59f3 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -976,29 +976,34 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Todos os ficheiros no cartafol de sincronización «%1» foron eliminados no servidor. +Estas eliminacións sincronizarse co seu cartafol de sincronización local, facendo que estes ficheiros non estean dispoñíbeis a menos que teña dereitos para restauralos. +Se decide restaurar os ficheiros, resincronizaranse co servidor se ten dereitos para facelo. +Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario. All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now. - + Todos os ficheiros foron eliminados do seu cartafol de sincronización local «%1». +Estes ficheiros eliminaranse do servidor e non estarán dispoñibles nos outros dispositivos se non se restauran. +Se esta acción non foi intencionada, pode restaurar os datos perdidos agora. Delete all files? - + Eliminar todos os ficheiros? Delete all files - + Eliminar todos os ficheiros Restore deleted files - + Restaurar os ficheiros eliminados @@ -2972,7 +2977,7 @@ Recomendámoslle que non o use. Share via - + Compartido mediante diff --git a/translations/client_it.ts b/translations/client_it.ts index c086dcc67..fbcd7cdc3 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -977,29 +977,34 @@ Questo significa che il client di sincronizzazione potrebbe non caricare le modi These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Tutti i file nella cartella di sincronizzazione '%1' sono stati eliminati sul server. +L'eliminazione sarà sincronizzata con la tua cartella locale, rendendo tali file indisponibili, a meno che tu abbia il permesso per ripristinarli. +Se decidi di ripristinare i file, essi saranno sincronizzati nuovamente con il server, se hai i diritti per farlo. +Se decidi di eliminare i file, non saranno più disponibili, a meno che tu sia il proprietario. All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now. - + Tutti i file sono stati eliminati dalla tua cartella di sincronizzazione locale '%1'. +Questi file saranno eliminati dal server e non saranno disponibili sugli altri tuoi dispositivi se non saranno ripristinati. +Se questa azione non era voluta, puoi ripristinare subito i dati persi. Delete all files? - + Vuoi eliminare tutti i file? Delete all files - + Elimina tutti i file Restore deleted files - + Ripristina file eliminati @@ -2972,7 +2977,7 @@ Non è consigliabile utilizzarlo. Share via - + Condividi tramite diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 2fe4f014a..14579ff66 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -976,29 +976,34 @@ Oznacza to, że klient synchronizacji może nie przesłać lokalnych zmian natyc These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Wszystkie pliki z folderu synchronizacji '%1' zostały usunięte z serwera. +W momencie synchronizacji zostaną usunięte z lokalnego folderu, co spowoduje ich niedostępność, chyba że posiadasz prawo do przywracania. +Jeśli zdecydujesz się przywrócić pliki i posiadasz odpowiednie uprawnienia, zostaną one ponownie przesłane na serwer. +Jeśli zdecydujesz się je usunąć, nie będą już dostępne. All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now. - + Wszystkie pliki zostały usunięte z lokalnego folderu synchronizacji '%1'. +Pliki te zostaną usunięte z serwera i nie będą dostępne na innych urządzeniach, chyba że zostaną przywrócone. +Jeśli ta akcja była niezamierzona, możesz teraz przywrócić utracone dane. Delete all files? - + Usunąć wszystkie pliki? Delete all files - + Usuń wszystkie pliki Restore deleted files - + Przywróć usunięte pliki @@ -2972,7 +2977,7 @@ Niezalecane jest jego użycie. Share via - + Współdziel przez diff --git a/translations/client_sv.ts b/translations/client_sv.ts index a08eaf9c2..973e65fc7 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -976,29 +976,34 @@ Det betyder att synkroniseringsklienten inte kan ladda upp lokala ändringar ome These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Alla filer i den synkade mappen '%1' raderades på servern. +Dessa raderingar kommer att synkroniseras till din lokalt synkade mapp och göra filerna otillgängliga, om du inte har möjlighet att återställa. +Om du återställer dessa filer kommer dom att synkroniseras till servern på nytt, om du har rättighet att göra det. +Om du raderar filerna kommer dom att vara otillgängliga för dig, om du inte är ägaren. All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now. - + Alla filer raderades från din lokalt synkade mapp '%1'. +Dessa filer kommer att raderas från servern och kommer inte att vara tillgängliga på dina andra enheter om de inte återställs. +Om den här åtgärden var oavsiktlig kan du återställa förlorad data nu. Delete all files? - + Radera alla filer? Delete all files - + Radera alla filer Restore deleted files - + Återställ raderade filer @@ -2972,7 +2977,7 @@ Det är inte lämpligt använda den. Share via - + Dela via diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 4f5b0f11f..39eb1d791 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -974,29 +974,34 @@ Bunun sonucunda eşitleme istemcisi yerel değişiklikleri anında yükleyemez. These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to restore the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + '%1' eşitleme klasöründeki tüm dosyalar silinecek. +Silinen bu dosyalar yerel eşitleme klasörünüzden de silineceğinden, geri yükleme yetkiniz yoksa bu dosyaları kullanamayacaksınız. +Geri yükleme yetkiniz varsa ve geri yüklemeyi seçerseniz, dosyalar sunucu ile yeniden eşitlenir. +Silmeyi seçerseniz, sahibi değilseniz bu dosyaları artık kullanamazsınız. All files got deleted from your local sync folder '%1'. These files will be deleted from the server and will not be available on your other devices if they will not be restored. If this action was unintended you can restore the lost data now. - + '%1' yerel eşitleme klasöründeki tüm dosyalar silindi. +Bu dosyalar sunucudan da silinecek ve geri yüklenmez ise diğer aygıtlarınız üzerinden de erişilemeyecek. +Bu işlemi kasıtlı olarak yapmıyorsanız şu anda silinen verileri geri geri yükleyebilirsiniz. Delete all files? - + Tüm dosyalar silinsin mi? Delete all files - + Tüm dosyaları sil Restore deleted files - + Silinmiş dosyaları geri yükle @@ -2970,7 +2975,7 @@ Kullanmanız önerilmez. Share via - + Şununla paylaş