aboutsummaryrefslogtreecommitdiff
path: root/gui/themes
diff options
context:
space:
mode:
authorEugene Sandulenko2016-11-03 23:46:46 +0100
committerGitHub2016-11-03 23:46:46 +0100
commite2f58be77f11b58976b6b2c00049b656cd5d6e24 (patch)
tree72aa2a2ae0d88d3f3eedf4a47d2ad51dc14f55a9 /gui/themes
parent42ebd5a66449121f8aa68f0e35f3f03b137ece63 (diff)
parent0f9655bfe05b0312224bf252c515370b1229fe23 (diff)
downloadscummvm-rg350-e2f58be77f11b58976b6b2c00049b656cd5d6e24.tar.gz
scummvm-rg350-e2f58be77f11b58976b6b2c00049b656cd5d6e24.tar.bz2
scummvm-rg350-e2f58be77f11b58976b6b2c00049b656cd5d6e24.zip
Merge pull request #859 from criezy/gui-apply
GUI: apply changes functionality
Diffstat (limited to 'gui/themes')
-rw-r--r--gui/themes/default.inc6
-rw-r--r--gui/themes/scummclassic.zipbin126628 -> 126739 bytes
-rw-r--r--gui/themes/scummclassic/THEMERC2
-rw-r--r--gui/themes/scummclassic/classic_layout.stx3
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx4
-rw-r--r--gui/themes/scummmodern.zipbin1646168 -> 1646279 bytes
-rw-r--r--gui/themes/scummmodern/THEMERC2
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx3
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx4
9 files changed, 20 insertions, 4 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 8524a7728f..a83fd788ad 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -804,6 +804,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<widget name='Cancel' "
"type='Button' "
"/>"
+"<widget name='Apply' "
+"type='Button' "
+"/>"
"<widget name='Ok' "
"type='Button' "
"/>"
@@ -2343,6 +2346,9 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<widget name='Cancel' "
"type='Button' "
"/>"
+"<widget name='Apply' "
+"type='Button' "
+"/>"
"<widget name='Ok' "
"type='Button' "
"/>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 44c78fabe4..400b997b93 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
Binary files differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index b70eeb6564..25d8531376 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.22:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.23:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index ea5d3268c4..b3100d4b92 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -228,6 +228,9 @@
<widget name = 'Cancel'
type = 'Button'
/>
+ <widget name = 'Apply'
+ type = 'Button'
+ />
<widget name = 'Ok'
type = 'Button'
/>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 7f43c7b1e1..7879e05a97 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -225,7 +225,9 @@
<widget name = 'Cancel'
type = 'Button'
/>
-
+ <widget name = 'Apply'
+ type = 'Button'
+ />
<widget name = 'Ok'
type = 'Button'
/>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index ec14e45830..673d67ed87 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
Binary files differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index 7e4eb31c96..3dbd640865 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.22:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.23:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index a0a4e41f14..9cadc11e13 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -242,6 +242,9 @@
<widget name = 'Cancel'
type = 'Button'
/>
+ <widget name = 'Apply'
+ type = 'Button'
+ />
<widget name = 'Ok'
type = 'Button'
/>
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 13ec698b85..7ef5fc5ee1 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -223,7 +223,9 @@
<widget name = 'Cancel'
type = 'Button'
/>
-
+ <widget name = 'Apply'
+ type = 'Button'
+ />
<widget name = 'Ok'
type = 'Button'
/>