ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed 'setTickmarkIntervals'

This commit is contained in:
thrust26 2019-05-14 22:52:06 +02:00
parent 94de76b78e
commit b043ed5335
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/AudioDialog.cxx
View File

@ -68,7 +68,7 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent,
myVolumeSlider = new SliderWidget(this, font, xpos, ypos,
"Volume", lwidth, 0, 4 * fontWidth, "%");
myVolumeSlider->setMinValue(1); myVolumeSlider->setMaxValue(100);
myVolumeSlider->setTickmarkInterval(4);
myVolumeSlider->setTickmarkIntervals(4);
wid.push_back(myVolumeSlider);
ypos += lineHeight + VGAP;
@ -129,7 +129,7 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent,
myHeadroomSlider = new SliderWidget(this, font, xpos, ypos, swidth, lineHeight,
"Headroom ", 0, kHeadroomChanged, 10 * fontWidth);
myHeadroomSlider->setMinValue(0); myHeadroomSlider->setMaxValue(AudioSettings::MAX_HEADROOM);
myHeadroomSlider->setTickmarkInterval(5);
myHeadroomSlider->setTickmarkIntervals(5);
wid.push_back(myHeadroomSlider);
ypos += lineHeight + VGAP;
@ -137,7 +137,7 @@ AudioDialog::AudioDialog(OSystem& osystem, DialogContainer& parent,
myBufferSizeSlider = new SliderWidget(this, font, xpos, ypos, swidth, lineHeight,
"Buffer size ", 0, kBufferSizeChanged, 10 * fontWidth);
myBufferSizeSlider->setMinValue(0); myBufferSizeSlider->setMaxValue(AudioSettings::MAX_BUFFER_SIZE);
myBufferSizeSlider->setTickmarkInterval(5);
myBufferSizeSlider->setTickmarkIntervals(5);
wid.push_back(myBufferSizeSlider);
ypos += lineHeight + VGAP;

10
src/gui/DeveloperDialog.cxx
View File

@ -299,7 +299,7 @@ void DeveloperDialog::addVideoTab(const GUI::Font& font)
myTVJitterWidget->getRight() + fontWidth * 3, ypos - 1,
"Recovery ", 0, kTVJitterChanged);
myTVJitterRecWidget->setMinValue(1); myTVJitterRecWidget->setMaxValue(20);
myTVJitterRecWidget->setTickmarkInterval(5);
myTVJitterRecWidget->setTickmarkIntervals(5);
wid.push_back(myTVJitterRecWidget);
myTVJitterRecLabelWidget = new StaticTextWidget(myTab, font,
myTVJitterRecWidget->getRight() + 4,
@ -439,7 +439,7 @@ void DeveloperDialog::addTimeMachineTab(const GUI::Font& font)
myStateSizeWidget->setMaxValue(1000);
#endif
myStateSizeWidget->setStepValue(20);
myStateSizeWidget->setTickmarkInterval(5);
myStateSizeWidget->setTickmarkIntervals(5);
wid.push_back(myStateSizeWidget);
ypos += lineHeight + VGAP;
@ -452,7 +452,7 @@ void DeveloperDialog::addTimeMachineTab(const GUI::Font& font)
myUncompressedWidget->setMaxValue(1000);
#endif
myUncompressedWidget->setStepValue(20);
myUncompressedWidget->setTickmarkInterval(5);
myUncompressedWidget->setTickmarkIntervals(5);
wid.push_back(myUncompressedWidget);
ypos += lineHeight + VGAP;
@ -534,7 +534,7 @@ void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
myDebuggerWidthSlider->setMaxValue(ds.w);
myDebuggerWidthSlider->setStepValue(10);
// one tickmark every ~100 pixel
myDebuggerWidthSlider->setTickmarkInterval((ds.w - DebuggerDialog::kSmallFontMinW + 50) / 100);
myDebuggerWidthSlider->setTickmarkIntervals((ds.w - DebuggerDialog::kSmallFontMinW + 50) / 100);
wid.push_back(myDebuggerWidthSlider);
ypos += lineHeight + VGAP;
@ -544,7 +544,7 @@ void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
myDebuggerHeightSlider->setMaxValue(ds.h);
myDebuggerHeightSlider->setStepValue(10);
// one tickmark every ~100 pixel
myDebuggerHeightSlider->setTickmarkInterval((ds.h - DebuggerDialog::kSmallFontMinH + 50) / 100);
myDebuggerHeightSlider->setTickmarkIntervals((ds.h - DebuggerDialog::kSmallFontMinH + 50) / 100);
wid.push_back(myDebuggerHeightSlider);
ypos += lineHeight + VGAP * 4;

4
src/gui/GameInfoDialog.cxx
View File

@ -120,7 +120,7 @@ GameInfoDialog::GameInfoDialog(
HBORDER + 20, ypos,
"Blend ", 0, kPPBlendChanged, 4 * fontWidth, "%");
myPPBlend->setMinValue(0); myPPBlend->setMaxValue(100);
myPPBlend->setTickmarkInterval(2);
myPPBlend->setTickmarkIntervals(2);
wid.push_back(myPPBlend);
ypos += lineHeight + VGAP * 4;
@ -273,7 +273,7 @@ GameInfoDialog::GameInfoDialog(
myMouseRange = new SliderWidget(myTab, font, HBORDER, ypos,
"Mouse axes range ", 0, 0, fontWidth * 4, "%");
myMouseRange->setMinValue(1); myMouseRange->setMaxValue(100);
myMouseRange->setTickmarkInterval(4);
myMouseRange->setTickmarkIntervals(4);
wid.push_back(myMouseRange);
// Add message concerning usage

12
src/gui/InputDialog.cxx
View File

@ -146,7 +146,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
myDeadzone = new SliderWidget(myTab, font, HBORDER, ypos, 13 * fontWidth, lineHeight,
"Joystick deadzone size ", lwidth, kDeadzoneChanged);
myDeadzone->setMinValue(0); myDeadzone->setMaxValue(29);
myDeadzone->setTickmarkInterval(4);
myDeadzone->setTickmarkIntervals(4);
xpos = HBORDER + myDeadzone->getWidth() + 5;
myDeadzoneLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 5*fontWidth, lineHeight, "");
wid.push_back(myDeadzone);
@ -156,14 +156,14 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
myDejitterBase = new SliderWidget(myTab, font, HBORDER, ypos, 6 * fontWidth, lineHeight,
"Paddle dejitter strength", lwidth, kDejitterChanged);
myDejitterBase->setMinValue(Paddles::MIN_DEJITTER); myDejitterBase->setMaxValue(Paddles::MAX_DEJITTER);
myDejitterBase->setTickmarkInterval(2);
myDejitterBase->setTickmarkIntervals(2);
xpos = HBORDER + myDejitterBase->getWidth() + fontWidth;
wid.push_back(myDejitterBase);
myDejitterDiff = new SliderWidget(myTab, font, xpos, ypos, 6 * fontWidth, lineHeight,
"", 0, kDejitterChanged);
myDejitterDiff->setMinValue(Paddles::MIN_DEJITTER); myDejitterDiff->setMaxValue(Paddles::MAX_DEJITTER);
myDejitterDiff->setTickmarkInterval(2);
myDejitterDiff->setTickmarkIntervals(2);
xpos += myDejitterDiff->getWidth() + 5;
wid.push_back(myDejitterDiff);
@ -175,7 +175,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
"Digital paddle sensitivity ",
lwidth, kDPSpeedChanged);
myDPaddleSpeed->setMinValue(1); myDPaddleSpeed->setMaxValue(20);
myDPaddleSpeed->setTickmarkInterval(4);
myDPaddleSpeed->setTickmarkIntervals(4);
xpos = HBORDER + myDPaddleSpeed->getWidth() + 5;
myDPaddleLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight, "");
wid.push_back(myDPaddleSpeed);
@ -186,7 +186,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
"Mouse paddle sensitivity ",
lwidth, kMPSpeedChanged);
myMPaddleSpeed->setMinValue(1); myMPaddleSpeed->setMaxValue(20);
myMPaddleSpeed->setTickmarkInterval(4);
myMPaddleSpeed->setTickmarkIntervals(4);
xpos = HBORDER + myMPaddleSpeed->getWidth() + 5;
myMPaddleLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight, "");
wid.push_back(myMPaddleSpeed);
@ -197,7 +197,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
"Trackball sensitivity ",
lwidth, kTBSpeedChanged);
myTrackBallSpeed->setMinValue(1); myTrackBallSpeed->setMaxValue(20);
myTrackBallSpeed->setTickmarkInterval(4);
myTrackBallSpeed->setTickmarkIntervals(4);
xpos = HBORDER + myTrackBallSpeed->getWidth() + 5;
myTrackBallLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight, "");
wid.push_back(myTrackBallSpeed);

