[Scummvm-cvs-logs] SF.net SVN: scummvm:[49767] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Jun 15 12:48:39 CEST 2010
Revision: 49767
http://scummvm.svn.sourceforge.net/scummvm/?rev=49767&view=rev
Author: sev
Date: 2010-06-15 10:48:39 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
scummvm/trunk/common/messages.cpp
scummvm/trunk/gui/ThemeEngine.cpp
scummvm/trunk/gui/ThemeEngine.h
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/options.h
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
scummvm/trunk/gui/themes/scummmodern.zip
scummvm/trunk/gui/widget.cpp
scummvm/trunk/gui/widget.h
scummvm/trunk/po/hu_HU.po
scummvm/trunk/po/ru_RU.po
scummvm/trunk/po/scummvm.pot
Added Paths:
-----------
scummvm/trunk/gui/themes/scummmodern/radiobutton.bmp
scummvm/trunk/gui/themes/scummmodern/radiobutton_empty.bmp
Modified: scummvm/trunk/common/messages.cpp
===================================================================
--- scummvm/trunk/common/messages.cpp 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/common/messages.cpp 2010-06-15 10:48:39 UTC (rev 49767)
@@ -30,185 +30,190 @@
/* 23 */ "Audio",
/* 24 */ "Autosave:",
/* 25 */ "A~b~out...",
- /* 26 */ "C1Available engines:",
- /* 27 */ "C1Features compiled in:",
- /* 28 */ "C2(built on ",
- /* 29 */ "CAMD",
- /* 30 */ "Cancel",
- /* 31 */ "Cannot create file",
- /* 32 */ "Choose",
- /* 33 */ "Choose an action to map",
- /* 34 */ "Close",
- /* 35 */ "CoreAudio",
- /* 36 */ "CoreMIDI",
- /* 37 */ "Could not find any engine capable of running the selected game",
- /* 38 */ "Creative Music System",
- /* 39 */ "DMedia",
- /* 40 */ "Date: ",
- /* 41 */ "Default",
- /* 42 */ "Delete",
- /* 43 */ "Disabled GFX",
- /* 44 */ "Discovered %d new games ...",
- /* 45 */ "Discovered %d new games.",
- /* 46 */ "Display keyboard",
- /* 47 */ "Do you really want to delete this savegame?",
- /* 48 */ "Do you really want to remove this game configuration?",
- /* 49 */ "Do you really want to run the mass game detector? This could potentially add a huge number of games.",
- /* 50 */ "Edit Game...",
- /* 51 */ "Enable Roland GS Mode",
- /* 52 */ "Engine does not support debug level '%s'",
- /* 53 */ "English",
- /* 54 */ "Error running game:",
- /* 55 */ "Extra Path:",
- /* 56 */ "FM Towns",
- /* 57 */ "Failed to load any GUI theme, aborting",
- /* 58 */ "FluidSynth",
- /* 59 */ "Fullscreen mode",
- /* 60 */ "GFX",
- /* 61 */ "GUI Renderer:",
- /* 62 */ "Game",
- /* 63 */ "Game Data not found",
- /* 64 */ "Game Id not supported",
- /* 65 */ "Game Path:",
- /* 66 */ "Go up",
- /* 67 */ "Graphics",
- /* 68 */ "Graphics mode:",
- /* 69 */ "Help",
- /* 70 */ "IBM PCjr",
- /* 71 */ "ID:",
- /* 72 */ "Invalid Path",
- /* 73 */ "Keys",
- /* 74 */ "Language:",
- /* 75 */ "Load",
- /* 76 */ "Load game:",
- /* 77 */ "Load...",
- /* 78 */ "MIDI",
- /* 79 */ "MIDI gain:",
- /* 80 */ "MT-32 Emulation",
- /* 81 */ "Map",
- /* 82 */ "Mass Add...",
- /* 83 */ "Menu",
- /* 84 */ "Misc",
- /* 85 */ "Mixed AdLib/MIDI mode",
- /* 86 */ "Mouse click",
- /* 87 */ "Music driver:",
- /* 88 */ "Music volume:",
- /* 89 */ "Mute All",
- /* 90 */ "Name:",
- /* 91 */ "Never",
- /* 92 */ "No",
- /* 93 */ "No date saved",
- /* 94 */ "No music",
- /* 95 */ "No playtime saved",
- /* 96 */ "No time saved",
- /* 97 */ "None",
- /* 98 */ "OK",
- /* 99 */ "Options",
- /* 100 */ "Options...",
- /* 101 */ "Output rate:",
- /* 102 */ "Override global MIDI settings",
- /* 103 */ "Override global audio settings",
- /* 104 */ "Override global graphic settings",
- /* 105 */ "Override global volume settings",
- /* 106 */ "PC Speaker",
- /* 107 */ "Path not a directory",
- /* 108 */ "Path not a file",
- /* 109 */ "Path not exists",
- /* 110 */ "Paths",
- /* 111 */ "Pause",
- /* 112 */ "Pick the game:",
- /* 113 */ "Platform:",
- /* 114 */ "Playtime: ",
- /* 115 */ "Please select an action",
- /* 116 */ "Plugins Path:",
- /* 117 */ "Press the key to associate",
- /* 118 */ "Quit",
- /* 119 */ "Read permission denied",
- /* 120 */ "Reading failed",
- /* 121 */ "Remap keys",
- /* 122 */ "Remove Game",
- /* 123 */ "Render mode:",
- /* 124 */ "Resume",
- /* 125 */ "Return to Launcher",
- /* 126 */ "SEQ",
- /* 127 */ "SFX volume:",
- /* 128 */ "Save",
- /* 129 */ "Save Path:",
- /* 130 */ "Save Path: ",
- /* 131 */ "Save game:",
- /* 132 */ "Scan complete!",
- /* 133 */ "Scanned %d directories ...",
- /* 134 */ "ScummVM could not find any engine capable of running the selected game!",
- /* 135 */ "ScummVM could not find any game in the specified directory!",
- /* 136 */ "ScummVM couldn't open the specified directory!",
- /* 137 */ "Search:",
- /* 138 */ "Select SoundFont",
- /* 139 */ "Select a Theme",
- /* 140 */ "Select additional game directory",
- /* 141 */ "Select an action and click 'Map'",
- /* 142 */ "Select directory for GUI themes",
- /* 143 */ "Select directory for extra files",
- /* 144 */ "Select directory for plugins",
- /* 145 */ "Select directory for saved games",
- /* 146 */ "Select directory for savegames",
- /* 147 */ "Select directory with game data",
- /* 148 */ "Skip",
- /* 149 */ "Skip line",
- /* 150 */ "SoundFont:",
- /* 151 */ "Speech & Subs",
- /* 152 */ "Speech Only",
- /* 153 */ "Speech and Subtitles",
- /* 154 */ "Speech volume:",
- /* 155 */ "Standard Renderer (16bpp)",
- /* 156 */ "Start",
- /* 157 */ "Subtitle speed:",
- /* 158 */ "Subtitles Only",
- /* 159 */ "Tapwave Zodiac",
- /* 160 */ "Text and Speech:",
- /* 161 */ "The chosen directory cannot be written to. Please select another one.",
- /* 162 */ "Theme Path:",
- /* 163 */ "Theme:",
- /* 164 */ "This game ID is already taken. Please choose another one.",
- /* 165 */ "This game does not support loading games from the launcher.",
- /* 166 */ "TiMidity",
- /* 167 */ "Time: ",
- /* 168 */ "True Roland MT-32 (disable GM emulation)",
- /* 169 */ "Unknown Error",
- /* 170 */ "Unsupported Color Mode",
- /* 171 */ "Untitled savestate",
- /* 172 */ "User picked target '%s' (gameid '%s')...\n",
- /* 173 */ "Volume",
- /* 174 */ "Windows MIDI",
- /* 175 */ "Write permission denied",
- /* 176 */ "Writing data failed",
- /* 177 */ "Yamaha Pa1",
- /* 178 */ "Yes",
- /* 179 */ "You have to restart ScummVM to take the effect.",
- /* 180 */ "every 10 mins",
- /* 181 */ "every 15 mins",
- /* 182 */ "every 30 mins",
- /* 183 */ "every 5 mins",
- /* 184 */ "failed\n",
- /* 185 */ "~A~bout",
- /* 186 */ "~A~dd Game...",
- /* 187 */ "~C~ancel",
- /* 188 */ "~C~lose",
- /* 189 */ "~E~dit Game...",
- /* 190 */ "~H~elp",
- /* 191 */ "~K~eys",
- /* 192 */ "~L~oad",
- /* 193 */ "~L~oad...",
- /* 194 */ "~N~ext",
- /* 195 */ "~O~K",
- /* 196 */ "~O~ptions",
- /* 197 */ "~O~ptions...",
- /* 198 */ "~P~revious",
- /* 199 */ "~Q~uit",
- /* 200 */ "~R~emove Game",
- /* 201 */ "~R~esume",
- /* 202 */ "~R~eturn to Launcher",
- /* 203 */ "~S~ave",
- /* 204 */ "~S~tart",
+ /* 26 */ "Both",
+ /* 27 */ "C1Available engines:",
+ /* 28 */ "C1Features compiled in:",
+ /* 29 */ "C2(built on ",
+ /* 30 */ "CAMD",
+ /* 31 */ "Cancel",
+ /* 32 */ "Cannot create file",
+ /* 33 */ "Choose",
+ /* 34 */ "Choose an action to map",
+ /* 35 */ "Close",
+ /* 36 */ "CoreAudio",
+ /* 37 */ "CoreMIDI",
+ /* 38 */ "Could not find any engine capable of running the selected game",
+ /* 39 */ "Creative Music System",
+ /* 40 */ "DMedia",
+ /* 41 */ "Date: ",
+ /* 42 */ "Default",
+ /* 43 */ "Delete",
+ /* 44 */ "Disabled GFX",
+ /* 45 */ "Discovered %d new games ...",
+ /* 46 */ "Discovered %d new games.",
+ /* 47 */ "Display keyboard",
+ /* 48 */ "Do you really want to delete this savegame?",
+ /* 49 */ "Do you really want to remove this game configuration?",
+ /* 50 */ "Do you really want to run the mass game detector? This could potentially add a huge number of games.",
+ /* 51 */ "Edit Game...",
+ /* 52 */ "Enable Roland GS Mode",
+ /* 53 */ "Engine does not support debug level '%s'",
+ /* 54 */ "English",
+ /* 55 */ "Error running game:",
+ /* 56 */ "Extra Path:",
+ /* 57 */ "FM Towns",
+ /* 58 */ "Failed to load any GUI theme, aborting",
+ /* 59 */ "FluidSynth",
+ /* 60 */ "Fullscreen mode",
+ /* 61 */ "GFX",
+ /* 62 */ "GUI Renderer:",
+ /* 63 */ "Game",
+ /* 64 */ "Game Data not found",
+ /* 65 */ "Game Id not supported",
+ /* 66 */ "Game Path:",
+ /* 67 */ "Go up",
+ /* 68 */ "Graphics",
+ /* 69 */ "Graphics mode:",
+ /* 70 */ "Help",
+ /* 71 */ "IBM PCjr",
+ /* 72 */ "ID:",
+ /* 73 */ "Invalid Path",
+ /* 74 */ "Keys",
+ /* 75 */ "Language:",
+ /* 76 */ "Load",
+ /* 77 */ "Load game:",
+ /* 78 */ "Load...",
+ /* 79 */ "MIDI",
+ /* 80 */ "MIDI gain:",
+ /* 81 */ "MT-32 Emulation",
+ /* 82 */ "Map",
+ /* 83 */ "Mass Add...",
+ /* 84 */ "Menu",
+ /* 85 */ "Misc",
+ /* 86 */ "Mixed AdLib/MIDI mode",
+ /* 87 */ "Mouse click",
+ /* 88 */ "Music driver:",
+ /* 89 */ "Music volume:",
+ /* 90 */ "Mute All",
+ /* 91 */ "Name:",
+ /* 92 */ "Never",
+ /* 93 */ "No",
+ /* 94 */ "No date saved",
+ /* 95 */ "No music",
+ /* 96 */ "No playtime saved",
+ /* 97 */ "No time saved",
+ /* 98 */ "None",
+ /* 99 */ "OK",
+ /* 100 */ "Options",
+ /* 101 */ "Options...",
+ /* 102 */ "Output rate:",
+ /* 103 */ "Override global MIDI settings",
+ /* 104 */ "Override global audio settings",
+ /* 105 */ "Override global graphic settings",
+ /* 106 */ "Override global volume settings",
+ /* 107 */ "PC Speaker",
+ /* 108 */ "Path not a directory",
+ /* 109 */ "Path not a file",
+ /* 110 */ "Path not exists",
+ /* 111 */ "Paths",
+ /* 112 */ "Pause",
+ /* 113 */ "Pick the game:",
+ /* 114 */ "Platform:",
+ /* 115 */ "Playtime: ",
+ /* 116 */ "Please select an action",
+ /* 117 */ "Plugins Path:",
+ /* 118 */ "Press the key to associate",
+ /* 119 */ "Quit",
+ /* 120 */ "Read permission denied",
+ /* 121 */ "Reading failed",
+ /* 122 */ "Remap keys",
+ /* 123 */ "Remove Game",
+ /* 124 */ "Render mode:",
+ /* 125 */ "Resume",
+ /* 126 */ "Return to Launcher",
+ /* 127 */ "SEQ",
+ /* 128 */ "SFX volume:",
+ /* 129 */ "Save",
+ /* 130 */ "Save Path:",
+ /* 131 */ "Save Path: ",
+ /* 132 */ "Save game:",
+ /* 133 */ "Scan complete!",
+ /* 134 */ "Scanned %d directories ...",
+ /* 135 */ "ScummVM could not find any engine capable of running the selected game!",
+ /* 136 */ "ScummVM could not find any game in the specified directory!",
+ /* 137 */ "ScummVM couldn't open the specified directory!",
+ /* 138 */ "Search:",
+ /* 139 */ "Select SoundFont",
+ /* 140 */ "Select a Theme",
+ /* 141 */ "Select additional game directory",
+ /* 142 */ "Select an action and click 'Map'",
+ /* 143 */ "Select directory for GUI themes",
+ /* 144 */ "Select directory for extra files",
+ /* 145 */ "Select directory for plugins",
+ /* 146 */ "Select directory for saved games",
+ /* 147 */ "Select directory for savegames",
+ /* 148 */ "Select directory with game data",
+ /* 149 */ "Skip",
+ /* 150 */ "Skip line",
+ /* 151 */ "SoundFont:",
+ /* 152 */ "Spch",
+ /* 153 */ "Speech",
+ /* 154 */ "Speech & Subs",
+ /* 155 */ "Speech Only",
+ /* 156 */ "Speech and Subtitles",
+ /* 157 */ "Speech volume:",
+ /* 158 */ "Standard Renderer (16bpp)",
+ /* 159 */ "Start",
+ /* 160 */ "Subs",
+ /* 161 */ "Subtitle speed:",
+ /* 162 */ "Subtitles",
+ /* 163 */ "Subtitles Only",
+ /* 164 */ "Tapwave Zodiac",
+ /* 165 */ "Text and Speech:",
+ /* 166 */ "The chosen directory cannot be written to. Please select another one.",
+ /* 167 */ "Theme Path:",
+ /* 168 */ "Theme:",
+ /* 169 */ "This game ID is already taken. Please choose another one.",
+ /* 170 */ "This game does not support loading games from the launcher.",
+ /* 171 */ "TiMidity",
+ /* 172 */ "Time: ",
+ /* 173 */ "True Roland MT-32 (disable GM emulation)",
+ /* 174 */ "Unknown Error",
+ /* 175 */ "Unsupported Color Mode",
+ /* 176 */ "Untitled savestate",
+ /* 177 */ "User picked target '%s' (gameid '%s')...\n",
+ /* 178 */ "Volume",
+ /* 179 */ "Windows MIDI",
+ /* 180 */ "Write permission denied",
+ /* 181 */ "Writing data failed",
+ /* 182 */ "Yamaha Pa1",
+ /* 183 */ "Yes",
+ /* 184 */ "You have to restart ScummVM to take the effect.",
+ /* 185 */ "every 10 mins",
+ /* 186 */ "every 15 mins",
+ /* 187 */ "every 30 mins",
+ /* 188 */ "every 5 mins",
+ /* 189 */ "failed\n",
+ /* 190 */ "~A~bout",
+ /* 191 */ "~A~dd Game...",
+ /* 192 */ "~C~ancel",
+ /* 193 */ "~C~lose",
+ /* 194 */ "~E~dit Game...",
+ /* 195 */ "~H~elp",
+ /* 196 */ "~K~eys",
+ /* 197 */ "~L~oad",
+ /* 198 */ "~L~oad...",
+ /* 199 */ "~N~ext",
+ /* 200 */ "~O~K",
+ /* 201 */ "~O~ptions",
+ /* 202 */ "~O~ptions...",
+ /* 203 */ "~P~revious",
+ /* 204 */ "~Q~uit",
+ /* 205 */ "~R~emove Game",
+ /* 206 */ "~R~esume",
+ /* 207 */ "~R~eturn to Launcher",
+ /* 208 */ "~S~ave",
+ /* 209 */ "~S~tart",
NULL
};
@@ -218,7 +223,7 @@
};
static struct _po2c_msg _po2c_lang_ru_RU[] = {
- { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-10 17:42+0300\nPO-Revision-Date: 2010-06-08 08:52-0100\nLast-Translator: Eugene Sandulenko <sev at scummvm.org>\nLanguage-Team: Russian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1251\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" },
+ { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-10 23:21+0300\nPO-Revision-Date: 2010-06-08 08:52-0100\nLast-Translator: Eugene Sandulenko <sev at scummvm.org>\nLanguage-Team: Russian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1251\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" },
{ 1, " \310\371\363 \357\353\340\343\350\355 \361 \357\356\344\344\345\360\346\352\356\351 \375\362\356\343\356 gameid... " },
{ 2, " \307\340\357\363\361\352\340\376 '%s'\n" },
{ 3, "%s \355\345 \361\354\356\343 \347\340\357\363\361\362\350\362\374 \344\342\350\346\356\352: %s (\366\345\353\374 '%s', \357\363\362\374 '%s')" },
@@ -244,238 +249,245 @@
{ 23, "\300\363\344\350\356" },
{ 24, "\300\342\362\356\361\356\365\360\340\355\345\355\350\345:" },
{ 25, "\316 \357~\360~\356\343\360\340\354\354\345..." },
- { 26, "C1\304\356\361\362\363\357\355\373\345 \344\342\350\346\352\350:" },
- { 27, "C1\302\352\353\376\367\345\355\355\373\345 \342 \341\350\353\344 \356\357\366\350\350:" },
- { 28, "C2(\361\356\341\360\340\355 " },
- { 29, "CAMD" },
- { 30, "\316\362\354\345\355\340" },
- { 31, "\315\345 \354\356\343\363 \361\356\347\344\340\362\374 \364\340\351\353" },
- { 32, "\302\373\341\360\340\362\374" },
- { 33, "\302\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345 \344\353\377 \355\340\347\355\340\367\345\355\350\377" },
- { 34, "\307\340\352\360\373\362\374" },
- { 35, "CoreAudio" },
- { 36, "CoreMIDI" },
- { 37, "\315\345 \354\356\343\363 \355\340\351\362\350 \344\342\350\346\356\352 \344\353\377 \347\340\357\363\361\352\340 \342\373\341\360\340\355\355\356\351 \350\343\360\373" },
- { 38, "Creative Music System" },
- { 39, "DMedia" },
- { 40, "\304\340\362\340: " },
- { 41, "\317\356 \363\354\356\353\367\340\355\350\376" },
- { 42, "\323\344\340\353\350\362\374" },
- { 43, "\301\345\347 \343\360\340\364\350\352\350" },
- { 44, "\315\340\351\344\345\355\356 %d \355\356\342\373\365 \350\343\360 ..." },
- { 45, "\315\340\351\344\345\355\356 %d \355\356\342\373\365 \350\343\360." },
- { 46, "\317\356\352\340\347\340\362\374 \352\353\340\342\350\340\362\363\360\363" },
- { 47, "\302\373 \344\345\351\361\362\342\350\362\345\353\374\355\356 \365\356\362\350\362\345 \363\344\340\353\350\362\374 \375\362\356 \361\356\365\360\340\355\345\355\350\345?" },
- { 48, "\302\373 \344\345\351\361\362\342\350\362\345\353\374\355\356 \365\356\362\350\362\345 \363\344\340\353\350\362\374 \363\361\362\340\355\356\342\352\350 \344\353\377 \375\362\356\351 \350\343\360\373?" },
- { 49, "\302\373 \344\345\351\361\362\342\350\362\345\353\374\355\356 \365\356\362\350\362\345 \347\340\357\363\361\362\350\362\374 \344\345\362\345\352\362\356\360 \342\361\345\365 \350\343\360? \335\362\356 \357\356\362\345\355\366\350\340\353\374\355\356 \354\356\346\345\362 \344\356\341\340\342\350\362\374 \341\356\353\374\370\356\345 \352\356\353\350\367\345\361\362\342\356 \350\343\360." },
- { 50, "\310\347\354. \350\343\360\363..." },
- { 51, "\302\352\353\376\367\350\362\374 \360\345\346\350\354 Roland GS" },
- { 52, "\304\342\350\346\356\352 \355\345 \357\356\344\344\345\360\346\350\342\340\345\362 \363\360\356\342\345\355\374 \356\362\353\340\344\352\350 '%s'" },
- { 53, "English" },
- { 54, "\316\370\350\341\352\340 \347\340\357\363\361\352\340 \350\343\360\373:" },
- { 55, "\304\356\357. \357\363\362\374:" },
- { 56, "FM Towns" },
- { 57, "\315\345 \363\344\340\353\356\361\374 \347\340\343\360\363\347\350\362\374 \362\345\354\363 GUI, \357\360\345\352\360\340\371\340\376 \360\340\341\356\362\363" },
- { 58, "FluidSynth" },
- { 59, "\317\356\353\355\356\375\352\360\340\355\355\373\351 \360\345\346\350\354" },
- { 60, "\303\360\364" },
- { 61, "\320\340\361\362\345\360\350\347\340\362\356\360 GUI:" },
- { 62, "\310\343\360\340" },
- { 63, "\315\345\362 \364\340\351\353\356\342 \350\343\360\373" },
- { 64, "Game Id \355\345 \357\356\344\344\345\360\346\350\342\340\345\362\361\377" },
- { 65, "\317\363\362\374 \352 \350\343\360\345: " },
- { 66, "\302\342\345\360\365" },
- { 67, "\303\360\340\364\350\352\340" },
- { 68, "\303\360\340\364\350\367\345\361\352\350\351 \360\345\346\350\354:" },
- { 69, "\317\356\354\356\371\374" },
- { 70, "IBM PCjr" },
- { 71, "ID:" },
- { 72, "\315\345\342\345\360\355\373\351 \357\363\362\374" },
- { 73, "\312\353\340\342\350\370\350" },
- { 74, "\337\347\373\352:" },
- { 75, "\307\340\343\360\363\347\350\362\374" },
- { 76, "\307\340\343\360\363\347\350\362\374 \350\343\360\363:" },
- { 77, "\307\340\343\360...." },
- { 78, "MIDI" },
- { 79, "\323\361\350\353\345\355\350\345 MIDI:" },
- { 80, "\335\354\363\353\377\366\350\377 MT-32" },
- { 81, "\315\340\347\355\340\367\350\362\374" },
- { 82, "\304\356\341. \354\355\356\343\356..." },
- { 83, "\314\345\355\376" },
- { 84, "\320\340\347\355\356\345" },
- { 85, "\321\354\345\370\340\355\355\373\351 \360\345\346\350\354 AdLib/MIDI" },
- { 86, "\312\353\350\352 \354\373\370\374\376" },
- { 87, "\304\360\340\351\342\345\360 \354\363\347\373\352\350:" },
- { 88, "\303\360\356\354\352\356\361\362\374 \354\363\347\373\352\350:" },
- { 89, "\302\373\352\353\376\367\350\362\374 \342\361\270" },
- { 90, "\315\340\347\342\340\355\350\345:" },
- { 91, "\315\350\352\356\343\344\340" },
- { 92, "\315\345\362" },
- { 93, "\304\340\362\340 \355\345 \347\340\357\350\361\340\355\340" },
- { 94, "\301\345\347 \354\363\347\373\352\350" },
- { 95, "\302\360\345\354\377 \350\343\360\373 \355\345 \347\340\357\350\361\340\355\356" },
- { 96, "\302\360\345\354\377 \355\345 \347\340\357\350\361\340\355\356" },
- { 97, "\315\345 \347\340\344\340\355" },
- { 98, "OK" },
- { 99, "\316\357\366\350\350" },
- { 100, "\316\357\366\350\350..." },
- { 101, "\302\373\365\356\344\355\340\377 \367\340\361\362\356\362\340:" },
- { 102, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 MIDI" },
- { 103, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \340\363\344\350\356" },
- { 104, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\340\364\350\352\350" },
- { 105, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\356\354\352\356\361\362\350" },
- { 106, "PC \361\357\350\352\345\360" },
- { 107, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \344\350\360\345\352\362\356\360\350\345\351" },
- { 108, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \364\340\351\353\356\354" },
- { 109, "\317\363\362\374 \355\345 \355\340\351\344\345\355" },
- { 110, "\317\363\362\350" },
- { 111, "\317\340\363\347\340" },
- { 112, "\302\373\341\345\360\350\362\345 \350\343\360\363:" },
- { 113, "\317\353\340\362\364\356\360\354\340:" },
- { 114, "\302\360\345\354\377 \350\343\360\373: " },
- { 115, "\317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345" },
- { 116, "\317\363\362\374 \352 \357\353\340\343\350\355\340\354:" },
- { 117, "\315\340\346\354\350\362\345 \352\353\340\342\350\370\363 \344\353\377 \355\340\347\355\340\367\345\355\350\377" },
- { 118, "\302\373\365\356\344" },
- { 119, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \367\362\345\355\350\377" },
- { 120, "\316\370\350\341\352\340 \367\362\345\355\350\377" },
- { 121, "\317\345\360\345\355\340\347\355\340\367\350\362\374 \352\353\340\342\350\370\350" },
- { 122, "\323\344\340\353\350\362\374 \350\343\360\363" },
- { 123, "\320\345\346\350\354 \360\340\361\362\360\350\360\356\342\340\355\350\377:" },
- { 124, "\317\360\356\344\356\353\346\350\362\374" },
- { 125, "\302\345\360\355\363\362\374\361\377 \342 \343\353\340\342\355\356\345 \354\345\355\376" },
- { 126, "SEQ" },
- { 127, "\303\360\356\354\352\356\361\362\374 \375\364\364\345\352\362\356\342:" },
- { 128, "\307\340\357\350\361\340\362\374" },
- { 129, "\317\363\362\374 \361\356\365\360.: " },
- { 130, "\317\363\362\374 \344\353\377 \361\356\365\360\340\355\345\355\350\351: " },
- { 131, "\321\356\365\360\340\355\350\362\374 \350\343\360\363: " },
- { 132, "\317\356\350\361\352 \347\340\352\356\355\367\345\355!" },
- { 133, "\317\360\356\361\354\356\362\360\345\355\356 %d \344\350\360\345\352\362\356\360\350\351 ..." },
- { 134, "ScummVM \355\345 \361\354\356\343 \355\340\351\362\350 \344\342\350\346\356\352 \344\353\377 \347\340\357\363\361\352\340 \342\373\341\360\340\355\355\356\351 \350\343\360\373!" },
- { 135, "ScummVM \355\345 \354\356\346\345\362 \355\340\351\362\350 \350\343\360\363 \342 \363\352\340\347\340\355\355\356\351 \344\350\360\345\352\362\356\360\350\350!" },
- { 136, "ScummVM \355\345 \354\356\346\345\362 \356\362\352\360\373\362\374 \363\352\340\347\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376!" },
- { 137, "\317\356\350\361\352:" },
- { 138, "\302\373\341\345\360\350\362\345 SoundFont" },
- { 139, "\302\373\341\345\360\350\362\345 \362\345\354\363" },
- { 140, "\302\373\341\345\360\350\362\345 \344\356\357\356\353\355\350\362\345\353\374\355\363\376 \344\350\360\345\352\362\356\360\350\376 \350\343\360\373" },
- { 141, "\302\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345 \350 \352\353\350\352\355\350\362\345 '\315\340\347\355\340\367\350\362\374'" },
- { 142, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \362\345\354 GUI" },
- { 143, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \344\356\357\356\353\355\350\362\345\353\374\355\373\354\350 \364\340\351\353\340\354\350" },
- { 144, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \357\353\340\343\350\355\340\354\350" },
- { 145, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \361\356\365\360\340\355\345\355\350\351" },
+ { 26, "\302\361\270" },
+ { 27, "C1\304\356\361\362\363\357\355\373\345 \344\342\350\346\352\350:" },
+ { 28, "C1\302\352\353\376\367\345\355\355\373\345 \342 \341\350\353\344 \356\357\366\350\350:" },
+ { 29, "C2(\361\356\341\360\340\355 " },
+ { 30, "CAMD" },
+ { 31, "\316\362\354\345\355\340" },
+ { 32, "\315\345 \354\356\343\363 \361\356\347\344\340\362\374 \364\340\351\353" },
+ { 33, "\302\373\341\360\340\362\374" },
+ { 34, "\302\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345 \344\353\377 \355\340\347\355\340\367\345\355\350\377" },
+ { 35, "\307\340\352\360\373\362\374" },
+ { 36, "CoreAudio" },
+ { 37, "CoreMIDI" },
+ { 38, "\315\345 \354\356\343\363 \355\340\351\362\350 \344\342\350\346\356\352 \344\353\377 \347\340\357\363\361\352\340 \342\373\341\360\340\355\355\356\351 \350\343\360\373" },
+ { 39, "Creative Music System" },
+ { 40, "DMedia" },
+ { 41, "\304\340\362\340: " },
+ { 42, "\317\356 \363\354\356\353\367\340\355\350\376" },
+ { 43, "\323\344\340\353\350\362\374" },
+ { 44, "\301\345\347 \343\360\340\364\350\352\350" },
+ { 45, "\315\340\351\344\345\355\356 %d \355\356\342\373\365 \350\343\360 ..." },
+ { 46, "\315\340\351\344\345\355\356 %d \355\356\342\373\365 \350\343\360." },
+ { 47, "\317\356\352\340\347\340\362\374 \352\353\340\342\350\340\362\363\360\363" },
+ { 48, "\302\373 \344\345\351\361\362\342\350\362\345\353\374\355\356 \365\356\362\350\362\345 \363\344\340\353\350\362\374 \375\362\356 \361\356\365\360\340\355\345\355\350\345?" },
+ { 49, "\302\373 \344\345\351\361\362\342\350\362\345\353\374\355\356 \365\356\362\350\362\345 \363\344\340\353\350\362\374 \363\361\362\340\355\356\342\352\350 \344\353\377 \375\362\356\351 \350\343\360\373?" },
+ { 50, "\302\373 \344\345\351\361\362\342\350\362\345\353\374\355\356 \365\356\362\350\362\345 \347\340\357\363\361\362\350\362\374 \344\345\362\345\352\362\356\360 \342\361\345\365 \350\343\360? \335\362\356 \357\356\362\345\355\366\350\340\353\374\355\356 \354\356\346\345\362 \344\356\341\340\342\350\362\374 \341\356\353\374\370\356\345 \352\356\353\350\367\345\361\362\342\356 \350\343\360." },
+ { 51, "\310\347\354. \350\343\360\363..." },
+ { 52, "\302\352\353\376\367\350\362\374 \360\345\346\350\354 Roland GS" },
+ { 53, "\304\342\350\346\356\352 \355\345 \357\356\344\344\345\360\346\350\342\340\345\362 \363\360\356\342\345\355\374 \356\362\353\340\344\352\350 '%s'" },
+ { 54, "English" },
+ { 55, "\316\370\350\341\352\340 \347\340\357\363\361\352\340 \350\343\360\373:" },
+ { 56, "\304\356\357. \357\363\362\374:" },
+ { 57, "FM Towns" },
+ { 58, "\315\345 \363\344\340\353\356\361\374 \347\340\343\360\363\347\350\362\374 \362\345\354\363 GUI, \357\360\345\352\360\340\371\340\376 \360\340\341\356\362\363" },
+ { 59, "FluidSynth" },
+ { 60, "\317\356\353\355\356\375\352\360\340\355\355\373\351 \360\345\346\350\354" },
+ { 61, "\303\360\364" },
+ { 62, "\320\340\361\362\345\360\350\347\340\362\356\360 GUI:" },
+ { 63, "\310\343\360\340" },
+ { 64, "\315\345\362 \364\340\351\353\356\342 \350\343\360\373" },
+ { 65, "Game Id \355\345 \357\356\344\344\345\360\346\350\342\340\345\362\361\377" },
+ { 66, "\317\363\362\374 \352 \350\343\360\345: " },
+ { 67, "\302\342\345\360\365" },
+ { 68, "\303\360\340\364\350\352\340" },
+ { 69, "\303\360\340\364\350\367\345\361\352\350\351 \360\345\346\350\354:" },
+ { 70, "\317\356\354\356\371\374" },
+ { 71, "IBM PCjr" },
+ { 72, "ID:" },
+ { 73, "\315\345\342\345\360\355\373\351 \357\363\362\374" },
+ { 74, "\312\353\340\342\350\370\350" },
+ { 75, "\337\347\373\352:" },
+ { 76, "\307\340\343\360\363\347\350\362\374" },
+ { 77, "\307\340\343\360\363\347\350\362\374 \350\343\360\363:" },
+ { 78, "\307\340\343\360...." },
+ { 79, "MIDI" },
+ { 80, "\323\361\350\353\345\355\350\345 MIDI:" },
+ { 81, "\335\354\363\353\377\366\350\377 MT-32" },
+ { 82, "\315\340\347\355\340\367\350\362\374" },
+ { 83, "\304\356\341. \354\355\356\343\356..." },
+ { 84, "\314\345\355\376" },
+ { 85, "\320\340\347\355\356\345" },
+ { 86, "\321\354\345\370\340\355\355\373\351 \360\345\346\350\354 AdLib/MIDI" },
+ { 87, "\312\353\350\352 \354\373\370\374\376" },
+ { 88, "\304\360\340\351\342\345\360 \354\363\347\373\352\350:" },
+ { 89, "\303\360\356\354\352\356\361\362\374 \354\363\347\373\352\350:" },
+ { 90, "\302\373\352\353\376\367\350\362\374 \342\361\270" },
+ { 91, "\315\340\347\342\340\355\350\345:" },
+ { 92, "\315\350\352\356\343\344\340" },
+ { 93, "\315\345\362" },
+ { 94, "\304\340\362\340 \355\345 \347\340\357\350\361\340\355\340" },
+ { 95, "\301\345\347 \354\363\347\373\352\350" },
+ { 96, "\302\360\345\354\377 \350\343\360\373 \355\345 \347\340\357\350\361\340\355\356" },
+ { 97, "\302\360\345\354\377 \355\345 \347\340\357\350\361\340\355\356" },
+ { 98, "\315\345 \347\340\344\340\355" },
+ { 99, "OK" },
+ { 100, "\316\357\366\350\350" },
+ { 101, "\316\357\366\350\350..." },
+ { 102, "\302\373\365\356\344\355\340\377 \367\340\361\362\356\362\340:" },
+ { 103, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 MIDI" },
+ { 104, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \340\363\344\350\356" },
+ { 105, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\340\364\350\352\350" },
+ { 106, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\356\354\352\356\361\362\350" },
+ { 107, "PC \361\357\350\352\345\360" },
+ { 108, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \344\350\360\345\352\362\356\360\350\345\351" },
+ { 109, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \364\340\351\353\356\354" },
+ { 110, "\317\363\362\374 \355\345 \355\340\351\344\345\355" },
+ { 111, "\317\363\362\350" },
+ { 112, "\317\340\363\347\340" },
+ { 113, "\302\373\341\345\360\350\362\345 \350\343\360\363:" },
+ { 114, "\317\353\340\362\364\356\360\354\340:" },
+ { 115, "\302\360\345\354\377 \350\343\360\373: " },
+ { 116, "\317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345" },
+ { 117, "\317\363\362\374 \352 \357\353\340\343\350\355\340\354:" },
+ { 118, "\315\340\346\354\350\362\345 \352\353\340\342\350\370\363 \344\353\377 \355\340\347\355\340\367\345\355\350\377" },
+ { 119, "\302\373\365\356\344" },
+ { 120, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \367\362\345\355\350\377" },
+ { 121, "\316\370\350\341\352\340 \367\362\345\355\350\377" },
+ { 122, "\317\345\360\345\355\340\347\355\340\367\350\362\374 \352\353\340\342\350\370\350" },
+ { 123, "\323\344\340\353\350\362\374 \350\343\360\363" },
+ { 124, "\320\345\346\350\354 \360\340\361\362\360\350\360\356\342\340\355\350\377:" },
+ { 125, "\317\360\356\344\356\353\346\350\362\374" },
+ { 126, "\302\345\360\355\363\362\374\361\377 \342 \343\353\340\342\355\356\345 \354\345\355\376" },
+ { 127, "SEQ" },
+ { 128, "\303\360\356\354\352\356\361\362\374 \375\364\364\345\352\362\356\342:" },
+ { 129, "\307\340\357\350\361\340\362\374" },
+ { 130, "\317\363\362\374 \361\356\365\360.: " },
+ { 131, "\317\363\362\374 \344\353\377 \361\356\365\360\340\355\345\355\350\351: " },
+ { 132, "\321\356\365\360\340\355\350\362\374 \350\343\360\363: " },
+ { 133, "\317\356\350\361\352 \347\340\352\356\355\367\345\355!" },
+ { 134, "\317\360\356\361\354\356\362\360\345\355\356 %d \344\350\360\345\352\362\356\360\350\351 ..." },
+ { 135, "ScummVM \355\345 \361\354\356\343 \355\340\351\362\350 \344\342\350\346\356\352 \344\353\377 \347\340\357\363\361\352\340 \342\373\341\360\340\355\355\356\351 \350\343\360\373!" },
+ { 136, "ScummVM \355\345 \354\356\346\345\362 \355\340\351\362\350 \350\343\360\363 \342 \363\352\340\347\340\355\355\356\351 \344\350\360\345\352\362\356\360\350\350!" },
+ { 137, "ScummVM \355\345 \354\356\346\345\362 \356\362\352\360\373\362\374 \363\352\340\347\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376!" },
+ { 138, "\317\356\350\361\352:" },
+ { 139, "\302\373\341\345\360\350\362\345 SoundFont" },
+ { 140, "\302\373\341\345\360\350\362\345 \362\345\354\363" },
+ { 141, "\302\373\341\345\360\350\362\345 \344\356\357\356\353\355\350\362\345\353\374\355\363\376 \344\350\360\345\352\362\356\360\350\376 \350\343\360\373" },
+ { 142, "\302\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345 \350 \352\353\350\352\355\350\362\345 '\315\340\347\355\340\367\350\362\374'" },
+ { 143, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \362\345\354 GUI" },
+ { 144, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \344\356\357\356\353\355\350\362\345\353\374\355\373\354\350 \364\340\351\353\340\354\350" },
+ { 145, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \357\353\340\343\350\355\340\354\350" },
{ 146, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \361\356\365\360\340\355\345\355\350\351" },
- { 147, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \364\340\351\353\340\354\350 \350\343\360\373" },
- { 148, "\317\360\356\357\363\361\362\350\362\374" },
- { 149, "\317\360\356\357\363\361\362\350\362\374 \361\362\360\356\352\363" },
- { 150, "SoundFont:" },
- { 151, "\307\342\363\352 \350 \361\363\341." },
- { 152, "\322\356\353\374\352\356 \356\347\342\363\367\352\340" },
- { 153, "\316\347\342\363\367\352\340 \350 \361\363\341\362\350\362\360\373" },
- { 154, "\303\360\356\354\352\356\361\362\374 \356\347\342\363\367\352\350:" },
- { 155, "\321\362\340\355\344\340\360\362\355\373\351 \360\340\361\362\345\360\350\347\340\362\356\360 (16bpp)" },
- { 156, "\317\363\361\352" },
- { 157, "\321\352\356\360\356\361\362\374 \361\363\341\362\350\362\360\356\342:" },
- { 158, "\322\356\353\374\352\356 \361\363\341\362\350\362\360\373" },
- { 159, "Tapware Zodiac" },
- { 160, "\322\345\352\361\362 \350 \356\347\342\363\367\352\340:" },
- { 161, "\315\345 \354\356\343\363 \357\350\361\340\362\374 \342 \342\373\341\360\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376. \317\356\346\340\353\363\351\361\362\340, \363\352\340\346\350\362\345 \344\360\363\343\363\376." },
- { 162, "\317\363\362\374 \352 \362\345\354\340\354:" },
- { 163, "\322\345\354\340:" },
- { 164, "\335\362\356\362 ID \350\343\360\373 \363\346\345 \350\361\357\356\353\374\347\363\345\362\361\377. \317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\360\363\343\356\351." },
- { 165, "\335\362\340 \350\343\360\340 \355\345 \357\356\344\344\345\360\346\350\342\340\345\362 \347\340\343\360\363\347\352\363 \361\356\365\360\340\355\345\355\350\351 \367\345\360\345\347 \343\353\340\342\355\356\345 \354\345\355\376." },
- { 166, "TiMidity" },
- { 167, "\302\360\345\354\377: " },
- { 168, "\315\340\361\362\356\377\371\350\351 Roland MT-32 (\347\340\357\360\345\362\350\362\374 \375\354\363\353\377\366\350\376 GM)" },
- { 169, "\315\345\350\347\342\345\361\362\355\340\377 \356\370\350\341\352\340" },
- { 170, "\315\345\357\356\344\344\345\360\346\350\342\340\345\354\373\351 \360\345\346\350\354 \366\342\345\362\340" },
- { 171, "\321\356\365\360\340\355\345\355\350\345 \341\345\347 \350\354\345\355\350" },
- { 172, "\317\356\353\374\347\356\342\340\362\345\353\374 \342\373\341\360\340\353 \366\345\353\374'%s' (gameid '%s')...\n" },
- { 173, "\303\360\356\354\352\356\361\362\374" },
- { 174, "Windows MIDI" },
- { 175, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \347\340\357\350\361\350" },
- { 176, "\316\370\350\341\352\340 \347\340\357\350\361\350 \344\340\355\355\373\365" },
- { 177, "Yamaha Pa1" },
- { 178, "\304\340" },
- { 179, "\302\373 \344\356\353\346\355\373 \357\345\360\345\347\340\357\363\361\362\350\362\374 ScummVM \367\362\356\341\373 \357\360\350\354\345\355\350\362\374 \350\347\354\345\355\345\355\350\377." },
- { 180, "\352\340\346\344\373\345 10 \354\350\355\363\362" },
- { 181, "\352\340\346\344\373\345 15 \354\350\355\363\362" },
- { 182, "\352\340\346\344\373\345 30 \354\350\355\363\362" },
- { 183, "\352\340\346\344\373\345 5 \354\350\355\363\362" },
- { 184, "\355\345 \363\344\340\353\356\361\374\n" },
- { 185, "\316 \357\360\356~\343~\360\340\354\354\345" },
- { 186, "~\304~\356\341. \350\343\360\363..." },
- { 187, "\316~\362~\354\345\355\340" },
- { 188, "~\307~\340\352\360\373\362\374" },
- { 189, "\310\347~\354~. \350\343\360\363..." },
- { 190, "~\317~\356\354\356\371\374" },
- { 191, "~\312~\353\340\342\350\370\350" },
- { 192, "~\307~\340\343\360\363\347\350\362\374" },
- { 193, "~\307~\340\343\360...." },
- { 194, "~\321~\353\345\344" },
- { 195, "~O~K" },
- { 196, "~\316~\357\366\350\350" },
- { 197, "~\316~\357\366\350\350..." },
- { 198, "~\317~\360\345\344" },
- { 199, "~\302~\373\365\356\344" },
- { 200, "~\323~\344\340\353\350\362\374 \350\343\360\363" },
- { 201, "\317\360\356\344\356\353~\346~\350\362\374" },
- { 202, "~\302~\345\360\355\363\362\374\361\377 \342 \343\353\340\342\355\356\345 \354\345\355\376" },
- { 203, "~\307~\340\357\350\361\340\362\374" },
- { 204, "\317~\363~\361\352" },
+ { 147, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \361\356\365\360\340\355\345\355\350\351" },
+ { 148, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \364\340\351\353\340\354\350 \350\343\360\373" },
+ { 149, "\317\360\356\357\363\361\362\350\362\374" },
+ { 150, "\317\360\356\357\363\361\362\350\362\374 \361\362\360\356\352\363" },
+ { 151, "SoundFont:" },
+ { 152, "\316\347\342" },
+ { 153, "\316\347\342\363\367\352\340" },
+ { 154, "\307\342\363\352 \350 \361\363\341." },
+ { 155, "\322\356\353\374\352\356 \356\347\342\363\367\352\340" },
+ { 156, "\316\347\342\363\367\352\340 \350 \361\363\341\362\350\362\360\373" },
+ { 157, "\303\360\356\354\352\356\361\362\374 \356\347\342\363\367\352\350:" },
+ { 158, "\321\362\340\355\344\340\360\362\355\373\351 \360\340\361\362\345\360\350\347\340\362\356\360 (16bpp)" },
+ { 159, "\317\363\361\352" },
+ { 160, "\321\363\341" },
+ { 161, "\321\352\356\360\356\361\362\374 \361\363\341\362\350\362\360\356\342:" },
+ { 162, "\321\363\341\362\350\362\360\373" },
+ { 163, "\322\356\353\374\352\356 \361\363\341\362\350\362\360\373" },
+ { 164, "Tapware Zodiac" },
+ { 165, "\322\345\352\361\362 \350 \356\347\342\363\367\352\340:" },
+ { 166, "\315\345 \354\356\343\363 \357\350\361\340\362\374 \342 \342\373\341\360\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376. \317\356\346\340\353\363\351\361\362\340, \363\352\340\346\350\362\345 \344\360\363\343\363\376." },
+ { 167, "\317\363\362\374 \352 \362\345\354\340\354:" },
+ { 168, "\322\345\354\340:" },
+ { 169, "\335\362\356\362 ID \350\343\360\373 \363\346\345 \350\361\357\356\353\374\347\363\345\362\361\377. \317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\360\363\343\356\351." },
+ { 170, "\335\362\340 \350\343\360\340 \355\345 \357\356\344\344\345\360\346\350\342\340\345\362 \347\340\343\360\363\347\352\363 \361\356\365\360\340\355\345\355\350\351 \367\345\360\345\347 \343\353\340\342\355\356\345 \354\345\355\376." },
+ { 171, "TiMidity" },
+ { 172, "\302\360\345\354\377: " },
+ { 173, "\315\340\361\362\356\377\371\350\351 Roland MT-32 (\347\340\357\360\345\362\350\362\374 \375\354\363\353\377\366\350\376 GM)" },
+ { 174, "\315\345\350\347\342\345\361\362\355\340\377 \356\370\350\341\352\340" },
+ { 175, "\315\345\357\356\344\344\345\360\346\350\342\340\345\354\373\351 \360\345\346\350\354 \366\342\345\362\340" },
+ { 176, "\321\356\365\360\340\355\345\355\350\345 \341\345\347 \350\354\345\355\350" },
+ { 177, "\317\356\353\374\347\356\342\340\362\345\353\374 \342\373\341\360\340\353 \366\345\353\374'%s' (gameid '%s')...\n" },
+ { 178, "\303\360\356\354\352\356\361\362\374" },
+ { 179, "Windows MIDI" },
+ { 180, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \347\340\357\350\361\350" },
+ { 181, "\316\370\350\341\352\340 \347\340\357\350\361\350 \344\340\355\355\373\365" },
+ { 182, "Yamaha Pa1" },
+ { 183, "\304\340" },
+ { 184, "\302\373 \344\356\353\346\355\373 \357\345\360\345\347\340\357\363\361\362\350\362\374 ScummVM \367\362\356\341\373 \357\360\350\354\345\355\350\362\374 \350\347\354\345\355\345\355\350\377." },
+ { 185, "\352\340\346\344\373\345 10 \354\350\355\363\362" },
+ { 186, "\352\340\346\344\373\345 15 \354\350\355\363\362" },
+ { 187, "\352\340\346\344\373\345 30 \354\350\355\363\362" },
+ { 188, "\352\340\346\344\373\345 5 \354\350\355\363\362" },
+ { 189, "\355\345 \363\344\340\353\356\361\374\n" },
+ { 190, "\316 \357\360\356~\343~\360\340\354\354\345" },
+ { 191, "~\304~\356\341. \350\343\360\363..." },
+ { 192, "\316~\362~\354\345\355\340" },
+ { 193, "~\307~\340\352\360\373\362\374" },
+ { 194, "\310\347~\354~. \350\343\360\363..." },
+ { 195, "~\317~\356\354\356\371\374" },
+ { 196, "~\312~\353\340\342\350\370\350" },
+ { 197, "~\307~\340\343\360\363\347\350\362\374" },
+ { 198, "~\307~\340\343\360...." },
+ { 199, "~\321~\353\345\344" },
+ { 200, "~O~K" },
+ { 201, "~\316~\357\366\350\350" },
+ { 202, "~\316~\357\366\350\350..." },
+ { 203, "~\317~\360\345\344" },
+ { 204, "~\302~\373\365\356\344" },
+ { 205, "~\323~\344\340\353\350\362\374 \350\343\360\363" },
+ { 206, "\317\360\356\344\356\353~\346~\350\362\374" },
+ { 207, "~\302~\345\360\355\363\362\374\361\377 \342 \343\353\340\342\355\356\345 \354\345\355\376" },
+ { 208, "~\307~\340\357\350\361\340\362\374" },
+ { 209, "\317~\363~\361\352" },
{ -1, NULL }
};
static struct _po2c_msg _po2c_lang_hu_HU[] = {
- { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-10 17:42+0300\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator: Alex Bevilacqua <alexbevi at gmail.com>\nLanguage-Team: Hungarian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1250\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
+ { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-10 23:21+0300\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator: Alex Bevilacqua <alexbevi at gmail.com>\nLanguage-Team: Hungarian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1250\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
{ 11, "<alap\351rtelmezett>" },
{ 15, "Hang" },
{ 16, "AdLib vezet :" },
{ 19, "Aspect adag korrekci\363" },
{ 23, "Hang" },
{ 24, "Automatikus ment\351s:" },
- { 35, "Hang" },
- { 41, "<alap\351rtelmezett>" },
- { 51, "K\351pess\351 Roland GS Mode" },
- { 55, "Extra \332tvonal:" },
- { 59, "Teljes k\351perny s m\363d:" },
- { 61, "Lek\351pez eszk\366z GUI:" },
- { 65, "Extra \332tvonal:" },
- { 67, "Grafik\341val" },
- { 68, "Grafikus m\363d:" },
- { 73, "Kulcsok" },
- { 79, "MIDI nyeres\351g:" },
- { 85, "Vegyes AdLib/MIDI m\363d" },
- { 87, "Zenei vezet :" },
- { 88, "Zene mennyis\351g:" },
- { 89, "Muta \326sszes" },
- { 91, "Soha" },
- { 92, "Semmi" },
- { 97, "Semmi" },
- { 98, "Igen" },
- { 101, "Kimeneti teljes\355tm\351ny:" },
- { 110, "\326sv\351nyek" },
+ { 36, "Hang" },
+ { 42, "<alap\351rtelmezett>" },
+ { 52, "K\351pess\351 Roland GS Mode" },
+ { 56, "Extra \332tvonal:" },
+ { 60, "Teljes k\351perny s m\363d:" },
+ { 62, "Lek\351pez eszk\366z GUI:" },
+ { 66, "Extra \332tvonal:" },
+ { 68, "Grafik\341val" },
+ { 69, "Grafikus m\363d:" },
+ { 74, "Kulcsok" },
+ { 80, "MIDI nyeres\351g:" },
+ { 86, "Vegyes AdLib/MIDI m\363d" },
+ { 88, "Zenei vezet :" },
+ { 89, "Zene mennyis\351g:" },
+ { 90, "Muta \326sszes" },
+ { 92, "Soha" },
+ { 93, "Semmi" },
+ { 98, "Semmi" },
+ { 99, "Igen" },
+ { 102, "Kimeneti teljes\355tm\351ny:" },
{ 111, "\326sv\351nyek" },
- { 123, "Renderel\351si m\363d:" },
- { 127, "SFX mennyis\351ge" },
- { 129, "Extra \332tvonal:" },
- { 151, "Besz\351d s Feliratok" },
- { 152, "Csak a besz\351d" },
- { 153, "Besz\351d \351s a Feliratok" },
- { 154, "Besz\351d mennyis\351g:" },
- { 157, "Felirat sebess\351g:" },
- { 158, "Csak feliratok" },
- { 160, "Sz\366veg \351s besz\351d:" },
- { 163, "T\351ma:" },
- { 167, "T\351ma:" },
- { 168, "Igaz Roland MT-32 (megb\351n\355t GM emul\341ci\363)" },
- { 173, "Volumene" },
- { 180, "10 percenk\351nt" },
- { 181, "15 percenk\351nt" },
- { 182, "30 percenk\351nt" },
- { 183, "5 percenk\351nt" },
- { 191, "Kulcsok" },
- { 195, "Igen" },
+ { 112, "\326sv\351nyek" },
+ { 124, "Renderel\351si m\363d:" },
+ { 128, "SFX mennyis\351ge" },
+ { 130, "Extra \332tvonal:" },
+ { 153, "Csak a besz\351d" },
+ { 154, "Besz\351d s Feliratok" },
+ { 155, "Csak a besz\351d" },
+ { 156, "Besz\351d \351s a Feliratok" },
+ { 157, "Besz\351d mennyis\351g:" },
+ { 161, "Felirat sebess\351g:" },
+ { 162, "Csak feliratok" },
+ { 163, "Csak feliratok" },
+ { 165, "Sz\366veg \351s besz\351d:" },
+ { 168, "T\351ma:" },
+ { 172, "T\351ma:" },
+ { 173, "Igaz Roland MT-32 (megb\351n\355t GM emul\341ci\363)" },
+ { 178, "Volumene" },
+ { 185, "10 percenk\351nt" },
+ { 186, "15 percenk\351nt" },
+ { 187, "30 percenk\351nt" },
+ { 188, "5 percenk\351nt" },
+ { 196, "Kulcsok" },
+ { 200, "Igen" },
{ -1, NULL }
};
Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/ThemeEngine.cpp 2010-06-15 10:48:39 UTC (rev 49767)
@@ -190,6 +190,10 @@
{kDDCheckboxDisabled, "checkbox_disabled", true, kDDNone},
{kDDCheckboxSelected, "checkbox_selected", false, kDDCheckboxDefault},
+ {kDDRadiobuttonDefault, "radiobutton_default", true, kDDNone},
+ {kDDRadiobuttonDisabled, "radiobutton_disabled", true, kDDNone},
+ {kDDRadiobuttonSelected, "radiobutton_selected", false, kDDRadiobuttonDefault},
+
{kDDTabActive, "tab_active", false, kDDTabInactive},
{kDDTabInactive, "tab_inactive", true, kDDNone},
{kDDTabBackground, "tab_background", true, kDDNone},
@@ -885,6 +889,32 @@
queueDDText(getTextData(dd), getTextColor(dd), r2, str, false, false, _widgets[kDDCheckboxDefault]->_textAlignH, _widgets[dd]->_textAlignV);
}
+void ThemeEngine::drawRadiobutton(const Common::Rect &r, const Common::String &str, bool checked, WidgetStateInfo state) {
+ if (!ready())
+ return;
+
+ Common::Rect r2 = r;
+ DrawData dd = kDDRadiobuttonDefault;
+
+ if (checked)
+ dd = kDDRadiobuttonSelected;
+
+ if (state == kStateDisabled)
+ dd = kDDRadiobuttonDisabled;
+
+ const int checkBoxSize = MIN((int)r.height(), getFontHeight());
+
+ r2.bottom = r2.top + checkBoxSize;
+ r2.right = r2.left + checkBoxSize;
+
+ queueDD(dd, r2);
+
+ r2.left = r2.right + checkBoxSize;
+ r2.right = r.right;
+
+ queueDDText(getTextData(dd), getTextColor(dd), r2, str, false, false, _widgets[kDDRadiobuttonDefault]->_textAlignH, _widgets[dd]->_textAlignV);
+}
+
void ThemeEngine::drawSlider(const Common::Rect &r, int width, WidgetStateInfo state) {
if (!ready())
return;
Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/ThemeEngine.h 2010-06-15 10:48:39 UTC (rev 49767)
@@ -82,6 +82,10 @@
kDDCheckboxDisabled,
kDDCheckboxSelected,
+ kDDRadiobuttonDefault,
+ kDDRadiobuttonDisabled,
+ kDDRadiobuttonSelected,
+
kDDTabActive,
kDDTabInactive,
kDDTabBackground,
@@ -312,6 +316,9 @@
void drawCheckbox(const Common::Rect &r, const Common::String &str,
bool checked, WidgetStateInfo state = kStateEnabled);
+ void drawRadiobutton(const Common::Rect &r, const Common::String &str,
+ bool checked, WidgetStateInfo state = kStateEnabled);
+
void drawTab(const Common::Rect &r, int tabHeight, int tabWidth,
const Common::Array<Common::String> &tabs, int active, uint16 hints,
int titleVPad, WidgetStateInfo state = kStateEnabled);
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/options.cpp 2010-06-15 10:48:39 UTC (rev 49767)
@@ -62,6 +62,12 @@
kChooseThemeCmd = 'chtf'
};
+enum {
+ kSubtitlesSpeech,
+ kSubtitlesSubs,
+ kSubtitlesBoth
+};
+
#ifdef SMALL_SCREEN_DEVICE
enum {
kChooseKeyMappingCmd = 'chma'
@@ -85,18 +91,6 @@
init();
}
-const char *OptionsDialog::_subModeDesc[] = {
- _s("Speech Only"),
- _s("Speech and Subtitles"),
- _s("Subtitles Only")
-};
-
-const char *OptionsDialog::_lowresSubModeDesc[] = {
- _s("Speech Only"),
- _s("Speech & Subs"),
- _s("Subtitles Only")
-};
-
void OptionsDialog::init() {
_enableGraphicSettings = false;
_gfxPopUp = 0;
@@ -123,7 +117,9 @@
_speechVolumeLabel = 0;
_muteCheckbox = 0;
_subToggleDesc = 0;
- _subToggleButton = 0;
+ _subToggleSubOnly = 0;
+ _subToggleSpeechOnly = 0;
+ _subToggleSubBoth = 0;
_subSpeedDesc = 0;
_subSpeedSlider = 0;
_subSpeedLabel = 0;
@@ -264,11 +260,12 @@
}
// Subtitle options
- if (_subToggleButton) {
- int speed; int sliderMaxValue = _subSpeedSlider->getMaxValue();
+ if (_subToggleGroup) {
+ int speed;
+ int sliderMaxValue = _subSpeedSlider->getMaxValue();
_subMode = getSubtitleMode(ConfMan.getBool("subtitles", _domain), ConfMan.getBool("speech_mute", _domain));
- _subToggleButton->setLabel(_(_subModeDesc[_subMode]));
+ _subToggleGroup->setValue(_subMode);
// Engines that reuse the subtitle speed widget set their own max value.
// Scale the config value accordingly (see addSubtitleControls)
@@ -393,21 +390,21 @@
}
// Subtitle options
- if (_subToggleButton) {
+ if (_subToggleGroup) {
if (_enableSubtitleSettings) {
bool subtitles, speech_mute;
int talkspeed;
int sliderMaxValue = _subSpeedSlider->getMaxValue();
switch (_subMode) {
- case 0:
+ case kSubtitlesSpeech:
subtitles = speech_mute = false;
break;
- case 1:
+ case kSubtitlesBoth:
subtitles = true;
speech_mute = false;
break;
- case 2:
+ case kSubtitlesSubs:
default:
subtitles = speech_mute = true;
break;
@@ -460,18 +457,6 @@
// 'true' because if control is disabled then event do not pass
setVolumeSettingsState(true);
break;
- case kSubtitleToggle:
- if (_subMode < 2)
- _subMode++;
- else
- _subMode = 0;
-
- _subToggleButton->setLabel(g_system->getOverlayWidth() > 320 ? _(_subModeDesc[_subMode]) : _(_lowresSubModeDesc[_subMode]));
- _subToggleButton->draw();
- _subSpeedDesc->draw();
- _subSpeedSlider->draw();
- _subSpeedLabel->draw();
- break;
case kSubtitleSpeedChanged:
_subSpeedLabel->setValue(_subSpeedSlider->getValue());
_subSpeedLabel->draw();
@@ -576,7 +561,7 @@
if ((_guioptions & Common::GUIO_NOSUBTITLES) || (_guioptions & Common::GUIO_NOSPEECH))
ena = false;
- _subToggleButton->setEnabled(ena);
+ _subToggleGroup->setEnabled(ena);
_subToggleDesc->setEnabled(ena);
ena = enabled;
@@ -685,8 +670,21 @@
void OptionsDialog::addSubtitleControls(GuiObject *boss, const Common::String &prefix, int maxSliderVal) {
_subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", _("Text and Speech:"));
- _subToggleButton = new ButtonWidget(boss, prefix + "subToggleButton", "", kSubtitleToggle);
+ if (g_system->getOverlayWidth() > 320) {
+ _subToggleGroup = new RadiobuttonGroup(boss, kSubtitleToggle);
+
+ _subToggleSpeechOnly = new RadiobuttonWidget(boss, prefix + "subToggleSpeechOnly", _subToggleGroup, kSubtitlesSpeech, _("Speech"));
+ _subToggleSubOnly = new RadiobuttonWidget(boss, prefix + "subToggleSubOnly", _subToggleGroup, kSubtitlesSubs, _("Subtitles"));
+ _subToggleSubBoth = new RadiobuttonWidget(boss, prefix + "subToggleSubBoth", _subToggleGroup, kSubtitlesBoth, _("Both"));
+ } else {
+ _subToggleGroup = new RadiobuttonGroup(boss, kSubtitleToggle);
+
+ _subToggleSpeechOnly = new RadiobuttonWidget(boss, prefix + "subToggleSpeechOnly", _subToggleGroup, kSubtitlesSpeech, _("Spch"));
+ _subToggleSubOnly = new RadiobuttonWidget(boss, prefix + "subToggleSubOnly", _subToggleGroup, kSubtitlesSubs, _("Subs"));
+ _subToggleSubBoth = new RadiobuttonWidget(boss, prefix + "subToggleSubBoth", _subToggleGroup, kSubtitlesBoth, _("Both"));
+ }
+
// Subtitle speed
_subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", _("Subtitle speed:"));
_subSpeedSlider = new SliderWidget(boss, prefix + "subSubtitleSpeedSlider", kSubtitleSpeedChanged);
@@ -729,19 +727,19 @@
int OptionsDialog::getSubtitleMode(bool subtitles, bool speech_mute) {
if (_guioptions & Common::GUIO_NOSUBTITLES)
- return 0; // Speech only
+ return kSubtitlesSpeech; // Speech only
if (_guioptions & Common::GUIO_NOSPEECH)
- return 2; // Subtitles only
+ return kSubtitlesSubs; // Subtitles only
if (!subtitles && !speech_mute) // Speech only
- return 0;
+ return kSubtitlesSpeech;
else if (subtitles && !speech_mute) // Speech and subtitles
- return 1;
+ return kSubtitlesBoth;
else if (subtitles && speech_mute) // Subtitles only
- return 2;
+ return kSubtitlesSubs;
else
warning("Wrong configuration: Both subtitles and speech are off. Assuming subtitles only");
- return 2;
+ return kSubtitlesSubs;
}
void OptionsDialog::reflowLayout() {
Modified: scummvm/trunk/gui/options.h
===================================================================
--- scummvm/trunk/gui/options.h 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/options.h 2010-06-15 10:48:39 UTC (rev 49767)
@@ -121,7 +121,10 @@
int getSubtitleMode(bool subtitles, bool speech_mute);
bool _enableSubtitleSettings;
StaticTextWidget *_subToggleDesc;
- ButtonWidget *_subToggleButton;
+ RadiobuttonGroup *_subToggleGroup;
+ RadiobuttonWidget *_subToggleSubOnly;
+ RadiobuttonWidget *_subToggleSpeechOnly;
+ RadiobuttonWidget *_subToggleSubBoth;
int _subMode;
static const char *_subModeDesc[];
static const char *_lowresSubModeDesc[];
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/themes/default.inc 2010-06-15 10:48:39 UTC (rev 49767)
@@ -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,10 +620,15 @@
"<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'> "
"<widget name='subSubtitleSpeedDesc' "
@@ -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,10 +1030,15 @@
"<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'> "
"<widget name='subSubtitleSpeedDesc' "
@@ -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,14 +1362,19 @@
"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'> "
"<widget name='subSubtitleSpeedDesc' "
@@ -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,14 +1781,19 @@
"/> "
"</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'> "
"<widget name='subSubtitleSpeedDesc' "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/themes/scummclassic/classic_gfx.stx 2010-06-15 10:48:39 UTC (rev 49767)
@@ -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'
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2010-06-15 10:48:39 UTC (rev 49767)
@@ -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,10 +244,15 @@
<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'>
<widget name = 'subSubtitleSpeedDesc'
@@ -661,10 +669,15 @@
<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'>
<widget name = 'subSubtitleSpeedDesc'
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2010-06-15 10:48:39 UTC (rev 49767)
@@ -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,14 +238,19 @@
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'>
<widget name = 'subSubtitleSpeedDesc'
@@ -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,14 +671,19 @@
/>
</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'>
<widget name = 'subSubtitleSpeedDesc'
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Added: scummvm/trunk/gui/themes/scummmodern/radiobutton.bmp
===================================================================
(Binary files differ)
Property changes on: scummvm/trunk/gui/themes/scummmodern/radiobutton.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/bmp
Added: scummvm/trunk/gui/themes/scummmodern/radiobutton_empty.bmp
===================================================================
(Binary files differ)
Property changes on: scummvm/trunk/gui/themes/scummmodern/radiobutton_empty.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/bmp
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_gfx.stx 2010-06-15 10:48:39 UTC (rev 49767)
@@ -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'>
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2010-06-15 10:48:39 UTC (rev 49767)
@@ -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,10 +257,15 @@
<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'>
<widget name = 'subSubtitleSpeedDesc'
@@ -674,10 +682,18 @@
<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'>
<widget name = 'subSubtitleSpeedDesc'
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2010-06-15 10:48:39 UTC (rev 49767)
@@ -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,14 +236,19 @@
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'>
<widget name = 'subSubtitleSpeedDesc'
@@ -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,10 +671,15 @@
<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'>
<widget name = 'subSubtitleSpeedDesc'
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/widget.cpp 2010-06-15 10:48:39 UTC (rev 49767)
@@ -335,7 +335,75 @@
}
#pragma mark -
+RadiobuttonGroup::RadiobuttonGroup(GuiObject *boss, uint32 cmd) : CommandSender(boss) {
+ _value = -1;
+ _cmd = cmd;
+}
+void RadiobuttonGroup::setValue(int value) {
+ Common::Array<RadiobuttonWidget *>::iterator button = _buttons.begin();
+ while (button != _buttons.end()) {
+ (*button)->setState((*button)->getValue() == value, false);
+
+ button++;
+ }
+
+ _value = value;
+
+ sendCommand(_cmd, _value);
+}
+
+void RadiobuttonGroup::setEnabled(bool ena) {
+ Common::Array<RadiobuttonWidget *>::iterator button = _buttons.begin();
+ while (button != _buttons.end()) {
+ (*button)->setEnabled(ena);
+
+ button++;
+ }
+}
+
+#pragma mark -
+
+RadiobuttonWidget::RadiobuttonWidget(GuiObject *boss, int x, int y, int w, int h, RadiobuttonGroup *group, int value, const Common::String &label, uint8 hotkey)
+ : ButtonWidget(boss, x, y, w, h, label, 0, hotkey), _state(false), _value(value), _group(group) {
+ setFlags(WIDGET_ENABLED);
+ _type = kRadiobuttonWidget;
+ _group->addButton(this);
+}
+
+RadiobuttonWidget::RadiobuttonWidget(GuiObject *boss, const Common::String &name, RadiobuttonGroup *group, int value, const Common::String &label, uint8 hotkey)
+ : ButtonWidget(boss, name, label, 0, hotkey), _state(false), _value(value), _group(group) {
+ setFlags(WIDGET_ENABLED);
+ _type = kRadiobuttonWidget;
+ _group->addButton(this);
+}
+
+void RadiobuttonWidget::handleMouseUp(int x, int y, int button, int clickCount) {
+ if (isEnabled() && x >= 0 && x < _w && y >= 0 && y < _h) {
+ toggleState();
+ }
+}
+
+void RadiobuttonWidget::setState(bool state, bool setGroup) {
+ if (setGroup) {
+ _group->setValue(_value);
+ return;
+ }
+
+ if (_state != state) {
+ _state = state;
+ //_flags ^= WIDGET_INV_BORDER;
+ draw();
+ }
+ sendCommand(_cmd, _state);
+}
+
+void RadiobuttonWidget::drawWidget() {
+ g_gui.theme()->drawRadiobutton(Common::Rect(_x, _y, _x+_w, _y+_h), _label, _state, Widget::_state);
+}
+
+#pragma mark -
+
SliderWidget::SliderWidget(GuiObject *boss, int x, int y, int w, int h, uint32 cmd)
: Widget(boss, x, y, w, h), CommandSender(boss),
_cmd(cmd), _value(0), _oldValue(0), _valueMin(0), _valueMax(100), _isDragging(false) {
Modified: scummvm/trunk/gui/widget.h
===================================================================
--- scummvm/trunk/gui/widget.h 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/gui/widget.h 2010-06-15 10:48:39 UTC (rev 49767)
@@ -62,6 +62,7 @@
kEditTextWidget = 'EDIT',
kButtonWidget = 'BTTN',
kCheckboxWidget = 'CHKB',
+ kRadiobuttonWidget = 'RDBT',
kSliderWidget = 'SLDE',
kListWidget = 'LIST',
kScrollBarWidget = 'SCRB',
@@ -213,6 +214,55 @@
void drawWidget();
};
+class RadiobuttonWidget;
+
+class RadiobuttonGroup : public CommandSender {
+public:
+ RadiobuttonGroup(GuiObject *boss, uint32 cmd = 0);
+ ~RadiobuttonGroup() {}
+
+ void addButton(RadiobuttonWidget *button) { _buttons.push_back(button); }
+ Common::Array<RadiobuttonWidget *> getButtonList() const { return _buttons; }
+
+ void setValue(int state);
+ int getValue() const { return _value; }
+
+ void setEnabled(bool ena);
+
+ void setCmd(uint32 cmd) { _cmd = cmd; }
+ uint32 getCmd() const { return _cmd; }
+
+protected:
+ Common::Array<RadiobuttonWidget *> _buttons;
+ int _value;
+ uint32 _cmd;
+};
+
+/* RadiobuttonWidget */
+class RadiobuttonWidget : public ButtonWidget {
+protected:
+ bool _state;
+ int _value;
+
+public:
+ RadiobuttonWidget(GuiObject *boss, int x, int y, int w, int h, RadiobuttonGroup *group, int value, const Common::String &label, uint8 hotkey = 0);
+ RadiobuttonWidget(GuiObject *boss, const Common::String &name, RadiobuttonGroup *group, int value, const Common::String &label, uint8 hotkey = 0);
+
+ void handleMouseUp(int x, int y, int button, int clickCount);
+ virtual void handleMouseEntered(int button) { setFlags(WIDGET_HILITED); draw(); }
+ virtual void handleMouseLeft(int button) { clearFlags(WIDGET_HILITED); draw(); }
+
+ void setState(bool state, bool setGroup = true);
+ void toggleState() { setState(!_state); }
+ bool getState() const { return _state; }
+ int getValue() const { return _value; }
+
+protected:
+ void drawWidget();
+
+ RadiobuttonGroup *_group;
+};
+
/* SliderWidget */
class SliderWidget : public Widget, public CommandSender {
protected:
Modified: scummvm/trunk/po/hu_HU.po
===================================================================
--- scummvm/trunk/po/hu_HU.po 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/po/hu_HU.po 2010-06-15 10:48:39 UTC (rev 49767)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-06-10 17:42+0300\n"
+"POT-Creation-Date: 2010-06-10 23:21+0300\n"
"PO-Revision-Date: 2009-11-25 07:42-0500\n"
"Last-Translator: Alex Bevilacqua <alexbevi at gmail.com>\n"
"Language-Team: Hungarian\n"
@@ -111,13 +111,14 @@
msgid "Name:"
msgstr ""
-#: gui/launcher.cpp:181 gui/options.cpp:839
+#: gui/launcher.cpp:181 gui/options.cpp:839 gui/options.cpp:837
msgid "Language:"
msgstr ""
#: gui/launcher.cpp:183 gui/launcher.cpp:193 gui/options.cpp:73
#: gui/options.cpp:598 gui/options.cpp:608 gui/options.cpp:842
-#: sound/mididrv.cpp:38 sound/mididrv.cpp:39
+#: sound/mididrv.cpp:38 sound/mididrv.cpp:39 gui/options.cpp:79
+#: gui/options.cpp:583 gui/options.cpp:593 gui/options.cpp:840
msgid "<default>"
msgstr "<alap\xE9rtelmezett>"
@@ -126,10 +127,12 @@
msgstr ""
#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+#: gui/options.cpp:747 gui/options.cpp:764
msgid "Graphics"
msgstr "Grafik\xE1val"
#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+#: gui/options.cpp:747 gui/options.cpp:764
msgid "GFX"
msgstr ""
@@ -137,7 +140,7 @@
msgid "Override global graphic settings"
msgstr ""
-#: gui/launcher.cpp:212 gui/options.cpp:772
+#: gui/launcher.cpp:212 gui/options.cpp:772 gui/options.cpp:770
msgid "Audio"
msgstr "Hang"
@@ -145,7 +148,7 @@
msgid "Override global audio settings"
msgstr ""
-#: gui/launcher.cpp:222 gui/options.cpp:776
+#: gui/launcher.cpp:222 gui/options.cpp:776 gui/options.cpp:774
msgid "Volume"
msgstr "Volumene"
@@ -153,7 +156,7 @@
msgid "Override global volume settings"
msgstr ""
-#: gui/launcher.cpp:231 gui/options.cpp:784
+#: gui/launcher.cpp:231 gui/options.cpp:784 gui/options.cpp:782
msgid "MIDI"
msgstr ""
@@ -161,7 +164,7 @@
msgid "Override global MIDI settings"
msgstr ""
-#: gui/launcher.cpp:243 gui/options.cpp:790
+#: gui/launcher.cpp:243 gui/options.cpp:790 gui/options.cpp:788
msgid "Paths"
msgstr "\xD6sv\xE9nyek"
@@ -170,7 +173,7 @@
msgid "Game Path:"
msgstr "Extra \xDAtvonal:"
-#: gui/launcher.cpp:253 gui/options.cpp:803
+#: gui/launcher.cpp:253 gui/options.cpp:803 gui/options.cpp:801
msgid "Extra Path:"
msgstr "Extra \xDAtvonal:"
@@ -188,7 +191,10 @@
#: gui/options.cpp:944 gui/options.cpp:1050 gui/options.cpp:885
#: gui/options.cpp:891 gui/options.cpp:897 gui/options.cpp:905
#: gui/options.cpp:929 gui/options.cpp:933 gui/options.cpp:939
-#: gui/options.cpp:946 gui/options.cpp:1045
+#: gui/options.cpp:946 gui/options.cpp:1045 gui/options.cpp:222
+#: gui/options.cpp:379 gui/options.cpp:465 gui/options.cpp:511
+#: gui/options.cpp:646 gui/options.cpp:799 gui/options.cpp:802
+#: gui/options.cpp:806 gui/options.cpp:1043
msgid "None"
msgstr "Semmi"
@@ -198,6 +204,7 @@
msgstr "<alap\xE9rtelmezett>"
#: gui/launcher.cpp:391 gui/options.cpp:1044 gui/options.cpp:1039
+#: gui/options.cpp:1037
msgid "Select SoundFont"
msgstr ""
@@ -328,43 +335,43 @@
msgid "Discovered %d new games ..."
msgstr ""
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "Never"
msgstr "Soha"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 5 mins"
msgstr "5 percenk\xE9nt"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 10 mins"
msgstr "10 percenk\xE9nt"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 15 mins"
msgstr "15 percenk\xE9nt"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 30 mins"
msgstr "30 percenk\xE9nt"
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "8 kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "11kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "22 kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "44 kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "48 kHz"
msgstr ""
@@ -384,131 +391,131 @@
msgid "Speech & Subs"
msgstr "Besz\xE9d s Feliratok"
-#: gui/options.cpp:595
+#: gui/options.cpp:595 gui/options.cpp:580
msgid "Graphics mode:"
msgstr "Grafikus m\xF3d:"
-#: gui/options.cpp:606
+#: gui/options.cpp:606 gui/options.cpp:591
msgid "Render mode:"
msgstr "Renderel\xE9si m\xF3d:"
-#: gui/options.cpp:616
+#: gui/options.cpp:616 gui/options.cpp:601
msgid "Fullscreen mode"
msgstr "Teljes k\xE9perny s m\xF3d:"
-#: gui/options.cpp:619
+#: gui/options.cpp:619 gui/options.cpp:604
msgid "Aspect ratio correction"
msgstr "Aspect adag korrekci\xF3"
-#: gui/options.cpp:626
+#: gui/options.cpp:626 gui/options.cpp:611
msgid "Music driver:"
msgstr "Zenei vezet :"
-#: gui/options.cpp:637
+#: gui/options.cpp:637 gui/options.cpp:622
msgid "AdLib emulator:"
msgstr "AdLib vezet :"
-#: gui/options.cpp:648
+#: gui/options.cpp:648 gui/options.cpp:633
msgid "Output rate:"
msgstr "Kimeneti teljes\xEDtm\xE9ny:"
-#: gui/options.cpp:660
+#: gui/options.cpp:660 gui/options.cpp:645
msgid "SoundFont:"
msgstr ""
-#: gui/options.cpp:665
+#: gui/options.cpp:665 gui/options.cpp:650
msgid "Mixed AdLib/MIDI mode"
msgstr "Vegyes AdLib/MIDI m\xF3d"
-#: gui/options.cpp:668
+#: gui/options.cpp:668 gui/options.cpp:653
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Igaz Roland MT-32 (megb\xE9n\xEDt GM emul\xE1ci\xF3)"
-#: gui/options.cpp:671
+#: gui/options.cpp:671 gui/options.cpp:656
msgid "Enable Roland GS Mode"
msgstr "K\xE9pess\xE9 Roland GS Mode"
-#: gui/options.cpp:674
+#: gui/options.cpp:674 gui/options.cpp:659
msgid "MIDI gain:"
msgstr "MIDI nyeres\xE9g:"
-#: gui/options.cpp:687
+#: gui/options.cpp:687 gui/options.cpp:672
msgid "Text and Speech:"
msgstr "Sz\xF6veg \xE9s besz\xE9d:"
-#: gui/options.cpp:691
+#: gui/options.cpp:691 gui/options.cpp:689
msgid "Subtitle speed:"
msgstr "Felirat sebess\xE9g:"
-#: gui/options.cpp:703
+#: gui/options.cpp:703 gui/options.cpp:701
msgid "Music volume:"
msgstr "Zene mennyis\xE9g:"
-#: gui/options.cpp:710
+#: gui/options.cpp:710 gui/options.cpp:708
msgid "Mute All"
msgstr "Muta \xD6sszes"
-#: gui/options.cpp:713
+#: gui/options.cpp:713 gui/options.cpp:711
msgid "SFX volume:"
msgstr "SFX mennyis\xE9ge"
-#: gui/options.cpp:720
+#: gui/options.cpp:720 gui/options.cpp:718
msgid "Speech volume:"
msgstr "Besz\xE9d mennyis\xE9g:"
-#: gui/options.cpp:797
+#: gui/options.cpp:797 gui/options.cpp:795
msgid "Save Path: "
msgstr ""
-#: gui/options.cpp:800
+#: gui/options.cpp:800 gui/options.cpp:798
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:807
+#: gui/options.cpp:807 gui/options.cpp:805
msgid "Plugins Path:"
msgstr ""
-#: gui/options.cpp:812
+#: gui/options.cpp:812 gui/options.cpp:810
msgid "Misc"
msgstr ""
-#: gui/options.cpp:814
+#: gui/options.cpp:814 gui/options.cpp:812
msgid "Theme:"
msgstr "T\xE9ma:"
-#: gui/options.cpp:818
+#: gui/options.cpp:818 gui/options.cpp:816
msgid "GUI Renderer:"
msgstr "Lek\xE9pez eszk\xF6z GUI:"
-#: gui/options.cpp:824
+#: gui/options.cpp:824 gui/options.cpp:822
msgid "Autosave:"
msgstr "Automatikus ment\xE9s:"
-#: gui/options.cpp:832 engines/dialogs.cpp:305
+#: gui/options.cpp:832 engines/dialogs.cpp:305 gui/options.cpp:830
msgid "Keys"
msgstr "Kulcsok"
-#: gui/options.cpp:844
+#: gui/options.cpp:844 gui/options.cpp:842
msgid "English"
msgstr ""
-#: gui/options.cpp:996 gui/options.cpp:991
+#: gui/options.cpp:996 gui/options.cpp:991 gui/options.cpp:989
msgid "Select directory for savegames"
msgstr ""
-#: gui/options.cpp:1003 gui/options.cpp:998
+#: gui/options.cpp:1003 gui/options.cpp:998 gui/options.cpp:996
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
-#: gui/options.cpp:1012 gui/options.cpp:1007
+#: gui/options.cpp:1012 gui/options.cpp:1007 gui/options.cpp:1005
msgid "Select directory for GUI themes"
msgstr ""
-#: gui/options.cpp:1022 gui/options.cpp:1017
+#: gui/options.cpp:1022 gui/options.cpp:1017 gui/options.cpp:1015
msgid "Select directory for extra files"
msgstr ""
-#: gui/options.cpp:1033 gui/options.cpp:1028
+#: gui/options.cpp:1033 gui/options.cpp:1028 gui/options.cpp:1026
msgid "Select directory for plugins"
msgstr ""
@@ -692,19 +699,19 @@
msgid "Save game:"
msgstr ""
-#: gui/options.cpp:978
+#: gui/options.cpp:978 gui/options.cpp:976
msgid "You have to restart ScummVM to take the effect."
msgstr ""
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:333 gui/ThemeEngine.cpp:337
msgid "Disabled GFX"
msgstr ""
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:334 gui/ThemeEngine.cpp:338
msgid "Standard Renderer (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:336 gui/ThemeEngine.cpp:340
msgid "Antialiased Renderer (16bpp)"
msgstr ""
@@ -871,3 +878,25 @@
#: engines/scumm/dialogs.cpp:289
msgid "~C~lose"
msgstr ""
+
+#: gui/options.cpp:677
+#, fuzzy
+msgid "Speech"
+msgstr "Csak a besz\xE9d"
+
+#: gui/options.cpp:678
+#, fuzzy
+msgid "Subtitles"
+msgstr "Csak feliratok"
+
+#: gui/options.cpp:679 gui/options.cpp:685
+msgid "Both"
+msgstr ""
+
+#: gui/options.cpp:683
+msgid "Spch"
+msgstr ""
+
+#: gui/options.cpp:684
+msgid "Subs"
+msgstr ""
Modified: scummvm/trunk/po/ru_RU.po
===================================================================
--- scummvm/trunk/po/ru_RU.po 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/po/ru_RU.po 2010-06-15 10:48:39 UTC (rev 49767)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-06-10 17:42+0300\n"
+"POT-Creation-Date: 2010-06-10 23:21+0300\n"
"PO-Revision-Date: 2010-06-08 08:52-0100\n"
"Last-Translator: Eugene Sandulenko <sev at scummvm.org>\n"
"Language-Team: Russian\n"
@@ -112,13 +112,14 @@
msgid "Name:"
msgstr "\xCD\xE0\xE7\xE2\xE0\xED\xE8\xE5:"
-#: gui/launcher.cpp:181 gui/options.cpp:839
+#: gui/launcher.cpp:181 gui/options.cpp:839 gui/options.cpp:837
msgid "Language:"
msgstr "\xDF\xE7\xFB\xEA:"
#: gui/launcher.cpp:183 gui/launcher.cpp:193 gui/options.cpp:73
#: gui/options.cpp:598 gui/options.cpp:608 gui/options.cpp:842
-#: sound/mididrv.cpp:38 sound/mididrv.cpp:39
+#: sound/mididrv.cpp:38 sound/mididrv.cpp:39 gui/options.cpp:79
+#: gui/options.cpp:583 gui/options.cpp:593 gui/options.cpp:840
msgid "<default>"
msgstr "<\xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE>"
@@ -127,10 +128,12 @@
msgstr "\xCF\xEB\xE0\xF2\xF4\xEE\xF0\xEC\xE0:"
#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+#: gui/options.cpp:747 gui/options.cpp:764
msgid "Graphics"
msgstr "\xC3\xF0\xE0\xF4\xE8\xEA\xE0"
#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+#: gui/options.cpp:747 gui/options.cpp:764
msgid "GFX"
msgstr "\xC3\xF0\xF4"
@@ -138,7 +141,7 @@
msgid "Override global graphic settings"
msgstr "\xCF\xE5\xF0\xE5\xEA\xF0\xFB\xF2\xFC \xE3\xEB\xEE\xE1\xE0\xEB\xFC\xED\xFB\xE5 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xE3\xF0\xE0\xF4\xE8\xEA\xE8"
-#: gui/launcher.cpp:212 gui/options.cpp:772
+#: gui/launcher.cpp:212 gui/options.cpp:772 gui/options.cpp:770
msgid "Audio"
msgstr "\xC0\xF3\xE4\xE8\xEE"
@@ -146,7 +149,7 @@
msgid "Override global audio settings"
msgstr "\xCF\xE5\xF0\xE5\xEA\xF0\xFB\xF2\xFC \xE3\xEB\xEE\xE1\xE0\xEB\xFC\xED\xFB\xE5 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xE0\xF3\xE4\xE8\xEE"
-#: gui/launcher.cpp:222 gui/options.cpp:776
+#: gui/launcher.cpp:222 gui/options.cpp:776 gui/options.cpp:774
msgid "Volume"
msgstr "\xC3\xF0\xEE\xEC\xEA\xEE\xF1\xF2\xFC"
@@ -154,7 +157,7 @@
msgid "Override global volume settings"
msgstr "\xCF\xE5\xF0\xE5\xEA\xF0\xFB\xF2\xFC \xE3\xEB\xEE\xE1\xE0\xEB\xFC\xED\xFB\xE5 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xE3\xF0\xEE\xEC\xEA\xEE\xF1\xF2\xE8"
-#: gui/launcher.cpp:231 gui/options.cpp:784
+#: gui/launcher.cpp:231 gui/options.cpp:784 gui/options.cpp:782
msgid "MIDI"
msgstr "MIDI"
@@ -162,7 +165,7 @@
msgid "Override global MIDI settings"
msgstr "\xCF\xE5\xF0\xE5\xEA\xF0\xFB\xF2\xFC \xE3\xEB\xEE\xE1\xE0\xEB\xFC\xED\xFB\xE5 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 MIDI"
-#: gui/launcher.cpp:243 gui/options.cpp:790
+#: gui/launcher.cpp:243 gui/options.cpp:790 gui/options.cpp:788
msgid "Paths"
msgstr "\xCF\xF3\xF2\xE8"
@@ -170,7 +173,7 @@
msgid "Game Path:"
msgstr "\xCF\xF3\xF2\xFC \xEA \xE8\xE3\xF0\xE5: "
-#: gui/launcher.cpp:253 gui/options.cpp:803
+#: gui/launcher.cpp:253 gui/options.cpp:803 gui/options.cpp:801
msgid "Extra Path:"
msgstr "\xC4\xEE\xEF. \xEF\xF3\xF2\xFC:"
@@ -187,7 +190,10 @@
#: gui/options.cpp:944 gui/options.cpp:1050 gui/options.cpp:885
#: gui/options.cpp:891 gui/options.cpp:897 gui/options.cpp:905
#: gui/options.cpp:929 gui/options.cpp:933 gui/options.cpp:939
-#: gui/options.cpp:946 gui/options.cpp:1045
+#: gui/options.cpp:946 gui/options.cpp:1045 gui/options.cpp:222
+#: gui/options.cpp:379 gui/options.cpp:465 gui/options.cpp:511
+#: gui/options.cpp:646 gui/options.cpp:799 gui/options.cpp:802
+#: gui/options.cpp:806 gui/options.cpp:1043
msgid "None"
msgstr "\xCD\xE5 \xE7\xE0\xE4\xE0\xED"
@@ -196,6 +202,7 @@
msgstr "\xCF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE"
#: gui/launcher.cpp:391 gui/options.cpp:1044 gui/options.cpp:1039
+#: gui/options.cpp:1037
msgid "Select SoundFont"
msgstr "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 SoundFont"
@@ -327,43 +334,43 @@
msgid "Discovered %d new games ..."
msgstr "\xCD\xE0\xE9\xE4\xE5\xED\xEE %d \xED\xEE\xE2\xFB\xF5 \xE8\xE3\xF0 ..."
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "Never"
msgstr "\xCD\xE8\xEA\xEE\xE3\xE4\xE0"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 5 mins"
msgstr "\xEA\xE0\xE6\xE4\xFB\xE5 5 \xEC\xE8\xED\xF3\xF2"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 10 mins"
msgstr "\xEA\xE0\xE6\xE4\xFB\xE5 10 \xEC\xE8\xED\xF3\xF2"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 15 mins"
msgstr "\xEA\xE0\xE6\xE4\xFB\xE5 15 \xEC\xE8\xED\xF3\xF2"
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 30 mins"
msgstr "\xEA\xE0\xE6\xE4\xFB\xE5 30 \xEC\xE8\xED\xF3\xF2"
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "8 kHz"
msgstr "8 \xEA\xC3\xF6"
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "11kHz"
msgstr "11 \xEA\xC3\xF6"
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "22 kHz"
msgstr "22 \xEA\xC3\xF6"
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "44 kHz"
msgstr "44 \xEA\xC3\xF6"
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "48 kHz"
msgstr "48 \xEA\xC3\xF6"
@@ -383,131 +390,131 @@
msgid "Speech & Subs"
msgstr "\xC7\xE2\xF3\xEA \xE8 \xF1\xF3\xE1."
-#: gui/options.cpp:595
+#: gui/options.cpp:595 gui/options.cpp:580
msgid "Graphics mode:"
msgstr "\xC3\xF0\xE0\xF4\xE8\xF7\xE5\xF1\xEA\xE8\xE9 \xF0\xE5\xE6\xE8\xEC:"
-#: gui/options.cpp:606
+#: gui/options.cpp:606 gui/options.cpp:591
msgid "Render mode:"
msgstr "\xD0\xE5\xE6\xE8\xEC \xF0\xE0\xF1\xF2\xF0\xE8\xF0\xEE\xE2\xE0\xED\xE8\xFF:"
-#: gui/options.cpp:616
+#: gui/options.cpp:616 gui/options.cpp:601
msgid "Fullscreen mode"
msgstr "\xCF\xEE\xEB\xED\xEE\xFD\xEA\xF0\xE0\xED\xED\xFB\xE9 \xF0\xE5\xE6\xE8\xEC"
-#: gui/options.cpp:619
+#: gui/options.cpp:619 gui/options.cpp:604
msgid "Aspect ratio correction"
msgstr "\xCA\xEE\xF0\xF0\xE5\xEA\xF6\xE8\xFF \xF1\xEE\xEE\xF2\xED\xEE\xF8\xE5\xED\xE8\xFF \xF1\xF2\xEE\xF0\xEE\xED"
-#: gui/options.cpp:626
+#: gui/options.cpp:626 gui/options.cpp:611
msgid "Music driver:"
msgstr "\xC4\xF0\xE0\xE9\xE2\xE5\xF0 \xEC\xF3\xE7\xFB\xEA\xE8:"
-#: gui/options.cpp:637
+#: gui/options.cpp:637 gui/options.cpp:622
msgid "AdLib emulator:"
msgstr "\xDD\xEC\xF3\xEB\xFF\xF2\xEE\xF0 AdLib:"
-#: gui/options.cpp:648
+#: gui/options.cpp:648 gui/options.cpp:633
msgid "Output rate:"
msgstr "\xC2\xFB\xF5\xEE\xE4\xED\xE0\xFF \xF7\xE0\xF1\xF2\xEE\xF2\xE0:"
-#: gui/options.cpp:660
+#: gui/options.cpp:660 gui/options.cpp:645
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:665
+#: gui/options.cpp:665 gui/options.cpp:650
msgid "Mixed AdLib/MIDI mode"
msgstr "\xD1\xEC\xE5\xF8\xE0\xED\xED\xFB\xE9 \xF0\xE5\xE6\xE8\xEC AdLib/MIDI"
-#: gui/options.cpp:668
+#: gui/options.cpp:668 gui/options.cpp:653
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "\xCD\xE0\xF1\xF2\xEE\xFF\xF9\xE8\xE9 Roland MT-32 (\xE7\xE0\xEF\xF0\xE5\xF2\xE8\xF2\xFC \xFD\xEC\xF3\xEB\xFF\xF6\xE8\xFE GM)"
-#: gui/options.cpp:671
+#: gui/options.cpp:671 gui/options.cpp:656
msgid "Enable Roland GS Mode"
msgstr "\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xF0\xE5\xE6\xE8\xEC Roland GS"
-#: gui/options.cpp:674
+#: gui/options.cpp:674 gui/options.cpp:659
msgid "MIDI gain:"
msgstr "\xD3\xF1\xE8\xEB\xE5\xED\xE8\xE5 MIDI:"
-#: gui/options.cpp:687
+#: gui/options.cpp:687 gui/options.cpp:672
msgid "Text and Speech:"
msgstr "\xD2\xE5\xEA\xF1\xF2 \xE8 \xEE\xE7\xE2\xF3\xF7\xEA\xE0:"
-#: gui/options.cpp:691
+#: gui/options.cpp:691 gui/options.cpp:689
msgid "Subtitle speed:"
msgstr "\xD1\xEA\xEE\xF0\xEE\xF1\xF2\xFC \xF1\xF3\xE1\xF2\xE8\xF2\xF0\xEE\xE2:"
-#: gui/options.cpp:703
+#: gui/options.cpp:703 gui/options.cpp:701
msgid "Music volume:"
msgstr "\xC3\xF0\xEE\xEC\xEA\xEE\xF1\xF2\xFC \xEC\xF3\xE7\xFB\xEA\xE8:"
-#: gui/options.cpp:710
+#: gui/options.cpp:710 gui/options.cpp:708
msgid "Mute All"
msgstr "\xC2\xFB\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xE2\xF1\xB8"
-#: gui/options.cpp:713
+#: gui/options.cpp:713 gui/options.cpp:711
msgid "SFX volume:"
msgstr "\xC3\xF0\xEE\xEC\xEA\xEE\xF1\xF2\xFC \xFD\xF4\xF4\xE5\xEA\xF2\xEE\xE2:"
-#: gui/options.cpp:720
+#: gui/options.cpp:720 gui/options.cpp:718
msgid "Speech volume:"
msgstr "\xC3\xF0\xEE\xEC\xEA\xEE\xF1\xF2\xFC \xEE\xE7\xE2\xF3\xF7\xEA\xE8:"
-#: gui/options.cpp:797
+#: gui/options.cpp:797 gui/options.cpp:795
msgid "Save Path: "
msgstr "\xCF\xF3\xF2\xFC \xE4\xEB\xFF \xF1\xEE\xF5\xF0\xE0\xED\xE5\xED\xE8\xE9: "
-#: gui/options.cpp:800
+#: gui/options.cpp:800 gui/options.cpp:798
msgid "Theme Path:"
msgstr "\xCF\xF3\xF2\xFC \xEA \xF2\xE5\xEC\xE0\xEC:"
-#: gui/options.cpp:807
+#: gui/options.cpp:807 gui/options.cpp:805
msgid "Plugins Path:"
msgstr "\xCF\xF3\xF2\xFC \xEA \xEF\xEB\xE0\xE3\xE8\xED\xE0\xEC:"
-#: gui/options.cpp:812
+#: gui/options.cpp:812 gui/options.cpp:810
msgid "Misc"
msgstr "\xD0\xE0\xE7\xED\xEE\xE5"
-#: gui/options.cpp:814
+#: gui/options.cpp:814 gui/options.cpp:812
msgid "Theme:"
msgstr "\xD2\xE5\xEC\xE0:"
-#: gui/options.cpp:818
+#: gui/options.cpp:818 gui/options.cpp:816
msgid "GUI Renderer:"
msgstr "\xD0\xE0\xF1\xF2\xE5\xF0\xE8\xE7\xE0\xF2\xEE\xF0 GUI:"
-#: gui/options.cpp:824
+#: gui/options.cpp:824 gui/options.cpp:822
msgid "Autosave:"
msgstr "\xC0\xE2\xF2\xEE\xF1\xEE\xF5\xF0\xE0\xED\xE5\xED\xE8\xE5:"
-#: gui/options.cpp:832 engines/dialogs.cpp:305
+#: gui/options.cpp:832 engines/dialogs.cpp:305 gui/options.cpp:830
msgid "Keys"
msgstr "\xCA\xEB\xE0\xE2\xE8\xF8\xE8"
-#: gui/options.cpp:844
+#: gui/options.cpp:844 gui/options.cpp:842
msgid "English"
msgstr "English"
-#: gui/options.cpp:996 gui/options.cpp:991
+#: gui/options.cpp:996 gui/options.cpp:991 gui/options.cpp:989
msgid "Select directory for savegames"
msgstr "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFE \xE4\xEB\xFF \xF1\xEE\xF5\xF0\xE0\xED\xE5\xED\xE8\xE9"
-#: gui/options.cpp:1003 gui/options.cpp:998
+#: gui/options.cpp:1003 gui/options.cpp:998 gui/options.cpp:996
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "\xCD\xE5 \xEC\xEE\xE3\xF3 \xEF\xE8\xF1\xE0\xF2\xFC \xE2 \xE2\xFB\xE1\xF0\xE0\xED\xED\xF3\xFE \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFE. \xCF\xEE\xE6\xE0\xEB\xF3\xE9\xF1\xF2\xE0, \xF3\xEA\xE0\xE6\xE8\xF2\xE5 \xE4\xF0\xF3\xE3\xF3\xFE."
-#: gui/options.cpp:1012 gui/options.cpp:1007
+#: gui/options.cpp:1012 gui/options.cpp:1007 gui/options.cpp:1005
msgid "Select directory for GUI themes"
msgstr "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFE \xE4\xEB\xFF \xF2\xE5\xEC GUI"
-#: gui/options.cpp:1022 gui/options.cpp:1017
+#: gui/options.cpp:1022 gui/options.cpp:1017 gui/options.cpp:1015
msgid "Select directory for extra files"
msgstr "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFE \xF1 \xE4\xEE\xEF\xEE\xEB\xED\xE8\xF2\xE5\xEB\xFC\xED\xFB\xEC\xE8 \xF4\xE0\xE9\xEB\xE0\xEC\xE8"
-#: gui/options.cpp:1033 gui/options.cpp:1028
+#: gui/options.cpp:1033 gui/options.cpp:1028 gui/options.cpp:1026
msgid "Select directory for plugins"
msgstr "\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFE \xF1 \xEF\xEB\xE0\xE3\xE8\xED\xE0\xEC\xE8"
@@ -691,19 +698,19 @@
msgid "Save game:"
msgstr "\xD1\xEE\xF5\xF0\xE0\xED\xE8\xF2\xFC \xE8\xE3\xF0\xF3: "
-#: gui/options.cpp:978
+#: gui/options.cpp:978 gui/options.cpp:976
msgid "You have to restart ScummVM to take the effect."
msgstr "\xC2\xFB \xE4\xEE\xEB\xE6\xED\xFB \xEF\xE5\xF0\xE5\xE7\xE0\xEF\xF3\xF1\xF2\xE8\xF2\xFC ScummVM \xF7\xF2\xEE\xE1\xFB \xEF\xF0\xE8\xEC\xE5\xED\xE8\xF2\xFC \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF."
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:333 gui/ThemeEngine.cpp:337
msgid "Disabled GFX"
msgstr "\xC1\xE5\xE7 \xE3\xF0\xE0\xF4\xE8\xEA\xE8"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:334 gui/ThemeEngine.cpp:338
msgid "Standard Renderer (16bpp)"
msgstr "\xD1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xE9 \xF0\xE0\xF1\xF2\xE5\xF0\xE8\xE7\xE0\xF2\xEE\xF0 (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:336 gui/ThemeEngine.cpp:340
msgid "Antialiased Renderer (16bpp)"
msgstr "\xD0\xE0\xF1\xF2\xE5\xF0\xE8\xE7\xE0\xF2\xEE\xF0 \xF1\xEE \xF1\xE3\xEB\xE0\xE6\xE8\xE2\xE0\xED\xE8\xE5\xEC (16bpp)"
@@ -866,3 +873,23 @@
#: engines/scumm/dialogs.cpp:289
msgid "~C~lose"
msgstr "~\xC7~\xE0\xEA\xF0\xFB\xF2\xFC"
+
+#: gui/options.cpp:677
+msgid "Speech"
+msgstr "\xCE\xE7\xE2\xF3\xF7\xEA\xE0"
+
+#: gui/options.cpp:678
+msgid "Subtitles"
+msgstr "\xD1\xF3\xE1\xF2\xE8\xF2\xF0\xFB"
+
+#: gui/options.cpp:679 gui/options.cpp:685
+msgid "Both"
+msgstr "\xC2\xF1\xB8"
+
+#: gui/options.cpp:683
+msgid "Spch"
+msgstr "\xCE\xE7\xE2"
+
+#: gui/options.cpp:684
+msgid "Subs"
+msgstr "\xD1\xF3\xE1"
Modified: scummvm/trunk/po/scummvm.pot
===================================================================
--- scummvm/trunk/po/scummvm.pot 2010-06-15 10:47:31 UTC (rev 49766)
+++ scummvm/trunk/po/scummvm.pot 2010-06-15 10:48:39 UTC (rev 49767)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-06-10 17:42+0300\n"
+"POT-Creation-Date: 2010-06-10 23:21+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -111,13 +111,14 @@
msgid "Name:"
msgstr ""
-#: gui/launcher.cpp:181 gui/options.cpp:839
+#: gui/launcher.cpp:181 gui/options.cpp:839 gui/options.cpp:837
msgid "Language:"
msgstr ""
#: gui/launcher.cpp:183 gui/launcher.cpp:193 gui/options.cpp:73
#: gui/options.cpp:598 gui/options.cpp:608 gui/options.cpp:842
-#: sound/mididrv.cpp:38 sound/mididrv.cpp:39
+#: sound/mididrv.cpp:38 sound/mididrv.cpp:39 gui/options.cpp:79
+#: gui/options.cpp:583 gui/options.cpp:593 gui/options.cpp:840
msgid "<default>"
msgstr ""
@@ -126,10 +127,12 @@
msgstr ""
#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+#: gui/options.cpp:747 gui/options.cpp:764
msgid "Graphics"
msgstr ""
#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+#: gui/options.cpp:747 gui/options.cpp:764
msgid "GFX"
msgstr ""
@@ -137,7 +140,7 @@
msgid "Override global graphic settings"
msgstr ""
-#: gui/launcher.cpp:212 gui/options.cpp:772
+#: gui/launcher.cpp:212 gui/options.cpp:772 gui/options.cpp:770
msgid "Audio"
msgstr ""
@@ -145,7 +148,7 @@
msgid "Override global audio settings"
msgstr ""
-#: gui/launcher.cpp:222 gui/options.cpp:776
+#: gui/launcher.cpp:222 gui/options.cpp:776 gui/options.cpp:774
msgid "Volume"
msgstr ""
@@ -153,7 +156,7 @@
msgid "Override global volume settings"
msgstr ""
-#: gui/launcher.cpp:231 gui/options.cpp:784
+#: gui/launcher.cpp:231 gui/options.cpp:784 gui/options.cpp:782
msgid "MIDI"
msgstr ""
@@ -161,7 +164,7 @@
msgid "Override global MIDI settings"
msgstr ""
-#: gui/launcher.cpp:243 gui/options.cpp:790
+#: gui/launcher.cpp:243 gui/options.cpp:790 gui/options.cpp:788
msgid "Paths"
msgstr ""
@@ -169,7 +172,7 @@
msgid "Game Path:"
msgstr ""
-#: gui/launcher.cpp:253 gui/options.cpp:803
+#: gui/launcher.cpp:253 gui/options.cpp:803 gui/options.cpp:801
msgid "Extra Path:"
msgstr ""
@@ -186,7 +189,10 @@
#: gui/options.cpp:944 gui/options.cpp:1050 gui/options.cpp:885
#: gui/options.cpp:891 gui/options.cpp:897 gui/options.cpp:905
#: gui/options.cpp:929 gui/options.cpp:933 gui/options.cpp:939
-#: gui/options.cpp:946 gui/options.cpp:1045
+#: gui/options.cpp:946 gui/options.cpp:1045 gui/options.cpp:222
+#: gui/options.cpp:379 gui/options.cpp:465 gui/options.cpp:511
+#: gui/options.cpp:646 gui/options.cpp:799 gui/options.cpp:802
+#: gui/options.cpp:806 gui/options.cpp:1043
msgid "None"
msgstr ""
@@ -195,6 +201,7 @@
msgstr ""
#: gui/launcher.cpp:391 gui/options.cpp:1044 gui/options.cpp:1039
+#: gui/options.cpp:1037
msgid "Select SoundFont"
msgstr ""
@@ -324,43 +331,43 @@
msgid "Discovered %d new games ..."
msgstr ""
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "Never"
msgstr ""
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 5 mins"
msgstr ""
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 10 mins"
msgstr ""
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 15 mins"
msgstr ""
-#: gui/options.cpp:71
+#: gui/options.cpp:71 gui/options.cpp:77
msgid "every 30 mins"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "8 kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "11kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "22 kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "44 kHz"
msgstr ""
-#: gui/options.cpp:73
+#: gui/options.cpp:73 gui/options.cpp:79
msgid "48 kHz"
msgstr ""
@@ -380,131 +387,131 @@
msgid "Speech & Subs"
msgstr ""
-#: gui/options.cpp:595
+#: gui/options.cpp:595 gui/options.cpp:580
msgid "Graphics mode:"
msgstr ""
-#: gui/options.cpp:606
+#: gui/options.cpp:606 gui/options.cpp:591
msgid "Render mode:"
msgstr ""
-#: gui/options.cpp:616
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list