Updating CMakeLists to copy Data directory into the app bundle on Mac

builds so that it doesn't have to be done in the build script.  Also
changing the name of it to match the name craft uses so that we don't
get two copies if using the nightly builds

kstars/auxiliary/ksutils.cpp

@@ -1238,26 +1238,18 @@ void copyResourcesFolderFromAppBundle(QString folder)
     }
 }
 
-bool copyDataFolderFromAppBundleIfNeeded() //The method returns true if the data directory is good to go.
+bool setupMacKStarsIfNeeded() // This method will return false if the KStars data directory doesn't exist when it's done
 {
     //This will copy the locale folder, the notifications folder, and the sounds folder and any missing files in them to Application Support if needed.
     copyResourcesFolderFromAppBundle("locale");
     copyResourcesFolderFromAppBundle("knotifications5");
     copyResourcesFolderFromAppBundle("sounds");
 
-    //This will check for the data directory and if its not present, it will run the wizard.
-    QString dataLocation =
-        QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kstars", QStandardPaths::LocateDirectory);
-    if (dataLocation.isEmpty()) //If there is no kstars user data directory
-    {
-        QPointer<KSWizard> wizard = new KSWizard(new QFrame());
-        wizard->exec(); //This will pause the startup until the user installs the data directory from the Wizard.
-
-        dataLocation =
-            QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kstars", QStandardPaths::LocateDirectory);
-        if (dataLocation.isEmpty())
-            return false;
+    //This will copy the KStars data directory
+    copyResourcesFolderFromAppBundle("kstars");
 
+    if(Options::kStarsFirstRun())
+    {
         //This sets some important OS X options.
         Options::setIndiServerIsInternal(true);
         Options::setIndiServer("*Internal INDI Server*");
@@ -1271,16 +1263,16 @@ bool copyDataFolderFromAppBundleIfNeeded() //The method returns true if the data
         Options::setSextractorBinary("*Internal Sextractor*");
         Options::setAstrometryWCSIsInternal(true);
         Options::setAstrometryWCSInfo("*Internal wcsinfo*");
-        Options::setAstrometryUseNoFITS2FITS(false);
         Options::setXplanetIsInternal(true);
         Options::setXplanetPath("*Internal XPlanet*");
-        Options::setRunStartupWizard(false); //don't run on startup because we are doing it now.
-
-        return true; //This means the data directory is good to go now that we created it from the default.
     }
-    //This will copy any of the critical KStars files from the app bundle to application support if they are missing.
-    copyResourcesFolderFromAppBundle("kstars");
-    return true; //This means the data directory was good to go from the start and the wizard did not run.
+
+    QString dataLocation =
+        QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kstars", QStandardPaths::LocateDirectory);
+    if (dataLocation.isEmpty()) //If there is no kstars user data directory
+        return false;
+
+    return true;
 }
 
 

kstars/auxiliary/ksutils.h

@@ -259,7 +259,7 @@ QString getDefaultPath(const QString &option);
 
 #ifdef Q_OS_OSX
 void copyResourcesFolderFromAppBundle(QString folder);
-bool copyDataFolderFromAppBundleIfNeeded(); //The boolean returns true if the data folders are good to go.
+bool setupMacKStarsIfNeeded(); //The boolean returns true if the data folders are good to go.
 bool configureAstrometry();
 bool replaceIndexFileNotYetSet();
 bool copyRecursively(QString sourceFolder, QString destFolder);

kstars/kstars.kcfg

@@ -1325,6 +1325,11 @@
       </entry>
    </group>
    <group name="General">
+       <entry name="KStarsFirstRun" type="Bool">
+          <label>Is this the first time running KStars?</label>
+          <whatsthis>This allows KStars to perform several operations if it has never been installed before.</whatsthis>
+          <default>true</default>
+       </entry>
       <entry name="AlwaysRecomputeCoordinates" type="Bool">
          <label>Always recompute coordinates</label>
          <whatsthis>Checking this option causes recomputation of current equatorial coordinates from catalog coordinates (i.e. application of precession, nutation and aberration corrections) for every redraw of the map. This makes processing slower when there are many stars to handle, but is more likely to be bug free. There are known bugs in the rendering of stars when this recomputation is avoided.</whatsthis>

kstars/main.cpp

@@ -81,12 +81,13 @@ int main(int argc, char *argv[])
 
 #ifdef Q_OS_OSX
     //Note, this function will return true on OS X if the data directories are good to go.  If not, quit with error code 1!
-    if (!KSUtils::copyDataFolderFromAppBundleIfNeeded())
+    if (!KSUtils::setupMacKStarsIfNeeded())
     {
         KSNotification::sorry(i18n("Sorry, without a KStars Data Directory, KStars cannot operate. Exiting program now."));
         return 1;
     }
 #endif
+    Options::setKStarsFirstRun(false);
     app.setApplicationVersion(KSTARS_VERSION);
     /**
     * enable high dpi support