summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--data/icons/CMakeLists.txt4
-rw-r--r--data/icons/Makefile.am5
-rw-r--r--data/icons/tmw-32x32.pngbin0 -> 2228 bytes
-rw-r--r--src/main.cpp4
-rw-r--r--tmw.cbp22
6 files changed, 24 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 8609f63f..c0cb7052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
registration. Fixed a crash caused by deleting an OkDialog twice (it
also deletes itself). Made the register dialog a bit wider. Register
dialog no longer clears username field when it is invalid.
+ * src/main.cpp, data/icons/CMakeLists.txt, data/icons/Makefile.am,
+ data/icons/tmw-32x32.png: Use a 32x32 non-alpha layered window icon.
+ * tmw.cbp: Updated project file.
2007-03-21 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 009ed32e..60bfc921 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -1,7 +1,5 @@
SET(FILES
- tmw.ico
- tmw.png
- tmw.xpm
+ tmw-32x32.png
)
INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 9697a363..3354d7ff 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,10 +1,7 @@
iconsdir = $(pkgdatadir)/data/icons
-icons_DATA = \
- tmw.ico \
- tmw.png \
- tmw.xpm
+icons_DATA = tmw-32x32.png
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
diff --git a/data/icons/tmw-32x32.png b/data/icons/tmw-32x32.png
new file mode 100644
index 00000000..af9ad35c
--- /dev/null
+++ b/data/icons/tmw-32x32.png
Binary files differ
diff --git a/src/main.cpp b/src/main.cpp
index 88a862e0..810dc758 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -257,7 +257,9 @@ void init_engine(const Options &options)
}
SDL_WM_SetCaption("The Mana World", NULL);
- SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw.png"), NULL);
+ SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw-32x32.png");
+ SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
+ SDL_WM_SetIcon(icon, NULL);
#ifdef USE_OPENGL
bool useOpenGL = (config.getValue("opengl", 0) == 1);
diff --git a/tmw.cbp b/tmw.cbp
index a8c2b798..f03cce59 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1109,6 +1109,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\resources\imageset.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\resources\imageset.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\resources\imagewriter.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1239,17 +1249,17 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\resources\spriteset.cpp">
- <Option compilerVar="CPP"/>
+ <Unit filename="src\serverinfo.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\resources\spriteset.h">
+ <Unit filename="src\simpleanimation.cpp">
<Option compilerVar="CPP"/>
- <Option compile="0"/>
- <Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\serverinfo.h">
+ <Unit filename="src\simpleanimation.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>