mirror of https://github.com/stella-emu/stella.git
made upper and lower case more consistent
This commit is contained in:
parent
eefa196f0d
commit
67785c34c5
|
@ -413,10 +413,10 @@ void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
|
||||||
|
|
||||||
// Font style (bold label vs. text, etc)
|
// Font style (bold label vs. text, etc)
|
||||||
items.clear();
|
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 labels only", "1");
|
||||||
VarList::push_back(items, "Bold non-labels only", "2");
|
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");
|
pwidth = font.getStringWidth("Bold non-labels only");
|
||||||
myDebuggerFontStyle =
|
myDebuggerFontStyle =
|
||||||
new PopUpWidget(myTab, font, HBORDER, ypos + 1, pwidth, lineHeight, items,
|
new PopUpWidget(myTab, font, HBORDER, ypos + 1, pwidth, lineHeight, items,
|
||||||
|
|
|
@ -304,7 +304,7 @@ GameInfoDialog::GameInfoDialog(
|
||||||
|
|
||||||
ypos += lineHeight + VGAP;
|
ypos += lineHeight + VGAP;
|
||||||
swidth = myFormat->getWidth();
|
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,
|
myYStart = new SliderWidget(myTab, font, t->getRight(), ypos, swidth, lineHeight,
|
||||||
" ", 0, kYStartChanged, 5 * fontWidth, "px");
|
" ", 0, kYStartChanged, 5 * fontWidth, "px");
|
||||||
myYStart->setMinValue(TIAConstants::minYStart-1);
|
myYStart->setMinValue(TIAConstants::minYStart-1);
|
||||||
|
|
|
@ -204,7 +204,7 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
|
||||||
// Enable/disable control key-combos
|
// Enable/disable control key-combos
|
||||||
ypos += lineHeight + VGAP;
|
ypos += lineHeight + VGAP;
|
||||||
myCtrlCombo = new CheckboxWidget(myTab, font, HBORDER, ypos,
|
myCtrlCombo = new CheckboxWidget(myTab, font, HBORDER, ypos,
|
||||||
"Use Control key combos");
|
"Use control key combos");
|
||||||
wid.push_back(myCtrlCombo);
|
wid.push_back(myCtrlCombo);
|
||||||
ypos += lineHeight + VGAP;
|
ypos += lineHeight + VGAP;
|
||||||
|
|
||||||
|
|
|
@ -112,12 +112,12 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
// 2) Launcher options
|
// 2) Launcher options
|
||||||
wid.clear();
|
wid.clear();
|
||||||
tabID = myTab->addTab(" Launcher ");
|
tabID = myTab->addTab(" Launcher ");
|
||||||
lwidth = font.getStringWidth("Launcher Height ");
|
lwidth = font.getStringWidth("Launcher height ");
|
||||||
xpos = HBORDER; ypos = VBORDER;
|
xpos = HBORDER; ypos = VBORDER;
|
||||||
|
|
||||||
// Launcher width and height
|
// Launcher width and height
|
||||||
myLauncherWidthSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher Width ",
|
myLauncherWidthSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher width ",
|
||||||
lwidth, 0, 6 * fontWidth, "px");
|
lwidth, kLauncherSize, 6 * fontWidth, "px");
|
||||||
myLauncherWidthSlider->setMinValue(FrameBuffer::kFBMinW);
|
myLauncherWidthSlider->setMinValue(FrameBuffer::kFBMinW);
|
||||||
myLauncherWidthSlider->setMaxValue(ds.w);
|
myLauncherWidthSlider->setMaxValue(ds.w);
|
||||||
myLauncherWidthSlider->setStepValue(10);
|
myLauncherWidthSlider->setStepValue(10);
|
||||||
|
@ -125,8 +125,8 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
wid.push_back(myLauncherWidthSlider);
|
wid.push_back(myLauncherWidthSlider);
|
||||||
ypos += lineHeight + 4;
|
ypos += lineHeight + 4;
|
||||||
|
|
||||||
myLauncherHeightSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher Height ",
|
myLauncherHeightSlider = new SliderWidget(myTab, font, xpos, ypos, "Launcher height ",
|
||||||
lwidth, 0, 6 * fontWidth, "px");
|
lwidth, kLauncherSize, 6 * fontWidth, "px");
|
||||||
myLauncherHeightSlider->setMinValue(FrameBuffer::kFBMinH);
|
myLauncherHeightSlider->setMinValue(FrameBuffer::kFBMinH);
|
||||||
myLauncherHeightSlider->setMaxValue(ds.h);
|
myLauncherHeightSlider->setMaxValue(ds.h);
|
||||||
myLauncherHeightSlider->setStepValue(10);
|
myLauncherHeightSlider->setStepValue(10);
|
||||||
|
@ -142,7 +142,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
VarList::push_back(items, "Large", "large");
|
VarList::push_back(items, "Large", "large");
|
||||||
myLauncherFontPopup =
|
myLauncherFontPopup =
|
||||||
new PopUpWidget(myTab, font, xpos, ypos + 1, pwidth, lineHeight, items,
|
new PopUpWidget(myTab, font, xpos, ypos + 1, pwidth, lineHeight, items,
|
||||||
"Launcher Font ", lwidth);
|
"Launcher font ", lwidth);
|
||||||
wid.push_back(myLauncherFontPopup);
|
wid.push_back(myLauncherFontPopup);
|
||||||
ypos += lineHeight + 4 * 4;
|
ypos += lineHeight + 4 * 4;
|
||||||
|
|
||||||
|
@ -153,7 +153,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
VarList::push_back(items, "2x (1000x760)", "2");
|
VarList::push_back(items, "2x (1000x760)", "2");
|
||||||
myRomViewerPopup =
|
myRomViewerPopup =
|
||||||
new PopUpWidget(myTab, font, xpos, ypos + 1, pwidth, lineHeight, items,
|
new PopUpWidget(myTab, font, xpos, ypos + 1, pwidth, lineHeight, items,
|
||||||
"ROM Info viewer ", lwidth, kRomViewer);
|
"ROM info viewer ", lwidth, kRomViewer);
|
||||||
wid.push_back(myRomViewerPopup);
|
wid.push_back(myRomViewerPopup);
|
||||||
ypos += lineHeight + 4;
|
ypos += lineHeight + 4;
|
||||||
|
|
||||||
|
@ -347,6 +347,7 @@ void UIDialog::handleCommand(CommandSender* sender, int cmd, int data, int id)
|
||||||
myWheelLinesPopup->setValueUnit(" lines");
|
myWheelLinesPopup->setValueUnit(" lines");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case kLauncherSize:
|
||||||
case kRomViewer:
|
case kRomViewer:
|
||||||
handleRomViewer();
|
handleRomViewer();
|
||||||
break;
|
break;
|
||||||
|
@ -372,10 +373,24 @@ void UIDialog::handleCommand(CommandSender* sender, int cmd, int data, int id)
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
void UIDialog::handleRomViewer()
|
void UIDialog::handleRomViewer()
|
||||||
{
|
{
|
||||||
|
//string size = myRomViewerPopup->getSelectedName();
|
||||||
bool enable = myRomViewerPopup->getSelectedName() != "Off";
|
bool enable = myRomViewerPopup->getSelectedName() != "Off";
|
||||||
|
VariantList items;
|
||||||
|
|
||||||
myOpenBrowserButton->setEnabled(enable);
|
myOpenBrowserButton->setEnabled(enable);
|
||||||
mySnapLoadPath->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) ");*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
|
|
@ -51,6 +51,7 @@ class UIDialog : public Dialog
|
||||||
{
|
{
|
||||||
kListDelay = 'UILd',
|
kListDelay = 'UILd',
|
||||||
kMouseWheel = 'UIMw',
|
kMouseWheel = 'UIMw',
|
||||||
|
kLauncherSize = 'UIls',
|
||||||
kRomViewer = 'UIRv',
|
kRomViewer = 'UIRv',
|
||||||
kChooseSnapLoadDirCmd = 'UIsl', // snapshot dir (load files)
|
kChooseSnapLoadDirCmd = 'UIsl', // snapshot dir (load files)
|
||||||
kSnapLoadDirChosenCmd = 'UIsc' // snap chosen (load files)
|
kSnapLoadDirChosenCmd = 'UIsc' // snap chosen (load files)
|
||||||
|
|
|
@ -310,7 +310,7 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
|
||||||
CREATE_CLONE_BUTTON(Composite, "Clone Composite");
|
CREATE_CLONE_BUTTON(Composite, "Clone Composite");
|
||||||
CREATE_CLONE_BUTTON(Svideo, "Clone S-Video");
|
CREATE_CLONE_BUTTON(Svideo, "Clone S-Video");
|
||||||
CREATE_CLONE_BUTTON(RGB, "Clone RGB");
|
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");
|
CREATE_CLONE_BUTTON(Custom, "Revert");
|
||||||
|
|
||||||
// Add items for tab 2
|
// Add items for tab 2
|
||||||
|
|
Loading…
Reference in New Issue