diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-02-11 21:41:46 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-02-11 22:48:28 +0100 |
commit | d27f25a3a142e59d83c5e4f14399b08eee0ec361 (patch) | |
tree | 920877d44c6437ba9835144f7021054256625fbb /src/gui | |
parent | 3b022084c6d661276b3a5f5151e2bfbf6201cb98 (diff) | |
download | mana-client-d27f25a3a142e59d83c5e4f14399b08eee0ec361.tar.gz mana-client-d27f25a3a142e59d83c5e4f14399b08eee0ec361.tar.bz2 mana-client-d27f25a3a142e59d83c5e4f14399b08eee0ec361.tar.xz mana-client-d27f25a3a142e59d83c5e4f14399b08eee0ec361.zip |
Fixed issues with the help texts and small NEWS file updates
* Changes were made to the way BrowserBox does colors that the help files
were not adapted to. For example, there is no more ##P for choosing the
previous color and applying a color changes it persistently rather than
returning to default text color after each line wrap. Rather than changing
the behavior of BrowserBox back I've just adapted the help files.
* Set a monospace font on the Help window because this was originally the
case and the text still relies on that for its layout.
* zlib and CSV support was already cherry-picked into 0.5.1 so it is removed
from the 0.6.0 changelog.
Reviewed-by: Erik Schilling
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/helpwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/browserbox.h | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index 308dd783..e4ded03a 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -21,6 +21,7 @@ #include "gui/helpwindow.h" +#include "gui/gui.h" #include "gui/setup.h" #include "gui/widgets/button.h" @@ -56,6 +57,7 @@ HelpWindow::HelpWindow(): 345 - okButton->getHeight()); mBrowserBox->setLinkHandler(this); + mBrowserBox->setFont(monoFont); place(0, 0, mScrollArea, 5, 3).setPadding(3); place(4, 3, okButton); diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index ecdf8ca7..46af14ab 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -121,10 +121,6 @@ class BrowserBox : public gcn::Widget, */ void clearRows(); -// void setSize(int width, int height); - -// void widgetResized(const gcn::Event &event); - /** * Handles mouse actions. */ @@ -138,8 +134,6 @@ class BrowserBox : public gcn::Widget, void updateHeight(); -// void widgetResized(const gcn::Event &event); - /** * BrowserBox modes. */ |