From 469b6cc8398c77d2dafaf3038306e2e4f9124094 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 26 Jan 2012 17:50:28 +0300
Subject: Add evol icons.
---
data/evol/icons/manaplus.ico | Bin 0 -> 44055 bytes
data/evol/icons/manaplus.png | Bin 0 -> 7366 bytes
data/evol/icons/manaplus.xpm | 45 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+)
create mode 100644 data/evol/icons/manaplus.ico
create mode 100644 data/evol/icons/manaplus.png
create mode 100644 data/evol/icons/manaplus.xpm
(limited to 'data/evol/icons')
diff --git a/data/evol/icons/manaplus.ico b/data/evol/icons/manaplus.ico
new file mode 100644
index 000000000..33f379feb
Binary files /dev/null and b/data/evol/icons/manaplus.ico differ
diff --git a/data/evol/icons/manaplus.png b/data/evol/icons/manaplus.png
new file mode 100644
index 000000000..2fb9eaab0
Binary files /dev/null and b/data/evol/icons/manaplus.png differ
diff --git a/data/evol/icons/manaplus.xpm b/data/evol/icons/manaplus.xpm
new file mode 100644
index 000000000..7fb1f2cda
--- /dev/null
+++ b/data/evol/icons/manaplus.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 ",
+" # + + ",
+" . @ . ",
+" .$# $@ "};
--
cgit v1.2.3-70-g09d2
From 2f8c81deca6df64e0ae4c228e2bee9aec506e5fe Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 26 Jan 2012 18:11:28 +0300
Subject: Add evol icon for windows branding.
---
data/evol/evol.manaplus | 2 +-
data/evol/icons/manaplus.ico | Bin 44055 -> 533366 bytes
packaging/windows/setup.nsi | 7 +++++--
src/manaplus.rc | 5 +++--
4 files changed, 9 insertions(+), 5 deletions(-)
(limited to 'data/evol/icons')
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index 9f883509c..4eca64197 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="icons/manaplus"/>
+ <option name="appIcon" value="evol/icons/manaplus"/>
<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/manaplus.ico b/data/evol/icons/manaplus.ico
index 33f379feb..17309a1ba 100644
Binary files a/data/evol/icons/manaplus.ico and b/data/evol/icons/manaplus.ico differ
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 92f653816..9600c841e 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -365,15 +365,18 @@ SectionEnd
Section "Evol Online shortcuts" SecEvol
SetOutPath "$INSTDIR"
CreateDirectory "$INSTDIR\data\evol"
+ CreateDirectory "$INSTDIR\data\evol\icons"
CreateDirectory "$INSTDIR\data\evol\images"
SetOutPath "$INSTDIR"
File "${SRCDIR}\data\evol\evol.manaplus"
SetOutPath "$INSTDIR\data\evol\images"
File "${SRCDIR}\data\evol\images\*.png"
+ SetOutPath "$INSTDIR\data\evol\icons"
+ File "${SRCDIR}\data\evol\icons\*.ico"
- CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"'
- CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"'
+ CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+ CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
SectionEnd
Section "Translations" SecTrans
diff --git a/src/manaplus.rc b/src/manaplus.rc
index b7720e2cc..1a6513bd6 100644
--- a/src/manaplus.rc
+++ b/src/manaplus.rc
@@ -3,6 +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"
1 VERSIONINFO
FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
@@ -11,10 +12,10 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
{
BLOCK "StringFileInfo" {
BLOCK "040904E4" {
- VALUE "CompanyName", "The Mana Development Team"
+ VALUE "CompanyName", "The ManaPlus Development Team"
VALUE "FileVersion", PACKAGE_VERSION "4144"
VALUE "FileDescription", "ManaPlus"
- VALUE "LegalCopyright", "2004-2010 (C)"
+ VALUE "LegalCopyright", "2004-2012 (C)"
VALUE "OriginalFilename", "manaplus.exe"
VALUE "ProductName", "ManaPlus MMORPG Client"
VALUE "ProductVersion", PACKAGE_VERSION "4144"
--
cgit v1.2.3-70-g09d2