Merge branch 'master' into stripped

Conflicts:
	configure.ac
	data/Makefile.am
	data/fonts/liberationsans-bold.ttf
	data/fonts/liberationsans.ttf
	data/fonts/liberationsansmono-bold.ttf
	data/fonts/liberationsansmono.ttf
	data/themes/redandblack/CMakeLists.txt
	data/themes/redandblack/Makefile.am
	po/cs.po
	po/de.po
	po/es.po
	po/fi.po
	po/fr.po
	po/id.po
	po/ja.po
	po/manaplus.pot
	po/nl_BE.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ru.po
	po/zh_CN.po
	src/guichan/color.cpp
	src/guichan/defaultfont.cpp
	src/guichan/focushandler.cpp
	src/guichan/include/guichan/actionlistener.hpp
	src/guichan/include/guichan/deathlistener.hpp
	src/guichan/include/guichan/focushandler.hpp
	src/guichan/include/guichan/focuslistener.hpp
	src/guichan/include/guichan/graphics.hpp
	src/guichan/include/guichan/keylistener.hpp
	src/guichan/include/guichan/listmodel.hpp
	src/guichan/include/guichan/mouselistener.hpp
	src/guichan/include/guichan/sdl/sdlpixel.hpp
	src/guichan/include/guichan/widget.hpp
	src/guichan/include/guichan/widgetlistener.hpp
	src/guichan/include/guichan/widgets/listbox.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp
	src/net/manaserv/attributes.cpp
	src/net/manaserv/beinghandler.cpp
	src/net/manaserv/charhandler.cpp
	src/net/manaserv/gamehandler.h
	src/net/manaserv/inventoryhandler.cpp
	src/net/manaserv/inventoryhandler.h
	src/net/manaserv/itemhandler.cpp
	src/net/manaserv/loginhandler.cpp
	src/net/manaserv/network.cpp

28 files changed, 35 insertions, 111 deletions

