pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove pandora speed setting from misc panel

Browse source
This commit is contained in:
Chips-fr 2015-05-18 19:02:13 +00:00
parent ee6817f76d
commit b7ad269295
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/od-pandora/gui/PanelMisc.cpp
View file

@ -22,10 +22,11 @@
static gcn::UaeCheckBox* chkStatusLine; static gcn::UaeCheckBox* chkStatusLine;
static gcn::UaeCheckBox* chkShowGUI; static gcn::UaeCheckBox* chkShowGUI;
#ifndef RASPBERRY
static gcn::Label* lblPandoraSpeed; static gcn::Label* lblPandoraSpeed;
static gcn::Label* lblPandoraSpeedInfo; static gcn::Label* lblPandoraSpeedInfo;
static gcn::Slider* sldPandoraSpeed; static gcn::Slider* sldPandoraSpeed;
#endif
class MiscActionListener : public gcn::ActionListener class MiscActionListener : public gcn::ActionListener
{ {
@ -38,6 +39,7 @@ class MiscActionListener : public gcn::ActionListener
else if (actionEvent.getSource() == chkShowGUI) else if (actionEvent.getSource() == chkShowGUI)
changed_prefs.start_gui = chkShowGUI->isSelected(); changed_prefs.start_gui = chkShowGUI->isSelected();
#ifndef RASPBERRY
else if (actionEvent.getSource() == sldPandoraSpeed) else if (actionEvent.getSource() == sldPandoraSpeed)
{ {
int newspeed = (int) sldPandoraSpeed->getValue(); int newspeed = (int) sldPandoraSpeed->getValue();
@ -48,6 +50,7 @@ class MiscActionListener : public gcn::ActionListener
RefreshPanelMisc(); RefreshPanelMisc();
} }
} }
#endif
} }
}; };
MiscActionListener* miscActionListener; MiscActionListener* miscActionListener;
@ -64,6 +67,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
chkShowGUI->setId("ShowGUI"); chkShowGUI->setId("ShowGUI");
chkShowGUI->addActionListener(miscActionListener); chkShowGUI->addActionListener(miscActionListener);
#ifndef RASPBERRY
lblPandoraSpeed = new gcn::Label("Pandora Speed:"); lblPandoraSpeed = new gcn::Label("Pandora Speed:");
lblPandoraSpeed->setSize(110, LABEL_HEIGHT); lblPandoraSpeed->setSize(110, LABEL_HEIGHT);
lblPandoraSpeed->setAlignment(gcn::Graphics::RIGHT); lblPandoraSpeed->setAlignment(gcn::Graphics::RIGHT);
@ -75,17 +79,18 @@ void InitPanelMisc(const struct _ConfigCategory& category)
sldPandoraSpeed->setId("PandSpeed"); sldPandoraSpeed->setId("PandSpeed");
sldPandoraSpeed->addActionListener(miscActionListener); sldPandoraSpeed->addActionListener(miscActionListener);
lblPandoraSpeedInfo = new gcn::Label("1000 MHz"); lblPandoraSpeedInfo = new gcn::Label("1000 MHz");
#endif
int posY = DISTANCE_BORDER; int posY = DISTANCE_BORDER;
category.panel->add(chkStatusLine, DISTANCE_BORDER, posY); category.panel->add(chkStatusLine, DISTANCE_BORDER, posY);
posY += chkStatusLine->getHeight() + DISTANCE_NEXT_Y; posY += chkStatusLine->getHeight() + DISTANCE_NEXT_Y;
category.panel->add(chkShowGUI, DISTANCE_BORDER, posY); category.panel->add(chkShowGUI, DISTANCE_BORDER, posY);
posY += chkShowGUI->getHeight() + DISTANCE_NEXT_Y; posY += chkShowGUI->getHeight() + DISTANCE_NEXT_Y;
#ifndef RASPBERRY
category.panel->add(lblPandoraSpeed, DISTANCE_BORDER, posY); category.panel->add(lblPandoraSpeed, DISTANCE_BORDER, posY);
category.panel->add(sldPandoraSpeed, DISTANCE_BORDER + lblPandoraSpeed->getWidth() + 8, posY); category.panel->add(sldPandoraSpeed, DISTANCE_BORDER + lblPandoraSpeed->getWidth() + 8, posY);
category.panel->add(lblPandoraSpeedInfo, sldPandoraSpeed->getX() + sldPandoraSpeed->getWidth() + 12, posY); category.panel->add(lblPandoraSpeedInfo, sldPandoraSpeed->getX() + sldPandoraSpeed->getWidth() + 12, posY);
posY += sldPandoraSpeed->getHeight() + DISTANCE_NEXT_Y; posY += sldPandoraSpeed->getHeight() + DISTANCE_NEXT_Y;
#endif
RefreshPanelMisc(); RefreshPanelMisc();
} }
@ -94,9 +99,11 @@ void ExitPanelMisc(void)
{ {
delete chkStatusLine; delete chkStatusLine;
delete chkShowGUI; delete chkShowGUI;
#ifndef RASPBERRY
delete lblPandoraSpeed; delete lblPandoraSpeed;
delete sldPandoraSpeed; delete sldPandoraSpeed;
delete lblPandoraSpeedInfo; delete lblPandoraSpeedInfo;
#endif
delete miscActionListener; delete miscActionListener;
} }
@ -107,8 +114,9 @@ void RefreshPanelMisc(void)
chkStatusLine->setSelected(changed_prefs.leds_on_screen); chkStatusLine->setSelected(changed_prefs.leds_on_screen);
chkShowGUI->setSelected(changed_prefs.start_gui); chkShowGUI->setSelected(changed_prefs.start_gui);
#ifndef RASPBERRY
sldPandoraSpeed->setValue(changed_prefs.pandora_cpu_speed); sldPandoraSpeed->setValue(changed_prefs.pandora_cpu_speed);
snprintf(tmp, 20, "%d MHz", changed_prefs.pandora_cpu_speed); snprintf(tmp, 20, "%d MHz", changed_prefs.pandora_cpu_speed);
lblPandoraSpeedInfo->setCaption(tmp); lblPandoraSpeedInfo->setCaption(tmp);
#endif
} }