libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 21:21:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

JANITORIAL: Update RTL references in themes and menus

Browse Source
This commit is contained in:
mataniko 2020-05-11 22:20:40 -04:00 committed by Eugene Sandulenko
parent 2f5eb14d4b
commit cc7b06d47a
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dists/bada/Res/scummmobile/scummmobile_layout.stx
View File

@ -650,7 +650,7 @@
/>
</layout>
</dialog>
<dialog name = 'GlobalMenu' overlays = 'screen_center'>
<layout type = 'vertical' padding = '16, 16, 16, 16' center = 'true'>
<widget name = 'Logo'
@ -688,7 +688,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
<widget name = 'RTL'
<widget name = 'ReturnToLauncher'
width = '190'
height = 'Globals.Button.Height'
/>

12
engines/dialogs.cpp
View File

@ -90,10 +90,10 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
new GUI::ButtonWidget(this, "GlobalMenu.About", _("~A~bout"), 0, kAboutCmd);
if (g_system->getOverlayWidth() > 320)
_rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _("~R~eturn to Launcher"), 0, kRTLCmd);
_returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", _("~R~eturn to Launcher"), 0, kLauncherCmd);
else
_rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _c("~R~eturn to Launcher", "lowres"), 0, kRTLCmd);
_rtlButton->setEnabled(_engine->hasFeature(Engine::kSupportsReturnToLauncher));
_returnToLauncherButton = new GUI::ButtonWidget(this, "GlobalMenu.ReturnToLauncher", _c("~R~eturn to Launcher", "lowres"), 0, kLauncherCmd);
_returnToLauncherButton->setEnabled(_engine->hasFeature(Engine::kSupportsReturnToLauncher));
if (!g_system->hasFeature(OSystem::kFeatureNoQuit))
new GUI::ButtonWidget(this, "GlobalMenu.Quit", _("~Q~uit"), 0, kQuitCmd);
@ -136,7 +136,7 @@ void MainMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint3
dialog.runModal();
}
break;
case kRTLCmd: {
case kLauncherCmd: {
Common::Event eventRTL;
eventRTL.type = Common::EVENT_RETURN_TO_LAUNCHER;
g_system->getEventManager()->pushEvent(eventRTL);
@ -166,9 +166,9 @@ void MainMenuDialog::reflowLayout() {
// FIXME: it might be better to declare GUI::StaticTextWidget::setLabel() virtual
// and to reimplement it in GUI::ButtonWidget to handle the hotkey.
if (g_system->getOverlayWidth() > 320)
_rtlButton->setLabel(_rtlButton->cleanupHotkey(_("~R~eturn to Launcher")));
_returnToLauncherButton->setLabel(_returnToLauncherButton->cleanupHotkey(_("~R~eturn to Launcher")));
else
_rtlButton->setLabel(_rtlButton->cleanupHotkey(_c("~R~eturn to Launcher", "lowres")));
_returnToLauncherButton->setLabel(_returnToLauncherButton->cleanupHotkey(_c("~R~eturn to Launcher", "lowres")));
#ifndef DISABLE_FANCY_THEMES
if (g_gui.xmlEval()->getVar("Globals.ShowGlobalMenuLogo", 0) == 1 && g_gui.theme()->supportsImages()) {

4
engines/dialogs.h
View File

@ -46,7 +46,7 @@ public:
kHelpCmd = 'HELP',
kAboutCmd = 'ABOU',
kQuitCmd = 'QUIT',
kRTLCmd = 'RTL ',
kLauncherCmd = 'LNCR',
kChooseCmd = 'CHOS'
};
@ -67,7 +67,7 @@ protected:
GUI::GraphicsWidget *_logo;
GUI::ButtonWidget *_rtlButton;
GUI::ButtonWidget *_returnToLauncherButton;
GUI::ButtonWidget *_loadButton;
GUI::ButtonWidget *_saveButton;
GUI::ButtonWidget *_helpButton;

2
engines/testbed/events.h
View File

@ -56,7 +56,7 @@ public:
return "Events";
}
const char *getDescription() const override {
return "Events : Keyboard/Mouse/RTL";
return "Events : Keyboard/Mouse/Return to Launcher";
}
};

4
gui/themes/default.inc
View File

@ -2057,7 +2057,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"height='Globals.Button.Height' "
"/>"
"<space size='10'/>"
"<widget name='RTL' "
"<widget name='ReturnToLauncher' "
"width='150' "
"height='Globals.Button.Height' "
"/>"
@ -3885,7 +3885,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"width='120' "
"height='12' "
"/>"
"<widget name='RTL' "
"<widget name='ReturnToLauncher' "
"width='120' "
"height='12' "
"/>"

BIN
gui/themes/scummclassic.zip
View File

Binary file not shown.

4
gui/themes/scummclassic/classic_layout.stx
View File

@ -248,7 +248,7 @@
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@ -1199,7 +1199,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
<widget name = 'RTL'
<widget name = 'ReturnToLauncher'
width = '150'
height = 'Globals.Button.Height'
/>

6
gui/themes/scummclassic/classic_layout_lowres.stx
View File

@ -245,7 +245,7 @@
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@ -1209,7 +1209,7 @@
width = '120'
height = '12'
/>
<widget name = 'RTL'
<widget name = 'ReturnToLauncher'
width = '120'
height = '12'
/>
@ -1831,7 +1831,7 @@
<dialog name = 'DropdownDialog' overlays = 'screen_center' shading = 'luminance'>
</dialog>
<dialog name = 'UnknownGameDialog' overlays = 'screen' inset = '8' shading = 'dim'>
<layout type = 'vertical' padding = '8, 8, 8, 0'>
<widget name = 'TextContainer'

BIN
gui/themes/scummmodern.zip
View File

Binary file not shown.

2
gui/themes/scummmodern/scummmodern_layout.stx
View File

@ -1212,7 +1212,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
<widget name = 'RTL'
<widget name = 'ReturnToLauncher'
width = '150'
height = 'Globals.Button.Height'
/>

2
gui/themes/scummmodern/scummmodern_layout_lowres.stx
View File

@ -1208,7 +1208,7 @@
width = '120'
height = 'Globals.Button.Height'
/>
<widget name = 'RTL'
<widget name = 'ReturnToLauncher'
width = '120'
height = 'Globals.Button.Height'
/>

BIN
gui/themes/scummremastered.zip
View File

Binary file not shown.

4
gui/themes/scummremastered/remastered_layout.stx
View File

@ -262,7 +262,7 @@
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@ -1212,7 +1212,7 @@
height = 'Globals.Button.Height'
/>
<space size = '10'/>
<widget name = 'RTL'
<widget name = 'ReturnToLauncher'
width = '150'
height = 'Globals.Button.Height'
/>

4
gui/themes/scummremastered/remastered_layout_lowres.stx
View File

@ -243,7 +243,7 @@
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>
<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<widget name = 'grOnScreenCheckbox'
@ -1208,7 +1208,7 @@
width = '120'
height = 'Globals.Button.Height'
/>
<widget name = 'RTL'
<widget name = 'ReturnToLauncher'
width = '120'
height = 'Globals.Button.Height'
/>