diff --git a/src/icons/logo_sxs_imager.png b/src/icons/logo_sxs_imager.png
new file mode 100644
index 0000000..cbf2c37
Binary files /dev/null and b/src/icons/logo_sxs_imager.png differ
diff --git a/src/main.qml b/src/main.qml
index 4c99d1b..387cc99 100644
--- a/src/main.qml
+++ b/src/main.qml
@@ -69,23 +69,24 @@ ApplicationWindow {
spacing: 0
Rectangle {
- implicitHeight: window.height/2
+ implicitHeight: window.height/3
Image {
id: image
- Layout.fillWidth: true
+ //Layout.fillWidth: true
+ Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
fillMode: Image.PreserveAspectFit
- source: "icons/logo_stacked_imager.png"
+ source: "icons/logo_sxs_imager.png"
width: window.width
- height: window.height/2
+ height: window.height/3
}
}
Rectangle {
color: "#c31c4a"
implicitWidth: window.width
- implicitHeight: window.height/2
+ implicitHeight: (window.height/3) * 2
GridLayout {
id: gridLayout
@@ -215,41 +216,11 @@ ApplicationWindow {
}
ColumnLayout {
+ id: columnLayoutProgress
spacing: 0
Layout.row: 1
- Layout.column: 2
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-
- ImButton {
- id: writebutton
- text: qsTr("WRITE")
- Layout.bottomMargin: 25
- Layout.minimumHeight: 40
- Layout.fillWidth: true
- Accessible.ignored: ospopup.visible || dstpopup.visible || hwpopup.visible
- Accessible.description: qsTr("Select this button to start writing the image")
- enabled: false
- onClicked: {
- if (!imageWriter.readyToWrite()) {
- return
- }
-
- if (!optionspopup.initialized && imageWriter.imageSupportsCustomization() && imageWriter.hasSavedCustomizationSettings()) {
- usesavedsettingspopup.openPopup()
- } else {
- confirmwritepopup.askForConfirmation()
- }
- }
- }
- }
-
- ColumnLayout {
- id: columnLayout3
- Layout.columnSpan: 2
- Layout.row: 1
Layout.column: 0
- Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+ Layout.columnSpan: 2
Text {
id: progressText
@@ -272,9 +243,19 @@ ApplicationWindow {
visible: false
Material.background: "#d15d7d"
}
+ }
+
+ ColumnLayout {
+ id: columnLayout3
+ Layout.row: 1
+ Layout.column: 2
+ Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+ spacing: 0
ImButton {
Layout.bottomMargin: 25
+ Layout.minimumHeight: 40
+ Layout.preferredWidth: 200
padding: 5
id: cancelwritebutton
text: qsTr("CANCEL WRITE")
@@ -288,6 +269,8 @@ ApplicationWindow {
}
ImButton {
Layout.bottomMargin: 25
+ Layout.minimumHeight: 40
+ Layout.preferredWidth: 200
padding: 5
id: cancelverifybutton
text: qsTr("CANCEL VERIFY")
@@ -302,6 +285,9 @@ ApplicationWindow {
ImButton {
Layout.bottomMargin: 25
+ Layout.minimumHeight: 40
+ Layout.preferredWidth: 200
+ Layout.alignment: Qt.AlignRight
padding: 5
id: customizebutton
onClicked: {
@@ -314,6 +300,28 @@ ApplicationWindow {
fillMode: Image.PreserveAspectFit
}
}
+ ImButton {
+ id: writebutton
+ text: qsTr("WRITE")
+ Layout.bottomMargin: 25
+ Layout.minimumHeight: 40
+ Layout.preferredWidth: 200
+ Layout.alignment: Qt.AlignRight
+ Accessible.ignored: ospopup.visible || dstpopup.visible || hwpopup.visible
+ Accessible.description: qsTr("Select this button to start writing the image")
+ enabled: false
+ onClicked: {
+ if (!imageWriter.readyToWrite()) {
+ return
+ }
+
+ if (!optionspopup.initialized && imageWriter.imageSupportsCustomization() && imageWriter.hasSavedCustomizationSettings()) {
+ usesavedsettingspopup.openPopup()
+ } else {
+ confirmwritepopup.askForConfirmation()
+ }
+ }
+ }
}
Text {
@@ -1126,6 +1134,7 @@ ApplicationWindow {
title: qsTr("Warning")
onYes: {
langbarRect.visible = false
+ writebutton.visible = false
writebutton.enabled = false
customizebutton.visible = false
cancelwritebutton.enabled = true
@@ -1138,6 +1147,7 @@ ApplicationWindow {
progressBar.Material.accent = "#ffffff"
osbutton.enabled = false
dstbutton.enabled = false
+ hwbutton.enabled = false
imageWriter.setVerifyEnabled(true)
imageWriter.startWrite()
}
@@ -1259,6 +1269,7 @@ ApplicationWindow {
customizebutton.visible = imageWriter.imageSupportsCustomization()
osbutton.enabled = true
dstbutton.enabled = true
+ hwbutton.enabled = true
writebutton.visible = true
writebutton.enabled = imageWriter.readyToWrite()
cancelwritebutton.visible = false
diff --git a/src/qml.qrc b/src/qml.qrc
index d29ef7a..c2f462a 100644
--- a/src/qml.qrc
+++ b/src/qml.qrc
@@ -32,6 +32,7 @@
icons/cat_language_specific_operating_systems.png
icons/cat_3d_printing.png
icons/logo_stacked_imager.png
+ icons/logo_sxs_imager.png
qmlcomponents/ImButton.qml
qmlcomponents/ImCheckBox.qml
qmlcomponents/ImRadioButton.qml