Update version number to 2.0

thesimonho · Jun 29, 2017 · 97a1cbc · 97a1cbc
1 parent 216f7ab
commit 97a1cbc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Change Log
 
+## [2.0.0](https://github.com/sho-87/cognitive-battery/releases/tag/2.0.0) *(2017-07-xx)*
+
 ## [1.1.0](https://github.com/sho-87/cognitive-battery/releases/tag/1.1.0) *(2016-10-09)*
 
 **General**
@@ -30,4 +32,4 @@
 - User input is no longer (pre)registered in digit span during digit display
 
 ## [1.0.0](https://github.com/sho-87/cognitive-battery/releases/tag/1.0) *(2015-11-21)*
-- Initial release
+- Initial release
diff --git a/README.md b/README.md
@@ -45,10 +45,11 @@ most of which are just Python modules:
   - Included with Anaconda. Otherwise, install using pip (`pip install pandas`)
 * **Numpy**
   - Included with Anaconda. Otherwise, install using pip (`pip install numpy`)
-* **PyQT5**
+* **PyQt5**
   - Included with Anaconda. Alternatively, full release (including QT designer)
    downloadable from the
    [PyQT website](https://www.riverbankcomputing.com/software/pyqt/download5)
+  - **Note**: Cognitive Battery version 1.x uses PyQt4. However, version 2.x onwards uses PyQt5
 * **Pygame**
   - Downloadable from the
   [Pygame website](http://www.pygame.org/download.shtml). If you installed

diff --git a/designer/about_dialog_qt.py b/designer/about_dialog_qt.py
@@ -48,6 +48,7 @@ def setupUi(self, Dialog):
         self.emailValue.setObjectName("emailValue")
         self.gridLayout.addWidget(self.emailValue, 2, 1, 1, 1)
         self.versionValue = QtWidgets.QLabel(Dialog)
+        self.versionValue.setText("")
         self.versionValue.setObjectName("versionValue")
         self.gridLayout.addWidget(self.versionValue, 0, 1, 1, 1)
         self.websiteValue = QtWidgets.QLabel(Dialog)
@@ -97,7 +98,6 @@ def retranslateUi(self, Dialog):
         self.title.setText(_translate("Dialog", "Cognitive Battery"))
         self.emailLabel.setText(_translate("Dialog", "Email:"))
         self.emailValue.setText(_translate("Dialog", "<a href=\"mailto:[email protected]?Subject=Cognitive%20Battery\">[email protected]</a>"))
-        self.versionValue.setText(_translate("Dialog", "1.1"))
         self.websiteValue.setText(_translate("Dialog", "<a href=\"http://www.simonho.ca\">www.simonho.ca</a>"))
         self.authorValue.setText(_translate("Dialog", "Simon Ho"))
         self.websiteLabel.setText(_translate("Dialog", "Website:"))

diff --git a/designer/ui/about_dialog_qt.ui b/designer/ui/about_dialog_qt.ui
@@ -79,7 +79,7 @@
        <item row="0" column="1">
         <widget class="QLabel" name="versionValue">
          <property name="text">
-          <string>1.1</string>
+          <string/>
          </property>
         </widget>
        </item>

diff --git a/interface/about_dialog.py b/interface/about_dialog.py
@@ -11,6 +11,9 @@ def __init__(self, parent=None):
         # Setup the about dialog box
         self.setupUi(self)
 
+        # Set version number
+        self.versionValue.setText("2.0")
+
         # Add icon image
         project_dir = os.path.dirname(os.path.dirname(
             os.path.abspath(__file__)))  # Get parent directory