From 06e02ed77f231036192baddff9d79cc602ac8dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Sedej?= <gsedej@gmail.com>
Date: Wed, 12 Mar 2014 10:53:56 +0100
Subject: [PATCH 1/3] Added version and revision number to mainmenu

---
 apps/openmw/mwgui/mainmenu.cpp     | 10 ++++++++++
 apps/openmw/mwgui/mainmenu.hpp     |  1 +
 files/mygui/openmw_mainmenu.layout |  6 +++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index da1992474b..2788c8f5ca 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -1,5 +1,7 @@
 #include "mainmenu.hpp"
 
+#include <components/version/version.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -20,6 +22,14 @@ namespace MWGui
         , mButtonBox(0), mWidth (w), mHeight (h)
         , mSaveGameDialog(NULL)
     {
+        getWidget(mVersionText, "VersionText");
+        std::string rev =  OPENMW_VERSION_COMMITHASH;
+        rev = rev.substr(0,10);
+        std::stringstream sstream;
+        sstream << "OpenMW version: " << OPENMW_VERSION << "\nrevision: " <<  rev;
+        std::string output = sstream.str();
+        mVersionText->setCaptionWithReplacing(output);
+
         updateMenu();
     }
 
diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp
index 6d52f26d5d..a9453b2c82 100644
--- a/apps/openmw/mwgui/mainmenu.hpp
+++ b/apps/openmw/mwgui/mainmenu.hpp
@@ -24,6 +24,7 @@ namespace MWGui
         private:
 
             MyGUI::Widget* mButtonBox;
+	    MyGUI::TextBox* mVersionText;
 
             std::map<std::string, MWGui::ImageButton*> mButtons;
 
diff --git a/files/mygui/openmw_mainmenu.layout b/files/mygui/openmw_mainmenu.layout
index 4479a121f6..2dc43f1b7e 100644
--- a/files/mygui/openmw_mainmenu.layout
+++ b/files/mygui/openmw_mainmenu.layout
@@ -2,5 +2,9 @@
 
 <MyGUI type="Layout">
     <!-- The entire screen -->
-    <Widget type="Widget" layer="Windows" position="0 0 300 300" name="_Main" />
+    <Widget type="Widget" layer="Windows" position="0 0 300 300" name="_Main" >
+        <Widget type="TextBox" skin="SandText" position="0 250 300 50" align="Bottom" name="VersionText">
+            <Property key="TextAlign" value="Center"/>
+        </Widget>
+    </Widget>	
 </MyGUI>

From d72a2f1ffb85d4e416c5bad19b974403c8f6c3ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Sedej?= <gsedej@gmail.com>
Date: Wed, 12 Mar 2014 12:33:42 +0100
Subject: [PATCH 2/3] Added code to test if git hash is availible

---
 apps/openmw/mwgui/mainmenu.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 2788c8f5ca..4ad260fd93 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -23,12 +23,20 @@ namespace MWGui
         , mSaveGameDialog(NULL)
     {
         getWidget(mVersionText, "VersionText");
-        std::string rev =  OPENMW_VERSION_COMMITHASH;
-        rev = rev.substr(0,10);
         std::stringstream sstream;
-        sstream << "OpenMW version: " << OPENMW_VERSION << "\nrevision: " <<  rev;
+        sstream << "OpenMW version: " << OPENMW_VERSION;
+
+        // adding info about git hash if availible
+        std::string rev = OPENMW_VERSION_COMMITHASH;
+        std::string tag = OPENMW_VERSION_TAGHASH;
+        if (!rev.empty() && !tag.empty())
+        {
+                rev = rev.substr(0,10);
+                sstream << "\nrevision: " <<  rev;
+        }
+        
         std::string output = sstream.str();
-        mVersionText->setCaptionWithReplacing(output);
+        mVersionText->setCaption(output);
 
         updateMenu();
     }

From 43a12fffd58369726bb51bc5a0dfcc349e933b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Sedej?= <gsedej@gmail.com>
Date: Wed, 12 Mar 2014 14:37:44 +0100
Subject: [PATCH 3/3] indentation issue...

---
 apps/openmw/mwgui/mainmenu.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp
index a9453b2c82..48b515d65b 100644
--- a/apps/openmw/mwgui/mainmenu.hpp
+++ b/apps/openmw/mwgui/mainmenu.hpp
@@ -24,7 +24,7 @@ namespace MWGui
         private:
 
             MyGUI::Widget* mButtonBox;
-	    MyGUI::TextBox* mVersionText;
+            MyGUI::TextBox* mVersionText;
 
             std::map<std::string, MWGui::ImageButton*> mButtons;