From 6361381214c00881ec2d20b597f29fa2cc370783 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Sat, 11 Oct 2025 07:46:23 +0000 Subject: [PATCH] icons git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@260 b9cfdab3-6d41-4d17-bbe4-086880011989 --- GNUmakefile | 2 +- doc/index.html | 20 ++++++++++ include/Mw/Constants.h | 5 +++ include/Mw/Icon.h | 5 +++ resource/icon/icon.sh | 5 --- resource/icon/info.gif | Bin 221 -> 265 bytes resource/icon/info.png | Bin 397 -> 434 bytes resource/icon/news.gif | Bin 0 -> 398 bytes resource/icon/news.png | Bin 0 -> 542 bytes resource/icon/note.gif | Bin 288 -> 439 bytes resource/icon/note.png | Bin 444 -> 594 bytes resource/icon/question.gif | Bin 325 -> 353 bytes resource/icon/question.png | Bin 492 -> 529 bytes resource/icon/warning.gif | Bin 312 -> 342 bytes resource/icon/warning.png | Bin 458 -> 498 bytes src/icon/info.c | 2 +- src/icon/news.c | 46 ++++++++++++++++++++++ src/icon/note.c | 78 +++++++++++++++++++------------------ src/icon/warning.c | 3 +- src/messagebox.c | 4 ++ tools/icon.sh | 7 ++++ tools/update.sh | 1 + 22 files changed, 132 insertions(+), 46 deletions(-) delete mode 100755 resource/icon/icon.sh create mode 100644 resource/icon/news.gif create mode 100644 resource/icon/news.png create mode 100644 src/icon/news.c 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 bdd8ad50f48ec4c71fe5d2be288f71f8b6f12718..fecf091c49ae8fc7c8c734ec847cbd231e9fc4f4 100644 GIT binary patch literal 265 zcmV+k0rvh!Nk%w1VJHA70Kx?T0093lPfxzSzJULL=H~ilGWTXO_hvHpA^s6Va%Ew3 zWn>_CX>@2HM@dak04x9i001ZeC;$Kh!AQE?{&0mzD-4r}&Ab0#h$#YQo@lD3+Sm?o zEYEZ;w^?cL{EU-Ot7t8J9j2@pgSs+zHPW^!;G`W$GORRrOeGa7Sa)KA=cL- P6D!-?-QM5e7zqG7LBV+O literal 221 zcmV<303!cKNk%v~VJHA70FeLy=H~jozP>L{PXGY_EC2ui04M+`0008EgpaAqCk-PL z4}^=e-n>&2P~u3IW@&wC$F^Eph3?G4pg`wu7~}eHTm5uF*>8YEwu-)7@>%2EhR*?| z!yJ;9QsI!6{erv3S#>ZAx6alkmh8^3lUJ8|BdXTzaF;$FrBcT6N7Tnsm~*F*sCc;1 z=qLzy5ji&5@w8`%Nk~V@*9rM4ciDqTSBbRAvB-EPlJ@9PB6%t%D~cOj>0YGr7mZD3$!U?6cTYbyf-gDOa03Q)CGZhlH;S|x*# zfsv`Mp@FWUVTggb6_SR`_Dh_TeHm4yP0Xwe4IzfK&rL4^8p7b|>gTe~DWM4fanv+k delta 113 zcmdnQ+{-*6j{VuQUmGs1J2Np=olRCQfyrXS#7Qxeg&F1fjV!E;47CjmtPBipsxdQ7 zc4QQhHMF!e)ip5EHM9&dFtsuU${9gaNWa?6F}a9QRociBC=3y+D*RQ-00f?{elF{r G5}E+|L?Fum diff --git a/resource/icon/news.gif b/resource/icon/news.gif new file mode 100644 index 0000000000000000000000000000000000000000..0da6e2802a53abf46f0e1a9247e8a6b7cbdaf543 GIT binary patch literal 398 zcmV;90df9ENk%w1VJHA70Kx|V0000lPfu`wkiNdYfd7Ez=KBBt|7J4xA^s6Va%Ew3 zWn>_CX>@2HM@dak04x9i001ZeC;$Kh{#d%){&0mzD-5%Y&Ab0#h$#bRo@lD3+Sn3s zEYEZ;w^?cL{EU-t&|J$0ETE%S=8;I25c5EtU7C0WH!3(d2QjXR3PQr z&b0J+EYMDUOkmtFAcqHXZFnwLF<5nMYkmf7iDfWwFi?F_b(DZ~P@0JVT#<(Wj)0Dx znwfrZlVp~wp?-E`Sp#RFqOMVWc5HTlUZIqX0KkY+YQcVhvw1C0#JIP7vahki)xNF6 zx56BYven9j0o944WVr(99e>{dz5*M!&Rgi|>&c$WI-TzuiTtnV>{Wx5@5?@T8?Y6d9LF8M4djgT*d)2AXPte8r*s@1DlF(d#0J7N*Ll>h($ literal 0 HcmV?d00001 diff --git a/resource/icon/news.png b/resource/icon/news.png new file mode 100644 index 0000000000000000000000000000000000000000..5cdcc210e3b1c3e9d553fc57801e5803382d55bc GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vO2U$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBC?OQ!6XFV_f#CoD{{;;b_U+r3X7qhxdFpwf5MxP@ zUoeBivm0q3PLj8~3+s>kmmoXXOFVsD*#U5zv9&jkLqP9$i_y*Pvf9z*%X`7gP9XonDMkGY z%YU#|aeiqCTXIJKVduVmpE%E~Q``OIqJkmN`I05B5hcm_xw)x%B@E6*sfi`2DGKG8 zB^e6tp1uLk*E^gBDpCb0N&!k)C4*Hk7#SFu>KYp88XATem|K~cS{WK?8yHv_7*un` z_oHaY%}>cptHiB=EBv`JP=f~ChLX(O)Z&uF+yZnxW>$uV5KG$UrWXPAFnGH9xvXxmSc}be>`BR-m%-)5@?u|s&hbZ4 z;uU;vs^9%T5TkqL7bBC0io%IMypc@z4QIxf%|1W7uS+Ik{lT0%_?L%v&ZR()A>Uu$?rbZ|vhOMk`0>VW91SogT;)7zY8 zN3nJ>teQWgWr@Y46^xl7nZ1je*H2o#IW5C$ZQrhCx~o|B#5C<#TxE7tW!1%t2Nx~r zU^sqr)s<%D{pn-W7D@2S!Y9T$mCVq+5vQFB>sr}AiF aHd~VBp{~%4iETGGXIx$t%dN!3U=08ddBdNk%v~VJHA70HOc@=H~jcA|k%NzAsNt{{R60|Nn4+kN^MxEC2ui04M+` z000B+2)f+N_DFSAmXsV{#*oGh>6L8mNWzEezUEidEP9Q53dISRu z_|g%K$fOd)%+-ofLSXu-3a`-UmTN2FzOZLjYanyH&SQ2=H3yw*wtEA==ILE_O=)X@ zfi6~rb8R7gib!L7e1eG~g^Z1qXqJnTlZcx!Vr`xRj*l~jb)Z9#q(7RiJ*ul`Lqw^s zu&lB&w6%A)0mHhxwznI_#=(9w$fmJia%{J!A5YW1rEk%e+1lICyqvD#)*hWY=NXa7!5tPpYb{MgupuvL(6Dq`z002AboQQJ( diff --git a/resource/icon/note.png b/resource/icon/note.png index d59aca4c43e33b87a1eda1585480013c2aa09e98..0bcb4b23576d49d7ac2d5a3c9d3ad7a23597d18d 100644 GIT binary patch delta 462 zcmdnPe2Ha3K)pnOPlzi682o2o_|Nbk3>fz9+m~kaeapX>AwVg{k|4ie28U-i(m`sfOD=A9J)ZOnIwyca4?SHRLp09EP735|HsEQyEv=LK?d}fl z9P7q}8u6z0tkZwXCwfLln=fqo`M>UGy>Q7n%ZAyz?c@soXtKEM`765Y{-Ns1Oh&yP zSIGl+Q)3%eh}JkTq}`KJwmIbBQtaHKX>+yE$)>NtzjTg(eP-W8YnFiGo+}Cybbig1 zR^fW#d_}=->6EX3H3akxqq@EpJ0*Fszh71EVNz@A-zf95&Q5gEtQ7yZ!rA<356@l` zNt&u(<&hQD+Oh3o_}j;-$3>%if!>uYag8WR&d<$F%`0JWE=o--Nlj5G&n(GMaQE~Lc)s4@^kgYU zB?l8zD+3E{0|P4q1K|q{@j#8LAdM+NfV5D6Plzi61H*qH`v1S6VZtUQrDxB6C5P=7omePZ&-x?(<#C`idx@v7 zEBi|>ZgyF@1SX3OK%p{E7sn8d^Su`nxeh3Bumv>BCd8LCS~*@2eDg1Tmg%u8Y-{Un zuUzSPCtNVej&VbiQjq8ooeLpuQ>-H#XMT9rvWN9g(~|jrS>hJtDVW;MS#8-UenB$m z$g~*=WnOb-C!AII5w9Wbp_ZgGm-mO=hStOU-nE%)Y#GJlDum}I8*cZTyn#`P-^kL+ z$U@t|z{_CX>@2HM@dak04x9i001ZeC;$Kh{&>3F{&0y%D-`pT&Ab0#h$#hTo@lD3+SnR! zEYEZ;w^?b!MDPEE9Slbj*m{7Za;e-AUo-+UK&@7jgW6L!lPaxXDTrNOgcoCJ0CjgTd0>PFW`Jx}hz4F^h>CNDjcAorl73Kyn0tJXhkTPU zo`h+UqnlhZm3CyIgQ_m9t%9GhrjDdDucx}Zt8z52l&Ox1!a|F;jlMLzN0`rA%0jW3 z#WvAVuG-tyLWa~%;o^ei<+Q^>zI;O5-M8=X<~35G%Q5kb_<8!t)?G`2YL7mCrKWsZ zhA?5CZ{P&#YnHB>M1Ah)S&Rc35Jts_IV^~buquSflOiUpSjn=b%a<@QBme+AYN@5V literal 325 zcmV-L0lNN2Nk%v~VJHA70HOc@=H~jcA|k%NzAsNt{{R4RfRO*C00000EC2ui04M+` z000C22)f+N_DFSAmXsV{#*oJWIwOJV(c&-~VO%5R(VMr_zVZPVL zU<^2)&tUd=PlAMPXK-VRPK;nb9gmB5SX-29dVg<+j*@nFjhCU5ew&A;l}a9TabB!_h^HR2 ztE9RexVgKjnSyw)Y&Vj+h{c{ViNdACzQ&&*wW`w7&B(&NNYu`N-rw6YW#i;w&Kt_> zzt*zrgW$-l^6!yM_Rjc)Lxy(v(SuBsM*s^b0yCCeGNZBw6AbQIedWo12QFYf>V delta 102 zcmbQp@`icBBsN*O1SX3O6K8ClT*N5PZ)9O*Y@%&oU}a$7zD37+@&ZN?Swl-p6J0|i vT|<))L!gAYm5BjFMTg2X$;lTPRi%wAt&E{!RfWGw8Gyjk)z4*}Q$iB}xjP%i diff --git a/resource/icon/warning.gif b/resource/icon/warning.gif index 29b852646dc831eaa2d5734b9380dcc216b0da30..783ed41b11e8acce4b09bb53dd4093f47f3637c4 100644 GIT binary patch literal 342 zcmV-c0jd5+Nk%w1VJHA70Kx|V00030001vfPrkmsfd7Ez=KBBt0A@1xA^s6Va%Ew3 zWn>_CX>@2HM@dak04x9i001ZeC;$Kh{#d%){&0y%D-^Sg&Ab0#h$#bRo@lD3+Sn3s zEYEZ;w^?cL{EU-=UMxTq#(pm$acLwVb;^K&h!H-6J)&Vt#qO@r?KDv3fq7c-xNJM` z(&DbUl=IfofIOFM_tAl9Qh9@GeK&tecTxs}dWCI>P>NfP0DEkHE|N2Fm2rGEZk&sZ zjh~oDk%k0trG%%3qC=#vj+e2jG_AFkYI28~hP$q6x0!XL#gw+bpsB&h%CE)0FrvfD zy~@?sw94Pc*10g)+2D^(N_DFSAmXsV{#*oJWIwOJ|OFij4)K>R&{?sfYadqZ21 zQ21ePNuKOis5+&&QVk2ES_#isbjqxL!=Z7^YrcxLyLA~rKXYerVu(ubH^FxuY9L;H zb$@7hE=q)RhIVOrj2>);0BwLEgOp_jmY9hgn;dMOkD!608>OG9AF8FMerAYwu$^YJ zv~Gfucd=EvyP2ZCoV2-z$h;eyz`@GP#6rfTxX9SUXoJttm)W(=)jrqB!rD@5-Llcr zPwM5g=k7dX>)_y5_D1~u{{KcsR0Bw`povW@5-Oy&C{Pd?Ni0Z=AnBpS4I>n4+{gy8 KqsJ2o0028;K9gzy diff --git a/resource/icon/warning.png b/resource/icon/warning.png index d5dfb1b383d2e1c73f3af843558c3d0854bb3116..08ba558bdafd382d78de6609d6d97aa34fe02f18 100644 GIT binary patch delta 203 zcmX@b{E2x&0He^vKw*&fNCCL)kh?3;|+}zZ>5(ej@)Wnk16ovB4k_-iRPv3y&>m5!{ z)?id}Ffp|X$Y%8sO4>W|q)78&qol`;+0OP1V6#xJL delta 150 zcmeywe2RHO03-jzKw-n5wrfHe7#J8!g8YIR9G=}s196hP-CYYyc6fD*ROnG@rrK)z4*}Q$iB}xs@lR 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