diff options
| author | John Fultz <jfultz@wolfram.com> | 2015-11-08 02:01:53 -0600 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2015-11-08 02:01:53 -0600 |
| commit | a32891e1408cbfc526af5497c96b0092a4b8d0fd (patch) | |
| tree | 6f0e612e9e7e200db82b4dda36d71d198c8fd98f | |
| parent | 32632761ebf834b4efdcd21c529c827bf2ab62f0 (diff) | |
Minor bug fixes.
* Windows installer now set up to use MSVC redistributables, not
MinGW ones.
* The Board popup's "Edit..." button should be disabled when the
popup is empty (i.e., the only choice is to add one, which is
in the popup).
| -rw-r--r-- | installer.iss | 5 | ||||
| -rw-r--r-- | quacker/settings.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/installer.iss b/installer.iss index 23e770f..74be11d 100644 --- a/installer.iss +++ b/installer.iss @@ -23,11 +23,10 @@ Root: HKCR; Subkey: "QuackleGameFile\shell\open\command"; ValueType: string; Val [Files] Source: "quacker\release\Quackle.exe"; DestDir: "{app}" Source: "LICENSE"; DestDir: "{app}" -Source: "mingwm10.dll"; DestDir: "{app}" -Source: "libgcc_s_dw2-1.dll"; DestDir: "{app}" -Source: "libstdc++-6.dll"; DestDir: "{app}" Source: "QtCore4.dll"; DestDir: "{app}" Source: "QtGui4.dll"; DestDir: "{app}" +Source: "msvcp120.dll"; DestDir: "{app}" +Source: "msvcr120.dll"; DestDir: "{app}" Source: "data\themes\*"; DestDir: "{app}\data\themes" Source: "data\alphabets\*"; DestDir: "{app}\data\alphabets" diff --git a/quacker/settings.cpp b/quacker/settings.cpp index cd6de27..6cbcb74 100644 --- a/quacker/settings.cpp +++ b/quacker/settings.cpp @@ -555,6 +555,8 @@ void Settings::loadBoardNameCombo() m_boardNameCombo->addItem("Add new board..."); settings.endGroup(); + m_editBoard->setEnabled(!boardNames.empty()); + QString currentItem = settings.value("quackle/settings/board-name", QString("")).toString(); int currentItemIndex = m_boardNameCombo->findText(currentItem); if (m_boardNameCombo->count() > 0 && currentItemIndex < 0) |