[Scummvm-git-logs] scummvm branch-2-6 -> dfc8d696eca28c32c5666afaac474a09b09f93c8

sev- noreply at scummvm.org
Wed Jun 22 12:46:16 UTC 2022 

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a7b578ca5c COMMON: Adding iconspath parameter to the command line
dfc8d696ec DOCS: Adding iconspath to German and Czech documentation


Commit: a7b578ca5cc053bd997166880b02d41c34b687b2
    https://github.com/scummvm/scummvm/commit/a7b578ca5cc053bd997166880b02d41c34b687b2
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-06-22T14:41:58+02:00

Commit Message:
COMMON: Adding iconspath parameter to the command line

Changed paths:
    base/commandLine.cpp
    doc/docportal/advanced_topics/command_line.rst
    doc/docportal/advanced_topics/configuration_file.rst
    doc/docportal/settings/paths.rst
    doc/se/LasMig


diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 8297b4f3202..2454f0842d8 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -151,6 +151,7 @@ static const char HELP_STRING[] =
 	"                           pce, segacd, wii, windows)\n"
 	"  --savepath=PATH          Path to where saved games are stored\n"
 	"  --extrapath=PATH         Extra path to additional game data\n"
+	"  --iconspath=PATH         Path to additional icons for the launcher grid view\n"
 	"  --soundfont=FILE         Select the SoundFont for MIDI playback (only\n"
 	"                           supported by some MIDI drivers)\n"
 	"  --multi-midi             Enable combination AdLib and native MIDI\n"
@@ -838,6 +839,15 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
 				}
 			END_OPTION
 
+			DO_LONG_OPTION("iconspath")
+			Common::FSNode path(option);
+			if (!path.exists()) {
+				usage("Non-existent icons path '%s'", option);
+			} else if (!path.isReadable()) {
+				usage("Non-readable icons path '%s'", option);
+			}
+			END_OPTION
+
 			DO_LONG_OPTION("md5-path")
 				// While the --md5 command expect a file name, the --md5mac may take a base name.
 				// Thus we do not check that the file exists here.
