From fbbd2edd6f33628b6e9257cf876670759f454017 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 12 Apr 2009 09:58:33 -0600
Subject: 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.
---
 src/gui/setup.cpp           | 7 +++++++
 src/gui/widgets/desktop.cpp | 8 ++++++++
 src/gui/widgets/desktop.h   | 6 ++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/gui')

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);
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index fc66ed93..4b806095 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -22,6 +22,7 @@
 #include "gui/widgets/desktop.h"
 
 #include "gui/palette.h"
+#include "gui/widgets/label.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
@@ -29,6 +30,7 @@
 
 #include "graphics.h"
 #include "log.h"
+#include "main.h"
 
 Desktop::Desktop()
     : mWallpaper(0)
@@ -36,12 +38,16 @@ Desktop::Desktop()
     addWidgetListener(this);
 
     Wallpaper::loadWallpapers();
+
+    versionLabel = new Label(Main::version);
+    add(versionLabel, 25, 2);
 }
 
 Desktop::~Desktop()
 {
     if (mWallpaper)
         mWallpaper->decRef();
+    delete versionLabel;
 }
 
 void Desktop::reloadWallpaper()
@@ -73,6 +79,8 @@ void Desktop::draw(gcn::Graphics *graphics)
                 (getWidth() - mWallpaper->getWidth()) / 2,
                 (getHeight() - mWallpaper->getHeight()) / 2);
     }
+
+    drawChildren(graphics);
 }
 
 void Desktop::setBestFittingWallpaper()
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index ed68145a..7eabde54 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -22,10 +22,11 @@
 #ifndef DESKTOP_H
 #define DESKTOP_H
 
-#include <guichan/widget.hpp>
+#include <guichan/widgets/container.hpp>
 #include <guichan/widgetlistener.hpp>
 
 class Image;
+class Label;
 
 /**
  * Desktop widget, for drawing a background image and color.
@@ -38,7 +39,7 @@ class Image;
  *
  * \ingroup GUI
  */
-class Desktop : public gcn::Widget, gcn::WidgetListener
+class Desktop : public gcn::Container, gcn::WidgetListener
 {
     public:
         Desktop();
@@ -57,6 +58,7 @@ class Desktop : public gcn::Widget, gcn::WidgetListener
         void setBestFittingWallpaper();
 
         Image *mWallpaper;
+        Label *versionLabel;
 };
 
 #endif // DESKTOP_H
-- 
cgit v1.2.3-70-g09d2