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

9 files changed, 79 insertions, 127 deletions

diff --git a/NEWS b/NEWS
index b73c26bc..d1c97072 100644
--- a/NEWS
+++ b/NEWS
@@ -8,12 +8,12 @@
 - Added customizable hit and attack effects
 - Added support for floor item sprites
 - Added support for different target cursor sizes for NPCs
-- Added support for 'zlib' compressed layer data and 'CSV' layer data
 - Added background support to the equipment boxes
 - Added offsetX/Y to 'imageset' element that applies to all its frames
 - Made it possible to separate the dye colors for particle effects
 - Emotes are now customizable particle effects
 - Allow resizing of the game in windowed mode
+- Allow switching between windowed and fullscreen without restart
 - Layered sprites are now buffered for performance and overlay support
 - Announcements now go to the active chat tab in addition to global chat
 - Fade out music when switching maps
@@ -30,7 +30,9 @@
 - Fixed 'switch character' action after choosing character on command line
 - Fixed hair colors and styles handling
 - Fixed interpretation of collision layer with flipped tiles
+- Fixed searching for wallpapers on 64-bit machines
 - Many changes and fixes to manaserv support, which is still experimental
+- Updated the German translation
 
 0.5.3 (11 September 2011)
 - Fixed endless loop when a sprite definition promises too many images
diff --git a/data/help/about.txt b/data/help/about.txt
index 9b46b3f1..5ef0d606 100644
--- a/data/help/about.txt
+++ b/data/help/about.txt
@@ -1,9 +1,9 @@
  <- @@index|Back to Index@@
  
  
-##3                      === ABOUT MANA ===
+##3                           === ABOUT MANA ===
  
- ##2Mana##P is a serious effort to create an innovative free and open
+ ##2Mana##0 is a serious effort to create an innovative free and open
  source MMORPG Client. Mana uses 2D graphics and aims to create a large
  and diverse interactive world. It is licensed under the GPL, making
  sure this game can't ever run away from you.
@@ -23,3 +23,4 @@
 ##2                          PhysFS (Data files)
 ##2                        libcurl (HTTP downloads)
 ##2                            zlib (Archives)
+
diff --git a/data/help/changes.txt b/data/help/changes.txt
index e1588a2a..e77ff41c 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -2,6 +2,7 @@
 
 
 ##3                         === RECENT CHANGES ===
+##0
  0.6.0 (.. February 2012)
  - Added support for a larger number of character slots
  - Added scrolling to tab bars when there isn't enough space
@@ -12,12 +13,12 @@
  - Added customizable hit and attack effects
  - Added support for floor item sprites
  - Added support for different target cursor sizes for NPCs
- - Added support for 'zlib' compressed layer data and 'CSV' layer data
  - Added background support to the equipment boxes
  - Added offsetX/Y to 'imageset' element that applies to all its frames
  - Made it possible to separate the dye colors for particle effects
  - Emotes are now customizable particle effects
  - Allow resizing of the game in windowed mode
+ - Allow switching between windowed and fullscreen without restart
  - Layered sprites are now buffered for performance and overlay support
  - Announcements now go to the active chat tab in addition to global chat
  - Fade out music when switching maps
@@ -34,7 +35,9 @@
  - Fixed 'switch character' action after choosing character on command line
  - Fixed hair colors and styles handling
  - Fixed interpretation of collision layer with flipped tiles
+ - Fixed searching for wallpapers on 64-bit machines
  - Many changes and fixes to manaserv support, which is still experimental
+ - Updated the German translation
 
  0.5.3 (11 September 2011)
  - Fixed endless loop when a sprite definition promises too many images
@@ -127,56 +130,3 @@
  - Small optimizations to OpenGL mode when drawing certain GUI widgets
  - Updated Spanish, Polish, Portugese, Swedish, French and German translations
 
