diff options
author | lubomyr | 2017-02-14 15:13:58 +0200 |
---|---|---|
committer | lubomyr | 2017-02-14 15:13:58 +0200 |
commit | 216f9c4f11cd95f9e4ed049c9ecc97304e83f837 (patch) | |
tree | d28adb26dca57181721d175e435b3140daba813d /gui/themes | |
parent | f8c4274f1a0bdde91123f3cd493d14e5a1b1a91e (diff) | |
download | scummvm-rg350-216f9c4f11cd95f9e4ed049c9ecc97304e83f837.tar.gz scummvm-rg350-216f9c4f11cd95f9e4ed049c9ecc97304e83f837.tar.bz2 scummvm-rg350-216f9c4f11cd95f9e4ed049c9ecc97304e83f837.zip |
ANDROIDSDL: backend related checking in options.cpp replaced with hasFeature... condition, renamed some fields and methods
Diffstat (limited to 'gui/themes')
-rw-r--r-- | gui/themes/default.inc | 2 | ||||
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 127377 -> 127371 bytes | |||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummmodern.zip | bin | 1646917 -> 1646989 bytes | |||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 2 |
7 files changed, 5 insertions, 5 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 54c63703b0..9254e97f40 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -814,7 +814,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>" "</layout>" "</dialog>" -"<dialog name='GlobalOptions_AndroidSdl' overlays='Dialog.GlobalOptions.TabWidget'>" +"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>" "<layout type='vertical' padding='16,16,16,16' spacing='8'>" "<widget name='grOnScreenCheckbox' " "type='Checkbox' " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 733668e5d6..22eaa76fde 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index f85020824d..a1a148b0c7 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -238,7 +238,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_AndroidSdl' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <widget name = 'grOnScreenCheckbox' type = 'Checkbox' diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index b660b4a8f5..1627ee6ce2 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -235,7 +235,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_AndroidSdl' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <widget name = 'grOnScreenCheckbox' type = 'Checkbox' diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 1779d22d44..a42d6ed620 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 49fb4813a4..16e85a0761 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -252,7 +252,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_AndroidSdl' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <widget name = 'grOnScreenCheckbox' type = 'Checkbox' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 4a74704c34..a2d51d9904 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -233,7 +233,7 @@ </layout> </dialog> - <dialog name = 'GlobalOptions_AndroidSdl' overlays = 'Dialog.GlobalOptions.TabWidget'> + <dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <widget name = 'grOnScreenCheckbox' type = 'Checkbox' |