Asure we have a decent window size

4 files changed, 21 insertions, 10 deletions

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 9b29ba4dc..11b2b2434 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -167,6 +167,10 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     customizeStyle();
 
     cfg.restoreGeometry(this);
+    if (size().width() < minimumSizeHint().width() || size().height() < minimumSizeHint().height())
+    {
+        resize(minimumSizeHint());
+    }
 
 #ifdef Q_OS_MAC
     setActivationPolicy(ActivationPolicy::Accessory);
@@ -178,6 +182,11 @@ SettingsDialog::~SettingsDialog()
     delete _ui;
 }
 
+QSize SettingsDialog::minimumSizeHint() const
+{
+    return {800, 500};
+}
+
 QWidget* SettingsDialog::currentPage()
 {
     return _ui->stack->currentWidget();
diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h
index fa52c2bbd..414069529 100644
--- a/src/gui/settingsdialog.h
+++ b/src/gui/settingsdialog.h
@@ -51,7 +51,8 @@ class SettingsDialog : public QMainWindow
 
 public:
     explicit SettingsDialog(ownCloudGui *gui, QWidget *parent = nullptr);
-    ~SettingsDialog() override;
+    ~SettingsDialog() override;    
+    QSize minimumSizeHint() const override;
 
     QWidget* currentPage();
 
@@ -93,6 +94,7 @@ private:
 
     QAction *_activityAction;
     ownCloudGui *_gui;
+
 };
 }
 
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui
index bcaaa5c26..eb077b97a 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.ui
+++ b/src/gui/wizard/owncloudadvancedsetuppage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>917</width>
-    <height>604</height>
+    <width>800</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -524,8 +524,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>899</width>
-        <height>167</height>
+        <width>782</width>
+        <height>165</height>
        </rect>
       </property>
       <property name="sizePolicy">
diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index aa34b8bc6..76695105e 100644
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -18,6 +18,9 @@
 #include "configfile.h"
 #include "theme.h"
 
+#include "application.h"
+#include "settingsdialog.h"
+
 #include "wizard/owncloudwizard.h"
 #include "wizard/owncloudsetuppage.h"
 #include "wizard/owncloudhttpcredspage.h"
@@ -36,10 +39,6 @@
 
 #include <stdlib.h>
 
-namespace {
-// just a bit smaller than the default size of the settings dialog
-const QSize WizardSize(750, 450);
-}
 namespace OCC {
 
 Q_LOGGING_CATEGORY(lcWizard, "gui.wizard", QtInfoMsg)
@@ -56,7 +55,8 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
     , _setupLog()
 {
     setObjectName("owncloudWizard");
-    setFixedSize(WizardSize);
+    auto size = ocApp()->gui()->settingsDialog()->minimumSizeHint();
+    resize(size.width() - 50, size.height() - 50);
 
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setPage(WizardCommon::Page_ServerSetup, _setupPage);