slideshow buttons

src/gui/wizard/owncloudsetuppage.cpp

@@ -84,7 +84,23 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
     _ui.slideShow->addSlide(Theme::hidpiFileName(":/client/theme/colored/wizard-files.png"), tr("Secure collaboration & file exchange"));
     _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);
+
+    connect(_ui.slideShow, &SlideShow::clicked, _ui.slideShow, &SlideShow::stopShow);
+    connect(_ui.nextButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::nextSlide);
+    connect(_ui.prevButton, &QPushButton::clicked, _ui.slideShow, &SlideShow::prevSlide);
+
+	auto widgetBgLightness = OwncloudSetupPage::palette().color(OwncloudSetupPage::backgroundRole()).lightness();
+	bool widgetHasDarkBg =
+        (widgetBgLightness >= 125)
+        ? false
+        : true;
+	_ui.nextButton->setIcon(theme->uiThemeIcon(QString("control-next.svg"), widgetHasDarkBg));
+    _ui.prevButton->setIcon(theme->uiThemeIcon(QString("control-prev.svg"), widgetHasDarkBg));
+
+	// QPushButtons are a mess when it comes to consistent background coloring without stylesheets,
+	// so we do it here even though this is an exceptional styling method here
+    _ui.createAccountButton->setStyleSheet("QPushButton {background-color: #0082C9; color: white}");
+
     _ui.slideShow->startShow();
 
     QPalette pal = _ui.slideShow->palette();

src/gui/wizard/slideshow.cpp

@@ -116,7 +116,7 @@ void SlideShow::nextSlide()
     _reverse = false;
 }
 
-void SlideShow::previousSlide()
+void SlideShow::prevSlide()
 {
     setCurrentSlide((_currentIndex > 0 ? _currentIndex : _labels.count()) - 1);
     _reverse = true;

src/gui/wizard/slideshow.h

@@ -51,7 +51,7 @@ public slots:
     void startShow(int interval = 0);
     void stopShow();
     void nextSlide();
-    void previousSlide();
+    void prevSlide();
     void reset();
 
 signals:

src/libsync/theme.cpp

@@ -177,6 +177,14 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray, bool sysTrayMenuVisibl
     return cached;
 }
 
+QIcon Theme::uiThemeIcon(const QString &iconName, bool uiHasDarkBg) const
+{
+    QString themeResBasePath = ":/client/theme/";
+    QString iconPath = themeResBasePath + (uiHasDarkBg?"white/":"black/") + iconName;
+    std::string icnPath = iconPath.toUtf8().constData();
+    return QIcon(QPixmap(iconPath));
+}
+
 QString Theme::hidpiFileName(const QString &fileName, QPaintDevice *dev)
 {
     qreal devicePixelRatio = dev ? dev->devicePixelRatio() : qApp->primaryScreen()->devicePixelRatio();

src/libsync/theme.h

@@ -347,6 +347,14 @@ class OWNCLOUDSYNC_EXPORT Theme : public QObject
      * important dependency versions.
      */
     virtual QString versionSwitchOutput() const;
+
+	/**
+    * @brief Request suitable QIcon resource depending on the background colour of the parent widget.
+    *
+    * This should be replaced (TODO) by a real theming implementation for the client UI 
+    * (actually 2019/09/13 only systray theming).
+    */
+	virtual QIcon uiThemeIcon(const QString &iconName, bool uiHasDarkBg) const;
 
 protected:
 #ifndef TOKEN_AUTH_ONLY

theme.qrc

@@ -43,7 +43,7 @@
         <file>theme/white/state-sync-64.png</file>
         <file>theme/white/state-sync-128.png</file>
         <file>theme/white/state-sync-256.png</file>
-        <file>theme/black/state-error-32.png</file>
+		<file>theme/black/state-error-32.png</file>
         <file>theme/black/state-error-64.png</file>
         <file>theme/black/state-error-128.png</file>
         <file>theme/black/state-error-256.png</file>
@@ -79,6 +79,8 @@
         <file>theme/colored/state-warning-64.png</file>
         <file>theme/colored/state-warning-128.png</file>
         <file>theme/colored/state-warning-256.png</file>
+        <file>theme/black/control-next.svg</file>
+		<file>theme/black/control-prev.svg</file>
         <file>theme/black/state-error.svg</file>
         <file>theme/black/state-error-16.png</file>
         <file>theme/black/state-offline.svg</file>
@@ -99,6 +101,8 @@
         <file>theme/black/state-warning-64.png</file>
         <file>theme/black/state-warning-128.png</file>
         <file>theme/black/state-warning-256.png</file>
+		<file>theme/white/control-next.svg</file>
+		<file>theme/white/control-prev.svg</file>
         <file>theme/white/state-error.svg</file>
         <file>theme/white/state-error-16.png</file>
         <file>theme/white/state-offline.svg</file>