diff options
author | Eugene Sandulenko | 2010-06-15 10:48:39 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-06-15 10:48:39 +0000 |
commit | dc040aa8671797853b0b1f9add3320c6e1f22c33 (patch) | |
tree | 5b8382613d784495f128a79573dc5cda07b29fa5 /gui/themes/scummclassic | |
parent | 3fafa07ab0aeb65fedad159fb0cf345cc8f5f278 (diff) | |
download | scummvm-rg350-dc040aa8671797853b0b1f9add3320c6e1f22c33.tar.gz scummvm-rg350-dc040aa8671797853b0b1f9add3320c6e1f22c33.tar.bz2 scummvm-rg350-dc040aa8671797853b0b1f9add3320c6e1f22c33.zip |
GUI: Implement radiobuttons.
Implement radiobuttons in GUI. Also closes FR #2821529:
"GUI: volume and subtitles speed sliders".
Subtitle toggle button is replaced by three radiobuttons grouped
by a single group.
Updated translations and themes.
svn-id: r49767
Diffstat (limited to 'gui/themes/scummclassic')
-rw-r--r-- | gui/themes/scummclassic/classic_gfx.stx | 63 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 25 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 37 |
3 files changed, 111 insertions, 14 deletions
diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx index cc6d7d471f..e107c1f04d 100644 --- a/gui/themes/scummclassic/classic_gfx.stx +++ b/gui/themes/scummclassic/classic_gfx.stx @@ -418,6 +418,69 @@ /> </drawdata> + <!-- Idle radiobutton --> + <drawdata id = 'radiobutton_default' cache = 'false'> + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + <drawstep func = 'circle' + width = '7' + height = '7' + radius = '7' + fill = 'background' + bg_color = 'darkgrey' + xpos = '0' + ypos = '0' + /> + </drawdata> + + <!-- Selected radiobutton --> + <drawdata id = 'radiobutton_selected' cache = 'false'> + <text font = 'text_default' + text_color = 'color_normal' + vertical_align = 'center' + horizontal_align = 'left' + /> + <drawstep func = 'circle' + width = '7' + height = '7' + radius = '7' + fg_color = 'darkgrey' + fill = 'none' + xpos = '0' + ypos = '0' + /> + <drawstep func = 'circle' + width = '7' + height = '7' + radius = '5' + fg_color = 'green' + fill = 'foreground' + xpos = '2' + ypos = '2' + /> + </drawdata> + + <!-- Disabled radiobutton --> + <drawdata id = 'radiobutton_disabled' cache = 'false'> + <text font = 'text_default' + text_color = 'color_normal_disabled' + vertical_align = 'center' + horizontal_align = 'left' + /> + <drawstep func = 'circle' + width = '7' + height = '7' + radius = '7' + bg_color = 'lightgrey' + fill = 'background' + xpos = '0' + ypos = '0' + /> + </drawdata> + <drawdata id = 'widget_default' cache = 'false'> <drawstep func = 'bevelsq' bevel = '2' diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index b7b07f8845..0faf909862 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -66,6 +66,9 @@ <widget name = 'Checkbox' size = '-1, 14' /> + <widget name = 'Radiobutton' + size = '-1, Globals.Line.Height' + /> <widget name = 'ListWidget' padding = '5, 0, 8, 0' /> @@ -241,9 +244,14 @@ <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = '150' - height = 'Globals.Slider.Height' + <widget name = 'subToggleSpeechOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubBoth' + type = 'Radiobutton' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> @@ -661,9 +669,14 @@ <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = '158' - height = 'Globals.Slider.Height' + <widget name = 'subToggleSpeechOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubBoth' + type = 'Radiobutton' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 8a0180db3c..3573e56a79 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -63,6 +63,9 @@ <widget name = 'Checkbox' size = '-1, Globals.Line.Height' /> + <widget name = 'Radiobutton' + size = '-1, Globals.Line.Height' + /> <widget name = 'ListWidget' padding = '5, 0, 0, 0' /> @@ -235,13 +238,18 @@ type = 'PopUp' /> </layout> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '3' center = 'true'> <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = '128' - height = 'Globals.Slider.Height' + <widget name = 'subToggleSpeechOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubBoth' + type = 'Radiobutton' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> @@ -407,6 +415,14 @@ type = 'PopUp' /> </layout> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <widget name = 'GuiLanguagePopupDesc' + type = 'OptionsLabel' + /> + <widget name = 'GuiLanguagePopup' + type = 'PopUp' + /> + </layout> <widget name='KeysButton' type='Button' /> @@ -655,13 +671,18 @@ /> </layout> <space size = '4' /> - <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> + <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '1' center = 'true'> <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = '128' - height = 'Globals.Slider.Height' + <widget name = 'subToggleSpeechOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubOnly' + type = 'Radiobutton' + /> + <widget name = 'subToggleSubBoth' + type = 'Radiobutton' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> |