[ui] Replacement of Controls1 SplitView to Controls2 SplitView

alicevision · Sep 17, 2024 · ccd88c4 · ccd88c4
1 parent 34e3847
commit ccd88c4
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 193 deletions.
diff --git a/meshroom/ui/qml/Application.qml b/meshroom/ui/qml/Application.qml
diff --git a/meshroom/ui/qml/GraphEditor/ChunksListView.qml b/meshroom/ui/qml/GraphEditor/ChunksListView.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.4 as Controls1 // SplitView
 import QtQuick.Layouts 1.11
 import MaterialIcons 2.2
 import Controls 1.0

diff --git a/meshroom/ui/qml/GraphEditor/NodeChunks.qml b/meshroom/ui/qml/GraphEditor/NodeChunks.qml
@@ -20,7 +20,7 @@ ListView {
     }
 
     orientation: ListView.Horizontal
-    implicitWidth: 100
+
     // If we have enough space, add one pixel margin between chunks
     spacing: modelIsBig ? 0 : 1
     delegate: Rectangle {

diff --git a/meshroom/ui/qml/GraphEditor/NodeEditor.qml b/meshroom/ui/qml/GraphEditor/NodeEditor.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.4 as Controls1 // SplitView
 import QtQuick.Layouts 1.11
 import MaterialIcons 2.2
 import Controls 1.0
@@ -254,7 +253,7 @@ Panel {
             Component {
                 id: editor_component
 
-                Controls1.SplitView {
+                SplitView {
                     anchors.fill: parent
 
                     // The list of chunks

diff --git a/meshroom/ui/qml/GraphEditor/NodeStatistics.qml b/meshroom/ui/qml/GraphEditor/NodeStatistics.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.4 as Controls1 // SplitView
 import QtQuick.Layouts 1.11
 import MaterialIcons 2.2
 import Controls 1.0

diff --git a/meshroom/ui/qml/Homepage.qml b/meshroom/ui/qml/Homepage.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.4 as Controls1 // For SplitView
 import QtQuick.Layouts 1.11
 import Utils 1.0
 import MaterialIcons 2.2
@@ -16,7 +15,7 @@ Page {
         }
     }
 
-    Controls1.SplitView {
+    SplitView {
         id: splitView
         anchors.fill: parent
 
@@ -25,8 +24,8 @@ Page {
             id: leftColumn
             height: parent.height
 
-            Layout.minimumWidth: 200
-            Layout.maximumWidth: 300
+            SplitView.minimumWidth: 200
+            SplitView.maximumWidth: 300
 
             AnimatedImage {
                 id: logo

diff --git a/meshroom/ui/qml/Viewer3D/Viewer3D.qml b/meshroom/ui/qml/Viewer3D/Viewer3D.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.4 as Controls1
 import QtQuick.Layouts 1.11
 import QtQml.Models 2.15
 import QtQuick.Scene3D 2.15

diff --git a/meshroom/ui/qml/WorkspaceView.qml b/meshroom/ui/qml/WorkspaceView.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.4 as Controls1 // For SplitView
 import QtQuick.Layouts 1.11
 import Qt.labs.platform 1.0 as Platform
 import ImageGallery 1.0
@@ -26,11 +25,9 @@ Item {
     readonly property Viewer2D viewer2D: viewer2D
     readonly property alias imageGallery: imageGallery
 
-    implicitWidth: 300
-    implicitHeight: 400
+    // Use settings instead of visible property as property changes are not propagated
     visible: settingsUILayout.showImageGallery || settingsUILayout.showImageViewer || settingsUILayout.showViewer3D || settingsUILayout.showLiveReconstruction
 
-
     // Load a 3D media file in the 3D viewer
     function load3DMedia(filepath, label = undefined) {
         if (panel3dViewerLoader.active) {
@@ -62,10 +59,12 @@ Item {
 
     SystemPalette { id: activePalette }
 
-    Controls1.SplitView {
+    SplitView {
+        id: mainSplitView
         anchors.fill: parent
 
-        Controls1.SplitView {
+        SplitView {
+            id: leftSplitView
             visible: settingsUILayout.showImageGallery || settingsUILayout.showLiveReconstruction
             orientation: Qt.Vertical
             Layout.fillHeight: true
@@ -96,6 +95,7 @@ Item {
                 }
             }
             LiveSfmView {
+                id: liveSfmView
                 visible: settingsUILayout.showLiveReconstruction
                 reconstruction: root.reconstruction
                 Layout.fillWidth: true
@@ -104,6 +104,7 @@ Item {
         }
 
         Panel {
+            id: imageViewer
             title: "Image Viewer"
             visible: settingsUILayout.showImageViewer
             implicitWidth: Math.round(parent.width * 0.35)
@@ -190,6 +191,7 @@ Item {
         }
 
         Item {
+            id: viewer3DContainer
             visible: settingsUILayout.showViewer3D
             Layout.minimumWidth: 20
             Layout.minimumHeight: 80
@@ -213,15 +215,15 @@ Item {
 
                 property alias viewer3D: c_viewer3D
 
-                Controls1.SplitView {
+                SplitView {
                     id: c_viewer3DSplitView
                     anchors.fill: parent
                     Viewer3D {
                         id: c_viewer3D
 
-                        Layout.fillWidth: true
-                        Layout.fillHeight: true
-                        Layout.minimumWidth: 20
+                        SplitView.fillWidth: true
+                        SplitView.fillHeight: true
+                        SplitView.minimumWidth: 20
 
                         DropArea {
                             anchors.fill: parent