Used spacer to pretty up setup

Signed-off-by: Jared Adams <jaxad0127@gmail.com>

2 files changed, 26 insertions, 5 deletions

diff --git a/src/gui/setup_interface.cpp b/src/gui/setup_interface.cpp
index 2c4a6583..5eefe6d5 100644
--- a/src/gui/setup_interface.cpp
+++ b/src/gui/setup_interface.cpp
@@ -37,6 +37,7 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/slider.h"
+#include "gui/widgets/spacer.h"
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/dropdown.h"
 
@@ -105,7 +106,7 @@ Setup_Interface::Setup_Interface():
                                        mVisibleNamesEnabled)),
     mNameCheckBox(new CheckBox(_("Show own name"), mNameEnabled)),
     mNPCLogCheckBox(new CheckBox(_("Log NPC dialogue"), mNPCLogEnabled)),
-    mPickupNotifyLabel(new Label(_("Show pickup notification"))),
+    mPickupNotifyLabel(new Label(_("Show pickup notification:"))),
     // TRANSLATORS: Refers to "Show pickup notification"
     mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
     // TRANSLATORS: Refers to "Show pickup notification"
@@ -119,12 +120,14 @@ Setup_Interface::Setup_Interface():
     setName(_("Interface"));
 
     // Create widgets
+    Spacer *space = new Spacer(0,10);
+
     mShowMonsterDamageCheckBox = new CheckBox(_("Show damage"),
                                               mShowMonsterDamageEnabled);
 
-    speechLabel = new Label(_("Overhead text"));
+    speechLabel = new Label(_("Overhead text:"));
     alphaLabel = new Label(_("Gui opacity"));
-    fontSizeLabel = new Label(_("Font size"));
+    fontSizeLabel = new Label(_("Font size:"));
 
     mFontSizeListModel = new FontSizeChoiceListModel;
     mFontSizeDropDown = new DropDown(mFontSizeListModel);
@@ -170,14 +173,20 @@ Setup_Interface::Setup_Interface():
     place(0, 1, mShowMonsterDamageCheckBox, 3);
     place(3, 1, mNPCLogCheckBox, 3);
 
+    place(0, 2, space, 1, 1);
+
     place(0, 3, mPickupNotifyLabel, 6);
 
     place(0, 4, mPickupChatCheckBox, 3);
     place(3, 4, mPickupParticleCheckBox, 3);
 
+    place(0, 5, space, 1, 1);
+
     place(0, 6, fontSizeLabel, 2);
     place(2, 6, mFontSizeDropDown, 2);
 
+    place(0, 7, space, 1, 1);
+
     place(0, 8, mAlphaSlider, 2);
     place(2, 8, alphaLabel, 2);
 
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index aaad729f..939cafb5 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -37,6 +37,7 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/slider.h"
+#include "gui/widgets/spacer.h"
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/dropdown.h"
 
@@ -182,11 +183,13 @@ Setup_Video::Setup_Video():
 {
     setName(_("Video"));
 
+    Spacer *space = new Spacer(0,10);
+
     ScrollArea *scrollArea = new ScrollArea(mModeList);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
-    overlayDetailLabel = new Label(_("Ambient FX"));
-    particleDetailLabel = new Label(_("Particle detail"));
+    overlayDetailLabel = new Label(_("Ambient FX:"));
+    particleDetailLabel = new Label(_("Particle detail:"));
 
     mModeList->setEnabled(true);
 
@@ -200,6 +203,9 @@ Setup_Video::Setup_Video():
     mFpsSlider->setEnabled(mFps > 0);
     mFpsCheckBox->setSelected(mFps > 0);
 
+    overlayDetailLabel->setAlignment(Graphics::RIGHT);
+    particleDetailLabel->setAlignment(Graphics::RIGHT);
+
     // If the openGL Mode is enabled, disabling the transaprency
     // is irrelevant.
     mDisableSDLTransparencyCheckBox->setEnabled(!mOpenGLEnabled);
@@ -250,11 +256,17 @@ Setup_Video::Setup_Video():
     place(2, 0, mFsCheckBox, 2);
     place(4, 0, mOpenGLCheckBox, 2);
 
+    place(2, 1, space, 4, 1);
+
     place(2, 2, mCustomCursorCheckBox, 2);
     place(4, 2, mParticleEffectsCheckBox, 2);
 
+    place(2, 3, space, 4, 1);
+
     place(2, 4, mDisableSDLTransparencyCheckBox, 4);
 
+    place(2, 5, space, 4, 1);
+
     place(0, 6, mFpsSlider, 2);
     place(2, 6, mFpsCheckBox).setPadding(3);
     place(3, 6, mFpsLabel).setPadding(1);