aboutsummaryrefslogtreecommitdiff
path: root/gui/themes
diff options
context:
space:
mode:
authorAlexander Tkachev2019-07-19 17:04:44 +0700
committerMatan Bareket2019-07-30 14:51:41 -0400
commit3df126853aa661f760792d478f80c2e2427b298c (patch)
tree2806a9bde1eda195a1b3af727e01f90552a4c415 /gui/themes
parent99c2418d1a270c4496b21d6d6c8035b6ef73e8a1 (diff)
downloadscummvm-rg350-3df126853aa661f760792d478f80c2e2427b298c.tar.gz
scummvm-rg350-3df126853aa661f760792d478f80c2e2427b298c.tar.bz2
scummvm-rg350-3df126853aa661f760792d478f80c2e2427b298c.zip
GUI: Separate Cloud tab in two
All local webserver-related settings are now shown in a separate, "Wi-Fi Sharing" tab (shown if built with USE_SDL_NET). Cloud tab is only shown if actual cloud storages are built (USE_LIBCURL).
Diffstat (limited to 'gui/themes')
-rw-r--r--gui/themes/scummclassic.zipbin135889 -> 136187 bytes
-rw-r--r--gui/themes/scummclassic/classic_layout.stx5
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx5
-rw-r--r--gui/themes/scummmodern.zipbin264656 -> 264954 bytes
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx5
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx5
-rw-r--r--gui/themes/scummremastered.zipbin264593 -> 264892 bytes
-rw-r--r--gui/themes/scummremastered/remastered_layout.stx5
-rw-r--r--gui/themes/scummremastered/remastered_layout_lowres.stx7
9 files changed, 25 insertions, 7 deletions
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 78229c36c1..1e8f3ad802 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 3929af9e81..f5fb08e833 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -729,8 +729,11 @@
height = 'Globals.Line.Height'
/>
</layout>
+ </layout>
+ </dialog>
- <!-- here goes Wi-Fi Sharing -->
+ <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
<widget name = 'RunServerButton'
type = 'Button'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 8f39a69b17..bbeead9032 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -734,8 +734,11 @@
height = 'Globals.Line.Height'
/>
</layout>
+ </layout>
+ </dialog>
- <!-- here goes Wi-Fi Sharing -->
+ <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
<widget name = 'RunServerButton'
type = 'Button'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index d1b4c239a1..d6ce4c3b32 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index b1d4e28015..967e5e5da1 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -743,8 +743,11 @@
height = 'Globals.Line.Height'
/>
</layout>
+ </layout>
+ </dialog>
- <!-- here goes Wi-Fi Sharing -->
+ <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
<widget name = 'RunServerButton'
type = 'Button'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index fd9990d2e3..8ff830af29 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -732,8 +732,11 @@
height = 'Globals.Line.Height'
/>
</layout>
+ </layout>
+ </dialog>
- <!-- here goes Wi-Fi Sharing -->
+ <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
<widget name = 'RunServerButton'
type = 'Button'
diff --git a/gui/themes/scummremastered.zip b/gui/themes/scummremastered.zip
index 5b5f82d2b3..763fc46dfa 100644
--- a/gui/themes/scummremastered.zip
+++ b/gui/themes/scummremastered.zip
Binary files differ
diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx
index b1d4e28015..967e5e5da1 100644
--- a/gui/themes/scummremastered/remastered_layout.stx
+++ b/gui/themes/scummremastered/remastered_layout.stx
@@ -743,8 +743,11 @@
height = 'Globals.Line.Height'
/>
</layout>
+ </layout>
+ </dialog>
- <!-- here goes Wi-Fi Sharing -->
+ <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
<widget name = 'RunServerButton'
type = 'Button'
diff --git a/gui/themes/scummremastered/remastered_layout_lowres.stx b/gui/themes/scummremastered/remastered_layout_lowres.stx
index fd9990d2e3..f16b905b6a 100644
--- a/gui/themes/scummremastered/remastered_layout_lowres.stx
+++ b/gui/themes/scummremastered/remastered_layout_lowres.stx
@@ -609,7 +609,7 @@
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'Container'/>
</layout>
- </dialog>
+ </dialog>
<dialog name = 'GlobalOptions_Cloud_Container' overlays = 'GlobalOptions_Cloud.Container'>
<layout type = 'vertical' padding = '10, 13, 10, 10' spacing = '8'>
@@ -732,8 +732,11 @@
height = 'Globals.Line.Height'
/>
</layout>
+ </layout>
+ </dialog>
- <!-- here goes Wi-Fi Sharing -->
+ <dialog name = 'GlobalOptions_WiFiSharing' overlays = 'Dialog.GlobalOptions.TabWidget'>
+ <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'>
<widget name = 'RunServerButton'
type = 'Button'