[Scummvm-git-logs] scummvm master -> 473400071c2fca8128fdd7f7596c648a706cdcd4
sev-
noreply at scummvm.org
Wed Oct 11 21:14:43 UTC 2023
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
94d859f790 DISTS: IOS7: Add ios-help.zip
bc07130dec IOS7: Add help sections for the iOS port
e834bf859b IOS7: Remove old help documentation
473400071c IOS7: Remove "ClickAndDragMode" from widget layout
Commit: 94d859f7908c9a096c7e4ec358f2386ecc55e894
https://github.com/scummvm/scummvm/commit/94d859f7908c9a096c7e4ec358f2386ecc55e894
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-10-11T23:14:37+02:00
Commit Message:
DISTS: IOS7: Add ios-help.zip
Add zip file containing images for the help section for the iOS
port.
Changed paths:
A dists/ios7/ios-help.zip
devtools/create_project/xcode.cpp
ports.mk
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 6781a2cde45..c6bc12a87f6 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1058,6 +1058,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
files.push_back("dists/engine-data/ultima.dat");
files.push_back("dists/engine-data/ultima8.dat");
files.push_back("dists/engine-data/wintermute.zip");
+ files.push_back("dists/ios7/ios-help.zip");
files.push_back("dists/ios7/LaunchScreen_ios.storyboard");
files.push_back("dists/tvos/LaunchScreen_tvos.storyboard");
files.push_back("dists/pred.dic");
diff --git a/dists/ios7/ios-help.zip b/dists/ios7/ios-help.zip
new file mode 100644
index 00000000000..4d8969bcf01
Binary files /dev/null and b/dists/ios7/ios-help.zip differ
diff --git a/ports.mk b/ports.mk
index 19f623f2a9d..ceac880a5e9 100644
--- a/ports.mk
+++ b/ports.mk
@@ -294,6 +294,7 @@ endif
$(STRIP) scummvm
chmod 755 scummvm
cp scummvm $(bundle_name)/ScummVM
+ cp $(srcdir)/dists/ios7/ios-help.zip $(bundle_name)/ios-help.zip
cp $(srcdir)/dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-29 at 2x.png $(bundle_name)/AppIcon29x29 at 2x.png
cp $(srcdir)/dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-29 at 2x.png $(bundle_name)/AppIcon29x29 at 2x~ipad.png
cp $(srcdir)/dists/ios7/Images.xcassets/AppIcon.appiconset/icon4-29 at 3x.png $(bundle_name)/AppIcon29x29 at 3x.png
Commit: bc07130dec12234cb768efb840e13718cffbe618
https://github.com/scummvm/scummvm/commit/bc07130dec12234cb768efb840e13718cffbe618
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-10-11T23:14:37+02:00
Commit Message:
IOS7: Add help sections for the iOS port
Add help sections to describe the different touch modes, touch
actions, how to add a game etc.
A temporary version for tvOS with no images is provided as well.
Changed paths:
backends/platform/ios7/ios7_osys_main.h
backends/platform/ios7/ios7_osys_misc.mm
diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index 0aa705f023f..f3a61a41774 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -153,7 +153,7 @@ public:
bool setTextInClipboard(const Common::U32String &text) override;
bool openUrl(const Common::String &url) override;
-
+ const char * const *buildHelpDialogData() override;
Common::String getSystemLanguage() const override;
bool isConnectionLimited() override;
diff --git a/backends/platform/ios7/ios7_osys_misc.mm b/backends/platform/ios7/ios7_osys_misc.mm
index 5ce58348062..507f96714e4 100644
--- a/backends/platform/ios7/ios7_osys_misc.mm
+++ b/backends/platform/ios7/ios7_osys_misc.mm
@@ -25,6 +25,7 @@
// Needs to be included first as system headers redefine NO and YES, which clashes
// with the DisposeAfterUse::Flag enum used in Common stream classes.
#include "common/file.h"
+#include "common/translation.h"
#include "backends/platform/ios7/ios7_osys_main.h"
#include "base/version.h"
@@ -241,3 +242,131 @@ void OSystem_iOS7::handleEvent_applicationRestoreState() {
void OSystem_iOS7::handleEvent_applicationClearState() {
clearState();
}
+
+#if TARGET_OS_IOS
+static const char * const helpTabs[] = {
+
+_s("Touch Controls"),
+"ios-help.zip",
+_s(
+"## Touch control modes\n"
+"The touch control mode can be changed by tapping or clicking on the controller icon in the upper right corner or by swiping two fingers from left to right.\n"
+"\n"
+"### Direct mouse \n"
+"\n"
+"The touch controls are direct. The pointer jumps to where the finger touches the screen (default for menus).\n"
+"\n"
+" ![Direct mouse mode](mouse.png \"Direct mouse mode\")\n"
+"\n"
+"### Touchpad emulation \n"
+"\n"
+"The touch controls are indirect, like on a laptop touchpad.\n"
+"\n"
+" ![Touchpad mode](touchpad.png \"Touchpad mode\")\n"
+"\n"
+"To select the preferred touch mode for menus, 2D games, and 3D games, go to **Global Options > Backend > Choose the preferred touch mode**.\n"
+"\n"
+"## Touch actions \n"
+"\n"
+"### One finger tap \n"
+"\n"
+"Tap one finger to perform a left mouse click"
+"\n"
+"### Two fingers tap\n"
+"\n"
+"Tap two fingers to perform a right mouse click\n"
+"\n"
+"### One finger long press\n"
+"\n"
+"Touch and hold one finger for at least 0.5 seconds to perform a left mouse button hold and drag, such as for selection from action wheel in Curse of Monkey Island.\n"
+"\n"
+"### Two fingers long press\n"
+"\n"
+"Touch and hold two fingers for at least 0.5 seconds to perform a right mouse button hold and drag, such as for selection from action wheel in Tony Tough.\n"
+"\n"
+"### Virtual Gamepad \n"
+"\n"
+"Devices running iOS 15 or later can connect virtual gamepad controller by swiping two fingers from right to left or through **Global Options > Backend**. The directional button can be configured to either a thumbstick or a dpad.\n"
+"\n"
+"### Global Main Menu\n"
+"\n"
+"To open the Global Main Menu, tap on the menu icon at the top right of the screen or by swiping two fingers downwards.\n"
+"\n"
+" ![Menu icon](menu.png \"Menu icon\")\n"
+"\n"
+"## Virtual keyboard\n"
+"\n"
+"To open the virtual keyboard, long press on the controller icon at the top right of the screen, perform a pinch gesture (zoom out) or tap on any editable text field. To hide the virtual keyboard, tap the controller icon again, do an opposite pinch gesture (zoom in) or tap outside the text field.\n"
+"\n"
+"\n"
+" ![Keybpard icon](keyboard.png \"Keyboard icon\")\n"
+"\n"
+),
+
+_s("Adding Games"),
+"ios-help.zip",
+_s(
+"## Adding Games \n"
+"\n"
+"1. Copy the required game files to the ScummVM application. There are several ways to do that, see our [Transferring game files documentation](https://docs.scummvm.org/en/latest/other_platforms/ios.html#transferring-game-files) for more information.\n"
+"\n"
+"2. Select **Add Game...** from the launcher. \n"
+"\n"
+"3. In the ScummVM file browser, double-tap to browse to your added folder. Add a game by selecting the sub-folder containing the game files, then tap **Choose**. \n"
+"\n"
+"To add more games, repeat the steps above. \n"
+"\n"
+"See our [iOS documentation](https://docs.scummvm.org/en/latest/other_platforms/ios.html) for more information.\n"
+),
+
+0 // End of list
+};
+#else //TVOS
+static const char * const helpTabs[] = {
+
+_s("Touch Controls"),
+"",
+_s(
+"## Touch actions \n"
+"\n"
+"### Press Touch area \n"
+"\n"
+"Press Touch area to perform a left mouse click"
+"\n"
+"### Play/Pause\n"
+"\n"
+"Press Play/Pause to perform a right mouse click\n"
+"\n"
+"### Global Main Menu\n"
+"\n"
+"To open the Global Main Menu, press Back/Menu button.\n"
+"\n"
+"## Virtual keyboard\n"
+"\n"
+"To open the virtual keyboard, press and hold the Play/Pause button. To hide the virtual keyboard, press the Back/Menu button.\n"
+"\n"
+),
+
+_s("Adding Games"),
+"",
+_s(
+"## Adding Games \n"
+"\n"
+"1. Copy the required game files to the ScummVM application. There are several ways to do that, see our [Transferring game files documentation](https://docs.scummvm.org/en/latest/other_platforms/tvos.html#transferring-game-files) for more information.\n"
+"\n"
+"2. Select **Add Game...** from the launcher. \n"
+"\n"
+"3. In the ScummVM file browser, double-tap to browse to your added folder. Add a game by selecting the sub-folder containing the game files, then tap **Choose**. \n"
+"\n"
+"To add more games, repeat the steps above. \n"
+"\n"
+"See our [tvOS documentation](https://docs.scummvm.org/en/latest/other_platforms/tvos.html) for more information.\n"
+),
+
+0 // End of list
+};
+#endif
+
+const char * const *OSystem_iOS7::buildHelpDialogData() {
+ return helpTabs;
+}
Commit: e834bf859b941f3ba93b0a1bba50eaa19ed0fca0
https://github.com/scummvm/scummvm/commit/e834bf859b941f3ba93b0a1bba50eaa19ed0fca0
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-10-11T23:14:37+02:00
Commit Message:
IOS7: Remove old help documentation
The help documentation is moved from the backend tab to the main
launcher screen.
Changed paths:
backends/platform/ios7/ios7_options.mm
diff --git a/backends/platform/ios7/ios7_options.mm b/backends/platform/ios7/ios7_options.mm
index 19ee6e66772..e8d72a43b99 100644
--- a/backends/platform/ios7/ios7_options.mm
+++ b/backends/platform/ios7/ios7_options.mm
@@ -34,7 +34,6 @@
#include <TargetConditionals.h>
enum {
- kHelpCmd = 'Help',
kGamepadControllerOpacityChanged = 'gcoc',
};
@@ -164,8 +163,6 @@ IOS7OptionsWidget::IOS7OptionsWidget(GuiObject *boss, const Common::String &name
_onscreenCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "IOS7OptionsDialog.OnscreenControl", _("Show On-screen control"));
#endif
- new GUI::ButtonWidget(widgetsBoss(), "IOS7OptionsDialog.ControlsHelp", _("Controls Help"), Common::U32String(), kHelpCmd);
-
// setEnabled is normally only called from the EditGameDialog, but some options (GamepadController)
// should be disabled in all domains if system is running a lower version of iOS than 15.0.
setEnabled(_enabled);
@@ -195,9 +192,7 @@ void IOS7OptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::Stri
.addWidget("GamepadControllerOpacityLabel", "OptionsLabel")
.closeLayout()
.addWidget("ClickAndDragMode", "Checkbox")
- .addWidget("KeyboardFunctionBar", "Checkbox")
- .addPadding(0, 0, 0, 0)
- .addWidget("ControlsHelp", "WideButton");
+ .addWidget("KeyboardFunctionBar", "Checkbox");
#if TARGET_OS_IOS
layouts.addWidget("PreferredTouchModeText", "", -1, layouts.getVar("Globals.Line.Height"));
@@ -243,39 +238,6 @@ void IOS7OptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::Stri
void IOS7OptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
- case kHelpCmd: {
- GUI::MessageDialog help(
-#if TARGET_OS_IOS
- _("Gestures and controls:\n"
- "\n"
- "One finger tap: Left mouse click\n"
- "Two finger tap: Right mouse click\n"
- "Two finger double tap: ESC\n"
- "Two finger swipe (left to right): Toggles between touch direct mode and touchpad mode\n"
- "Two finger swipe (right to left): Shows/hides on-screen controls\n"
- "Two finger swipe (top to bottom): Global Main Menu\n"
- "Three finger swipe: Arrow keys\n"
- "Pinch gesture: Enables/disables keyboard\n"
- "Keyboard spacebar: Pause"),
-#else // TVOS
- _("Using the Apple TV remote control:\n"
- "\n"
- "Press Touch area: Left mouse click\n"
- "Press Play/Pause button: Right mouse click\n"
- "Press Back/Menu button in game: Global Main menu\n"
- "Press Back/Menu button in launcher: Apple TV Home\n"
- "Press and hold Play/Pause button: Show keyboard with extra keys\n"
- "Touch (not press) on top of Touch area: Up arrow key\n"
- "Touch (not press) on left of Touch area: Left arrow key\n"
- "Touch (not press) on right of Touch area: Right arrow key\n"
- "Touch (not press) on bottom of Touch area: Down arrow key\n"
- "Keyboard spacebar: Pause"),
-#endif
- Common::U32String(_("Close")), Common::U32String(), Graphics::kTextAlignLeft);
-
- help.runModal();
- break;
- }
case kGamepadControllerOpacityChanged: {
const int newValue = _gamepadControllerOpacitySlider->getValue();
_gamepadControllerOpacityLabel->setValue(newValue);
Commit: 473400071c2fca8128fdd7f7596c648a706cdcd4
https://github.com/scummvm/scummvm/commit/473400071c2fca8128fdd7f7596c648a706cdcd4
Author: Lars Sundström (l.sundstrom at gmail.com)
Date: 2023-10-11T23:14:37+02:00
Commit Message:
IOS7: Remove "ClickAndDragMode" from widget layout
The "ClickAndDragMode" option is removed. The widget layout was not
removed when the option was removed. Remove it.
Changed paths:
backends/platform/ios7/ios7_options.mm
diff --git a/backends/platform/ios7/ios7_options.mm b/backends/platform/ios7/ios7_options.mm
index e8d72a43b99..fc89f4f60d7 100644
--- a/backends/platform/ios7/ios7_options.mm
+++ b/backends/platform/ios7/ios7_options.mm
@@ -191,7 +191,6 @@ void IOS7OptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::Stri
.addWidget("GamepadControllerOpacitySlider", "Slider")
.addWidget("GamepadControllerOpacityLabel", "OptionsLabel")
.closeLayout()
- .addWidget("ClickAndDragMode", "Checkbox")
.addWidget("KeyboardFunctionBar", "Checkbox");
#if TARGET_OS_IOS
More information about the Scummvm-git-logs
mailing list