2
src/gui/SnapshotDialog.cxx
View File

@ -65,7 +65,7 @@ SnapshotDialog::SnapshotDialog(OSystem& osystem, DialogContainer& parent,
font.getStringWidth("10 seconds"));
mySnapInterval->setMinValue(1);
mySnapInterval->setMaxValue(10);
mySnapInterval->setTickmarkInterval(3);
mySnapInterval->setTickmarkIntervals(3);
wid.push_back(mySnapInterval);
// Booleans for saving snapshots

4
src/gui/StellaSettingsDialog.cxx
View File

@ -149,7 +149,7 @@ void StellaSettingsDialog::addVideoOptions(WidgetArray& wid, int& xpos, int& ypo
myTVScanIntense = new SliderWidget(this, font, xpos + INDENT, ypos-1, swidth, lineHeight,
"Intensity ", lwidth, kScanlinesChanged, fontWidth * 2);
myTVScanIntense->setMinValue(0); myTVScanIntense->setMaxValue(10);
myTVScanIntense->setTickmarkInterval(2);
myTVScanIntense->setTickmarkIntervals(2);
wid.push_back(myTVScanIntense);
ypos += lineHeight + VGAP;
@ -160,7 +160,7 @@ void StellaSettingsDialog::addVideoOptions(WidgetArray& wid, int& xpos, int& ypo
myTVPhosLevel = new SliderWidget(this, font, xpos + INDENT, ypos-1, swidth, lineHeight,
"Blend ", lwidth, kPhosphorChanged, fontWidth * 2);
myTVPhosLevel->setMinValue(0); myTVPhosLevel->setMaxValue(10);
myTVPhosLevel->setTickmarkInterval(2);
myTVPhosLevel->setTickmarkIntervals(2);
wid.push_back(myTVPhosLevel);
ypos += lineHeight + VGAP;
}

8
src/gui/UIDialog.cxx
View File

@ -111,7 +111,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
myListDelayPopup->setMinValue(0);
myListDelayPopup->setMaxValue(1000);
myListDelayPopup->setStepValue(50);
myListDelayPopup->setTickmarkInterval(5);
myListDelayPopup->setTickmarkIntervals(5);
wid.push_back(myListDelayPopup);
ypos += lineHeight + V_GAP;
@ -121,7 +121,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
font.getStringWidth("10 lines"));
myWheelLinesPopup->setMinValue(1);
myWheelLinesPopup->setMaxValue(10);
myWheelLinesPopup->setTickmarkInterval(3);
myWheelLinesPopup->setTickmarkIntervals(3);
wid.push_back(myWheelLinesPopup);
// Add message concerning usage
@ -160,7 +160,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
myLauncherWidthSlider->setMaxValue(ds.w);
myLauncherWidthSlider->setStepValue(10);
// one tickmark every ~100 pixel
myLauncherWidthSlider->setTickmarkInterval((ds.w - FBMinimum::Width + 50) / 100);
myLauncherWidthSlider->setTickmarkIntervals((ds.w - FBMinimum::Width + 50) / 100);
wid.push_back(myLauncherWidthSlider);
ypos += lineHeight + V_GAP;
@ -170,7 +170,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
myLauncherHeightSlider->setMaxValue(ds.h);
myLauncherHeightSlider->setStepValue(10);
// one tickmark every ~100 pixel
myLauncherHeightSlider->setTickmarkInterval((ds.h - FBMinimum::Height + 50) / 100);
myLauncherHeightSlider->setTickmarkIntervals((ds.h - FBMinimum::Height + 50) / 100);
wid.push_back(myLauncherHeightSlider);
ypos += lineHeight + V_GAP;

