Merge pull request #71 from oblivioncth/dev

Merge to master for v0.8.2

Author: oblivioncth

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24.0...3.30.0)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(FIL
-    VERSION 0.8.1
+    VERSION 0.8.2
     LANGUAGES CXX
     DESCRIPTION "Flashpoint Importer for Launchers"
 )

app/src/import/details.h

@@ -3,7 +3,8 @@
 
 /* Although somewhat redundant with settings.h, this is a collection of
  * Import related info that is specifically collected to be shared with
- * Installs
+ * Installs or other faculties that don't get passed the details
+ * directly.
  */
 
 // Project Includes
@@ -20,6 +21,7 @@ struct Details
     QString clifpPath;
     QList<QString> involvedPlatforms;
     QList<QString> involvedPlaylists;
+    bool forceFullscreen; // TODO: This doesn't quite fit here as installs don't need to know this directly
 
     static Details current();
 

app/src/import/settings.h

@@ -44,6 +44,7 @@ struct OptionSet
     PlaylistGameMode playlistMode;
     Fp::Db::InclusionOptions inclusionOptions;
     bool excludeAddApps;
+    bool forceFullscreen;
 };
 
 class ImagePaths

app/src/import/worker.cpp

@@ -526,7 +526,8 @@ Worker::Result Worker::doImport(Qx::Error& errorReport)
         .imageMode = mOptionSet.imageMode,
         .clifpPath = CLIFp::standardCLIFpPath(*mFlashpointInstall),
         .involvedPlatforms = involvedPlatforms,
-        .involvedPlaylists = mImportSelections.playlists
+        .involvedPlaylists = mImportSelections.playlists,
+        .forceFullscreen = mOptionSet.forceFullscreen
     };
     Details::setCurrent(details);
 

app/src/kernel/clifp.cpp

@@ -11,6 +11,7 @@
 
 // Project Includes
 #include "project_vars.h"
+#include "import/details.h"
 
 //===============================================================================================================
 // CLIFp
@@ -95,5 +96,13 @@ QString CLIFp::parametersFromStandard(QStringView originalAppPath, QStringView o
     return clifpParam;
 }
 
-QString CLIFp::parametersFromStandard(const QUuid& titleId) { return u"-q "_s + PLAY_COMMAND + ' ' + ID_ARG.arg(titleId.toString(QUuid::WithoutBraces)); }
-QString CLIFp::parametersFromStandard(const QString& titleId) { return u"-q "_s + PLAY_COMMAND + ' ' + ID_ARG.arg(titleId); }
+QString CLIFp::parametersFromStandard(const QUuid& titleId) { return parametersFromStandard(titleId.toString(QUuid::WithoutBraces)); }
+
+QString CLIFp::parametersFromStandard(const QString& titleId)
+{
+    QString params = u"-q "_s + PLAY_COMMAND + ' ' + ID_ARG.arg(titleId);
+    auto impDet = Import::Details::current();
+    if(impDet.forceFullscreen)
+        params += ' ' + FULLSCREEN_SWITCH;
+    return params;
+}

app/src/kernel/clifp.h

@@ -28,6 +28,7 @@ class CLIFp
     static inline const QString PARAM_ARG = uR"(--param="%1")"_s;
     static inline const QString MSG_ARG = uR"(--msg="%1")"_s;
     static inline const QString EXTRA_ARG = uR"(--extra="%1")"_s;
+    static inline const QString FULLSCREEN_SWITCH = uR"(--fullscreen)"_s;
 
     static inline const QString ERR_FP_CANT_DEPLOY_CLIFP = u"Failed to deploy "_s + EXE_NAME + u" to the selected Flashpoint install.\n"_s
                                                            "\n"

app/src/launcher/implementation/attractmode/am-install.cpp

@@ -353,7 +353,7 @@ Qx::Error Install::postImport()
     // General emulator setup
     QString workingDir = QDir::toNativeSeparators(QFileInfo(Import::Details::current().clifpPath).absolutePath());
     emulatorConfig->setExecutable(CLIFp::EXE_NAME);
-    emulatorConfig->setArgs(uR"(play -i u"[romfilename]"_s)"_s);
+    emulatorConfig->setArgs(CLIFp::parametersFromStandard(u"[romfilename]"_s));
     emulatorConfig->setWorkDir(workingDir);
     emulatorConfig->setRomPath(u""_s);
     emulatorConfig->setRomExt(u""_s);

app/src/ui/mainwindow.cpp

@@ -387,6 +387,11 @@ bool MainWindow::getExcludeAddApps() const
     return ui->action_excludeAdditionalApps->isChecked();
 }
 
+bool MainWindow::getForceFullscreen() const
+{
+    return ui->action_forceFullscreen->isChecked();
+}
+
 void MainWindow::prepareImport()
 {
     // Gather selection's and notify controller
@@ -398,7 +403,8 @@ void MainWindow::prepareImport()
         getForceDownloadImages(),
         getSelectedPlaylistGameMode(),
         getSelectedInclusionOptions(),
-        getExcludeAddApps()
+        getExcludeAddApps(),
+        getForceFullscreen()
     };
 
     emit importTriggered(impSel, optSet, selectionsMayModify());

app/src/ui/mainwindow.h

@@ -180,6 +180,7 @@ class MainWindow : public QMainWindow
     Import::ImageMode getSelectedImageMode() const;
     bool getForceDownloadImages() const;
     bool getExcludeAddApps() const;
+    bool getForceFullscreen() const;
 
     // Import
     void prepareImport();

app/src/ui/mainwindow.ui

@@ -956,6 +956,7 @@
     <addaction name="action_forceDownloadImages"/>
     <addaction name="action_includeAnimations"/>
     <addaction name="action_excludeAdditionalApps"/>
+    <addaction name="action_forceFullscreen"/>
     <addaction name="separator"/>
     <addaction name="action_deployCLIFp"/>
    </widget>
@@ -1082,6 +1083,14 @@
     <string>Exclude Additional Apps</string>
    </property>
   </action>
+  <action name="action_forceFullscreen">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Force Fullscreen (If Supported)</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../../res/resources.qrc"/>
@@ -1404,7 +1413,7 @@
  </slots>
  <buttongroups>
   <buttongroup name="buttonGroup_playlistGameMode"/>
-  <buttongroup name="buttonGroup_updateMode"/>
   <buttongroup name="buttonGroup_imageMode"/>
+  <buttongroup name="buttonGroup_updateMode"/>
  </buttongroups>
 </ui>