define minimum sizes of conflict dialogs in Style component

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/gui/ResolveConflictsDialog.qml b/src/gui/ResolveConflictsDialog.qml
index 7b6efb18088f4da3df8d03d8cac0b4aca1510f04..77b01eecfd0d404366b09dbe0b9bc5f4160d6497 100644 (file)
--- a/src/gui/ResolveConflictsDialog.qml
+++ b/src/gui/ResolveConflictsDialog.qml
@@ -30,10 +30,10 @@ QtWindow.Window {
     flags: Qt.Window | Qt.Dialog
     visible: true
 
-    width: 600
-    height: 800
-    minimumWidth: 600
-    minimumHeight: 800
+    width: Style.minimumWidthResolveConflictsDialog
+    height: Style.minimumHeightResolveConflictsDialog
+    minimumWidth: Style.minimumWidthResolveConflictsDialog
+    minimumHeight: Style.minimumHeightResolveConflictsDialog
     title: qsTr('Solve sync conflicts')
 
     onClosing: function(close) {

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 34f2470abb12e7a6bf223a1ce3424df81b387777..e9fbdbf2ee68cc2a3db8ff13cba71c593acae574 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -133,6 +133,8 @@ QtObject {
 \r
     readonly property int bigFontPixelSizeResolveConflictsDialog: 20\r
     readonly property int fontPixelSizeResolveConflictsDialog: 15\r
+    readonly property int minimumWidthResolveConflictsDialog: 600\r
+    readonly property int minimumHeightResolveConflictsDialog: 800\r
 \r
     readonly property int activityContentSpace: 4\r
 \r