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

made upper and lower case more consistent

This commit is contained in:
thrust26 2018-08-19 10:08:11 +02:00
parent eefa196f0d
commit 67785c34c5
6 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/DeveloperDialog.cxx
View File

@ -413,10 +413,10 @@ void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
// Font style (bold label vs. text, etc)
items.clear();
VarList::push_back(items, "All Normal font", "0");
VarList::push_back(items, "All normal font", "0");
VarList::push_back(items, "Bold labels only", "1");
VarList::push_back(items, "Bold non-labels only", "2");
VarList::push_back(items, "All Bold font", "3");
VarList::push_back(items, "All bold font", "3");
pwidth = font.getStringWidth("Bold non-labels only");
myDebuggerFontStyle =
new PopUpWidget(myTab, font, HBORDER, ypos + 1, pwidth, lineHeight, items,

2
src/gui/GameInfoDialog.cxx
View File

@ -304,7 +304,7 @@ GameInfoDialog::GameInfoDialog(
ypos += lineHeight + VGAP;
swidth = myFormat->getWidth();
t = new StaticTextWidget(myTab, font, HBORDER, ypos+2, "Y-Start ");
t = new StaticTextWidget(myTab, font, HBORDER, ypos+2, "Y-start ");
myYStart = new SliderWidget(myTab, font, t->getRight(), ypos, swidth, lineHeight,
" ", 0, kYStartChanged, 5 * fontWidth, "px");
myYStart->setMinValue(TIAConstants::minYStart-1);

2
src/gui/InputDialog.cxx
View File

@ -204,7 +204,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
// Enable/disable control key-combos
ypos += lineHeight + VGAP;
myCtrlCombo = new CheckboxWidget(myTab, font, HBORDER, ypos,
"Use Control key combos");
"Use control key combos");
wid.push_back(myCtrlCombo);
ypos += lineHeight + VGAP;

29
src/gui/UIDialog.cxx
View File

@ -112,12 +112,12 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
// 2) Launcher options
wid.clear();
tabID = myTab->addTab(" Launcher ");
lwidth = font.getStringWidth("Launcher Height ");
lwidth = font.getStringWidth("Launcher height ");
xpos = HBORDER; ypos = VBORDER;
// Launcher width and height
myLauncherWidthSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher Width ",
lwidth, 0, 6 * fontWidth, "px");
myLauncherWidthSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher width ",
lwidth, kLauncherSize, 6 * fontWidth, "px");
myLauncherWidthSlider->setMinValue(FrameBuffer::kFBMinW);
myLauncherWidthSlider->setMaxValue(ds.w);
myLauncherWidthSlider->setStepValue(10);
@ -125,8 +125,8 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
wid.push_back(myLauncherWidthSlider);
ypos += lineHeight + 4;
myLauncherHeightSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher Height ",
lwidth, 0, 6 * fontWidth, "px");
myLauncherHeightSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher height ",
lwidth, kLauncherSize, 6 * fontWidth, "px");
myLauncherHeightSlider->setMinValue(FrameBuffer::kFBMinH);
myLauncherHeightSlider->setMaxValue(ds.h);
myLauncherHeightSlider->setStepValue(10);
@ -142,7 +142,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
VarList::push_back(items, "Large", "large");
myLauncherFontPopup =
new PopUpWidget(myTab, font, xpos, ypos + 1, pwidth, lineHeight, items,
"Launcher Font ", lwidth);
"Launcher font ", lwidth);
wid.push_back(myLauncherFontPopup);
ypos += lineHeight + 4 * 4;
@ -153,7 +153,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
VarList::push_back(items, "2x (1000x760)", "2");
myRomViewerPopup =
new PopUpWidget(myTab, font, xpos, ypos + 1, pwidth, lineHeight, items,
"ROM Info viewer ", lwidth, kRomViewer);
"ROM info viewer ", lwidth, kRomViewer);
wid.push_back(myRomViewerPopup);
ypos += lineHeight + 4;
@ -347,6 +347,7 @@ void UIDialog::handleCommand(CommandSender* sender, int cmd, int data, int id)
myWheelLinesPopup->setValueUnit(" lines");
break;
case kLauncherSize:
case kRomViewer:
handleRomViewer();
break;
@ -372,10 +373,24 @@ void UIDialog::handleCommand(CommandSender* sender, int cmd, int data, int id)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void UIDialog::handleRomViewer()
{
//string size = myRomViewerPopup->getSelectedName();
bool enable = myRomViewerPopup->getSelectedName() != "Off";
VariantList items;
myOpenBrowserButton->setEnabled(enable);
mySnapLoadPath->setEnabled(enable);
/*items.clear();
VarList::push_back(items, "Off", "0");
VarList::push_back(items, "1x (640x480) ", "1");
if(myLauncherWidthSlider->getValue() >= 1000 &&
myLauncherHeightSlider->getValue() >= 760)
{
VarList::push_back(items, "2x (1000x760)", "2");
}
myRomViewerPopup->addItems(items);
//myRomViewerPopup->setSelected("1x(640x480) ");*/
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/gui/UIDialog.hxx
View File

@ -51,6 +51,7 @@ class UIDialog : public Dialog
{
kListDelay = 'UILd',
kMouseWheel = 'UIMw',
kLauncherSize = 'UIls',
kRomViewer = 'UIRv',
kChooseSnapLoadDirCmd = 'UIsl', // snapshot dir (load files)
kSnapLoadDirChosenCmd = 'UIsc' // snap chosen (load files)

2
src/gui/VideoDialog.cxx
View File

@ -310,7 +310,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
CREATE_CLONE_BUTTON(Composite, "Clone Composite");
CREATE_CLONE_BUTTON(Svideo, "Clone S-Video");
CREATE_CLONE_BUTTON(RGB, "Clone RGB");
CREATE_CLONE_BUTTON(Bad, "Clone Bad Adjust");
CREATE_CLONE_BUTTON(Bad, "Clone Bad adjust");
CREATE_CLONE_BUTTON(Custom, "Revert");
// Add items for tab 2