Rename FirstRunFlag to make the logic easier to read and set first ru…

…n done in welcome screen itself
opengisch · Jan 31, 2024 · e3942ec · e3942ec
1 parent 83af549
commit e3942ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/qml/WelcomeScreen.qml b/src/qml/WelcomeScreen.qml
@@ -871,18 +871,18 @@ Page {
   function adjustWelcomeScreen() {
     if (visible) {
       const currentProjectButtonVisible = !!qgisProject.fileName;
+      currentProjectButton.visible = currentProjectButtonVisible
 
       if (firstShown) {
         welcomeText.text = " ";
-        currentProjectButton.visible = currentProjectButtonVisible
       } else {
-        var firstRun = !settings.value( "/QField/FirstRunFlag", false )
+        var firstRun = !settings.valueBool( "/QField/FirstRunDone", false )
         if ( firstRun ) {
           welcomeText.text = qsTr( "Welcome to QField. First time using this application? Try the sample projects listed below." )
+          settings.setValue( "/QField/FirstRunDone", true )
         } else {
           welcomeText.text = qsTr( "Welcome back to QField." )
         }
-        currentProjectButton.visible = currentProjectButtonVisible
       }
     }
   }

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -3351,8 +3351,6 @@ ApplicationWindow {
       }
 
       layoutListInstantiator.model.reloadModel()
-
-      settings.setValue( "/QField/FirstRunFlag", false )
     }
 
     function onSetMapExtent(extent) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3351,8 +3351,6 @@ ApplicationWindow { @@
           }
           layoutListInstantiator.model.reloadModel()
-          settings.setValue( "/QField/FirstRunFlag", false )
         }
         function onSetMapExtent(extent) {
@@ Expand Down @@