diff --git a/GNUmakefile b/GNUmakefile
index 5ea51c5..f5e5697 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -30,7 +30,7 @@ L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o src/boldf
L_OBJS += src/external/ds.o src/external/image.o
L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/entry.o src/widget/numberentry.o
L_OBJS += src/cursor/default.o src/cursor/cross.o src/cursor/text.o
-L_OBJS += src/icon/question.o src/icon/warning.o src/icon/note.o src/icon/info.o
+L_OBJS += src/icon/question.o src/icon/warning.o src/icon/note.o src/icon/info.o src/icon/news.o
OOL_CXXFLAGS = $(DEPINC) $(CFLAGS) -std=c++98 -fPIC
OOL_LDFLAGS = $(LDFLAGS) -L src
diff --git a/doc/index.html b/doc/index.html
index 9f2190e..964835d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -38,6 +38,9 @@
#define MwMB_ICONQUESTION 0x4
+
+ #define MwMB_ICONNEWS 0x5
+
Mw/Core.h
@@ -224,6 +227,9 @@
MwIconInfo[]
+
+ MwIconNews[]
+
MwIconNote[]
@@ -485,6 +491,13 @@
+#define MwMB_ICONNEWS 0x5
+
+-
+ News icon.
+
+
+
Mw/Core.h
-
@@ -1876,6 +1889,13 @@
+MWDECL char* MwIconNews[];
+
+-
+ News icon.
+
+
+
MWDECL char* MwIconNote[];
-
diff --git a/include/Mw/Constants.h b/include/Mw/Constants.h
index 2a47891..e7c6734 100644
--- a/include/Mw/Constants.h
+++ b/include/Mw/Constants.h
@@ -63,4 +63,9 @@ enum MwALIGNMENT {
*/
#define MwMB_ICONQUESTION 0x4
+/*!
+ * %brief News icon
+ */
+#define MwMB_ICONNEWS 0x5
+
#endif
diff --git a/include/Mw/Icon.h b/include/Mw/Icon.h
index 5ebdbc1..102bff4 100644
--- a/include/Mw/Icon.h
+++ b/include/Mw/Icon.h
@@ -17,6 +17,11 @@ extern "C" {
*/
MWDECL char* MwIconInfo[];
+/*!
+ * %brief News icon
+ */
+MWDECL char* MwIconNews[];
+
/*!
* %brief Note icon
*/
diff --git a/resource/icon/icon.sh b/resource/icon/icon.sh
deleted file mode 100755
index 864e4ec..0000000
--- a/resource/icon/icon.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# $Id$
-for i in *.gif; do
- convert $i -shave 4x4 -alpha on -channel rgba -fill 'transparent' -opaque '#bebebe' `echo $i | cut -d. -f1`.png
-done
diff --git a/resource/icon/info.gif b/resource/icon/info.gif
index bdd8ad5..fecf091 100644
Binary files a/resource/icon/info.gif and b/resource/icon/info.gif differ
diff --git a/resource/icon/info.png b/resource/icon/info.png
index 067b260..b6f543f 100644
Binary files a/resource/icon/info.png and b/resource/icon/info.png differ
diff --git a/resource/icon/news.gif b/resource/icon/news.gif
new file mode 100644
index 0000000..0da6e28
Binary files /dev/null and b/resource/icon/news.gif differ
diff --git a/resource/icon/news.png b/resource/icon/news.png
new file mode 100644
index 0000000..5cdcc21
Binary files /dev/null and b/resource/icon/news.png differ
diff --git a/resource/icon/note.gif b/resource/icon/note.gif
index 181ea9a..c081a73 100644
Binary files a/resource/icon/note.gif and b/resource/icon/note.gif differ
diff --git a/resource/icon/note.png b/resource/icon/note.png
index d59aca4..0bcb4b2 100644
Binary files a/resource/icon/note.png and b/resource/icon/note.png differ
diff --git a/resource/icon/question.gif b/resource/icon/question.gif
index 891c60f..c93ca19 100644
Binary files a/resource/icon/question.gif and b/resource/icon/question.gif differ
diff --git a/resource/icon/question.png b/resource/icon/question.png
index a742b66..3a44a59 100644
Binary files a/resource/icon/question.png and b/resource/icon/question.png differ
diff --git a/resource/icon/warning.gif b/resource/icon/warning.gif
index 29b8526..783ed41 100644
Binary files a/resource/icon/warning.gif and b/resource/icon/warning.gif differ
diff --git a/resource/icon/warning.png b/resource/icon/warning.png
index d5dfb1b..08ba558 100644
Binary files a/resource/icon/warning.png and b/resource/icon/warning.png differ
diff --git a/src/icon/info.c b/src/icon/info.c
index d2b8df8..31c9ee6 100644
--- a/src/icon/info.c
+++ b/src/icon/info.c
@@ -8,7 +8,7 @@ char* MwIconInfo[] = {
" c None",
". c blue",
"X c DarkSlateGray",
- "o c lavender",
+ "o c #6632F7",
/* pixels */
" ",
" ",
diff --git a/src/icon/news.c b/src/icon/news.c
new file mode 100644
index 0000000..1b7483e
--- /dev/null
+++ b/src/icon/news.c
@@ -0,0 +1,46 @@
+/* $Id$ */
+#include
+
+/* XPM */
+char* MwIconNews[] = {
+ /* columns rows colors chars-per-pixel */
+ "32 32 6 1 ",
+ " c None",
+ ". c black",
+ "X c white",
+ "o c SlateGray",
+ "O c gray",
+ "+ c #6632F7",
+ /* pixels */
+ " ",
+ " ",
+ " ",
+ " ... ",
+ " .XXX.. ",
+ " .XX.XXX.. ",
+ " .XX..X.XXX.. ",
+ " .XX.X..XX.oXX.. ",
+ " .XX.XX.XX.Xo.XXX.. ",
+ " .XOXXX.XX.O.XX.XXXX.. ",
+ " .XXo.oXXX.oXXX.XoXoXXX.. ",
+ " .XOXXXo.OXXO.X.Xo.X.X.oXX.. ",
+ " .XXo.oXXXO.oXXX...X.X.Xo.XXX.",
+ " .XOXXXo.OXXXo.oXXX..XXX.XXXX.O",
+ " .XXo.oXXXO.oXXXOX.XXX.oX.XXX.O.",
+ ".oOXXXo.OXXXo.oXX.X..XXo.XXX.O.O",
+ ".Xo.oXXXO.oXXXOX.OXXX..XXXX.O.O.",
+ ".XXXo.OXXXo.oXX.OOOOXXX.XX.O.O.O",
+ ".O.oXXO.oXXXOX.oooOOOO.XX.O.O.O.",
+ ".oOO.oXXo.oXXX..ooooO.XX.O.O.O. ",
+ " ..oOOOoXXoOOXXX..oo.XX.O.O.O. ",
+ " ..oOO.oXXO.oXXX..XX.O.O.O. ",
+ " ..oOO.oXXo.oXXXX.O.O.O. ",
+ " ..oOXOoXXo.XX.O.O.O. ",
+ " ..oOo.oXXX.O.O.O. ",
+ " ..oOO.X.O.O.O. ",
+ " ..oOO.O..O. ",
+ " ..o.oOO. ",
+ " ..... ",
+ " ",
+ " ",
+ " "};
diff --git a/src/icon/note.c b/src/icon/note.c
index 95c6fc1..7735c2d 100644
--- a/src/icon/note.c
+++ b/src/icon/note.c
@@ -4,43 +4,45 @@
/* XPM */
char* MwIconNote[] = {
/* columns rows colors chars-per-pixel */
- "32 32 6 1 ",
+ "32 32 8 1 ",
" c None",
- ". c red",
- "X c white",
- "o c SlateGray",
- "O c firebrick",
- "+ c lavender",
+ ". c black",
+ "X c red",
+ "o c magenta",
+ "O c white",
+ "+ c yellow",
+ "@ c gray",
+ "# c #6632F7",
/* pixels */
- " .... ",
- " ........ ",
- " ..XX......o ",
- " .XX.......oo ",
- " ..X........Oo ",
- " .XX........Ooo ",
- " .X.........Ooo ",
- " .X.........Ooo ",
- " ...........Ooo ",
- " ...........Ooo ",
- " ..........Ooo ",
- " ..........Ooo ",
- " .........Oooo ",
- " .........Ooo ",
- " .........Ooo ",
- " ........Oooo ",
- " .......Ooo ",
- " ......Oooo ",
- " ......Ooo ",
- " ....Oooo ",
- " ....Ooo ",
- " OOOooo ",
- " ooo ",
- " ..... ",
- " .XX...Oo ",
- " .XX.....Oo ",
- " .X......Ooo ",
- " ........Ooo ",
- " ........Ooo ",
- " O.....Oooo ",
- " OOOOOooo ",
- " ooooo "};
+ " ..... ",
+ " .XXXXX. ",
+ " .XXXXXXX. ",
+ " .XXXXXXo. ",
+ " .XooOOoX. .. ",
+ " .XXOOX. ..+O. ",
+ " ..... ..O+O+. ",
+ " ..XXX....+O+O+O+. ",
+ " .X.XXO.X.+O+O+O+O. ",
+ " .XX.XXo.Xo.+O+O+O+O. ",
+ " .XXX...XXo.O+O+O+O+. ",
+ " .XoXXXXXoX.+O+O+O+O+. ",
+ " ..XXooOOoXX.O+O+O+O+O. ",
+ "..@..XXXXXXX.O+O+O+O+O+O. ",
+ ".@@@........O+O+O+O+O+O+. ",
+ " .@.@.@..O+O+O+O+O+@@O+O+. ",
+ " .@@.@.@.+O+O+O+O@@+O+O+O. ",
+ " .@@.@.@O+O+@+@@O+O+O+O+O. ",
+ " .@@@.@O+O+O@@+O@O+O@@+O+. ",
+ " .@O+O+O+@@O+O+O+@@O+O+O+. ",
+ " .@@O+O@@+@@O+O@@+O@O+O+O+. ",
+ " .@+O+O+O+O+@@O+O+O+O@@+O+...",
+ " .@@+O+O+@@@+O+O+O+@@O+O+O+O.",
+ " .@O+O@@+O+@+@+O@@+O+O+O+O. ",
+ " .@@O+O+O+O+O+@@O+@+O+O+O. ",
+ " .@+O+O+O+O@@+O+O+O+O+.. ",
+ " ..@+O+O+O+O+O+O+O+O.. ",
+ " ....O+O+O+O+O+O+.. ",
+ " .......+O+O+O.. ",
+ " ..+OO..+O+.. ",
+ " ...+..... ",
+ " ..... "};
diff --git a/src/icon/warning.c b/src/icon/warning.c
index c056e6d..e17958b 100644
--- a/src/icon/warning.c
+++ b/src/icon/warning.c
@@ -4,12 +4,13 @@
/* XPM */
char* MwIconWarning[] = {
/* columns rows colors chars-per-pixel */
- "32 32 5 1 ",
+ "32 32 6 1 ",
" c None",
". c red",
"X c yellow",
"o c DarkSlateGray",
"O c black",
+ "+ c #6632F7",
/* pixels */
" ",
" ",
diff --git a/src/messagebox.c b/src/messagebox.c
index a0fecd1..50710e0 100644
--- a/src/messagebox.c
+++ b/src/messagebox.c
@@ -50,6 +50,10 @@ MwWidget MwMessageBox(MwWidget handle, const char* text, const char* title, unsi
data = MwIconQuestion;
break;
}
+ case MwMB_ICONNEWS: {
+ data = MwIconNews;
+ break;
+ }
}
px = MwLoadXPM(icon, data);
diff --git a/tools/icon.sh b/tools/icon.sh
index 77e977d..db75445 100755
--- a/tools/icon.sh
+++ b/tools/icon.sh
@@ -1,5 +1,12 @@
#!/bin/sh
# $Id$
+
+cd resource/icon
+for i in *.gif; do
+ convert $i -shave 4x4 -alpha on -channel rgba -fill 'transparent' -opaque '#80ff80' `echo $i | cut -d. -f1`.png
+done
+cd ../..
+
echo '/* $Id$ */' > include/Mw/Icon.h
echo '/*!' >> include/Mw/Icon.h
echo ' * %file Mw/Icon.h' >> include/Mw/Icon.h
diff --git a/tools/update.sh b/tools/update.sh
index eb2cdd7..cd67a7d 100755
--- a/tools/update.sh
+++ b/tools/update.sh
@@ -5,6 +5,7 @@ if which gmake >/dev/null 2>&1; then
MAKE=gmake
fi
./tools/doc.pl
+./tools/icon.sh
./tools/genoo.pl
./tools/genmsvc.pl
$MAKE format