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 branch 'master' into icon-name-fix

Browse source
This commit is contained in:
Camila Ayres 2018-08-30 16:45:52 +02:00 committed by GitHub
commit e3d7c9f1ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/activitylistmodel.cpp
View file

@ -121,7 +121,6 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
return type; return type;
break; break;
} }
case Qt::ToolTipRole:
case ActivityItemDelegate::ActionTextRole: case ActivityItemDelegate::ActionTextRole:
return a._subject; return a._subject;
break; break;

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

@ -100,13 +100,12 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
_ui.hostButton->hide(); _ui.hostButton->hide();
#endif #endif
setStyleSheet(QString("background-color:%1; color:%2 QLabel { color:%2; } QSpacerItem { color: red; }").arg(theme->wizardHeaderBackgroundColor().name(), theme->wizardHeaderTitleColor().name())); setStyleSheet(QString("background-color:%1; color:%2 QLabel { color:%2; } QSpacerItem { color: red; }").arg(theme->wizardHeaderBackgroundColor().name(), theme->wizardHeaderTitleColor().name()));
} }
#ifdef WITH_PROVIDERS #ifdef WITH_PROVIDERS
void OwncloudSetupPage::nextSlide() void OwncloudSetupPage::nextSlide()
{ {
if (_currentSlide < _slideshow.length()-1) { if (_currentSlide < _slideshow.length() - 1) {
_currentSlide++; _currentSlide++;
} else { } else {
_currentSlide = 0; _currentSlide = 0;
@ -155,6 +154,7 @@ void OwncloudSetupPage::slotLogin()
animation->setStartValue(500); animation->setStartValue(500);
animation->setEndValue(500); animation->setEndValue(500);
_ui.login->show(); _ui.login->show();
_ui.loginButton->hide();
wizard()->resize(wizard()->sizeHint()); wizard()->resize(wizard()->sizeHint());
animation->start(); animation->start();
} }