Switch to classic style and remove paint events

src/gui/nmcgui/nmcowncloudadvancedsetuppage.cpp

@@ -35,15 +35,8 @@ NMCOwncloudAdvancedSetupPage::NMCOwncloudAdvancedSetupPage(OwncloudWizard *wizar
 
     _ui.verticalLayout->removeWidget(_ui.errorLabel);
     _ui.wSyncStrategy->insertWidget(0, _ui.errorLabel);
-}
 
-void NMCOwncloudAdvancedSetupPage::paintEvent(QPaintEvent *event)
-{
-    QPainter painter;
-    painter.begin(this);
-    painter.fillRect(rect(), Qt::white);
-    painter.end();
-    OwncloudAdvancedSetupPage::paintEvent(event);
+    _ui.lServerIcon->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 }
 
 } // namespace OCC

src/gui/nmcgui/nmcowncloudadvancedsetuppage.h

@@ -32,9 +32,6 @@ class NMCOwncloudAdvancedSetupPage : public OwncloudAdvancedSetupPage
 public:
     NMCOwncloudAdvancedSetupPage(OwncloudWizard *wizard);
     ~NMCOwncloudAdvancedSetupPage() = default;
-
-protected:
-    void paintEvent(QPaintEvent *event) override;
 };
 
 } // namespace OCC

src/gui/wizard/flow2authcredspage.cpp

@@ -146,13 +146,4 @@ void Flow2AuthCredsPage::slotStyleChanged()
     emit styleChanged();
 }
 
-void Flow2AuthCredsPage::paintEvent(QPaintEvent *event)
-{
-    QPainter painter;
-    painter.begin(this);
-    painter.fillRect(rect(), Qt::white);
-    painter.end();
-    AbstractCredentialsWizardPage::paintEvent(event);
-}
-
 } // namespace OCC

src/gui/wizard/flow2authcredspage.h

@@ -60,9 +60,6 @@ public Q_SLOTS:
     QString _user;
     QString _appPassword;
 
-protected:
-    void paintEvent(QPaintEvent *event) override;
-
 private:
     Flow2AuthWidget *_flow2AuthWidget = nullptr;
     QVBoxLayout *_layout = nullptr;

src/gui/wizard/owncloudwizard.cpp

@@ -89,7 +89,7 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
 
     Theme *theme = Theme::instance();
     setWindowTitle(tr("Add %1 account").arg(theme->appNameGUI()));
-    setWizardStyle(QWizard::ModernStyle);
+    setWizardStyle(QWizard::ClassicStyle);
     setOption(QWizard::NoBackButtonOnStartPage);
     setOption(QWizard::NoCancelButton);
     setButtonText(QWizard::CustomButton1, tr("Skip folders configuration"));
@@ -387,6 +387,15 @@ void OwncloudWizard::changeEvent(QEvent *e)
     QWizard::changeEvent(e);
 }
 
+void OwncloudWizard::paintEvent(QPaintEvent *event)
+{
+    QPainter painter;
+    painter.begin(this);
+    painter.fillRect(rect(), Qt::white);
+    painter.end();
+    QWizard::paintEvent(event);
+}
+
 void OwncloudWizard::customizeStyle()
 {
     // HINT: Customize wizard's own style here, if necessary in the future (Dark-/Light-Mode switching)

src/gui/wizard/owncloudwizard.h

@@ -111,6 +111,7 @@ public slots:
 
 protected:
     void changeEvent(QEvent *) override;
+    void paintEvent(QPaintEvent *event) override;
 
 private:
     void customizeStyle();