@@ -1671,7 +1681,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
 
 void storeSessionSetting(const Common::String &command, const Common::String &settingName, const Common::StringMap &settings) {
 	if (settings.contains(command))
-		ConfMan.set(settingName, settings[command], Common::ConfigManager::kSessionDomain); 
+		ConfMan.set(settingName, settings[command], Common::ConfigManager::kSessionDomain);
 }
 
 bool processSettings(Common::String &command, Common::StringMap &settings, Common::Error &err) {
@@ -1835,28 +1845,29 @@ bool processSettings(Common::String &command, Common::StringMap &settings, Commo
 	}
 
 	// store all session related settings
-	storeSessionSetting("config", "config", settings); 
-	storeSessionSetting("fullscreen", "fullscreen", settings); 
-	storeSessionSetting("gfx-mode", "gfx_mode", settings); 
-	storeSessionSetting("stretch-mode", "stretch_mode", settings); 
-	storeSessionSetting("scaler", "scaler", settings); 
-	storeSessionSetting("scale-factor", "scale_factor", settings); 
-	storeSessionSetting("filtering", "filtering", settings); 
-	storeSessionSetting("gui-theme", "gui_theme", settings); 
-	storeSessionSetting("themepath", "themepath", settings); 
-	storeSessionSetting("music-volume", "music_volume", settings); 
-	storeSessionSetting("sfx-volume", "sfx_volume", settings); 
-	storeSessionSetting("speech-volume", "speech_volume", settings); 
-	storeSessionSetting("midi-gain", "midi_gain", settings); 
-	storeSessionSetting("subtitles", "subtitles", settings); 
-	storeSessionSetting("savepath", "savepath", settings); 
-	storeSessionSetting("extrapath", "extrapath", settings); 
-	storeSessionSetting("soundfont", "soundfont", settings); 
-	storeSessionSetting("multi-midi", "multi_midi", settings); 
-	storeSessionSetting("native-mt32", "native-mt32", settings); 
-	storeSessionSetting("enable-gs", "enable_gs", settings); 
-	storeSessionSetting("opl-driver", "opl_driver", settings); 
-	storeSessionSetting("talkspeed", "talkspeed", settings); 
+	storeSessionSetting("config", "config", settings);
+	storeSessionSetting("fullscreen", "fullscreen", settings);
+	storeSessionSetting("gfx-mode", "gfx_mode", settings);
+	storeSessionSetting("stretch-mode", "stretch_mode", settings);
+	storeSessionSetting("scaler", "scaler", settings);
+	storeSessionSetting("scale-factor", "scale_factor", settings);
+	storeSessionSetting("filtering", "filtering", settings);
+	storeSessionSetting("gui-theme", "gui_theme", settings);
+	storeSessionSetting("themepath", "themepath", settings);
+	storeSessionSetting("music-volume", "music_volume", settings);
+	storeSessionSetting("sfx-volume", "sfx_volume", settings);
+	storeSessionSetting("speech-volume", "speech_volume", settings);
+	storeSessionSetting("midi-gain", "midi_gain", settings);
+	storeSessionSetting("subtitles", "subtitles", settings);
+	storeSessionSetting("savepath", "savepath", settings);
+	storeSessionSetting("extrapath", "extrapath", settings);
+	storeSessionSetting("iconspath", "iconspath", settings);
+	storeSessionSetting("soundfont", "soundfont", settings);
+	storeSessionSetting("multi-midi", "multi_midi", settings);
+	storeSessionSetting("native-mt32", "native-mt32", settings);
+	storeSessionSetting("enable-gs", "enable_gs", settings);
+	storeSessionSetting("opl-driver", "opl_driver", settings);
+	storeSessionSetting("talkspeed", "talkspeed", settings);
 	storeSessionSetting("render-mode", "render_mode", settings);
 	storeSessionSetting("screenshotpath", "screenshotpath", settings);
 
diff --git a/doc/docportal/advanced_topics/command_line.rst b/doc/docportal/advanced_topics/command_line.rst
index 646ebf9e7ce..7f180cbfedc 100755
--- a/doc/docportal/advanced_topics/command_line.rst
+++ b/doc/docportal/advanced_topics/command_line.rst
@@ -129,6 +129,7 @@ Short options are listed where they are available.
         ``--dump-scripts``,``-u``,"Enables script dumping if a directory called 'dumps' exists in the current directory"
         ``--enable-gs``,,":ref:`Enables Roland GS mode for MIDI playback <gs>`"
         ``--extrapath=PATH``,,":ref:`Extra path to additional game data <extra>`"
+        ``--iconspath=PATH``,,":ref:`Path to additional icons for the launcher grid view <iconspath>`"
         ``--filtering``,,":ref:`Forces filtered graphics mode <filtering>`"
         ``--fullscreen``,``-f``,":ref:`Forces full-screen mode <fullscreen>`"
         ``--game=NAME``,,"In combination with ``--add`` or ``--detect`` only adds or attempts to detect the game with id NAME."
diff --git a/doc/docportal/advanced_topics/configuration_file.rst b/doc/docportal/advanced_topics/configuration_file.rst
index e63099a5906..c66daca60a4 100755
--- a/doc/docportal/advanced_topics/configuration_file.rst
+++ b/doc/docportal/advanced_topics/configuration_file.rst
@@ -163,6 +163,7 @@ There are many recognized configuration keys. In the table below, each key is ei
 		enable_unsupported_game_warning,boolean,true, Shows a warning when adding a game that is unsupported.
 		extra,string, ,"Shows additional information about a game, such as version"
 		":ref:`extrapath <extra>`",string,None,
+		":ref:`iconspath <iconspath>`",string,None,
 		":ref:`fade_style <fade>`",boolean,true,
 		":ref:`filtering <filtering>`",boolean,false,
 		":ref:`floating_cursors <floating>`",boolean,false,
diff --git a/doc/docportal/settings/paths.rst b/doc/docportal/settings/paths.rst
index e17cab6092d..1991ec1831c 100644
--- a/doc/docportal/settings/paths.rst
+++ b/doc/docportal/settings/paths.rst
@@ -41,3 +41,9 @@ Extra Path
 
 	*extrapath*
 
+.. _iconspath:
+
+Icons Path
+	Sets the path to the folder in which ScummVM will look for additional icons for the launcher grid view.
+
+	*iconspath*
diff --git a/doc/se/LasMig b/doc/se/LasMig
index 8a489c0dc22..4a3f9586f7d 100644
--- a/doc/se/LasMig
+++ b/doc/se/LasMig
@@ -705,6 +705,7 @@ Ordning: scummvm [INSTÄLLNINGAR]... [SPEL]
                            pce, segacd, windows)
   --savepath=PATH          Sökväg dit spardata lagras
   --extrapath=PATH         ”Extra”-sökväg för ytterligare speldata