- 0.0.29 (13 May 2009)
- - Added support for dynamic emotes and a new way to select them
- - Added speech balloons that wrap the text
- - Added item popup for showing detailed information
- - Added ability to refer to items in chat
- - Added the ability to see your own name in game
- - Added the option to hide player names
- - Added support for dynamically defined weight unit and currency
- - Added support for NPC item storage
- - Added compile-time support for tmwserv, as an alternative to eAthena
- - Added support for entering the port of the login server
- - Added support for creating parties and inviting other players to them
- - Added tabs to the chat window for party and private chats
- - Added ability to set initial player attributes when creating a new character
- - Added command line option to temporarily disable OpenGL (--no-opengl)
- - Added support for showing arrows flying through the air
- - Added option to show pickup as text particle instead of in the chat
- - Added ability to change the font size
- - Added support for the /me command to do actions
- - Added a /present command to show players present in the area
- - Added ability to record the chatlog to a file
- - Made emote shortcuts customizable in more detail
- - Made it possible to change resolution
- - Made many colors used by the game configurable
- - Made setup window available during login
- - Dynamically generate the item effects description
- - Minimap can now be told to stay on the screen
- - Minimap now adapts to the scale and size of the minimap image
- - Non-stackable items can now be sold more easily
- - Login dialog now remembers the list of recently used servers
- - Completely rewritten NPC interaction
- - GUI opacity now effects the whole user interface
- - Redesigned the trade window
- - Redesigned equipment window and allow unequip from there
- - Next level percentage is now displayed in hundredths
- - The player will no longer walk away when clicking the map while sitting
- - Keep the login screen from taking 100% CPU
- - No longer prompt for character server when there is only one
- - Fixed compilation with GCC 4.4
- - Fixed scroll wheel handling and dragging glitches in lists
- - Many more bug fixes, small improvements and code cleanups
- - Updated German, Finnish, Croatian, French, Spanish, Swedish and Polish
-   translations
-
- 0.0.28.1 (12 February 2009)
- - Enabled translations on Windows
- - Added command line option to set home directory path
- - Tweaked green chat color to be a bit more readable
- - Made font size configurable in the config file
- - Fixed restoring of punching animation after weapon removal
- - Fixed inability to chat while talking to NPCs
- - Updated Swedish translation
-
diff --git a/data/help/commands.txt b/data/help/commands.txt
index edb17c52..71017c10 100644
--- a/data/help/commands.txt
+++ b/data/help/commands.txt
@@ -2,85 +2,85 @@
  
  
 ##3                            === COMMANDS ===
-
+##0
 KEYBOARD:
 
 ##2 Use arrow keys to move around.
- 
+
 ##3Most useful keys:
  
-     ##2Enter##P              focus chat window / send message
-     ##2A##P                  target nearest monster
-     ##2Ctrl##P               attack
-     ##2X##P                  target & attack
-     ##2left shift##P         stop attack
-     ##2Z##P                  pick up item
-     ##2S##P                  sit down / stand up
-     ##2R##P                  toggle ignore of incoming trades
-     ##2Escape##P             quit
+     ##2Enter##0              focus chat window / send message
+     ##2A##0                  target nearest monster
+     ##2Ctrl##0               attack
+     ##2X##0                  target & attack
+     ##2left shift##0         stop attack
+     ##2Z##0                  pick up item
+     ##2S##0                  sit down / stand up
+     ##2R##0                  toggle ignore of incoming trades
+     ##2Escape##0             quit
 
 ##3Advanced keys:
 
-     ##2space##P              select OK
-     ##2Alt + 0-9##P          show emotions
-     ##2Q##P                  target nearest player
-     ##2N##P                  target nearest NPC
-     ##2T##P                  talk to targeted NPC
-     ##2P##P                  take screenshot
-     ##20-9##P                item shortcut
-     ##2right Ctrl##P         wear outfit
-     ##2right Alt##P          copy outfit
-     ##2Page Up##P            scroll chat up
-     ##2Page Down##P          scroll chat down
-     ##2[##P                  previous chat tab
-     ##2]##P                  next chat tab
-     ##2H##P                  hide all non-sticky windows
-     ##2F##P                  toggle debug pathfinding feature
+     ##2space##0              select OK
+     ##2Alt + 0-9##0          show emotions
+     ##2Q##0                  target nearest player
+     ##2N##0                  target nearest NPC
+     ##2T##0                  talk to targeted NPC
+     ##2P##0                  take screenshot
+     ##20-9##0                item shortcut
+     ##2right Ctrl##0         wear outfit
+     ##2right Alt##0          copy outfit
+     ##2Page Up##0            scroll chat up
+     ##2Page Down##0          scroll chat down
+     ##2[##0                  previous chat tab
+     ##2]##0                  next chat tab
+     ##2H##0                  hide all non-sticky windows
+     ##2F##0                  toggle debug pathfinding feature
 
 ##3Keys to toggle windows:
 
-     ##2F1##P                 toggle the online help
-     ##2F2##P                 toggle status window
-     ##2F3##P                 toggle inventory window
-     ##2F4##P                 toggle equipment window
-     ##2F5##P                 toggle skills window
-     ##2F6##P                 toggle minimap
-     ##2F7##P                 toggle chat window
-     ##2F8##P                 toggle item shortcut window
-     ##2F9##P                 toggle setup window
-     ##2F10##P                toggle debug window
-     ##2F11##P                toggle social window
-     ##2F12##P                toggle emote shortcut window
-     ##2O##P                  toggle outfit window
+     ##2F1##0                 toggle the online help
+     ##2F2##0                 toggle status window
+     ##2F3##0                 toggle inventory window
+     ##2F4##0                 toggle equipment window
+     ##2F5##0                 toggle skills window
+     ##2F6##0                 toggle minimap
+     ##2F7##0                 toggle chat window
+     ##2F8##0                 toggle item shortcut window
+     ##2F9##0                 toggle setup window
+     ##2F10##0                toggle debug window
+     ##2F11##0                toggle social window
+     ##2F12##0                toggle emote shortcut window
+     ##2O##0                  toggle outfit window
 
 
 ##3MOUSE:
