diff --git a/meshroom/ui/qml/Application.qml b/meshroom/ui/qml/Application.qml index 63290a69..c82c1b36 100644 --- a/meshroom/ui/qml/Application.qml +++ b/meshroom/ui/qml/Application.qml @@ -21,7 +21,7 @@ Page { property alias unsavedDialog: unsavedDialog Settings { - id: settings_UILayout + id: settingsUILayout category: 'UILayout' property alias showLiveReconstruction: liveSfMVisibilityCB.checked property alias showGraphEditor: graphEditorVisibilityCB.checked @@ -1054,7 +1054,7 @@ Page { orientation: Qt.Horizontal width: parent.width height: Math.round(parent.height * 0.3) - visible: settings_UILayout.showGraphEditor + visible: settingsUILayout.showGraphEditor TabPanel { id: graphEditorPanel diff --git a/meshroom/ui/qml/WorkspaceView.qml b/meshroom/ui/qml/WorkspaceView.qml index 5e05cfab..7326a099 100644 --- a/meshroom/ui/qml/WorkspaceView.qml +++ b/meshroom/ui/qml/WorkspaceView.qml @@ -93,7 +93,7 @@ Item { } } LiveSfmView { - visible: settings_UILayout.showLiveReconstruction + visible: settingsUILayout.showLiveReconstruction reconstruction: root.reconstruction Layout.fillWidth: true Layout.preferredHeight: childrenRect.height @@ -102,7 +102,7 @@ Item { Panel { title: "Image Viewer" - visible: settings_UILayout.showImageViewer + visible: settingsUILayout.showImageViewer implicitWidth: Math.round(parent.width * 0.35) Layout.fillHeight: true Layout.fillWidth: true @@ -187,7 +187,7 @@ Item { } Item { - visible: settings_UILayout.showViewer3D + visible: settingsUILayout.showViewer3D Layout.minimumWidth: 20 Layout.minimumHeight: 80 Layout.fillHeight: true @@ -195,7 +195,7 @@ Item { Loader { id: panel3dViewerLoader - active: settings_UILayout.showViewer3D + active: settingsUILayout.showViewer3D visible: active anchors.fill: parent sourceComponent: panel3dViewerComponent diff --git a/meshroom/ui/qml/main.qml b/meshroom/ui/qml/main.qml index 85bd7c64..859d8dae 100644 --- a/meshroom/ui/qml/main.qml +++ b/meshroom/ui/qml/main.qml @@ -8,8 +8,8 @@ import Qt.labs.settings 1.0 ApplicationWindow { id: _window - width: settings_General.windowWidth - height: settings_General.windowHeight + width: settingsGeneral.windowWidth + height: settingsGeneral.windowHeight minimumWidth: 650 minimumHeight: 500 visible: true @@ -62,7 +62,7 @@ ApplicationWindow { SystemPalette { id: disabledPalette; colorGroup: SystemPalette.Disabled } Settings { - id: settings_General + id: settingsGeneral category: 'General' property int windowWidth: 1280 property int windowHeight: 720 @@ -70,8 +70,8 @@ ApplicationWindow { Component.onDestruction: { // Store main window dimensions in persisting Settings - settings_General.windowWidth = _window.width - settings_General.windowHeight = _window.height + settingsGeneral.windowWidth = _window.width + settingsGeneral.windowHeight = _window.height } // Check if document has been saved