mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 13:35:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2551 from nextcloud/fix_share_dialog_animation_for_enforced_password_policy

Browse source 
Fix share dialog animation for enforced password policy
This commit is contained in:
Kevin Ottens 2020-10-19 17:09:55 +02:00 committed by GitHub
commit 0927b9bc90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/sharedialog.cpp
View file

@ -184,6 +184,10 @@ void ShareDialog::initLinkShareWidget(){
_emptyShareLinkWidget = new ShareLinkWidget(_accountState->account(), _sharePath, _localPath, _maxSharingPermissions, this);
_linkWidgetList.append(_emptyShareLinkWidget);
if (_manager) {
connect(_manager, &ShareManager::linkShareRequiresPassword, _emptyShareLinkWidget, &ShareLinkWidget::slotCreateShareRequiresPassword);
}
connect(_emptyShareLinkWidget, &ShareLinkWidget::resizeRequested, this, &ShareDialog::slotAdjustScrollWidgetSize);
// connect(this, &ShareDialog::toggleAnimation, _emptyShareLinkWidget, &ShareLinkWidget::slotToggleAnimation);
connect(_emptyShareLinkWidget, &ShareLinkWidget::createLinkShare, this, &ShareDialog::slotCreateLinkShare);

2
src/gui/sharelinkwidget.cpp
View file

@ -401,7 +401,7 @@ void ShareLinkWidget::slotDeleteAnimationFinished()
void ShareLinkWidget::slotCreateShareRequiresPassword(const QString &message)
{
slotToggleAnimation(true);
slotToggleAnimation(message.isEmpty());
showPasswordOptions(true);
if (!message.isEmpty()) {

3
src/gui/sharemanager.cpp
View file

@ -133,9 +133,8 @@ void Share::deleteShare()
void Share::slotDeleted()
{
emit shareDeleted();
updateFolder(_account, _path);
emit shareDeleted();
}
void Share::slotOcsError(int statusCode, const QString &message)