Version added to GUI

Author: dcwhite

src/CMake/Modules/Version.cc.in

@@ -26,7 +26,7 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <Core/Application/version.h>
+#include <Core/Application/Version.h>
 
-const std::string GIT_VERSION_TAG = "@VERSION_TAG@";
-const std::string GIT_COMMIT_SHA = "@VERSION_HASHVAR@";
+const std::string VersionInfo::GIT_VERSION_TAG = "@VERSION_TAG@";
+const std::string VersionInfo::GIT_COMMIT_SHA = "@VERSION_HASHVAR@";

src/Core/Application/Application.cc

@@ -173,7 +173,7 @@ std::string Application::commandHelpString() const
 
 std::string Application::version() const
 {
-  return GIT_VERSION_TAG.empty() ? "5.0.0 developer version" : GIT_VERSION_TAG;
+  return VersionInfo::GIT_VERSION_TAG.empty() ? "5.0.0 developer version" : VersionInfo::GIT_VERSION_TAG;
 }
 
 boost::filesystem::path Application::configDirectory() const

src/Core/Application/Version.h

@@ -24,14 +24,19 @@
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
-*/
+   */
 
 #ifndef SCIRUN_GIT_VERSION_H
 #define SCIRUN_GIT_VERSION_H
 
 #include <string>
-
-extern const std::string GIT_VERSION_TAG;
-extern const std::string GIT_COMMIT_SHA;
+#include <Core/Application/share.h>
+
+class SCISHARE VersionInfo
+{
+public:
+  static const std::string GIT_VERSION_TAG;
+  static const std::string GIT_COMMIT_SHA;
+};
 
 #endif

src/Interface/Application/SCIRunMainWindow.cc

@@ -58,6 +58,7 @@
 #include <Core/Application/Application.h>
 #include <Core/Application/Preferences/Preferences.h>
 #include <Core/Logging/Log.h>
+#include <Core/Application/Version.h>
 
 #include <Dataflow/Serialization/Network/XMLSerializer.h>
 #include <Dataflow/Serialization/Network/NetworkDescriptionSerialization.h>
@@ -296,6 +297,8 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
 
   hideNonfunctioningWidgets();
 
+  statusBar()->addPermanentWidget(new QLabel("Version: " + QString::fromStdString(VersionInfo::GIT_VERSION_TAG)));
+
   //parseStyleXML();
 }