[Scummvm-git-logs] scummvm master -> 033b45058eed02109c38bad22df43addffe060d1
lephilousophe
noreply at scummvm.org
Sun Jun 18 14:21:14 UTC 2023
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:
0492a0e222 GUI: Update themes
033b45058e ACHIEVEMENTS: Add extrapath to search path for achievements
Commit: 0492a0e222ad63facedcd18fa0b62d8a400390e0
https://github.com/scummvm/scummvm/commit/0492a0e222ad63facedcd18fa0b62d8a400390e0
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-06-18T16:18:14+02:00
Commit Message:
GUI: Update themes
Latest changes were not applied to zip and include
Changed paths:
gui/themes/default.inc
gui/themes/residualvm.zip
gui/themes/scummclassic.zip
gui/themes/scummmodern.zip
gui/themes/scummremastered.zip
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 07ab72ba60d..28f5c258acc 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1750,7 +1750,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Graphics_Container' overlays='GlobalOptions_Graphics.Container'>"
@@ -2072,7 +2074,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_GUI' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_GUI_Container' overlays='GlobalOptions_GUI.Container'>"
@@ -2190,7 +2194,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud_Container' overlays='GlobalOptions_Cloud.Container'>"
@@ -2282,44 +2288,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"/>"
"</layout>"
"<layout type='horizontal' padding='0,0,-2,0' spacing='10' align='center'>"
-"<layout type='vertical' padding='0,0,2,0' spacing='4'>"
-"<widget name='StorageWizardOpenLinkHint' "
-"width='106' "
-"height='Globals.Line.Height' "
-"/>"
-"</layout>"
-"<layout type='vertical' padding='0,0,1,0' spacing='4'>"
-"<widget name='StorageWizardLink' "
-"width='192' "
-"height='Globals.Line.Height' "
-"/>"
-"</layout>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,-2,0' spacing='10' align='center'>"
-"<widget name='StorageWizardCodeHint' "
-"height='Globals.Line.Height' "
-"/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
-"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
-"<widget name='StorageWizardCodeBox' "
-"width='108' "
-"height='24' "
-"/>"
-"</layout>"
-"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
-"<widget name='StorageWizardPasteButton' "
-"type='Button' "
-"/>"
-"</layout>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,-2,0' spacing='10' align='center'>"
"<widget name='StorageWizardConnectButton' "
"type='Button' "
"/>"
-"<widget name='StorageWizardConnectionStatusHint' "
-"height='Globals.Line.Height' "
-"/>"
"</layout>"
"</layout>"
"</dialog>"
@@ -2440,94 +2411,158 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud_ConnectionWizard' overlays='Dialog.GlobalOptions' shading='dim'>"
-"<layout type='vertical' padding='0,0,0,0'>"
+"<layout type='vertical' padding='16,16,16,8' spacing='0'>"
+"<widget name='Headline' "
+"height='Globals.Line.Height' "
+"/>"
+"<space size='16' />"
"<widget name='Container'/>"
-"</layout>"
-"</dialog>"
-"<dialog name='GlobalOptions_Cloud_ConnectionWizard_Container' overlays='GlobalOptions_Cloud_ConnectionWizard.Container'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='0'>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
-"<layout type='vertical' padding='0,0,0,0' spacing='6'>"
-"<widget name='Picture' "
-"width='109' "
-"height='109' "
+"<space />"
+"<layout type='horizontal' padding='0,0,0,0' spacing='12'>"
+"<space />"
+"<widget name='CancelButton' "
+"type='Button' "
"/>"
-"<widget name='OpenUrlButton' "
+"<widget name='PrevButton' "
"type='Button' "
"/>"
-"<widget name='PasteCodeButton' "
+"<widget name='NextButton' "
+"type='Button' "
+"/>"
+"<widget name='FinishButton' "
"type='Button' "
"/>"
"</layout>"
-"<layout type='vertical' padding='0,0,0,0' spacing='6'>"
-"<widget name='Headline' "
+"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_ModeSelect' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='0' align='center'>"
+"<widget name='QuickModeButton' "
+"type='Button' "
+"/>"
+"<space size='12' />"
+"<widget name='QuickModeHint' "
"height='Globals.Line.Height' "
"/>"
-"<space size='4' />"
-"<widget name='NavigateLine' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,8,0' spacing='0' align='center'>"
+"<widget name='ManualModeButton' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_QuickModeStep1' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<layout type='vertical' padding='0,0,0,16' spacing='0' align='center'>"
+"<widget name='Line1' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='URLLine' "
+"<widget name='Line2' "
"height='Globals.Line.Height' "
"/>"
-"<space size='4' />"
-"<widget name='ReturnLine1' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='0' align='center'>"
+"<widget name='RunServerButton' "
+"type='Button' "
+"/>"
+"<space size='12' />"
+"<widget name='ServerInfoLabel' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='ReturnLine2' "
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_QuickModeStep2' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<layout type='vertical' padding='0,0,0,16' spacing='0'>"
+"<widget name='Line1' "
"height='Globals.Line.Height' "
"/>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='4' align='center'>"
-"<widget name='CodeBox1' "
-"width='70' "
+"<space size='4' />"
+"<widget name='OpenLinkButton' "
+"width='192' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox2' "
-"width='70' "
+"</layout>"
+"<layout type='vertical' padding='0,0,0,12' spacing='0' align='center'>"
+"<widget name='Line2' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox3' "
-"width='70' "
+"<widget name='Line3' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox4' "
-"width='70' "
+"<space size='8' />"
+"<widget name='Line4' "
"height='Globals.Line.Height' "
"/>"
"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='4' align='center'>"
-"<widget name='CodeBox5' "
-"width='70' "
+"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_ManualModeStep1' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox6' "
-"width='70' "
+"<space size='4' />"
+"<widget name='OpenLinkButton' "
+"width='192' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox7' "
-"width='70' "
+"<space size='16' />"
+"<widget name='Line2' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox8' "
-"width='70' "
+"<widget name='Line3' "
"height='Globals.Line.Height' "
"/>"
-"</layout>"
-"<widget name='MessageLine' "
+"<widget name='Line4' "
"height='Globals.Line.Height' "
"/>"
-"<space size='6' />"
"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_ManualModeStep2' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
+"height='Globals.Line.Height' "
+"/>"
+"<space size='4' />"
+"<widget name='CodeBox' "
+"height='24' "
+"/>"
+"<space size='4' />"
+"<widget name='PasteButton' "
+"height='24' "
+"/>"
+"<space size='8' />"
+"<widget name='Line2' "
+"height='Globals.Line.Height' "
+"/>"
"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='10' align='center'>"
-"<widget name='CancelButton' "
-"type='Button' "
+"</dialog>"
+"<dialog name='ConnectionWizard_Failure' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
+"height='Globals.Line.Height' "
"/>"
-"<space />"
-"<widget name='ConnectButton' "
-"type='Button' "
+"<widget name='Line2' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='Line3' "
+"height='Globals.Line.Height' "
+"/>"
+"<space size='16' />"
+"<widget name='Line4' "
+"height='Globals.Line.Height' "
"/>"
"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_Success' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
+"height='Globals.Line.Height' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>"
@@ -2569,12 +2604,16 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GameOptions_Achievements' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Graphics' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Graphics_Container' overlays='GameOptions_Graphics.Container'>"
@@ -2848,7 +2887,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalConfig_Achievements' overlays='Dialog.GlobalConfig.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>"
@@ -3379,6 +3420,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<dialog name='UnknownGameDialog' overlays='Dialog.Launcher.GameList' shading='dim'>"
"<layout type='vertical' padding='8,8,8,0'>"
"<widget name='TextContainer' "
+"type='ScrollContainerWidget' "
"/>"
"<layout type='horizontal' padding='0,0,16,16'>"
"<space/>"
@@ -3781,7 +3823,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Graphics_Container' overlays='GlobalOptions_Graphics.Container'>"
@@ -4102,7 +4146,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_GUI' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_GUI_Container' overlays='GlobalOptions_GUI.Container'>"
@@ -4232,7 +4278,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud' overlays='Dialog.GlobalOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud_Container' overlays='GlobalOptions_Cloud.Container'>"
@@ -4324,45 +4372,10 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"height='Globals.Line.Height' "
"/>"
"</layout>"
-"<layout type='horizontal' padding='0,0,-3,0' spacing='6' align='center'>"
-"<layout type='vertical' padding='0,0,1,0' spacing='2'>"
-"<widget name='StorageWizardOpenLinkHint' "
-"width='90' "
-"height='Globals.Line.Height' "
-"/>"
-"</layout>"
-"<layout type='vertical' padding='0,0,1,0' spacing='4'>"
-"<widget name='StorageWizardLink' "
-"width='150' "
-"height='Globals.Line.Height' "
-"/>"
-"</layout>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,-2,0' spacing='6' align='center'>"
-"<widget name='StorageWizardCodeHint' "
-"height='Globals.Line.Height' "
-"/>"
-"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='6' align='center'>"
-"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
-"<widget name='StorageWizardCodeBox' "
-"width='72' "
-"height='16' "
-"/>"
-"</layout>"
-"<layout type='vertical' padding='0,0,-2,0' spacing='2'>"
-"<widget name='StorageWizardPasteButton' "
-"type='Button' "
-"/>"
-"</layout>"
-"</layout>"
"<layout type='horizontal' padding='0,0,-2,0' spacing='6' align='center'>"
"<widget name='StorageWizardConnectButton' "
"type='Button' "
"/>"
-"<widget name='StorageWizardConnectionStatusHint' "
-"height='Globals.Line.Height' "
-"/>"
"</layout>"
"</layout>"
"</dialog>"
@@ -4485,89 +4498,153 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Cloud_ConnectionWizard' overlays='Dialog.GlobalOptions' shading='dim'>"
-"<layout type='vertical' padding='0,0,0,0'>"
+"<layout type='vertical' padding='8,8,8,4' spacing='0'>"
+"<widget name='Headline' "
+"height='Globals.Line.Height' "
+"/>"
+"<space size='8' />"
"<widget name='Container'/>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='6'>"
+"<space />"
+"<widget name='CancelButton' "
+"type='Button' "
+"/>"
+"<widget name='PrevButton' "
+"type='Button' "
+"/>"
+"<widget name='NextButton' "
+"type='Button' "
+"/>"
+"<widget name='FinishButton' "
+"type='Button' "
+"/>"
+"</layout>"
"</layout>"
"</dialog>"
-"<dialog name='GlobalOptions_Cloud_ConnectionWizard_Container' overlays='GlobalOptions_Cloud_ConnectionWizard.Container'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<layout type='vertical' padding='0,0,0,0' spacing='4'>"
-"<widget name='Headline' "
+"<dialog name='ConnectionWizard_ModeSelect' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<layout type='horizontal' padding='0,0,0,0' spacing='0' align='center'>"
+"<widget name='QuickModeButton' "
+"type='Button' "
+"/>"
+"<space size='6' />"
+"<widget name='QuickModeHint' "
"height='Globals.Line.Height' "
"/>"
-"<space size='2' />"
-"<widget name='NavigateLine' "
+"</layout>"
+"<layout type='horizontal' padding='0,0,4,0' spacing='0' align='center'>"
+"<widget name='ManualModeButton' "
+"type='Button' "
+"/>"
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_QuickModeStep1' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='URLLine' "
+"<widget name='Line2' "
"height='Globals.Line.Height' "
"/>"
-"<space size='2' />"
-"<widget name='ReturnLine1' "
+"<space size='8' />"
+"<layout type='horizontal' padding='0,0,0,0' spacing='0' align='center'>"
+"<widget name='RunServerButton' "
+"type='Button' "
+"/>"
+"<space size='6' />"
+"<widget name='ServerInfoLabel' "
"height='Globals.Line.Height' "
"/>"
-"<widget name='ReturnLine2' "
+"</layout>"
+"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_QuickModeStep2' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
"height='Globals.Line.Height' "
"/>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='4' align='center'>"
-"<widget name='CodeBox1' "
-"width='60' "
-"height='16' "
+"<space size='4' />"
+"<widget name='OpenLinkButton' "
+"width='160' "
+"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox2' "
-"width='60' "
-"height='16' "
+"<space size='8' />"
+"<widget name='Line2' "
+"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox3' "
-"width='60' "
-"height='16' "
+"<widget name='Line3' "
+"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox4' "
-"width='60' "
-"height='16' "
+"<space size='4' />"
+"<widget name='Line4' "
+"height='Globals.Line.Height' "
"/>"
"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='4' align='center'>"
-"<widget name='CodeBox5' "
-"width='60' "
-"height='16' "
+"</dialog>"
+"<dialog name='ConnectionWizard_ManualModeStep1' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
+"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox6' "
-"width='60' "
-"height='16' "
+"<space size='4' />"
+"<widget name='OpenLinkButton' "
+"width='160' "
+"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox7' "
-"width='60' "
-"height='16' "
+"<space size='8' />"
+"<widget name='Line2' "
+"height='Globals.Line.Height' "
"/>"
-"<widget name='CodeBox8' "
-"width='60' "
-"height='16' "
+"<widget name='Line3' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='Line4' "
+"height='Globals.Line.Height' "
"/>"
"</layout>"
-"<widget name='MessageLine' "
+"</dialog>"
+"<dialog name='ConnectionWizard_ManualModeStep2' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
"height='Globals.Line.Height' "
"/>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='4' align='center'>"
-"<widget name='OpenUrlButton' "
-"type='Button' "
+"<space size='4' />"
+"<widget name='CodeBox' "
+"height='16' "
"/>"
-"<widget name='PasteCodeButton' "
-"type='Button' "
+"<space size='4' />"
+"<widget name='PasteButton' "
+"height='16' "
+"/>"
+"<space size='8' />"
+"<widget name='Line2' "
+"height='Globals.Line.Height' "
"/>"
"</layout>"
-"<layout type='horizontal' padding='0,0,0,0' spacing='4' align='center'>"
-"<widget name='CancelButton' "
-"type='Button' "
+"</dialog>"
+"<dialog name='ConnectionWizard_Failure' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
+"height='Globals.Line.Height' "
"/>"
-"<space />"
-"<widget name='ConnectButton' "
-"type='Button' "
+"<widget name='Line2' "
+"height='Globals.Line.Height' "
+"/>"
+"<widget name='Line3' "
+"height='Globals.Line.Height' "
+"/>"
+"<space size='8' />"
+"<widget name='Line4' "
+"height='Globals.Line.Height' "
"/>"
"</layout>"
-"<space size='6' />"
-"<widget name='Picture' width='1' height='1' />"
-"</layout>"
+"</dialog>"
+"<dialog name='ConnectionWizard_Success' overlays='GlobalOptions_Cloud_ConnectionWizard.Container' shading='dim'>"
+"<layout type='vertical' padding='0,0,0,0' spacing='0'>"
+"<widget name='Line1' "
+"height='Globals.Line.Height' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions_Accessibility' overlays='Dialog.GlobalOptions.TabWidget'>"
@@ -4609,12 +4686,16 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GameOptions_Achievements' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Graphics' overlays='Dialog.GameOptions.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='GameOptions_Graphics_Container' overlays='GameOptions_Graphics.Container'>"
@@ -4897,7 +4978,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"</dialog>"
"<dialog name='GlobalConfig_Achievements' overlays='Dialog.GlobalConfig.TabWidget'>"
"<layout type='vertical' padding='0,0,0,0'>"
-"<widget name='Container'/>"
+"<widget name='Container' "
+"type='ScrollContainerWidget' "
+"/>"
"</layout>"
"</dialog>"
"<dialog name='FluidSynthSettings' overlays='GlobalOptions' shading='dim'>"
@@ -5386,6 +5469,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<dialog name='UnknownGameDialog' overlays='screen' inset='8' shading='dim'>"
"<layout type='vertical' padding='8,8,8,0'>"
"<widget name='TextContainer' "
+"type='ScrollContainerWidget' "
"/>"
"<layout type='horizontal' padding='0,0,8,8'>"
"<space/>"
diff --git a/gui/themes/residualvm.zip b/gui/themes/residualvm.zip
index 0ad0beb47e3..9721c452593 100644
Binary files a/gui/themes/residualvm.zip and b/gui/themes/residualvm.zip differ
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 46756171068..f097e41a60e 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 69e3f3bf607..3f49d46bc9a 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 948486025ef..2be43eab630 100644
Binary files a/gui/themes/scummremastered.zip and b/gui/themes/scummremastered.zip differ
Commit: 033b45058eed02109c38bad22df43addffe060d1
https://github.com/scummvm/scummvm/commit/033b45058eed02109c38bad22df43addffe060d1
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-06-18T16:19:58+02:00
Commit Message:
ACHIEVEMENTS: Add extrapath to search path for achievements
When editing game options, the achivements are not found by SearchMan
because extrapath is only added to it when starting a game.
Changed paths:
engines/achievements.cpp
diff --git a/engines/achievements.cpp b/engines/achievements.cpp
index 11a5557abdf..4d1d99b0440 100644
--- a/engines/achievements.cpp
+++ b/engines/achievements.cpp
@@ -20,6 +20,7 @@
*/
+#include "common/config-manager.h"
#include "common/debug.h"
#include "common/stream.h"
#include "common/system.h"
@@ -97,7 +98,17 @@ String AchievementsManager::getCurrentLang() const {
bool AchievementsManager::loadAchievementsData(const char *platform, const char *appId) {
- Archive *cfgZip = Common::makeZipArchive("achievements.dat");
+ Archive *cfgZip = nullptr;
+
+ if (!cfgZip && ConfMan.hasKey("extrapath")) {
+ Common::FSDirectory extrapath(ConfMan.get("extrapath"));
+ cfgZip = Common::makeZipArchive(extrapath.createReadStreamForMember("achievements.dat"));
+ }
+
+ if (!cfgZip) {
+ cfgZip = Common::makeZipArchive("achievements.dat");
+ }
+
if (!cfgZip) {
warning("achievements.dat is not found. Achievements messages are unavailable");
return false;
More information about the Scummvm-git-logs
mailing list