From fbbd2edd6f33628b6e9257cf876670759f454017 Mon Sep 17 00:00:00 2001 From: Jared Adams 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/widgets/desktop.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/gui/widgets/desktop.cpp') 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() -- cgit v1.2.3-70-g09d2