mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-05-06 05:36:39 +02:00
Merge a35adedb1c
into ee679fcf34
This commit is contained in:
commit
a4da9cf729
1 changed files with 383 additions and 361 deletions
|
@ -599,16 +599,24 @@ Page {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
header: RowLayout {
|
header: Rectangle {
|
||||||
|
color: Qt.darker(activePalette.window, 1.15)
|
||||||
|
height: 26
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
anchors.fill: parent
|
||||||
spacing: 0
|
spacing: 0
|
||||||
MaterialToolButton {
|
MaterialToolButton {
|
||||||
id: homeButton
|
id: homeButton
|
||||||
text: MaterialIcons.home
|
text: MaterialIcons.home
|
||||||
|
|
||||||
font.pointSize: 18
|
topPadding: 0
|
||||||
|
bottomPadding: 0
|
||||||
|
|
||||||
|
font.pointSize: 18
|
||||||
|
palette.text: hovered ? Colors.sysPalette.highlight : Colors.sysPalette.text
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
color: homeButton.hovered ? activePalette.highlight : Qt.darker(activePalette.window, 1.15)
|
color: Qt.darker(activePalette.window, 1.15)
|
||||||
border.color: Qt.darker(activePalette.window, 1.15)
|
border.color: Qt.darker(activePalette.window, 1.15)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -624,8 +632,17 @@ Page {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Item {
|
||||||
|
Layout.fillHeight: true
|
||||||
|
Layout.fillWidth: true
|
||||||
MenuBar {
|
MenuBar {
|
||||||
palette.window: Qt.darker(activePalette.window, 1.15)
|
Layout.fillHeight: true
|
||||||
|
topPadding: 0
|
||||||
|
bottomPadding: 0
|
||||||
|
|
||||||
|
background: Rectangle {
|
||||||
|
color: Qt.darker(activePalette.window, 1.15)
|
||||||
|
}
|
||||||
Menu {
|
Menu {
|
||||||
title: "File"
|
title: "File"
|
||||||
Action {
|
Action {
|
||||||
|
@ -925,11 +942,6 @@ Page {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
Layout.fillWidth: true
|
|
||||||
Layout.fillHeight: true
|
|
||||||
color: Qt.darker(activePalette.window, 1.15)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
|
@ -939,13 +951,17 @@ Page {
|
||||||
|
|
||||||
font.pointSize: 18
|
font.pointSize: 18
|
||||||
|
|
||||||
|
topPadding: 0
|
||||||
|
bottomPadding: 0
|
||||||
|
palette.text: hovered ? Colors.sysPalette.highlight : Colors.sysPalette.text
|
||||||
|
|
||||||
text: !(_reconstruction.computingLocally) ? MaterialIcons.send : MaterialIcons.cancel_schedule_send
|
text: !(_reconstruction.computingLocally) ? MaterialIcons.send : MaterialIcons.cancel_schedule_send
|
||||||
|
|
||||||
ToolTip.text: !(_reconstruction.computingLocally) ? "Compute" : "Stop Computing"
|
ToolTip.text: !(_reconstruction.computingLocally) ? "Compute" : "Stop Computing"
|
||||||
ToolTip.visible: hovered
|
ToolTip.visible: hovered
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
color: processButton.hovered ? activePalette.highlight : Qt.darker(activePalette.window, 1.15)
|
color: Qt.darker(activePalette.window, 1.15)
|
||||||
border.color: Qt.darker(activePalette.window, 1.15)
|
border.color: Qt.darker(activePalette.window, 1.15)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -957,6 +973,10 @@ Page {
|
||||||
|
|
||||||
font.pointSize: 18
|
font.pointSize: 18
|
||||||
|
|
||||||
|
topPadding: 0
|
||||||
|
bottomPadding: 0
|
||||||
|
palette.text: hovered ? Colors.sysPalette.highlight : Colors.sysPalette.text
|
||||||
|
|
||||||
visible: _reconstruction ? _reconstruction.canSubmit : false
|
visible: _reconstruction ? _reconstruction.canSubmit : false
|
||||||
text: MaterialIcons.rocket_launch
|
text: MaterialIcons.rocket_launch
|
||||||
|
|
||||||
|
@ -964,7 +984,7 @@ Page {
|
||||||
ToolTip.visible: hovered
|
ToolTip.visible: hovered
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
color: submitButton.hovered ? activePalette.highlight : Qt.darker(activePalette.window, 1.15)
|
color: Qt.darker(activePalette.window, 1.15)
|
||||||
border.color: Qt.darker(activePalette.window, 1.15)
|
border.color: Qt.darker(activePalette.window, 1.15)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -972,10 +992,9 @@ Page {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Item {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
color: Qt.darker(activePalette.window, 1.15)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CompatibilityManager indicator
|
// CompatibilityManager indicator
|
||||||
|
@ -984,18 +1003,21 @@ Page {
|
||||||
visible: compatibilityManager.issueCount
|
visible: compatibilityManager.issueCount
|
||||||
text: MaterialIcons.warning
|
text: MaterialIcons.warning
|
||||||
font.family: MaterialIcons.fontFamily
|
font.family: MaterialIcons.fontFamily
|
||||||
palette.buttonText: "#FF9800"
|
palette.buttonText: hovered ? Colors.sysPalette.highlight : "#FF9800"
|
||||||
font.pointSize: 12
|
font.pointSize: 12
|
||||||
onClicked: compatibilityManager.open()
|
onClicked: compatibilityManager.open()
|
||||||
ToolTip.text: "Compatibility Issues"
|
ToolTip.text: "Compatibility Issues"
|
||||||
ToolTip.visible: hovered
|
ToolTip.visible: hovered
|
||||||
|
|
||||||
|
Layout.fillHeight: true
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
color: compatibilityIssuesButton.hovered ? activePalette.highlight : Qt.darker(activePalette.window, 1.15)
|
color: Qt.darker(activePalette.window, 1.15)
|
||||||
border.color: Qt.darker(activePalette.window, 1.15)
|
border.color: Qt.darker(activePalette.window, 1.15)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
footer: ToolBar {
|
footer: ToolBar {
|
||||||
id: footer
|
id: footer
|
||||||
|
|
Loading…
Add table
Reference in a new issue