+  --iconspath=PATH         <Path to additional icons for the launcher grid view>
   --soundfont=FILE         Välj SoundFont för MIDI-uppspelning (Stöds endast
                            av vissa MIDI-drivers)
   --multi-midi             Aktivera kombination av AdLib och Native MIDI


Commit: dfc8d696eca28c32c5666afaac474a09b09f93c8
    https://github.com/scummvm/scummvm/commit/dfc8d696eca28c32c5666afaac474a09b09f93c8
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2022-06-22T14:42:06+02:00

Commit Message:
DOCS: Adding iconspath to German and Czech documentation

If anybody has a real translation, feel free to add it.

Changed paths:
    doc/cz/PrectiMe
    doc/de/LIESMICH


diff --git a/doc/cz/PrectiMe b/doc/cz/PrectiMe
index 053f8057208..1af492fb416 100644
--- a/doc/cz/PrectiMe
+++ b/doc/cz/PrectiMe
@@ -1015,6 +1015,7 @@ ScummVM může také hru spustit přímo pomocí argumentů příkazové řádky
   --platform=SLOVO         Určí platformu hry (povolené hodnoty: 2gs, 3do, acorn, amiga, atari, c64, fmtowns, mac, nes, pc, pce, segacd, windows)
   --savepath=CESTA         Cesta, kde jsou umístěny uložené hry
   --extrapath=CESTA        Dodatečná cesta pro další data hry
+  --iconspath=CESTA        <Path to additional icons for the launcher grid view>
   --soundfont=SOUBOR       Vybere SoundFont pro přehrávání MIDI (Podporováno pouze některými ovladači MIDI)
   --multi-midi             Povolí kombinaci AdLib a přirozeného MIDI
   --native-mt32            Pravý Roland MT-32 (zakáže emulaci GM)
diff --git a/doc/de/LIESMICH b/doc/de/LIESMICH
index a57fe48af4f..cb6817ce4cf 100644
--- a/doc/de/LIESMICH
+++ b/doc/de/LIESMICH
@@ -1591,6 +1591,7 @@ gestartet werden -- siehe nächster Abschnitt.
                            pce, segacd, windows).
   --savepath=PFAD          Pfad zu gespeicherten Spielständen
   --extrapath=PFAD         Extrapfad zu zusätzlichen Spieldaten
+  --iconspath=PFAD         <Path to additional icons for the launcher grid view>
   --soundfont=DATEI        Wählt SoundFont für MIDI-Wiedergabe (wird nur
                            von einigen MIDI-Treibern unterstützt).
   --multi-midi             Aktiviert Kombinierung von AdLib und MIDI.

More information about the Scummvm-git-logs mailing list