Merge version strings, add version to setup, etc

All instances of version strings should now use the same text. The
version label was moved from main.cpp to Desktop. A new version label
was added to SetupDialog to make it easier to get the version if you are
already in game.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 50068c6e..b2474ead 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -21,6 +21,8 @@
 
 #include "setup.h"
 
+#include "main.h"
+
 #include "gui/setup_audio.h"
 #include "gui/setup_colors.h"
 #include "gui/setup_joystick.h"
@@ -29,6 +31,7 @@
 #include "gui/setup_video.h"
 
 #include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
 #include "utils/dtor.h"
@@ -101,6 +104,10 @@ Setup::Setup():
 
     add(panel);
 
+    Label *version = new Label(Main::version);
+    version->setPosition(5, height - version->getHeight() - 5);
+    add(version);
+
     center();
 
     setInGame(false);