git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@260 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-11 07:46:23 +00:00
parent 97edd88d06
commit 6361381214
22 changed files with 132 additions and 46 deletions

View File

@@ -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

View File

@@ -38,6 +38,9 @@
<dd>
<a href="#Mw_Constants_h___define_MwMB_ICONQUESTION_0x4">#define MwMB_ICONQUESTION 0x4</a>
</dd>
<dd>
<a href="#Mw_Constants_h___define_MwMB_ICONNEWS_0x5">#define MwMB_ICONNEWS 0x5</a>
</dd>
<dt>
<a href="#Mw_Core_h">Mw/Core.h</a>
</dt>
@@ -224,6 +227,9 @@
<dd>
<a href="#Mw_Icon_h__MwIconInfo__">MwIconInfo[]</a>
</dd>
<dd>
<a href="#Mw_Icon_h__MwIconNews__">MwIconNews[]</a>
</dd>
<dd>
<a href="#Mw_Icon_h__MwIconNote__">MwIconNote[]</a>
</dd>
@@ -485,6 +491,13 @@
</dd>
</dl>
<hr>
<pre id="Mw_Constants_h___define_MwMB_ICONNEWS_0x5">#<B><FONT COLOR="#5F9EA0">define</FONT></B> <FONT COLOR="#B8860B">MwMB_ICONNEWS</FONT> 0x5</pre>
<dl>
<dd>
News icon.
</dd>
</dl>
<hr>
<h2 align="center" id="Mw_Core_h">Mw/Core.h</h2>
<dl>
<dt>
@@ -1876,6 +1889,13 @@
</dd>
</dl>
<hr>
<pre id="Mw_Icon_h__MwIconNews__">MWDECL <B><FONT COLOR="#228B22">char</FONT></B>* MwIconNews[];</pre>
<dl>
<dd>
News icon.
</dd>
</dl>
<hr>
<pre id="Mw_Icon_h__MwIconNote__">MWDECL <B><FONT COLOR="#228B22">char</FONT></B>* MwIconNote[];</pre>
<dl>
<dd>

View File

@@ -63,4 +63,9 @@ enum MwALIGNMENT {
*/
#define MwMB_ICONQUESTION 0x4
/*!
* %brief News icon
*/
#define MwMB_ICONNEWS 0x5
#endif

View File

@@ -17,6 +17,11 @@ extern "C" {
*/
MWDECL char* MwIconInfo[];
/*!
* %brief News icon
*/
MWDECL char* MwIconNews[];
/*!
* %brief Note icon
*/

View File

@@ -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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 434 B

BIN
resource/icon/news.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 398 B

BIN
resource/icon/news.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

After

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 444 B

After

Width:  |  Height:  |  Size: 594 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 B

After

Width:  |  Height:  |  Size: 498 B

View File

@@ -8,7 +8,7 @@ char* MwIconInfo[] = {
" c None",
". c blue",
"X c DarkSlateGray",
"o c lavender",
"o c #6632F7",
/* pixels */
" ",
" ",

46
src/icon/news.c Normal file
View File

@@ -0,0 +1,46 @@
/* $Id$ */
#include <Mw/Milsko.h>
/* 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. ",
" ..... ",
" ",
" ",
" "};

View File

@@ -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+.. ",
" ...+..... ",
" ..... "};

View File

@@ -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 */
" ",
" ",

View File

@@ -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);

View File

@@ -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

View File

@@ -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