New login wallpaper by Momotaro and shortened update window a bit to not

overlap the logo.

4 files changed, 17 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 228206b8..d63695ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,4 +19,7 @@
 	  format.
 	* src/gui/updatewindow.h, src/gui/updatewindow.cpp: Changed member
 	  names, set a 15 second timeout for connecting to update server and
-	  restore some doxygen comments.
+	  restore some doxygen comments, improved size adaption and made the
+	  window a shorter.
+	* data/graphics/images/login_wallpaper.png: New login wallpaper by
+	  Momotaro.
diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 03a98db3..54692dfd 100644
--- a/data/graphics/images/login_wallpaper.png
+++ b/data/graphics/images/login_wallpaper.png
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index a12c6510..e9e3f1b9 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -28,8 +28,11 @@
 ImageRect ProgressBar::mBorder;
 int ProgressBar::mInstances = 0;
 
-ProgressBar::ProgressBar(float progress, int x, int y, unsigned int width, unsigned int height,
-        unsigned char red, unsigned char green, unsigned char blue):
+ProgressBar::ProgressBar(float progress, int x, int y,
+                         unsigned int width, unsigned int height,
+                         unsigned char red,
+                         unsigned char green,
+                         unsigned char blue):
     gcn::Widget(),
     red(red), green(green), blue(blue),
     redToGo(red), greenToGo(green), blueToGo(blue)
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index d29474fe..ebe9013f 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -50,17 +50,12 @@ UpdaterWindow::UpdaterWindow():
     mCurlError = new char[CURL_ERROR_SIZE];
     mCurlError[0] = 0;
 
-    int h = 300;
+    int h = 240;
     int w = 320;
     setContentSize(w, h);
 
     mBrowserBox = new BrowserBox();
     mBrowserBox->setOpaque(false);
-    mScrollArea = new ScrollArea(mBrowserBox);
-    mScrollArea->setDimension(gcn::Rectangle(5, 5, 310, 190));
-    mLabel = new gcn::Label("Connecting...");
-    mLabel->setPosition(5,205);
-    mProgressBar = new ProgressBar(0.0, 5, 225, w - 10, 40, 37, 70, 23);
     mCancelButton = new Button("Cancel");
     mCancelButton->setPosition(5, h - 5 - mCancelButton->getHeight());
     mCancelButton->setEventId("cancel");
@@ -72,6 +67,13 @@ UpdaterWindow::UpdaterWindow():
     mPlayButton->setEventId("play");
     mPlayButton->setEnabled(false);
     mPlayButton->addActionListener(this);
+    mProgressBar = new ProgressBar(0.0, 5, mCancelButton->getY() - 20 - 5,
+                                   w - 10, 20, 37, 70, 23);
+    mLabel = new gcn::Label("Connecting...");
+    mLabel->setPosition(5, mProgressBar->getY() - mLabel->getHeight() - 5);
+    mScrollArea = new ScrollArea(mBrowserBox);
+    mScrollArea->setDimension(gcn::Rectangle(5, 5, 310,
+                                             mLabel->getY() - 12));
 
     add(mScrollArea);
     add(mLabel);