adjusted hotkeys to reordered "TV modes"

This commit is contained in:
thrust26 2019-03-29 17:12:12 +01:00
parent 6f51b6039d
commit 0666be24e6
4 changed files with 12 additions and 12 deletions

View File

@ -307,7 +307,7 @@
generation of DASM-compatible disassembly files</li> generation of DASM-compatible disassembly files</li>
<li>Emulation of CRT TV systems using <a href="http://slack.net/~ant/libs/ntsc.html"> <li>Emulation of CRT TV systems using <a href="http://slack.net/~ant/libs/ntsc.html">
Blargg filtering</a>, including presets for several common TV outputs Blargg filtering</a>, including presets for several common TV outputs
(composite, S-video, RGB, etc.), and ability to fully customize (Composite, S-Video, RGB, etc.), and ability to fully customize
many attributes (contrast, brightness, saturation, gamma, etc.).</li> many attributes (contrast, brightness, saturation, gamma, etc.).</li>
<li>Built-in ROM database with information partially compiled by <li>Built-in ROM database with information partially compiled by
<a href="http://www.atarimania.com/rom_collection_archive_atari_2600_roms.html"> <a href="http://www.atarimania.com/rom_collection_archive_atari_2600_roms.html">
@ -1270,17 +1270,17 @@
<td>Cmd + 1</td> <td>Cmd + 1</td>
</tr> </tr>
<tr> <tr>
<td>Select 'Composite' preset</td> <td>Select 'RGB' preset</td>
<td>Alt + 2</td> <td>Alt + 2</td>
<td>Cmd + 2</td> <td>Cmd + 2</td>
</tr> </tr>
<tr> <tr>
<td>Select 'S-video' preset</td> <td>Select 'S-Video' preset</td>
<td>Alt + 3</td> <td>Alt + 3</td>
<td>Cmd + 3</td> <td>Cmd + 3</td>
</tr> </tr>
<tr> <tr>
<td>Select 'RGB' preset</td> <td>Select 'Composite' preset</td>
<td>Alt + 4</td> <td>Alt + 4</td>
<td>Cmd + 4</td> <td>Cmd + 4</td>
</tr> </tr>

View File

@ -327,16 +327,16 @@ void PhysicalKeyboardHandler::handleEvent(StellaKey key, StellaMod mod, bool sta
myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_OFF); myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_OFF);
break; break;
case KBDK_2: // Alt-2 turns on 'composite' NTSC filtering case KBDK_2: // Alt-2 turns on 'rgb' NTSC filtering
myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_COMPOSITE); myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_RGB);
break; break;
case KBDK_3: // Alt-3 turns on 'svideo' NTSC filtering case KBDK_3: // Alt-3 turns on 'svideo' NTSC filtering
myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_SVIDEO); myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_SVIDEO);
break; break;
case KBDK_4: // Alt-4 turns on 'rgb' NTSC filtering case KBDK_4: // Alt-4 turns on 'composite' NTSC filtering
myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_RGB); myOSystem.frameBuffer().tiaSurface().setNTSC(NTSCFilter::PRESET_COMPOSITE);
break; break;
case KBDK_5: // Alt-5 turns on 'bad' NTSC filtering case KBDK_5: // Alt-5 turns on 'bad' NTSC filtering

View File

@ -37,7 +37,7 @@ StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& pa
const int lineHeight = font.getLineHeight(), const int lineHeight = font.getLineHeight(),
fontWidth = font.getMaxCharWidth(); fontWidth = font.getMaxCharWidth();
int xpos, ypos; int xpos, ypos;
WidgetArray wid; WidgetArray wid;
VariantList items; VariantList items;
@ -197,7 +197,7 @@ void StellaSettingsDialog::loadConfig()
// TV Mode // TV Mode
myTVMode->setSelected( myTVMode->setSelected(
settings.getString("tv.filter"), "0"); settings.getString("tv.filter"), "0");
// TV scanline intensity and interpolation // TV scanline intensity and interpolation
myTVScanIntense->setValue(settings.getInt("tv.scanlines")); myTVScanIntense->setValue(settings.getInt("tv.scanlines"));
@ -260,7 +260,7 @@ void StellaSettingsDialog::saveConfig()
{ {
instance().console().setProperties(myGameProperties); instance().console().setProperties(myGameProperties);
} }
// Finally, issue a complete framebuffer re-initialization // Finally, issue a complete framebuffer re-initialization
instance().createFrameBuffer(); instance().createFrameBuffer();
} }

View File

@ -41,7 +41,7 @@ class StellaSettingsDialog : public Dialog
void addVideoOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font); void addVideoOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font);
void addUIOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font); void addUIOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font);
void addGameOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font); void addGameOptions(WidgetArray& wid, int& xpos, int& ypos, const GUI::Font& font);
void handleCommand(CommandSender* sender, int cmd, int data, int id) override; void handleCommand(CommandSender* sender, int cmd, int data, int id) override;
void handleTVModeChange(); void handleTVModeChange();
void handlePhosphorChange(); void handlePhosphorChange();