diff options
| author | Ira Rice <irarice@gmail.com> | 2009-03-14 13:21:35 -0600 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-03-14 13:21:35 -0600 |
| commit | 3575c7a606c2d24c0d444e9999892c0390fa5ae8 (patch) | |
| tree | 399bd2ce51577aa721a460884b397f52d4a4590c /src/gui/connection.cpp | |
| parent | f0c6bed3d879e1c7b9a6d5b7e676a4f1c6a29a54 (diff) | |
| download | mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.tar.gz mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.tar.bz2 mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.tar.xz mana-3575c7a606c2d24c0d444e9999892c0390fa5ae8.zip | |
Made a label class derived from the guichan label class which utilizes
the palette colors. While technically, this can be accomplished through
other means, it's rather clumsy overall, and is prone to introducing in
programmer errors.
This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/gui/connection.cpp')
| -rw-r--r-- | src/gui/connection.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp index f6033cd7..d4a2b18a 100644 --- a/src/gui/connection.cpp +++ b/src/gui/connection.cpp @@ -22,10 +22,9 @@ #include <guichan/actionlistener.hpp> -#include <guichan/widgets/label.hpp> - #include "button.h" #include "connection.h" +#include "label.h" #include "progressbar.h" #include "../main.h" @@ -47,7 +46,7 @@ ConnectionDialog::ConnectionDialog(): Button *cancelButton = new Button(_("Cancel"), "cancelButton", &listener); mProgressBar = new ProgressBar(0.0, 200 - 10, 20, 128, 128, 128); - gcn::Label *label = new gcn::Label(_("Connecting...")); + gcn::Label *label = new Label(_("Connecting...")); cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight()); mProgressBar->setPosition(5, cancelButton->getY() - 25); |