3 files changed, 30 insertions, 13 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index e8bdc7511..381244799 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -703,11 +703,11 @@ impHandler0(hideWindows)
     return true;
 }
 
-static bool showHelpPage(const std::string &page)
+static bool showHelpPage(const std::string &page, const bool showHide)
 {
     if (helpWindow)
     {
-        if (helpWindow->isWindowVisible())
+        if (showHide && helpWindow->isWindowVisible())
         {
             helpWindow->setVisible(false);
         }
@@ -723,12 +723,12 @@ static bool showHelpPage(const std::string &page)
 
 impHandler0(helpWindowShow)
 {
-    return showHelpPage("index");
+    return showHelpPage("index", true);
 }
 
 impHandler0(aboutWindowShow)
 {
-    return showHelpPage("about");
+    return showHelpPage("about", false);
 }
 
 static void showHideWindow(Window *const window)
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index a77516c62..8e8831a49 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -24,7 +24,9 @@
 #include "configuration.h"
 #include "main.h"
 
-#include "gui/widgets/label.h"
+#include "gui/widgets/browserbox.h"
+
+#include "input/inputmanager.h"
 
 #include "resources/image.h"
 #include "resources/imagehelper.h"
@@ -35,9 +37,11 @@
 
 Desktop::Desktop(const Widget2 *const widget) :
     Container(widget),
+    LinkHandler(),
     WidgetListener(),
     mWallpaper(nullptr),
-    mVersionLabel(nullptr),
+    mVersionLabel(new BrowserBox(this, BrowserBox::AUTO_WRAP, true,
+        "browserbox.xml")),
     mSkin(nullptr),
     mBackgroundColor(getThemeColor(Theme::BACKGROUND, 128)),
     mBackgroundGrayColor(getThemeColor(Theme::BACKGROUND_GRAY)),
@@ -57,15 +61,16 @@ Desktop::Desktop(const Widget2 *const widget) :
     const std::string appName = branding.getValue("appName", std::string());
     if (appName.empty())
     {
-        mVersionLabel = new Label(this, FULL_VERSION);
+        mVersionLabel->addRow(FULL_VERSION);
     }
     else
     {
-        mVersionLabel = new Label(this, strprintf("%s (%s)", FULL_VERSION,
+        mVersionLabel->addRow(strprintf("%s (%s)", FULL_VERSION,
             appName.c_str()));
     }
-
-    mVersionLabel->setBackgroundColor(getThemeColor(Theme::BACKGROUND, 128));
+    mVersionLabel->addRow("copyright",
+        "(C) ManaPlus developers, http://manaplus.org");
+    mVersionLabel->setLinkHandler(this);
 }
 
 Desktop::~Desktop()
@@ -100,6 +105,7 @@ void Desktop::reloadWallpaper()
 
 void Desktop::widgetResized(const Event &event A_UNUSED)
 {
+    mVersionLabel->setSize(getWidth(), getHeight());
     setBestFittingWallpaper();
 }
 
@@ -198,3 +204,9 @@ void Desktop::setBestFittingWallpaper()
         logger->log("Couldn't load %s as wallpaper", wallpaperName.c_str());
     }
 }
+
+void Desktop::handleLink(const std::string &link, MouseEvent *event)
+{
+    if (link == "copyright")
+        inputManager.executeAction(Input::KEY_WINDOW_ABOUT);
+}
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index f0fd500ea..f3b0cd371 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -24,12 +24,14 @@
 
 #include "gui/widgets/container.h"
 
+#include "gui/widgets/linkhandler.h"
+
 #include "listeners/widgetlistener.h"
 
 #include "localconsts.h"
 
+class BrowserBox;
 class Image;
-class Label;
 class Skin;
 
 /**
@@ -46,7 +48,8 @@ class Skin;
  * \ingroup GUI
  */
 class Desktop final : public Container,
-                      private WidgetListener
+                      public LinkHandler,
+                      public WidgetListener
 {
     public:
         explicit Desktop(const Widget2 *const widget);
@@ -66,11 +69,13 @@ class Desktop final : public Container,
 
         void postInit();
 
+        void handleLink(const std::string &link,
+                        MouseEvent *event) override final;
     private:
         void setBestFittingWallpaper();
 
         Image *mWallpaper;
-        Label *mVersionLabel;
+        BrowserBox *mVersionLabel;
         Skin *mSkin;
         Color mBackgroundColor;
         Color mBackgroundGrayColor;