8
src/gui/VideoDialog.cxx
View File

@ -147,7 +147,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
"NTSC aspect ", lwidth, 0,
fontWidth * 4, "%");
myNAspectRatio->setMinValue(80); myNAspectRatio->setMaxValue(120);
myNAspectRatio->setTickmarkInterval(2);
myNAspectRatio->setTickmarkIntervals(2);
wid.push_back(myNAspectRatio);
ypos += lineHeight + VGAP;
@ -157,7 +157,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
"PAL aspect ", lwidth, 0,
fontWidth * 4, "%");
myPAspectRatio->setMinValue(80); myPAspectRatio->setMaxValue(120);
myPAspectRatio->setTickmarkInterval(2);
myPAspectRatio->setTickmarkIntervals(2);
wid.push_back(myPAspectRatio);
ypos += lineHeight + VGAP;
@ -167,7 +167,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
"Emul. speed ", lwidth, kSpeedupChanged, fontWidth * 5, "%");
mySpeed->setMinValue(MIN_SPEED); mySpeed->setMaxValue(MAX_SPEED);
mySpeed->setStepValue(SPEED_STEP);
mySpeed->setTickmarkInterval(2);
mySpeed->setTickmarkIntervals(2);
wid.push_back(mySpeed);
ypos += lineHeight + VGAP;
@ -199,7 +199,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
myUseOverscan = new SliderWidget(myTab, font, xpos + INDENT, ypos - 1, swidth, lineHeight,
"Overscan", font.getStringWidth("Overscan "), kOverscanChanged, fontWidth * 3, "%");
myUseOverscan->setMinValue(0); myUseOverscan->setMaxValue(10);
myUseOverscan->setTickmarkInterval(2);
myUseOverscan->setTickmarkIntervals(2);
wid.push_back(myUseOverscan);
ypos += (lineHeight + VGAP) * 2;

2
src/gui/Widget.cxx
View File

@ -764,7 +764,7 @@ void SliderWidget::setValueUnit(const string& valueUnit)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SliderWidget::setTickmarkInterval(int numIntervals)
void SliderWidget::setTickmarkIntervals(int numIntervals)
{
_numIntervals = numIntervals;
setDirty();

2
src/gui/Widget.hxx
View File

@ -334,7 +334,7 @@ class SliderWidget : public ButtonWidget
const string& getValueLabel() const { return _valueLabel; }
void setValueUnit(const string& valueUnit);
void setTickmarkInterval(int numIntervals);
void setTickmarkIntervals(int numIntervals);
protected:
void handleMouseMoved(int x, int y) override;