diff options
| -rw-r--r-- | installer.iss | 2 | ||||
| -rw-r--r-- | quacker/quacker.cpp | 36 | ||||
| -rw-r--r-- | quacker/quacker.plist | 4 | ||||
| -rw-r--r-- | quacker/quacker.pro | 2 | ||||
| -rw-r--r-- | sim.cpp | 2 |
5 files changed, 8 insertions, 38 deletions
diff --git a/installer.iss b/installer.iss index a450985..6eba702 100644 --- a/installer.iss +++ b/installer.iss @@ -3,7 +3,7 @@ [Setup] AppName=Quackle -AppVerName=Quackle 1.0 +AppVerName=Quackle 1.0.2 DefaultDirName={pf}\Quackle DefaultGroupName=Quackle ChangesAssociations=yes diff --git a/quacker/quacker.cpp b/quacker/quacker.cpp index 7baeb9e..5f06822 100644 --- a/quacker/quacker.cpp +++ b/quacker/quacker.cpp @@ -198,36 +198,6 @@ void TopLevel::commit() return; } - const bool askSillyQuestion = false; - - if (askSillyQuestion) - { - if (!(m_game->currentPosition().location() == m_game->history().lastLocation())) - { - int result = QMessageBox::warning(this, tr("Previous Position Commit - Quackle"), dialogText(tr("You've asked to commit a move from a previous position. You have three options: <ol><li>Commit and resume the game from directly after this position. This throws away all later positions.</li><li>Commit and leave later moves the same. This is risky because scores and board position of all later moves might become inconsistent. You'll need to save the game and reopen it to have the scores make sense.</li><li>Cancel this commit. <b>Canceling is recommended.</b></li></ol>Which would you like to do?")), tr("&Commit and resume from after this position"), tr("&Commit and leave later moves the same"), tr("&Cancel"), 0, 2); - - switch (result) - { - case 0: - // Commit and resume after this position. - // We can just pass back to the normal commit method. - break; - - case 1: - // commit silently - m_game->currentPosition().prepareForCommit(); - setModified(true); - showToHuman(); - return; - - case 2: - default: - // cancel - return; - } - } - } - if (m_game->candidate().isAMove()) { stopEverything(); @@ -2145,9 +2115,9 @@ void TopLevel::firstTimeRun() void TopLevel::about() { QString aboutText = tr( -"<p><b>Quackle</b> 1.0.1 is a crossword game playing, analysis, and study tool. Visit the Quackle homepage at <tt><a href=\"http://quackle.org\">http://quackle.org</a></tt> for more information.</p>" +"<p><b>Quackle</b> 1.0.2 is a crossword game playing, analysis, and study tool. Visit the Quackle homepage at <tt><a href=\"http://quackle.org\">http://quackle.org</a></tt> for more information.</p>" "<p>Quackle was written by Jason Katz-Brown, John O'Laughlin, John Fultz, Matt Liberty, and Anand Buddhdev. We thank the anonymous donor who made this software free.</p>" -"<p>Copyright 2005-2015 by</p>" +"<p>Copyright 2005-2016 by</p>" "<ul>" "<li>Jason Katz-Brown <jasonkatzbrown@gmail.com></li>" "<li>John O'Laughlin <olaughlin@gmail.com></li>" @@ -2173,7 +2143,7 @@ void TopLevel::about() fclose(file); aboutText += "</ul>"; } - QMessageBox::about(this, tr("About Quackle 1.0.1"), dialogText(aboutText)); + QMessageBox::about(this, tr("About Quackle 1.0.2"), dialogText(aboutText)); } void TopLevel::hints() diff --git a/quacker/quacker.plist b/quacker/quacker.plist index eef0ac9..cf8d52f 100644 --- a/quacker/quacker.plist +++ b/quacker/quacker.plist @@ -13,7 +13,7 @@ <key>CFBundleName</key> <string>Quackle</string> <key>CFBundleShortVersionString</key> - <string>1.0.0</string> + <string>1.0.2</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>LSApplicationCategoryType</key> @@ -21,6 +21,6 @@ <key>NSPrincipalClass</key> <string>NSApplication</string> <key>NSHumanReadableCopyright</key> - <string>Copyright © 2005-2015 by Jason Katz-Brown & John O'Laughlin</string> + <string>Copyright © 2005-2016 by Jason Katz-Brown & John O'Laughlin</string> </dict> </plist> diff --git a/quacker/quacker.pro b/quacker/quacker.pro index c6fc0bb..774055b 100644 --- a/quacker/quacker.pro +++ b/quacker/quacker.pro @@ -1,5 +1,5 @@ TEMPLATE = app -VERSION = 1.0.1 +VERSION = 1.0.2 TARGET = Quackle DEPENDPATH += .. ../quackleio INCLUDEPATH += . .. @@ -315,7 +315,7 @@ void Simulator::simulate(int plies) { LetterString deadwood; deadwoodScore = m_simulatedGame.currentPosition().deadwood(&deadwood); - // accont for deadwood in this move rather than a separate + // account for deadwood in this move rather than a separate // UnusedTilesBonus move. move.score += deadwoodScore; } |