-
-##2 Left click to execute default action: walk, pick up an item, attack a monster
+##0
+ Left click to execute default action: walk, pick up an item, attack a monster
  and talk to NPCs.  Right click to show up a context menu.
 
 
 ##3COMMUNICATION:
-
-##2 Communication is often essential to success in this game. You can communicate
+##0
+ Communication is often essential to success in this game. You can communicate
  in several ways:  By chatting and showing emotions (see above), by trading
  (with the right-click context menu), and by whispering.
 
  To whisper, type
-
+##2
  /whisper <name> <message>
-
+##0
  This will send <message> to player <name>, if that player is logged in. If the
  name has a space in it, put double quotes around it like this:
-
+##2
  /whisper "<name>" <message>
-
+##0
  For further help type /help in the chat console.
 
 
 ##3IGNORING COMMUNICATION
-
-##2 You may find that not all communication is to your liking.  While most people
+##0
+ You may find that not all communication is to your liking.  While most people
  are nice, some may offend you or try to make your life harder. Since this is
  an open game, there is nothing the developers can do to prevent this.
 
@@ -93,21 +93,22 @@ KEYBOARD:
  There you will find a list of all players you are acquainted with, as well as
  several configuration options:
 
- - ##2allow trading##P:  Do you wish to allow trade requests from arbitrary players?
- ##2- allow whispers##P:  Do you wish to allow arbitrary players to send
+ - allow trading:  Do you wish to allow trade requests from arbitrary players?
+ - allow whispers:  Do you wish to allow arbitrary players to send
    private messages to you in-game?
 
 ##3THE PLAYER LIST
-
-##2 The player list lists all of your acquaintances.  They are categorised as one
+##0
+ The player list lists all of your acquaintances.  They are categorised as one
  of the following:
 
- - ##2neutral##P:  As far as the game is concerned, this is the same as not
+ - ##2neutral##0:  As far as the game is concerned, this is the same as not
    having the player listed:  the player may chat with you, but may only trade
    or whisper if you have this option allowed for everyone.
- - ##2friend##P:  You consider this player a friend.  The player may chat,
+ - ##2friend##0:  You consider this player a friend.  The player may chat,
    message your in private, or trade with you at any point.
- - ##2disregarded##P:  You wish to disregard this player, meaning that his or
+ - ##2disregarded##0:  You wish to disregard this player, meaning that his or
    her trade requests and whispers are ignored.
- - ##2ignored##P:  You wish to completely ignore this player.  You will not
+ - ##2ignored##0:  You wish to completely ignore this player.  You will not
    even see emotions for him or her anymore.
+
diff --git a/data/help/header.txt b/data/help/header.txt
index ae41147b..e1531e46 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,9 +1,9 @@
 
 ##1                      M  A  N  A      C L I E N T
-##1               ==========================================
+##1               =========================================
 
-           ##2Version:##6 0.6.0          ##2Date:##3 .. February 2012
+             ##2Version:##0 0.6.0          ##2Date:##0 .. February 2012
 
-##2                    Website: http://manasource.org
+##2                    Website:##0 http://manasource.org
 
 
diff --git a/data/help/support.txt b/data/help/support.txt
index f9b41239..8a554ece 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -2,13 +2,14 @@
 
 
 ##3                            === SUPPORT ===
-
+##0
  If you're having troubles, plase first of all read the FAQ. If you
  can't find a solution to your problem, feel free to check our
  Bugs/Support section of the forum:
 
 ##2     http://forums.themanaworld.org/viewforum.php?f=3
-
+##0
  or come visit us on our IRC channel:
 
-##2     #mana ##P@##2 irc.freenode.net
+##2     #mana ##0@##2 irc.freenode.net
+
diff --git a/data/help/windows.txt b/data/help/windows.txt
index 325f75d7..6757dd5b 100644
--- a/data/help/windows.txt
+++ b/data/help/windows.txt
@@ -4,9 +4,10 @@
 ##3                            === WINDOWS ===
  
 ##2SHORTCUT:
-
+##0
  To add an item to the shortcut bar click on the item in the inventory window,
  then click on the box in the shortcut-window which should be associated with
  the item. To reorder items within the shortcut-window simply click and drag
  them between the boxes. To remove items you simply drag them outside of the
  window and drop them.
+
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.
          */