Skip to content

Commit

Permalink
update tour buttons text
Browse files Browse the repository at this point in the history
Remove debug artefact
  • Loading branch information
anatoly-os committed Dec 15, 2018
1 parent 3c886cf commit a8a8ee0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion mscore/newwizard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@ NewWizard::NewWizard(QWidget* parent)
setOption(QWizard::CancelButtonOnLeft, true);
#endif
setWizardStyle(wizardStyleValue);
qDebug() << int(wizardStyle());

setPixmap(QWizard::LogoPixmap, QPixmap(":/data/mscore.png"));
setPixmap(QWizard::WatermarkPixmap, QPixmap());
Expand Down
7 changes: 4 additions & 3 deletions mscore/tourhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,14 @@ void TourHandler::displayTour(Tour* tour)
QPushButton* backButton = nullptr;
QPushButton* nextButton = nullptr;

//QMessageBox doesn't support next/back semantic for various OS styles. QWizard does.
mbox->addButton(tr("Close"), QMessageBox::AcceptRole);
if (i != 0)
backButton = mbox->addButton(tr("< Previous"), QMessageBox::NoRole);
backButton = mbox->addButton(tr("Back"), QMessageBox::NoRole); //Explicit text is bad since it varies depending on the OS. MacOS uses "Go back"
if (i != tourMessages.size() - 1)
nextButton = mbox->addButton(tr("Next >"), QMessageBox::YesRole);
nextButton = mbox->addButton(tr("Next"), QMessageBox::YesRole); //MacOS uses "Continue"
else
nextButton = mbox->addButton(tr("End"), QMessageBox::YesRole);
nextButton = mbox->addButton(tr("End"), QMessageBox::YesRole); // MacOS uses "Done"

// Sets default to last pressed button
if (next)
Expand Down

0 comments on commit a8a8ee0

Please sign in to comment.