From a3b2921f6dec9b989493801958af47664a4a41ca Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 3 Feb 2012 20:21:47 +0300
Subject: Rename some files for evol branding.
---
data/evol/evol.desktop | 47 ++++++++++++++++++++++++++++++++++++++++
data/evol/evol.manaplus | 2 +-
data/evol/icons/evol-client.ico | Bin 0 -> 533366 bytes
data/evol/icons/evol-client.png | Bin 0 -> 7366 bytes
data/evol/icons/evol-client.xpm | 45 ++++++++++++++++++++++++++++++++++++++
data/evol/icons/manaplus.ico | Bin 533366 -> 0 bytes
data/evol/icons/manaplus.png | Bin 7366 -> 0 bytes
data/evol/icons/manaplus.xpm | 45 --------------------------------------
packaging/windows/evol.nsi | 4 ++--
src/manaplus.rc | 2 +-
10 files changed, 96 insertions(+), 49 deletions(-)
create mode 100644 data/evol/evol.desktop
create mode 100644 data/evol/icons/evol-client.ico
create mode 100644 data/evol/icons/evol-client.png
create mode 100644 data/evol/icons/evol-client.xpm
delete mode 100644 data/evol/icons/manaplus.ico
delete mode 100644 data/evol/icons/manaplus.png
delete mode 100644 data/evol/icons/manaplus.xpm
diff --git a/data/evol/evol.desktop b/data/evol/evol.desktop
new file mode 100644
index 000000000..7ccfc4001
--- /dev/null
+++ b/data/evol/evol.desktop
@@ -0,0 +1,47 @@
+
+[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
index 4eca64197..9527f9ee3 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -3,7 +3,7 @@
<configuration>
<option name="appName" value="Evol Online"/>
<option name="appShort" value="mana"/>
- <option name="appIcon" value="evol/icons/manaplus"/>
+ <option name="appIcon" value="evol/icons/evol-client"/>
<option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
<option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/>
<option name="defaultServer" value="world.evolonline.org"/>
diff --git a/data/evol/icons/evol-client.ico b/data/evol/icons/evol-client.ico
new file mode 100644
index 000000000..17309a1ba
Binary files /dev/null and b/data/evol/icons/evol-client.ico differ
diff --git a/data/evol/icons/evol-client.png b/data/evol/icons/evol-client.png
new file mode 100644
index 000000000..2fb9eaab0
Binary files /dev/null and b/data/evol/icons/evol-client.png differ
diff --git a/data/evol/icons/evol-client.xpm b/data/evol/icons/evol-client.xpm
new file mode 100644
index 000000000..7fb1f2cda
--- /dev/null
+++ b/data/evol/icons/evol-client.xpm
@@ -0,0 +1,45 @@
+/* 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/icons/manaplus.ico b/data/evol/icons/manaplus.ico
deleted file mode 100644
index 17309a1ba..000000000
Binary files a/data/evol/icons/manaplus.ico and /dev/null differ
diff --git a/data/evol/icons/manaplus.png b/data/evol/icons/manaplus.png
deleted file mode 100644
index 2fb9eaab0..000000000
Binary files a/data/evol/icons/manaplus.png and /dev/null differ
diff --git a/data/evol/icons/manaplus.xpm b/data/evol/icons/manaplus.xpm
deleted file mode 100644
index 7fb1f2cda..000000000
--- a/data/evol/icons/manaplus.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/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index 49bfa9963..1d17d46ce 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -62,9 +62,9 @@ RequestExecutionLevel admin
; MUI Settings
!define MUI_ABORTWARNING
;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${SRCDIR}\data\evol\icons\manaplus.ico"
+!define MUI_ICON "${SRCDIR}\data\evol\icons\evol-client.ico"
;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "${SRCDIR}\data\evol\icons\manaplus.ico"
+!define MUI_UNICON "${SRCDIR}\data\evol\icons\evol-client.ico"
;Language Selection Dialog Settings
;Remember the installer language
diff --git a/src/manaplus.rc b/src/manaplus.rc
index 1a6513bd6..b16ca40a7 100644
--- a/src/manaplus.rc
+++ b/src/manaplus.rc
@@ -3,7 +3,7 @@
#include "winver.h"
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico"
-evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/manaplus.ico"
+evol ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/evol/icons/evol-client.ico"
1 VERSIONINFO
FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
--
cgit v1.2.3-70-g09d2