Improved folder sync setup page

src/gui/nmcgui/nmcflow2authwidget.cpp

@@ -25,8 +25,6 @@ namespace OCC {
 NMCFlow2AuthWidget::NMCFlow2AuthWidget(QWidget *parent)
     : Flow2AuthWidget(parent)
 {
-    setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
-
     _ui.copyLinkLabel->setVisible(false);
     _ui.openLinkLabel->setVisible(false);
 

src/gui/nmcgui/nmcowncloudadvancedsetuppage.cpp

@@ -13,13 +13,28 @@
  */
 
 #include "nmcgui/nmcowncloudadvancedsetuppage.h"
+#include "QtGui/qpainter.h"
 
 namespace OCC {
 
 NMCOwncloudAdvancedSetupPage::NMCOwncloudAdvancedSetupPage(OwncloudWizard *wizard)
     : OwncloudAdvancedSetupPage(wizard)
 
 {
-    setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
+    _ui.confCheckBoxSize->setVisible(false);
+    _ui.confSpinBox->setVisible(false);
+    _ui.confTraillingSizeLabel->setVisible(false);
+    _ui.confCheckBoxSize->setFixedSize(0,0);
+    _ui.confSpinBox->setFixedSize(0,0);
+    _ui.confTraillingSizeLabel->setFixedSize(0,0);
+    _ui.wSyncStrategy->removeItem(_ui.horizontalLayout_6);
+
+    _ui.confCheckBoxExternal->setVisible(false);
+    _ui.confCheckBoxExternal->setFixedSize(0,0);
+    _ui.wSyncStrategy->removeItem(_ui.horizontalLayout_8);
+
+    _ui.verticalLayout->removeWidget(_ui.errorLabel);
+    _ui.wSyncStrategy->insertWidget(0, _ui.errorLabel);
 }
+
 } // namespace OCC

src/gui/wizard/owncloudadvancedsetuppage.cpp

@@ -582,7 +582,7 @@ void OwncloudAdvancedSetupPage::customizeStyle()
 void OwncloudAdvancedSetupPage::styleLocalFolderLabel()
 {
     const auto backgroundColor = palette().window().color();
-    const auto folderIconFileName = Theme::instance()->isBranded() ? Theme::hidpiFileName("folder.png", backgroundColor)
+    const auto folderIconFileName = Theme::instance()->isBranded() ? Theme::hidpiFileName("computer-icon.png", backgroundColor)
                                                                    : Theme::hidpiFileName(":/client/theme/colored/folder.png");
     _ui.lLocal->setPixmap(folderIconFileName);
 }

src/gui/wizard/owncloudadvancedsetuppage.h

@@ -50,6 +50,8 @@ class OwncloudAdvancedSetupPage : public QWizardPage
     void setMultipleFoldersExist(bool exist);
     void directoriesCreated();
 
+    Ui_OwncloudAdvancedSetupPage ui() const;
+
 signals:
     void createLocalAndRemoteFolders(const QString &, const QString &);
 
@@ -64,6 +66,9 @@ private slots:
     void slotVirtualFileSyncClicked();
     void slotQuotaRetrieved(const QVariantMap &result);
 
+protected:
+    Ui_OwncloudAdvancedSetupPage _ui{};
+
 private:
     void setRadioChecked(QRadioButton *radio);
 
@@ -87,7 +92,6 @@ private slots:
     // TODO: remove when UX decision is made
     void refreshVirtualFilesAvailibility(const QString &path);
 
-    Ui_OwncloudAdvancedSetupPage _ui{};
     bool _checking = false;
     bool _created = false;
     bool _localFolderValid = false;

src/gui/wizard/owncloudwizard.cpp

@@ -309,7 +309,7 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
         id == WizardCommon::Page_Flow2AuthCreds) {
         setButtonLayout({ QWizard::Stretch });
     } else if (id == WizardCommon::Page_AdvancedSetup) {
-        setButtonLayout({ QWizard::CustomButton2, QWizard::Stretch, QWizard::CustomButton1, QWizard::FinishButton });
+        setButtonLayout({ QWizard::Stretch, QWizard::FinishButton });
         setNextButtonAsDefault();
     } else {
         setButtonLayout({ QWizard::BackButton, QWizard::Stretch, QWizard::NextButton });

src/gui/wizard/owncloudwizard.h

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