diff --git a/data/evol/evol.desktop b/data/evol/evol.desktop
deleted file mode 100644
index 7ccfc4001..000000000
--- a/data/evol/evol.desktop
+++ /dev/null
@@ -1,47 +0,0 @@
-
-[Desktop Entry]
-Version=1.0
-Name=EvolOnline
-Comment=A 2D MMORPG client
-Exec=manaplus /usr/share/games/manaplus/data/evol/evol.manaplus
-StartupNotify=false
-Terminal=false
-Type=Application
-Icon=evol-client
-Categories=Game;AdventureGame;
-
-
-# Translations
-Comment[vls]=Nen 2D MMORPG client
-Name[vls]=ManaPlus
-Icon[vls]=manaplus
-Comment[ru]=Клиент к 2D MMORPG игре
-Name[ru]=ManaPlus
-Icon[ru]=manaplus
-Comment[it]=Un gioco fantasy online
-Name[it]=ManaPlus
-Icon[it]=manaplus
-Comment[ja]=2DのMMORPGクライアント
-Name[ja]=ManaPlus
-Icon[ja]=manaplus
-Comment[cs]=2D MMORPG klient
-Name[cs]=ManaPlus
-Icon[cs]=manaplus
-Comment[nl_BE]=Een 2D MMORPG client
-Name[nl_BE]=ManaPlus
-Icon[nl_BE]=manaplus
-Comment[de]=ein 2D MMORG Client
-Name[de]=ManaPlus
-Icon[de]=manaplus
-Comment[sv_SE]=Ett fantasyrollspel online
-Name[sv_SE]=ManaPlus
-Icon[sv_SE]=manaplus
-Comment[es]=Un cliente MMORPG 2D
-Name[es]=ManaPlus
-Icon[es]=manaplus
-Comment[fr]=Un jeu en ligne dans un univers fantastique
-Name[fr]=ManaPlus
-Icon[fr]=manaplus
-Comment[nl]=Een online role playing game
-Name[nl]=ManaPlus
-Icon[nl]=manaplus
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
deleted file mode 100644
index 9c4743852..000000000
--- a/data/evol/evol.manaplus
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
- <option name="appName" value="Evol Online"/>
- <option name="appShort" value="mana"/>
- <option name="appIcon" value="evol/icons/evol-client"/>
- <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
- <option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/>
- <option name="onlineServerFile" value="evol.xml"/>
- <option name="defaultServer" value="world.evolonline.org"/>
- <option name="defaultPort" value="6901"/>
- <option name="defaultServerType" value="evol"/>
- <option name="font" value="fonts/dejavusans.ttf" />
- <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
- <option name="theme" value="wood" />
- <option name="wallpapersPath" value="evol/images/" />
- <option name="wallpaperFile" value="loginwallpaper_800x600.png" />
-</configuration>
diff --git a/data/evol/icons/evol-client.ico b/data/evol/icons/evol-client.ico
deleted file mode 100644
index 17309a1ba..000000000
--- a/data/evol/icons/evol-client.ico
+++ /dev/null
diff --git a/data/evol/icons/evol-client.png b/data/evol/icons/evol-client.png
deleted file mode 100644
index 2fb9eaab0..000000000
--- a/data/evol/icons/evol-client.png
+++ /dev/null
diff --git a/data/evol/icons/evol-client.xpm b/data/evol/icons/evol-client.xpm
deleted file mode 100644
index 7fb1f2cda..000000000
--- a/data/evol/icons/evol-client.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * manaplus_xpm[] = {
-"32 32 10 1",
-" 	c None",
-".	c #663300",
-"X	c #673200",
-"o	c #663400",
-"O	c #653400",
-"+	c #653200",
-"@	c #653300",
-"#	c #673300",
-"$	c #663200",
-"%	c #673400",
-"         ..       .             ",
-"           ..    X     .        ",
-"       .X   ..   o   O.         ",
-"        +@o  .o O# o.           ",
-"          Xo. $.@ .  o%.        ",
-"             $.#$.#$+           ",
-"          .   $$$##             ",
-"           ....$@+   %.         ",
-"             ....o#$X           ",
-"              .$o..             ",
-"              .@@.              ",
-"              Oo#.              ",
-"               o                ",
-"              #@ .              ",
-"              O...              ",
-"               $.o              ",
-"              #.$.              ",
-"               ..%              ",
-"              #$@.              ",
-"              ....              ",
-"       # O%.@..$.#.o    .       ",
-"       +# oO X+$..@ .#$$        ",
-"          %  +...o #   %        ",
-"         O   %o..$oO O.%        ",
-"        o   #O$@ X#  +          ",
-"           #  $    $  %         ",
-"         O.  . $    #@          ",
-"         o           XO         ",
-"        .  X          $X        ",
-"        #   +         +         ",
-"        .   @         .         ",
-"         .$#        $@          "};
diff --git a/data/evol/images/loginwallpaper_800x600.png b/data/evol/images/loginwallpaper_800x600.png
deleted file mode 100644
index a1fe4f83b..000000000
--- a/data/evol/images/loginwallpaper_800x600.png
+++ /dev/null
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index aba42b39c..b262a5ac3 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -3,6 +3,7 @@ SET (FILES
     button.png
     button_disabled.png
     buttonhi.png
+    buttonplay.png
     buttonpress.png
     checkbox.png
     circle-gray.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 7fb82f545..6f294fa45 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -6,6 +6,7 @@ gui_DATA =				\
 	button.png			\
 	button_disabled.png		\
 	buttonhi.png			\
+	buttonplay.png			\
 	buttonpress.png			\
 	checkbox.png			\
 	circle-gray.png			\
diff --git a/data/graphics/gui/buttonplay.png b/data/graphics/gui/buttonplay.png
new file mode 100644
index 000000000..cd3a2c3db
--- /dev/null
+++ b/data/graphics/gui/buttonplay.png
diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 9fa36a243..df93609cd 100644
--- a/data/graphics/images/login_wallpaper.png
+++ b/data/graphics/images/login_wallpaper.png
diff --git a/data/sfx/system/CMakeLists.txt b/data/sfx/system/CMakeLists.txt
index bf6f0f0f3..0fa325a45 100644
--- a/data/sfx/system/CMakeLists.txt
+++ b/data/sfx/system/CMakeLists.txt
@@ -1,5 +1,21 @@
 SET (FILES
+    attention.ogg
+    chat1.ogg
+    chat2.ogg
+    complete.ogg
+    email.ogg
+    error.ogg
+    finish.ogg
+    incoming.ogg
+    move.ogg
+    notify.ogg
     newmessage.ogg
+    offline.ogg
+    online.ogg
+    reminder.ogg
+    send.ogg
+    start.ogg
+    watcher.ogg
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/sfx/system)
diff --git a/data/sfx/system/Makefile.am b/data/sfx/system/Makefile.am
index e744932c3..d46934461 100644
--- a/data/sfx/system/Makefile.am
+++ b/data/sfx/system/Makefile.am
@@ -1,7 +1,23 @@
 systemdir = $(pkgdatadir)/data/sfx/system
 
 system_DATA =				\
-	newmessage.ogg
+	attention.ogg \
+	chat1.ogg \
+	chat2.ogg \
+	complete.ogg \
+	email.ogg \
+	error.ogg \
+	finish.ogg \
+	incoming.ogg \
+	move.ogg \
+	newmessage.ogg \
+	notify.ogg \
+	offline.ogg \
+	online.ogg \
+	reminder.ogg \
+	send.ogg \
+	start.ogg \
+	watcher.ogg
 
 EXTRA_DIST =				\
 	$(system_DATA) \
diff --git a/data/sfx/system/attention.ogg b/data/sfx/system/attention.ogg
new file mode 100644
index 000000000..929265775
--- /dev/null
+++ b/data/sfx/system/attention.ogg
diff --git a/data/sfx/system/chat1.ogg b/data/sfx/system/chat1.ogg
new file mode 100644
index 000000000..ad6c52a1d
--- /dev/null
+++ b/data/sfx/system/chat1.ogg
diff --git a/data/sfx/system/chat2.ogg b/data/sfx/system/chat2.ogg
new file mode 100644
index 000000000..155b15e1f
--- /dev/null
+++ b/data/sfx/system/chat2.ogg
diff --git a/data/sfx/system/complete.ogg b/data/sfx/system/complete.ogg
new file mode 100644
index 000000000..0975ff7c8
--- /dev/null
+++ b/data/sfx/system/complete.ogg
diff --git a/data/sfx/system/email.ogg b/data/sfx/system/email.ogg
new file mode 100644
index 000000000..afb25909f
--- /dev/null
+++ b/data/sfx/system/email.ogg
diff --git a/data/sfx/system/error.ogg b/data/sfx/system/error.ogg
new file mode 100644
index 000000000..69dccfe7c
--- /dev/null
+++ b/data/sfx/system/error.ogg
diff --git a/data/sfx/system/finish.ogg b/data/sfx/system/finish.ogg
new file mode 100644
index 000000000..d8dbbf80f
--- /dev/null
+++ b/data/sfx/system/finish.ogg
diff --git a/data/sfx/system/incoming.ogg b/data/sfx/system/incoming.ogg
new file mode 100644
index 000000000..a8ff86676
--- /dev/null
+++ b/data/sfx/system/incoming.ogg
diff --git a/data/sfx/system/move.ogg b/data/sfx/system/move.ogg
new file mode 100644
index 000000000..e5c703bbf
--- /dev/null
+++ b/data/sfx/system/move.ogg
diff --git a/data/sfx/system/notify.ogg b/data/sfx/system/notify.ogg
new file mode 100644
index 000000000..95d8fed4a
--- /dev/null
+++ b/data/sfx/system/notify.ogg
diff --git a/data/sfx/system/offline.ogg b/data/sfx/system/offline.ogg
new file mode 100644
index 000000000..cc1b8e938
--- /dev/null
+++ b/data/sfx/system/offline.ogg
diff --git a/data/sfx/system/online.ogg b/data/sfx/system/online.ogg
new file mode 100644
index 000000000..3e55793fd
--- /dev/null
+++ b/data/sfx/system/online.ogg
diff --git a/data/sfx/system/reminder.ogg b/data/sfx/system/reminder.ogg
new file mode 100644
index 000000000..d7beeed6f
--- /dev/null
+++ b/data/sfx/system/reminder.ogg
diff --git a/data/sfx/system/send.ogg b/data/sfx/system/send.ogg
new file mode 100644
index 000000000..b5941323d
--- /dev/null
+++ b/data/sfx/system/send.ogg
diff --git a/data/sfx/system/start.ogg b/data/sfx/system/start.ogg
new file mode 100644
index 000000000..0b1f85643
--- /dev/null
+++ b/data/sfx/system/start.ogg
diff --git a/data/sfx/system/watcher.ogg b/data/sfx/system/watcher.ogg
new file mode 100644
index 000000000..9a0dd1af2
--- /dev/null
+++ b/data/sfx/system/watcher.ogg