Add remembering of main select and file name

Fixes FedoraQt#642
gastoner · Oct 9, 2023 · 6e24494 · 6e24494
1 parent eb35f02
commit 6e24494
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/app/qml/DrivePage.qml b/src/app/qml/DrivePage.qml
@@ -107,6 +107,7 @@ Page {
                     Connections {
                         target: portalFileDialog
                         function onFileSelected(fileName) {
+                            mainWindow.fileName = fileName
                             releases.selectLocalFile(fileName)
                         }
                     }

diff --git a/src/app/qml/MainPage.qml b/src/app/qml/MainPage.qml
@@ -66,7 +66,6 @@ Page {
                 text: qsTr("Select .iso file")
                 onClicked: {
                     selectedOption = Units.MainSelect.Write
-                    releases.selectLocalFile("")
                 }
                 ButtonGroup.group: radioGroup
             }

diff --git a/src/app/qml/main.qml b/src/app/qml/main.qml
@@ -36,6 +36,7 @@ ApplicationWindow {
     property int selectedOption: Units.MainSelect.Download
     property QtObject lastRestoreable
     property bool eraseVariant: false
+    property string fileName: ""
 
     ColumnLayout {
         id: mainLayout
@@ -130,7 +131,6 @@ ApplicationWindow {
                 StateChangeScript {
                     script: {
                         //reset of source on versionPage
-                        selectedOption = Units.MainSelect.Download
                         releases.filterSource = 0
                         if (stackView.depth > 1)  {
                             while (stackView.depth != 1) {
@@ -298,11 +298,11 @@ ApplicationWindow {
         if (selectedPage == Units.Page.MainPage) {
             if (selectedOption == Units.MainSelect.Write) {
                 if (releases.localFile.iso)
-                    releases.selectLocalFile()
+                    releases.selectLocalFile(fileName)
                 selectedPage = Units.Page.DrivePage
-            } else if (selectedOption == Units.MainSelect.Restore)
+            } else if (selectedOption == Units.MainSelect.Restore && drives.lastRestoreable)
                 selectedPage = Units.Page.RestorePage
-            else
+            else if (selectedOption == Units.MainSelect.Download)
                 selectedPage = Units.Page.VersionPage
         } else if (selectedPage == Units.Page.VersionPage) {
             selectedPage += 1