jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Feature/3139 new features for tips (#3152)

Browse source 
* "Tip of the Day" option added to Help menu

* Tip of the Day setting moved

* If no new tips are availabe, don't show tip of the day again

* list storing try #1

* first unseen tip shown first

* lastShownTip removed

* fixed next/previous buttons

* spaces > tab

* "Show this window on startup" is not checked by default
This commit is contained in:
David Szabo 2018-04-01 10:52:26 +02:00 • committed by Zach H
parent 6374d157fc
commit e1394bd851
8 changed files with 62 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cockatrice/src/dlg_tip_of_the_day.cpp
View file

@ -41,7 +41,19 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
tipNumber = new QLabel();
tipNumber->setAlignment(Qt::AlignCenter);
currentTip = settingsCache->getLastShownTip() + 1;
if (settingsCache->getSeenTips().size() != tipDatabase->rowCount()) {
newTipsAvailable = true;
QList<int> rangeToMaxTips;
for (int i = 0; i < tipDatabase->rowCount(); i++) {
rangeToMaxTips.append(i);
}
QSet<int> unseenTips = rangeToMaxTips.toSet() - settingsCache->getSeenTips().toSet();
currentTip = *std::min_element(unseenTips.begin(), unseenTips.end());
} else {
newTipsAvailable = false;
currentTip = 0;
}
connect(this, SIGNAL(newTipRequested(int)), this, SLOT(updateTip(int)));
newTipRequested(currentTip);
@ -63,7 +75,7 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
connect(previousButton, SIGNAL(clicked()), this, SLOT(previousClicked()));
showTipsOnStartupCheck = new QCheckBox("Show tips on startup");
showTipsOnStartupCheck->setChecked(true);
showTipsOnStartupCheck->setChecked(settingsCache->getShowTipsOnStartup());
connect(showTipsOnStartupCheck, SIGNAL(clicked(bool)), settingsCache, SLOT(setShowTipsOnStartup(bool)));
buttonBar = new QHBoxLayout();
buttonBar->addWidget(showTipsOnStartupCheck);
@ -118,6 +130,13 @@ void DlgTipOfTheDay::updateTip(int tipId)
tipId = tipId % tipDatabase->rowCount();
}
// Store tip id as seen
QList<int> seenTips = settingsCache->getSeenTips();
if (!seenTips.contains(tipId)) {
seenTips.append(tipId);
settingsCache->setSeenTips(seenTips);
}
TipOfTheDay tip = tipDatabase->getTip(tipId);
titleText = tip.getTitle();
contentText = tip.getContent();
@ -140,7 +159,6 @@ void DlgTipOfTheDay::updateTip(int tipId)
tipNumber->setText("Tip " + QString::number(tipId + 1) + " / " + QString::number(tipDatabase->rowCount()));
currentTip = static_cast<unsigned int>(tipId);
settingsCache->setLastShownTip(currentTip);
}
void DlgTipOfTheDay::resizeEvent(QResizeEvent *event)