aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2009-06-07 22:05:57 +0000
committerEugene Sandulenko2009-06-07 22:05:57 +0000
commit28a114c70210dffe7bb957da2ed2a041bd64f392 (patch)
tree1a298b8332aad659718023c7102945f11451d8b9
parent5c233c447ba9656608b41fd0bd46edcc830e8b13 (diff)
downloadscummvm-rg350-28a114c70210dffe7bb957da2ed2a041bd64f392.tar.gz
scummvm-rg350-28a114c70210dffe7bb957da2ed2a041bd64f392.tar.bz2
scummvm-rg350-28a114c70210dffe7bb957da2ed2a041bd64f392.zip
Added current keymapper dialog to all themes so it could be tested by other
devs. svn-id: r41352
-rw-r--r--gui/themes/scummclassic.zipbin51435 -> 52924 bytes
-rw-r--r--gui/themes/scummclassic/classic_layout.stx25
-rw-r--r--gui/themes/scummclassic/classic_layout_lowres.stx25
-rw-r--r--gui/themes/scummmodern.zipbin156821 -> 157601 bytes
-rw-r--r--gui/themes/scummmodern/scummmodern_layout.stx5
-rw-r--r--gui/themes/scummmodern/scummmodern_layout_lowres.stx25
6 files changed, 78 insertions, 2 deletions
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index c96b575249..3b50cd1954 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 431db7756d..969788cea0 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -37,6 +37,10 @@
<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '1'/>
+ <def var = 'KeyRemapper.Spacing' value = '10'/>
+ <def var = 'KeyRemapper.LabelWidth' value = '100'/>
+ <def var = 'KeyRemapper.ButtonWidth' value = '80'/>
+
<widget name = 'OptionsLabel'
size = '110, Globals.Line.Height'
textalign = 'right'
@@ -778,4 +782,25 @@
</layout>
</layout>
</dialog>
+ <dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '8, 8, 32, 8' spacing = '10' center = 'true'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+ <widget name = 'PopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'Popup'
+ type = 'PopUp'
+ width = '400'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <widget name = 'KeymapArea'
+ width = '600'
+ height = '280'
+ />
+ <widget name = 'Close'
+ type = 'Button'
+ />
+ </layout>
+ </dialog>
</layout_info>
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index a5f8e627e9..932ee16389 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -38,6 +38,10 @@
<def var = 'ScummSaveLoad.ExtInfo.Visible' value = '0'/>
+ <def var = 'KeyRemapper.Spacing' value = '5'/>
+ <def var = 'KeyRemapper.LabelWidth' value = '80'/>
+ <def var = 'KeyRemapper.ButtonWidth' value = '60'/>
+
<widget name = 'Button'
size = '72, 16'
/>
@@ -783,4 +787,25 @@
</layout>
</layout>
</dialog>
+ <dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '8, 8, 8, 8' spacing = '10' center = 'true'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+ <widget name = 'PopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'Popup'
+ type = 'PopUp'
+ width = '150'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <widget name = 'KeymapArea'
+ width = '300'
+ height = '120'
+ />
+ <widget name = 'Close'
+ type = 'Button'
+ />
+ </layout>
+ </dialog>
</layout_info>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 1f53da672e..c84ff72b55 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 1d26edc42c..d30e4a805b 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -805,12 +805,13 @@
/>
<widget name = 'Popup'
type = 'PopUp'
- width = '500'
+ width = '400'
+ height = 'Globals.Line.Height'
/>
</layout>
<widget name = 'KeymapArea'
width = '600'
- height = '378'
+ height = '280'
/>
<widget name = 'Close'
type = 'Button'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 96b3763540..5d15d2efc7 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -44,6 +44,10 @@
size = '85, 12'
/>
+ <def var = 'KeyRemapper.Spacing' value = '5'/>
+ <def var = 'KeyRemapper.LabelWidth' value = '80'/>
+ <def var = 'KeyRemapper.ButtonWidth' value = '60'/>
+
<widget name = 'OptionsLabel'
size = '100, Globals.Line.Height'
textalign = 'right'
@@ -772,4 +776,25 @@
</layout>
</layout>
</dialog>
+ <dialog name = 'KeyRemapper' overlays = 'screen_center' shading = 'dim'>
+ <layout type = 'vertical' padding = '8, 8, 8, 8' spacing = '10' center = 'true'>
+ <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+ <widget name = 'PopupDesc'
+ type = 'OptionsLabel'
+ />
+ <widget name = 'Popup'
+ type = 'PopUp'
+ width = '150'
+ height = 'Globals.Line.Height'
+ />
+ </layout>
+ <widget name = 'KeymapArea'
+ width = '300'
+ height = '120'
+ />
+ <widget name = 'Close'
+ type = 'Button'
+ />
+ </layout>
+ </dialog>
</layout_info>