summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/graphics/images/login_wallpaper.pngbin22807 -> 4118615 bytes
-rw-r--r--data/icons/manaplus.pngbin4325 -> 4544 bytes
-rw-r--r--data/icons/manaplus.xpm73
-rw-r--r--src/defaults.cpp4
-rw-r--r--src/gui/windows/editserverdialog.cpp2
5 files changed, 38 insertions, 41 deletions
diff --git a/data/graphics/images/login_wallpaper.png b/data/graphics/images/login_wallpaper.png
index 5cf03bab6..b274236ba 100644
--- a/data/graphics/images/login_wallpaper.png
+++ b/data/graphics/images/login_wallpaper.png
Binary files differ
diff --git a/data/icons/manaplus.png b/data/icons/manaplus.png
index bace39c78..423d1c6c2 100644
--- a/data/icons/manaplus.png
+++ b/data/icons/manaplus.png
Binary files differ
diff --git a/data/icons/manaplus.xpm b/data/icons/manaplus.xpm
index df48f3ad3..c8480d214 100644
--- a/data/icons/manaplus.xpm
+++ b/data/icons/manaplus.xpm
@@ -1,41 +1,38 @@
/* XPM */
static char * manaplus_xpm[] = {
-"32 32 6 1",
+"32 32 3 1",
" c None",
-". c #FF6600",
-"X c #FF6500",
-"o c #FF6400",
-"O c #FF6700",
-"+ c #FF6300",
-" .X.XX.. ",
-" ..X...o .X.O ",
-" XX..o . ",
-" ..X. o ",
-" X.X. + XX ",
-" ..X. o+oX+ ",
-" .... +XXXX ",
-" X..X oo .",
-" ..X o ",
-" X.. ... ... . ",
-" ..X ...X.X.....X....XX ",
-" ... O.... ....X. ..... ",
-" ... ....X ..... .... ",
-"o..X X... .... ...X ",
-"X.. .... .... .... ",
-"... .... .... .... ",
-"... .... .... ...X ",
-"... .... .... ...X ",
-"... X...X ..... ...X ",
-"... X... X... X... ",
-" .. .... .... X..X ",
-" .. ...X .... ....XXX.X.",
-" X. ... ... ..X.. X",
-" .X X .",
-" X. .. .X",
-" X. .. XX ",
-" .. X.X XX ",
-" XX X...X.. ",
-" .X X.....X ",
-" XX ....X.. ",
-" XXX.O.XX.X.X.. ",
-" ..X..X.. "};
+". c #001FC6",
+"+ c #001EC3",
+" ........ ",
+" ........ .... ",
+" ..... ",
+" .... ",
+" .... ",
+" .... ",
+" .... ",
+" .... ",
+" ... ",
+" ... ",
+" ... ",
+" ... ++ + ",
+" ... + + +++ + ",
+".... ++ ++ ++ + ",
+"... +++ ++ ++ + ",
+"... ++++ +++ ++ + ",
+"... + ++ + ++ ++ + ",
+"... + +++ + ++ ",
+"... + ++ ++ ++ ",
+"... ++ + ++ ",
+" .. ",
+" .. .....",
+" .. . .",
+" .. . .",
+" .. .. .",
+" .. .. . ",
+" .. ... .. ",
+" . ....... ",
+" .. ....... ",
+" .. ........ ",
+" .... .......... ",
+" .......... "};
diff --git a/src/defaults.cpp b/src/defaults.cpp
index fab83a6df..43061cf09 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -495,12 +495,12 @@ void setBrandingDefaults(Configuration &cfg)
DefaultsData &configData = cfg.getDefaultValues();
AddDEF("wallpapersPath", "");
AddDEF("wallpapersFile", "");
- AddDEF("appName", "ManaPlus");
+ AddDEF("appName", "ManaVerse");
AddDEF("appIcon", "icons/manaplus");
AddDEF("loginMusic", "keprohm.ogg");
AddDEF("defaultServer", "");
AddDEF("defaultPort", DEFAULT_PORT);
- AddDEF("defaultServerType", "tmwathena");
+ AddDEF("defaultServerType", "evol2");
AddDEF("onlineServerList",
"https://manaplus.germantmw.de/manaplus/serverlist.xml");
AddDEF("onlineServerList2",
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 31cd5a656..1fb54e010 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -95,7 +95,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
mPortField->setNumeric(true);
mPortField->setRange(1, 65535);
- mTypeField->setSelected(0); // TmwAthena by default
+ mTypeField->setSelected(0); // FIXME: Currently, TmwAthena by default
mServerAddressField->addActionListener(this);
mPortField->addActionListener(this);