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 | |
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')
-rw-r--r-- | gui/themes/default.inc | 127 | ||||
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 52484 -> 54695 bytes | |||
-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 | ||||
-rw-r--r-- | gui/themes/scummmodern.zip | bin | 158475 -> 162132 bytes | |||
-rwxr-xr-x | gui/themes/scummmodern/radiobutton.bmp | bin | 0 -> 774 bytes | |||
-rwxr-xr-x | gui/themes/scummmodern/radiobutton_empty.bmp | bin | 0 -> 774 bytes | |||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_gfx.stx | 38 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 28 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 35 |
11 files changed, 312 insertions, 41 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 93897a7d88..9d1cabf7f0 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -349,6 +349,63 @@ "fill='none' " "/> " "</drawdata> " +"<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> " +"<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> " +"<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' " @@ -390,6 +447,9 @@ "<widget name='Checkbox' " "size='-1,14' " "/> " +"<widget name='Radiobutton' " +"size='-1,Globals.Line.Height' " +"/> " "<widget name='ListWidget' " "padding='5,0,8,0' " "/> " @@ -560,9 +620,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'> " @@ -721,6 +786,14 @@ "type='PopUp' " "/> " "</layout> " +"<layout type='horizontal' padding='0,0,0,0' spacing='10' center='true'> " +"<widget name='GuiLanguagePopupDesc' " +"type='OptionsLabel' " +"/> " +"<widget name='GuiLanguagePopup' " +"type='PopUp' " +"/> " +"</layout> " "<widget name='KeysButton' " "type='Button' " "/> " @@ -957,9 +1030,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'> " @@ -1116,6 +1194,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' " "/> " @@ -1281,13 +1362,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'> " @@ -1449,6 +1535,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' " "/> " @@ -1687,13 +1781,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'> " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 1a4481376d..bff76afd91 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip 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'> diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 64e9a633ff..a301e25f14 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/radiobutton.bmp b/gui/themes/scummmodern/radiobutton.bmp Binary files differnew file mode 100755 index 0000000000..d3ba468321 --- /dev/null +++ b/gui/themes/scummmodern/radiobutton.bmp diff --git a/gui/themes/scummmodern/radiobutton_empty.bmp b/gui/themes/scummmodern/radiobutton_empty.bmp Binary files differnew file mode 100755 index 0000000000..06b9f9bb70 --- /dev/null +++ b/gui/themes/scummmodern/radiobutton_empty.bmp diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx index 05316b516f..13f9cd2196 100644 --- a/gui/themes/scummmodern/scummmodern_gfx.stx +++ b/gui/themes/scummmodern/scummmodern_gfx.stx @@ -98,6 +98,8 @@ <bitmap filename = 'cursor_small.bmp'/> <bitmap filename = 'checkbox.bmp'/> <bitmap filename = 'checkbox_empty.bmp'/> + <bitmap filename = 'radiobutton.bmp'/> + <bitmap filename = 'radiobutton_empty.bmp'/> <bitmap filename = 'logo_small.bmp'/> <bitmap filename = 'search.bmp'/> </bitmaps> @@ -595,6 +597,42 @@ /> </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 = 'bitmap' + file = 'radiobutton_empty.bmp' + /> + </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 = 'bitmap' + file = 'radiobutton.bmp' + /> + </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 = 'bitmap' + file = 'radiobutton_empty.bmp' + /> + </drawdata> + <!-- Background of the list widget (the games list and the list in the choosers) --> <!-- TODO: Have separate options for the games list (with gradient background) and the list in the choosers (without gradient) --> <drawdata id = 'widget_default' cache = 'false'> diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 699d59b0be..787696dc34 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -70,6 +70,9 @@ <widget name = 'Checkbox' size = '-1, Globals.Line.Height' /> + <widget name = 'Radiobutton' + size = '-1, Globals.Line.Height' + /> <widget name = 'ListWidget' padding = '5, 0, 8, 0' /> @@ -254,9 +257,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'> @@ -674,9 +682,17 @@ <widget name = 'subToggleDesc' type = 'OptionsLabel' /> - <widget name = 'subToggleButton' - width = '158' - height = 'Globals.Slider.Height' + <widget name = 'subToggleSpeechOnly' + type = 'Radiobutton' + width = '50' + /> + <widget name = 'subToggleSubOnly' + type = 'Radiobutton' + width = '50' + /> + <widget name = 'subToggleSubBoth' + type = 'Radiobutton' + width = '50' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 1c2f83a3b7..9b811f5a48 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -61,6 +61,9 @@ <widget name = 'Checkbox' size = '-1, Globals.Line.Height' /> + <widget name = 'Radiobutton' + size = '-1, Globals.Line.Height' + /> <widget name = 'ListWidget' padding = '5, 0, 8, 0' /> @@ -233,13 +236,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'> @@ -403,6 +411,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,9 +671,14 @@ <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'> |