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

display game name in high scores title

This commit is contained in:
thrust26 2020-02-20 08:26:51 +01:00
parent f8997038e6
commit be93aa27d1
4 changed files with 87 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/HighScoresManager.hxx
View File

@ -25,8 +25,8 @@ class OSystem;
namespace HSM {
static const uInt32 MAX_PLAYERS = 4;
static const uInt32 MAX_ADDR_CHARS = 4;
static const uInt32 MAX_SCORE_DIGITS = 6;
static const uInt32 MAX_SCORE_ADDR = 3;
static const uInt32 MAX_SCORE_DIGITS = 8;
static const uInt32 MAX_SCORE_ADDR = 4;
static const uInt32 MAX_SPECIAL_NAME = 5;
static const uInt32 MAX_SPECIAL_DIGITS = 3;

163
src/gui/HighScoresDialog.cxx
View File

@ -29,63 +29,32 @@
#include "HighScoresDialog.hxx"
static constexpr int BUTTON_GFX_W = 12, BUTTON_GFX_H = 12;
static constexpr std::array<uInt32, BUTTON_GFX_H> PREV = {
//0b000000000011,
//0b000000001110,
//0b000000111000,
//0b000011100000,
//0b001110000000,
//0b111000000000,
//0b111000000000,
//0b001110000000,
//0b000011100000,
//0b000000111000,
//0b000000001110,
//0b000000000011,
0b000001100000,
0b000001100000,
0b000011110000,
0b000010010000,
0b000110011000,
0b000100001000,
0b001100001100,
0b001000000100,
0b011000000110,
0b010000000010,
0b110000000011,
0b100000000001,
static constexpr int BUTTON_GFX_W = 10, BUTTON_GFX_H = 10;
static constexpr std::array<uInt32, BUTTON_GFX_H> PREV_GFX = {
0b0000110000,
0b0000110000,
0b0001111000,
0b0001111000,
0b0011001100,
0b0011001100,
0b0110000110,
0b0110000110,
0b1100000011,
0b1100000011,
};
static constexpr std::array<uInt32, BUTTON_GFX_H> NEXT = {
//0b110000000000,
//0b011100000000,
//0b000111000000,
//0b000001110000,
//0b000000011100,
//0b000000000111,
//0b000000000111,
//0b000000011100,
//0b000001110000,
//0b000111000000,
//0b011100000000,
//0b110000000000,
0b100000000001,
0b110000000011,
0b010000000010,
0b011000000110,
0b001000000100,
0b001100001100,
0b000100001000,
0b000110011000,
0b000010010000,
0b000011110000,
0b000001100000,
0b000001100000,
static constexpr std::array<uInt32, BUTTON_GFX_H> NEXT_GFX = {
0b1100000011,
0b1100000011,
0b0110000110,
0b0110000110,
0b0011001100,
0b0011001100,
0b0001111000,
0b0001111000,
0b0000110000,
0b0000110000,
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -117,19 +86,19 @@ HighScoresDialog::HighScoresDialog(OSystem& osystem, DialogContainer& parent,
_font.getStringWidth("256") - 4, lineHeight, items, "", 0,
kVariationChanged);
wid.push_back(myVariationPopup);
myPrevVarButton = new ButtonWidget(this, _font, myVariationPopup->getRight() + 154, ypos - 1,
myPrevVarButton = new ButtonWidget(this, _font, myVariationPopup->getRight() + 162, ypos - 1,
48, myVariationPopup->getHeight(),
PREV.data(), BUTTON_GFX_W, BUTTON_GFX_H, kPrevVariation);
PREV_GFX.data(), BUTTON_GFX_W, BUTTON_GFX_H, kPrevVariation);
wid.push_back(myPrevVarButton);
myNextVarButton = new ButtonWidget(this, _font, myPrevVarButton->getRight() + 8, ypos - 1,
48, myVariationPopup->getHeight(),
NEXT.data(), BUTTON_GFX_W, BUTTON_GFX_H, kNextVariation);
NEXT_GFX.data(), BUTTON_GFX_W, BUTTON_GFX_H, kNextVariation);
wid.push_back(myNextVarButton);
ypos += lineHeight + VGAP * 2;
ypos += lineHeight + VGAP * 4;
int xposRank = HBORDER;
int xposScore = xposRank + _font.getStringWidth("Rank") + 16;
int xposScore = xposRank + _font.getStringWidth("Rank") + 24;
int xposSpecial = xposScore + _font.getStringWidth("Score") + 24;
int xposName = xposSpecial + _font.getStringWidth("Round") + 16;
int xposDate = xposName + _font.getStringWidth("Name") + 16;
@ -146,16 +115,16 @@ HighScoresDialog::HighScoresDialog(OSystem& osystem, DialogContainer& parent,
for (uInt32 p = 0; p < NUM_POSITIONS; ++p)
{
myPositionsWidget[p] = new StaticTextWidget(this, _font, xposRank + 8, ypos + 1,
myPositionWidgets[p] = new StaticTextWidget(this, _font, xposRank + 8, ypos + 1,
(p < 9 ? " " : "") + std::to_string(p + 1));
myScoresWidget[p] = new StaticTextWidget(this, _font, xposScore, ypos + 1, "123456");
mySpecialsWidget[p] = new StaticTextWidget(this, _font, xposSpecial + 8, ypos + 1, "123");
myNamesWidget[p] = new StaticTextWidget(this, _font, xposName + 2, ypos + 1, " ");
myEditNamesWidget[p] = new EditTextWidget(this, _font, xposName, ypos - 1, nWidth, lineHeight);
myEditNamesWidget[p]->setFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNamesWidget[p]->setEnabled(false);
wid.push_back(myEditNamesWidget[p]);
myDatesWidget[p] = new StaticTextWidget(this, _font, xposDate, ypos + 1, "YY-MM-DD HH:MM");
myScoreWidgets[p] = new StaticTextWidget(this, _font, xposScore, ypos + 1, "12345678");
mySpecialWidgets[p] = new StaticTextWidget(this, _font, xposSpecial + 8, ypos + 1, "123");
myNameWidgets[p] = new StaticTextWidget(this, _font, xposName + 2, ypos + 1, " ");
myEditNameWidgets[p] = new EditTextWidget(this, _font, xposName, ypos - 1, nWidth, lineHeight);
myEditNameWidgets[p]->setFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNameWidgets[p]->setEnabled(false);
wid.push_back(myEditNameWidgets[p]);
myDateWidgets[p] = new StaticTextWidget(this, _font, xposDate, ypos + 1, "YY-MM-DD HH:MM");
myDeleteButtons[p] = new ButtonWidget(this, _font, xposDelete, ypos + 1, 18, 18, "X",
kDeleteSingle);
myDeleteButtons[p]->setID(p);
@ -190,6 +159,14 @@ void HighScoresDialog::loadConfig()
surface().applyAttributes();
}
string title = "High Scores - " + cartName();
uInt32 maxChars = (_w - 20) / _font.getMaxCharWidth();
if(title.length() > maxChars)
setTitle(title.substr(0, maxChars - 1) + ELLIPSIS);
else
setTitle(title);
VariantList items;
// fill drown down with all variation numbers of current game
@ -228,7 +205,7 @@ void HighScoresDialog::saveConfig()
// save initials and remember for the next time
if (myHighScorePos != -1)
{
myInitials = myEditNamesWidget[myHighScorePos]->getText();
myInitials = myEditNameWidgets[myHighScorePos]->getText();
myNames[myHighScorePos] = myInitials;
}
// save selected variation
@ -254,12 +231,12 @@ void HighScoresDialog::handleCommand(CommandSender* sender, int cmd, int data, i
handleVariation();
break;
case kPrevVariation:
myVariationPopup->setSelected(--myVariation);
myVariationPopup->setSelected(myVariation - 1);
handleVariation();
break;
case kNextVariation:
myVariationPopup->setSelected(++myVariation);
myVariationPopup->setSelected(myVariation + 1);
handleVariation();
break;
@ -318,43 +295,44 @@ void HighScoresDialog::updateWidgets(bool init)
if (myHighScores[p] > 0)
{
buf << std::setw(HSM::MAX_SCORE_DIGITS) << std::setfill(' ') << myHighScores[p];
myPositionsWidget[p]->clearFlags(Widget::FLAG_INVISIBLE);
myPositionWidgets[p]->clearFlags(Widget::FLAG_INVISIBLE);
myDeleteButtons[p]->clearFlags(Widget::FLAG_INVISIBLE);
myDeleteButtons[p]->setEnabled(true);
}
else
{
myPositionsWidget[p]->setFlags(Widget::FLAG_INVISIBLE);
myPositionWidgets[p]->setFlags(Widget::FLAG_INVISIBLE);
myDeleteButtons[p]->setFlags(Widget::FLAG_INVISIBLE);
myDeleteButtons[p]->setEnabled(false);
}
myScoresWidget[p]->setLabel(buf.str());
myScoreWidgets[p]->setLabel(buf.str());
buf.str("");
if (mySpecials[p] > 0)
buf << std::setw(HSM::MAX_SPECIAL_DIGITS) << std::setfill(' ') << mySpecials[p];
mySpecialsWidget[p]->setLabel(buf.str());
mySpecialWidgets[p]->setLabel(buf.str());
myNamesWidget[p]->setLabel(myNames[p]);
myDatesWidget[p]->setLabel(myDates[p]);
myNameWidgets[p]->setLabel(myNames[p]);
myDateWidgets[p]->setLabel(myDates[p]);
if (p == myEditPos)
{
myNamesWidget[p]->setFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNamesWidget[p]->clearFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNamesWidget[p]->setEnabled(true);
myEditNamesWidget[p]->setEditable(true);
myNameWidgets[p]->setFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNameWidgets[p]->clearFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNameWidgets[p]->setEnabled(true);
myEditNameWidgets[p]->setEditable(true);
if (init)
myEditNamesWidget[p]->setText(myInitials);
myEditNameWidgets[p]->setText(myInitials);
}
else
{
myNamesWidget[p]->clearFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNamesWidget[p]->setFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNamesWidget[p]->setEnabled(false);
myEditNamesWidget[p]->setEditable(false);
myNameWidgets[p]->clearFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNameWidgets[p]->setFlags(EditTextWidget::FLAG_INVISIBLE);
myEditNameWidgets[p]->setEnabled(false);
myEditNameWidgets[p]->setEditable(false);
}
}
_defaultWidget->setEnabled(myHighScores[0] > 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -420,7 +398,7 @@ void HighScoresDialog::deletePos(int pos)
{
myHighScorePos--;
myEditPos--;
myEditNamesWidget[myEditPos]->setText(myEditNamesWidget[myEditPos + 1]->getText());
myEditNameWidgets[myEditPos]->setText(myEditNameWidgets[myEditPos + 1]->getText());
}
myDirty = true;
}
@ -434,8 +412,8 @@ bool HighScoresDialog::handleDirty()
{
StringList msg;
msg.push_back("Do you want to save the changed");
msg.push_back("high scores for this variation?");
msg.push_back("Do you want to save the changes");
msg.push_back("for this variation?");
msg.push_back("");
myConfirmMsg = make_unique<GUI::MessageBox>
(this, _font, msg, _max_w, _max_h, kConfirmSave, kCancelSave,
@ -457,7 +435,12 @@ string HighScoresDialog::cartName() const
Properties props;
instance().propSet().getMD5(myMD5, props);
return props.get(PropType::Cart_Name);
if(props.get(PropType::Cart_Name).empty())
return instance().launcher().currentNode().getNameWithExt("");
else
return props.get(PropType::Cart_Name);
}
}

18
src/gui/HighScoresDialog.hxx
View File

@ -112,15 +112,17 @@ class HighScoresDialog : public Dialog
string myMD5;
PopUpWidget* myVariationPopup{nullptr};
ButtonWidget* myPrevVarButton{ nullptr };
ButtonWidget* myNextVarButton{ nullptr };
ButtonWidget* myPrevVarButton{nullptr};
ButtonWidget* myNextVarButton{nullptr};
StaticTextWidget* mySpecialLabelWidget{nullptr};
StaticTextWidget* myPositionsWidget[NUM_POSITIONS]{nullptr};
StaticTextWidget* myScoresWidget[NUM_POSITIONS]{nullptr};
StaticTextWidget* mySpecialsWidget[NUM_POSITIONS]{nullptr};
StaticTextWidget* myNamesWidget[NUM_POSITIONS]{nullptr};
EditTextWidget* myEditNamesWidget[NUM_POSITIONS]{nullptr};
StaticTextWidget* myDatesWidget[NUM_POSITIONS]{nullptr};
StaticTextWidget* myPositionWidgets[NUM_POSITIONS]{nullptr};
StaticTextWidget* myScoreWidgets[NUM_POSITIONS]{nullptr};
StaticTextWidget* mySpecialWidgets[NUM_POSITIONS]{nullptr};
StaticTextWidget* myNameWidgets[NUM_POSITIONS]{nullptr};
EditTextWidget* myEditNameWidgets[NUM_POSITIONS]{nullptr};
StaticTextWidget* myDateWidgets[NUM_POSITIONS]{nullptr};
ButtonWidget* myDeleteButtons[NUM_POSITIONS]{nullptr};
StaticTextWidget* myMD5Widget{nullptr};

2
src/gui/LauncherDialog.cxx
View File

@ -282,6 +282,8 @@ void LauncherDialog::loadConfig()
if(myRomInfoWidget)
myRomInfoWidget->reloadProperties(currentNode());
myList->clearFlags(Widget::FLAG_WANTS_RAWDATA); // always reset this
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -