diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp index b286550ee..0594a9a34 100644 --- a/src/gui/sysConf.cpp +++ b/src/gui/sysConf.cpp @@ -754,42 +754,50 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl clockSel=0; altered=true; } - if (ImGui::RadioButton("1.77MHz (ZX Spectrum)",clockSel==1)) { + if (ImGui::RadioButton("1.77MHz (ZX Spectrum PAL)",clockSel==1)) { clockSel=1; altered=true; } - if (ImGui::RadioButton("1.75MHz (ZX Spectrum)",clockSel==2)) { - clockSel=2; - altered=true; - } - if (ImGui::RadioButton("2MHz (Atari ST/Sharp X1)",clockSel==3)) { - clockSel=3; - altered=true; - } - if (ImGui::RadioButton("1.5MHz (Vectrex)",clockSel==4)) { - clockSel=4; - altered=true; - } - if (ImGui::RadioButton("1MHz (Amstrad CPC)",clockSel==5)) { - clockSel=5; - altered=true; - } - if (ImGui::RadioButton("0.89MHz (Pre-divided Sunsoft 5B)",clockSel==6)) { - clockSel=6; - altered=true; - } - if (ImGui::RadioButton("1.67MHz (?)",clockSel==7)) { - clockSel=7; - altered=true; - } if (ImGui::RadioButton("0.83MHz (Pre-divided Sunsoft 5B on PAL)",clockSel==8)) { clockSel=8; altered=true; } + if (ImGui::RadioButton("0.89MHz (Pre-divided Sunsoft 5B)",clockSel==6)) { + clockSel=6; + altered=true; + } + if (ImGui::RadioButton("1MHz (Amstrad CPC)",clockSel==5)) { + clockSel=5; + altered=true; + } if (ImGui::RadioButton("1.10MHz (Gamate/VIC-20 PAL)",clockSel==9)) { clockSel=9; altered=true; } + if (ImGui::RadioButton("1.25MHz (Mag Max)",clockSel==13)) { + clockSel=13; + altered=true; + } + if (ImGui::RadioButton("1.5MHz (Vectrex)",clockSel==4)) { + clockSel=4; + altered=true; + } + if (ImGui::RadioButton("1.536MHz (Kyugo)",clockSel==14)) { + clockSel=14; + altered=true; + } + if (ImGui::RadioButton("1.67MHz (?)",clockSel==7)) { + clockSel=7; + altered=true; + } + if (ImGui::RadioButton("1.75MHz (ZX Spectrum 48K)",clockSel==2)) { + clockSel=2; + altered=true; + } + if (ImGui::RadioButton("2MHz (Atari ST/Sharp X1)",clockSel==3)) { + clockSel=3; + altered=true; + } if (ImGui::RadioButton("2^21Hz (Game Boy)",clockSel==10)) { clockSel=10; altered=true; @@ -802,14 +810,6 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl clockSel=12; altered=true; } - if (ImGui::RadioButton("1.25MHz (Mag Max)",clockSel==13)) { - clockSel=13; - altered=true; - } - if (ImGui::RadioButton("1.536MHz (Kyugo)",clockSel==14)) { - clockSel=14; - altered=true; - } ImGui::Unindent(); if (type==DIV_SYSTEM_AY8910) { ImGui::Text("Chip type:"); @@ -1468,36 +1468,40 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl ImGui::Text("Clock rate:"); ImGui::Indent(); + if (ImGui::RadioButton("0.875MHz",clockSel==10)) { + clockSel=10; + altered=true; + } + if (ImGui::RadioButton("0.89MHz",clockSel==7)) { + clockSel=7; + altered=true; + } + if (ImGui::RadioButton("0.9375MHz",clockSel==11)) { + clockSel=11; + altered=true; + } if (ImGui::RadioButton("1MHz",clockSel==0)) { clockSel=0; altered=true; } - if (ImGui::RadioButton("1.056MHz",clockSel==1)) { - clockSel=1; - altered=true; - } - if (ImGui::RadioButton("4MHz",clockSel==2)) { - clockSel=2; - altered=true; - } - if (ImGui::RadioButton("4.224MHz",clockSel==3)) { - clockSel=3; - altered=true; - } - if (ImGui::RadioButton("3.58MHz",clockSel==4)) { - clockSel=4; - altered=true; - } - if (ImGui::RadioButton("1.79MHz",clockSel==5)) { - clockSel=5; - altered=true; - } if (ImGui::RadioButton("1.02MHz",clockSel==6)) { clockSel=6; altered=true; } - if (ImGui::RadioButton("0.89MHz",clockSel==7)) { - clockSel=7; + if (ImGui::RadioButton("1.056MHz",clockSel==1)) { + clockSel=1; + altered=true; + } + if (ImGui::RadioButton("1.193MHz (Atari)",clockSel==14)) { + clockSel=14; + altered=true; + } + if (ImGui::RadioButton("1.5MHz",clockSel==12)) { + clockSel=12; + altered=true; + } + if (ImGui::RadioButton("1.79MHz",clockSel==5)) { + clockSel=5; altered=true; } if (ImGui::RadioButton("2MHz",clockSel==8)) { @@ -1508,24 +1512,20 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl clockSel=9; altered=true; } - if (ImGui::RadioButton("0.875MHz",clockSel==10)) { - clockSel=10; - altered=true; - } - if (ImGui::RadioButton("0.9375MHz",clockSel==11)) { - clockSel=11; - altered=true; - } - if (ImGui::RadioButton("1.5MHz",clockSel==12)) { - clockSel=12; - altered=true; - } if (ImGui::RadioButton("3MHz",clockSel==13)) { clockSel=13; altered=true; } - if (ImGui::RadioButton("1.193MHz (Atari)",clockSel==14)) { - clockSel=14; + if (ImGui::RadioButton("3.58MHz",clockSel==4)) { + clockSel=4; + altered=true; + } + if (ImGui::RadioButton("4MHz",clockSel==2)) { + clockSel=2; + altered=true; + } + if (ImGui::RadioButton("4.224MHz",clockSel==3)) { + clockSel=3; altered=true; } ImGui::Unindent();