From 8d225071b5873496cb33802e6aaaff4b3ace2a8b Mon Sep 17 00:00:00 2001
From: Trevor Bekolay <tbekolay@gmail.com>
Date: Tue, 11 Apr 2017 11:12:38 -0400
Subject: [PATCH] Release version 1.4.0

---
 simulator-ui/docs/conf.py                            |  7 ++-----
 .../src/java/main/ca/nengo/ui/NengoGraphics.java     | 12 ++++++------
 simulator/src/resources/ca/nengo/ui/nengo.desktop    |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/simulator-ui/docs/conf.py b/simulator-ui/docs/conf.py
index b89db697..d049c983 100644
--- a/simulator-ui/docs/conf.py
+++ b/simulator-ui/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3'
+version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.3'
+release = '1.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -245,6 +245,3 @@
 autoclass_content='both'
 todo_include_todos=True
 autodoc_member_order='bysource'
-
-
-
diff --git a/simulator-ui/src/java/main/ca/nengo/ui/NengoGraphics.java b/simulator-ui/src/java/main/ca/nengo/ui/NengoGraphics.java
index 7b7cd93b..6f5389de 100644
--- a/simulator-ui/src/java/main/ca/nengo/ui/NengoGraphics.java
+++ b/simulator-ui/src/java/main/ca/nengo/ui/NengoGraphics.java
@@ -114,7 +114,7 @@ Public License license (the GPL License), in which case the provisions of GPL
 
 /**
  * Top level instance of the NeoGraphics application
- * 
+ *
  * @author Shu Wu
  */
 /**
@@ -126,7 +126,7 @@ public class NengoGraphics extends AppFrame implements NodeContainer {
     /**
      * Nengo version number, no real rhyme or reason to it
      */
-    public static final double VERSION = 1.4;
+    public static final String VERSION = "1.4.0";
 
     /**
      * String used in the UI to identify Nengo
@@ -828,7 +828,7 @@ protected void updateScriptConsole() {
 
     /**
      * TODO
-     * 
+     *
      * @author TODO
      */
     public class ToggleScriptPane extends StandardAction {
@@ -1028,7 +1028,7 @@ public AuxillarySplitPane toJComponent() {
 
 /**
  * Runs the closest network to the currently selected obj
- * 
+ *
  * @author Shu Wu
  */
 class RunNetworkAction extends StandardAction {
@@ -1059,7 +1059,7 @@ protected void action() throws ActionException {
 
 /**
  * Saves the closest network to the currently selected object
- * 
+ *
  * @author Shu Wu
  */
 class SaveNetworkAction extends StandardAction {
@@ -1088,7 +1088,7 @@ protected void action() throws ActionException {
 
 /**
  * Generates a script for the highest network including the selected object
- * 
+ *
  * @author Chris Eliasmith
  */
 class GenerateScriptAction extends StandardAction {
diff --git a/simulator/src/resources/ca/nengo/ui/nengo.desktop b/simulator/src/resources/ca/nengo/ui/nengo.desktop
index 9bc7c7ac..ec7ec28e 100644
--- a/simulator/src/resources/ca/nengo/ui/nengo.desktop
+++ b/simulator/src/resources/ca/nengo/ui/nengo.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
-Version=1.3
+Version=1.4.0
 Name=Nengo
 Comment=Large-scale neural simulator
 Exec=nengo
 Icon=nengologo256
 Terminal=false
-Categories=Education;Science;Java
\ No newline at end of file
+Categories=Education;Science;Java