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

Merge branch 'master' into modernize

Browse source
This commit is contained in:
Roeland Jago Douma 2018-11-12 14:56:35 +01:00 committed by GitHub
commit c5a4694c74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/servernotificationhandler.cpp
View file

@ -128,6 +128,9 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
link.setScheme(ai->account()->url().scheme());
link.setHost(ai->account()->url().host());
}
if (link.port() == -1) {
link.setPort(ai->account()->url().port());
}
}
a._link = link;
a._dateTime = QDateTime::fromString(json.value("datetime").toString(), Qt::ISODate);

2
src/gui/wizard/owncloudsetuppage.cpp
View file

@ -85,7 +85,7 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
_ui.slideShow->addSlide(Theme::hidpiFileName(":/client/theme/colored/wizard-groupware.png"), tr("Easy-to-use web mail, calendaring & contacts"));
_ui.slideShow->addSlide(Theme::hidpiFileName(":/client/theme/colored/wizard-talk.png"), tr("Screensharing, online meetings & web conferences"));
connect(_ui.slideShow, &SlideShow::clicked, _ui.slideShow, &SlideShow::nextSlide);
_ui.slideShow->startShow(2500);
_ui.slideShow->startShow();
QPalette pal = _ui.slideShow->palette();
pal.setColor(QPalette::WindowText, theme->wizardHeaderBackgroundColor());

2
src/gui/wizard/slideshow.cpp
View file

@ -138,7 +138,7 @@ void SlideShow::mousePressEvent(QMouseEvent *event)
void SlideShow::mouseReleaseEvent(QMouseEvent *event)
{
if (QLineF(_pressPoint, event->pos()).length() < QGuiApplication::styleHints()->startDragDistance())
if (!_animation && QLineF(_pressPoint, event->pos()).length() < QGuiApplication::styleHints()->startDragDistance())
emit clicked();
}

2
src/gui/wizard/slideshow.h
View file

@ -69,7 +69,7 @@ private:
void drawSlide(QPainter *painter, int index);
bool _reverse = false;
int _interval = 2500;
int _interval = 3500;
int _currentIndex = 0;
QPoint _pressPoint;
QBasicTimer _timer;