diff options
author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-11-13 01:15:56 +0000 |
---|---|---|
committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-11-13 01:15:56 +0000 |
commit | 4df4d1f209ea8f79473086cb743295b5c1809696 (patch) | |
tree | f7bb0cbf3c2166817e3d8b457627ea0bd517e92a /image | |
parent | 2eb36d389b85ccd1e2f0f20356f1910ea7a9a34c (diff) |
Set a transparency threshold for the XPM icons. Have the make-icons script
constify the XPMs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19883 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'image')
-rwxr-xr-x | image/make-icons | 9 | ||||
-rw-r--r-- | image/wsicon16.xpm | 7 | ||||
-rw-r--r-- | image/wsicon32.xpm | 11 | ||||
-rw-r--r-- | image/wsicon48.xpm | 12 | ||||
-rw-r--r-- | image/wsicon64.xpm | 20 | ||||
-rw-r--r-- | image/wsiconcap16.xpm | 7 | ||||
-rw-r--r-- | image/wsiconcap32.xpm | 11 | ||||
-rw-r--r-- | image/wsiconcap48.xpm | 12 |
8 files changed, 49 insertions, 40 deletions
diff --git a/image/make-icons b/image/make-icons index 866ef4ba17..e7e6018094 100755 --- a/image/make-icons +++ b/image/make-icons @@ -3,14 +3,19 @@ RESOLUTIONS="64 48 32 16" CONVERT=convert +XPM_OPTS="-channel A -threshold 50%" for RES in 64 48 32 16 ; do $CONVERT -resize ${RES}x${RES} wsicon256.png wsicon${RES}.png - $CONVERT -resize ${RES}x${RES} wsicon256.png wsicon${RES}.xpm + $CONVERT -resize ${RES}x${RES} $XPM_OPTS wsicon256.png xpm:- | \ + sed -e "s/^static char \*-/static const char *wsicon${RES}_xpm/" > \ + wsicon${RES}.xpm done for RES in 48 32 16 ; do - $CONVERT -resize ${RES}x${RES} wsiconcap256.png wsiconcap${RES}.xpm + $CONVERT -resize ${RES}x${RES} $XPM_OPTS wsiconcap256.png xpm:- | \ + sed -e "s/^static char \*-/static const char *wsiconcap${RES}_xpm/" > \ + wsiconcap${RES}.xpm done diff --git a/image/wsicon16.xpm b/image/wsicon16.xpm index e528bb9fa2..a6879eff95 100644 --- a/image/wsicon16.xpm +++ b/image/wsicon16.xpm @@ -1,7 +1,7 @@ /* XPM */ static const char *wsicon16_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 16 200 2", +"16 16 201 2", " c #000305", ". c #031219", "X c #0E1112", @@ -202,8 +202,9 @@ static const char *wsicon16_xpm[] = { "-X c #93BBCD", ";X c #97BBCB", ":X c #96BBCC", +">X c None", /* pixels */ -"@ l }. XXXOX@X#X#XoX.X|.~.| k X ", +">Xl }. XXXOX@X#X#XoX.X|.~.| k >X", "+ Q.;X:X:X*X*X&X%X$X{.[.].'.f.O ", "& U f.!.!._.).`./.^.D.A.a.p.D # ", "& S ) 1.r.j.c.M.s.Z g s 1.=.W ; ", @@ -218,5 +219,5 @@ static const char *wsicon16_xpm[] = { "# z v V U 1.1.6.9.9.1.W C B z # ", "= S L L ) ..=.=.=.=.=. .) L S ; ", "o v S S S S H T L U U H S S v o ", -" o & & & & = = = = $ & & & o " +">Xo & & & & = = = = $ & & & o >X" }; diff --git a/image/wsicon32.xpm b/image/wsicon32.xpm index 6ec1ba8da7..9f7f6d5e66 100644 --- a/image/wsicon32.xpm +++ b/image/wsicon32.xpm @@ -1,7 +1,7 @@ /* XPM */ static const char *wsicon32_xpm[] = { /* columns rows colors chars-per-pixel */ -"32 32 146 2", +"32 32 147 2", " c #000000", ". c #010709", "X c #030B0E", @@ -148,9 +148,10 @@ static const char *wsicon32_xpm[] = { "b. c #ACBBC1", "n. c #B1BCC1", "m. c #A5C1CD", +"M. c None", /* pixels */ -" @ > , d g h h j j k k k k z z z z z z z k j j j h f s > : . ", -" @ t.f.g.g.n.n.n.n.b.n.n.b.b.b.b.b.b.b.s.s.s.p.p.i.u.u.y.l . ", +"M.M.> , d g h h j j k k k k z z z z z z z k j j j h f s > : M.M.", +"M.@ t.f.g.g.n.n.n.n.b.n.n.b.b.b.b.b.b.b.s.s.s.p.p.i.u.u.y.l . M.", " + ;.m.m.v.m.v.m.z.z.z.c.c.c.c.l.l.k.k.l.k.h.h.r.r.w.w.w.K O ", " 1 A >.j.j.j.j.h.h.r.r.r.r.e.e.e.e.0.0.0.9.9.7.7.2.2.:.) Z 1 ", " 3 V Z =.7.7.7.7.7.8.6.6.6.6.6.6.4.1.1.1.1.<.,._ _ ( ! Z V 3 ", @@ -179,6 +180,6 @@ static const char *wsicon32_xpm[] = { " 4 V B B B B V V Z A A U U Y Y Y Y Y U Y U A A V V V B B V 4 ", " 1 V B B B B B B B V V A A A A U U U U A A V V B B B B B V 1 ", " + x V V V V V V V V V V V V A V V A V V V V V V V V V V x + ", -" + 1 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 3 3 3 3 3 3 3 3 3 1 + ", -" " +"M. + 1 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 3 3 3 3 3 3 3 3 3 1 + M.", +"M.M. M.M." }; diff --git a/image/wsicon48.xpm b/image/wsicon48.xpm index a955fb5421..f2961d188d 100644 --- a/image/wsicon48.xpm +++ b/image/wsicon48.xpm @@ -172,9 +172,9 @@ static const char *wsicon48_xpm[] = { "E. c #B8C0C4", "W. c None", /* pixels */ -"W.W. o o # # $ > > , , , < < < < 1 1 1 f f f f f f f f f f f 1 1 1 < < , > $ $ # # . W.W.", -"W. # h f.g.j.k.k.b.b.n.n.n.n.n.n.m.m.m.m.m.m.m.m.m.m.m.m.m.n.b.b.b.l.l.k.j.h.h.g.f.j h f W.", -" # h.E.R.E.R.E.R.R.R.R.T.T.T.T.T.U.L.U.L.K.I.U.J.J.F.J.J.D.D.S.S.S.S.Z.Z.c.Z.c.c.c.z.g ", +"W.W.W. o o # # $ > > , , , < < < < 1 1 1 f f f f f f f f f f f 1 1 1 < < , > $ $ # # . W.W.W.", +"W.W.# h f.g.j.k.k.b.b.n.n.n.n.n.n.m.m.m.m.m.m.m.m.m.m.m.m.m.n.b.b.b.l.l.k.j.h.h.g.f.j h f W.W.", +"W. # h.E.R.E.R.E.R.R.R.R.T.T.T.T.T.U.L.U.L.K.I.U.J.J.F.J.J.D.D.S.S.S.S.Z.Z.c.Z.c.c.c.z.g W.", " O %.U.U.U.U.U.I.I.I.I.I.I.I.Y.Y.Y.F.P.H.H.P.P.P.P.G.G.C.C.C.C.V.V.V.N.N.M.M.M.p.p.u.D O ", " 3 Z >.F.F.F.A.A.A.A.A.A.C.A.C.C.C.C.B.B.B.B.B.B.B.d.d.d.d.d.d.i.i.i.u.u.r.r.0.0.>.^ N 3 ", " w N C ;.M.M.M.M.M.M.d.d.d.d.d.d.d.a.a.a.a.y.y.y.y.t.t.t.t.w.w.q.9.7.7.7.2.;.;.-.~ B N w ", @@ -217,7 +217,7 @@ static const char *wsicon48_xpm[] = { " w B N N N N N N N N N N N B Z Z Z Z Z Z P Z Z L Z P Z Z Z Z Z N Z N N N N N N N N N N w ", " 4 N N N N N N N N N N N N N N B N B Z N Z Z Z Z Z Z Z Z Z B Z N N N N N N N N N N N N 3 ", " O w N N B N N N N N B N B B N N N B B B B N Z Z B B N B B B N N B N N N N N B N N N p O ", -" O 3 w p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p w 3 O ", -"W. . . . . . . . . . . . . . . . . . . . . . W.", -"W.W. W.W." +"W. O 3 w p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p w 3 O W.", +"W.W. . . . . . . . . . . . . . . . . . . . . . W.W.", +"W.W.W. W.W.W." }; diff --git a/image/wsicon64.xpm b/image/wsicon64.xpm index 064f5c5285..5e972201d7 100644 --- a/image/wsicon64.xpm +++ b/image/wsicon64.xpm @@ -182,11 +182,11 @@ static const char *wsicon64_xpm[] = { "`. c #B3C4CC", "'. c None", /* pixels */ -"'.'.'. o o o o o # o o # # # # $ # $ $ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 $ $ $ # # # # o o o . '.'.'.", -"'.'. . 2 s d g j j k l l l.l.z.z.z.x.x.x.x.x.c.c.v.v.v.V.V.v.V.V.V.V.V.V.V.B.B.N.v.v.x.v.x.x.x.z.z.l.l k k j h f d 3 # '.'.", -"'. 1 M.F.F.G.G.G.G.G.G.G.G.G.^.G.G.^.G.G.G.G.G.^.G.G.G.G.G.^.F.G.D.D.S.A.S.S.A.Z.Z.Z.C.C.C.C.M.M.M.n.n.n.n.n.v.x.x.g '.", -" o z.G.`.`.`.`.`.`.`.`.`.`.`.`.^.`.~.`.`.`.`.~.^.~.~.(.~.(.~.~.~.~.~.~.~.~.W.~.W.W.W.W.R.R.R.R.R.R.Y.Y.L.L.L.m.b.d ", -" . I ).`.`.).).).).).).).~.~.~.~.~.~.~.~.~.~.~.!.!.~.!.!.!./.Q.Q.Q.!.Q.Q.E.Q.U.I.I.I.I.P.P.P.P.P.H.H.H.H.H.j.j.d.a X ", +"'.'.'.'.'. o o o o o # o o # # # # $ # $ $ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 $ $ $ # # # # o o o . '.'.'.'.'.", +"'.'.'.. 2 s d g j j k l l l.l.z.z.z.x.x.x.x.x.c.c.v.v.v.V.V.v.V.V.V.V.V.V.V.B.B.N.v.v.x.v.x.x.x.z.z.l.l k k j h f d 3 # '.'.'.", +"'.'. 1 M.F.F.G.G.G.G.G.G.G.G.G.^.G.G.^.G.G.G.G.G.^.G.G.G.G.G.^.F.G.D.D.S.A.S.S.A.Z.Z.Z.C.C.C.C.M.M.M.n.n.n.n.n.v.x.x.g '.'.", +"'. o z.G.`.`.`.`.`.`.`.`.`.`.`.`.^.`.~.`.`.`.`.~.^.~.~.(.~.(.~.~.~.~.~.~.~.~.W.~.W.W.W.W.R.R.R.R.R.R.Y.Y.L.L.L.m.b.d '.", +"'. . I ).`.`.).).).).).).).~.~.~.~.~.~.~.~.~.~.~.!.!.~.!.!.!./.Q.Q.Q.!.Q.Q.E.Q.U.I.I.I.I.P.P.P.P.P.H.H.H.H.H.j.j.d.a X '.", " 5 S 3.~.~.~.~.~.~.~.W.W.W.W.!.~.!.!.Q.Q.Q.Q.Q.U.U.Q.Q.U.U.U.U.U.U.P.J.K.J.J.J.J.k.J.k.k.g.g.g.d.g.g.d.d.d.p.t._ C 5 ", " . z C D 5.T.P.E.P.T.P.P.P.P.P.P.P.I.K.K.K.K.J.K.J.J.K.K.k.k.h.k.k.k.k.k.h.h.g.g.f.f.s.s.s.a.u.u.i.t.t.t.8.3.3._ C C z . ", " + n C C S 2.H.H.H.H.H.j.j.j.k.g.k.k.k.h.k.h.h.h.h.h.h.s.h.s.h.h.s.s.s.s.i.i.i.i.y.y.e.t.w.w.w.8.8.8.2.2.2.<.( S C C n + ", @@ -241,9 +241,9 @@ static const char *wsicon64_xpm[] = { " O n C C C C C C C C C C C C C C C C C D D D D D D D Y D D D D Y Y D D Y D Y D U D D D D C C C C C C C C C C C C C C n @ ", " . z C C C C C C C C C C C C C C C C C C C D C D D D D D D D D D D D D D D Z D D D C Z C Z Z C C C C C C C C C C C C z . ", " 5 C C C C C C C C C C C C C C C C C C C C C D C D D D D D D D D D D D Z D D C C C C C C Z C C C C C C C C C C C C 5 ", -" X q C C C C C C C C C C C C C C C C C C C Z Z D C Z C Z C Z Z Z D Z Z Z Z Z Z C C C C C D C C C C C C C C C C C q . ", -" . 5 z n m n n n m m n m n n m n m n n n m n n n n n m n m n m m m n m m n n m n m n n n m m m n n n m n n z 5 . ", -"'. . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ O . '.", -"'.'. '.'.", -"'.'.'. '.'.'." +"'. X q C C C C C C C C C C C C C C C C C C C Z Z D C Z C Z C Z Z Z D Z Z Z Z Z Z C C C C C D C C C C C C C C C C C q . '.", +"'. . 5 z n m n n n m m n m n n m n m n n n m n n n n n m n m n m m m n m m n n m n m n n n m m m n n n m n n z 5 . '.", +"'.'. . + @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ O . '.'.", +"'.'.'. '.'.'.", +"'.'.'.'.'. '.'.'.'.'." }; diff --git a/image/wsiconcap16.xpm b/image/wsiconcap16.xpm index 43454a62bf..669174099d 100644 --- a/image/wsiconcap16.xpm +++ b/image/wsiconcap16.xpm @@ -1,7 +1,7 @@ /* XPM */ static const char *wsiconcap16_xpm[] = { /* columns rows colors chars-per-pixel */ -"16 16 195 2", +"16 16 196 2", " c #020500", ". c #0F120E", "X c #0A1803", @@ -197,8 +197,9 @@ static const char *wsiconcap16_xpm[] = { "$X c #A4CD92", "%X c #A7CC95", "&X c #A8CB96", +"*X c None", /* pixels */ -"$ k `.].[.[. X X X}.{.'.s.a.j . ", +"*Xk `.].[.[. X X X}.{.'.s.a.j *X", "# d.&X%X$X$X@X+XOXoX_.).(./.i.+ ", "& Y p.f.^.~.!.Q.W.E.U.I.u.5.R & ", "& G _ 5.9.t.z.C.4.m f f &.%.( - ", @@ -213,5 +214,5 @@ static const char *wsiconcap16_xpm[] = { "@ b n M W #.6.8.6.6.6.W N M b @ ", "& Y R R _ _ [ } %.%.[ _ _ R R = ", "O n G G G G K K K K Y F D D n + ", -" O & & & & - & & & & & & & O " +"*XO & & & & - & & & & & & & O *X" }; diff --git a/image/wsiconcap32.xpm b/image/wsiconcap32.xpm index 54bf1b64a0..6f2aec7ebf 100644 --- a/image/wsiconcap32.xpm +++ b/image/wsiconcap32.xpm @@ -1,7 +1,7 @@ /* XPM */ static const char *wsiconcap32_xpm[] = { /* columns rows colors chars-per-pixel */ -"32 32 137 2", +"32 32 138 2", " c #000000", ". c #050D02", "X c #071203", @@ -139,9 +139,10 @@ static const char *wsiconcap32_xpm[] = { "g. c #B3C1AD", "h. c #B2CDA5", "j. c #B6C1B1", +"k. c None", /* pixels */ -" + ; : t u i i p p p a a d d d d d d d a a a p p i y : ; - . ", -" + 4.w.w.e.j.e.j.j.j.j.g.g.g.g.d.d.d.d.q.q.0.0.9.7.7.6.5.s . ", +"k.k.; : t u i i p p p a a d d d d d d d a a a p p i y : ; - k.k.", +"k.+ 4.w.w.e.j.e.j.j.j.j.g.g.g.g.d.d.d.d.q.q.0.0.9.7.7.6.5.s . k.", " O / h.h.h.h.h.f.p.p.p.s.s.s.a.a.i.i.u.i.u.y.y.3.2.2.2.1.C o ", " , D ) t.t.y.y.y.r.r.r.3.<.<.<.,.,.,.:.:.;.;.=.=.&.) ( Q D , ", " 3 Z Z ~ -.-.-.=.=.=.=.*.*.%.%.#.#.#.@.@.+.^ ^ W W E R A A 3 ", @@ -170,6 +171,6 @@ static const char *wsiconcap32_xpm[] = { " 3 A Z Z Z Z Z Z A S S S F F S F F F F S S S A A A A Z Z A 3 ", " , Z Z Z Z Z Z Z Z Z A A S S S S S S A D A A A Z Z Z Z Z A , ", " O j A Z A Z Z Z A A A A A A A A S S A A A A A A Z A A A j o ", -" O , 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 , O ", -" " +"k. O , 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 , O k.", +"k.k. k.k." }; diff --git a/image/wsiconcap48.xpm b/image/wsiconcap48.xpm index 08af687973..fd3739dd27 100644 --- a/image/wsiconcap48.xpm +++ b/image/wsiconcap48.xpm @@ -182,9 +182,9 @@ static const char *wsiconcap48_xpm[] = { "`. c #BAC8B4", "'. c None", /* pixels */ -"'.'. X X @ @ # ; ; : : : > > > > , , h h h h h h h h h h h h , , > > > : ; # # @ @ . '.'.", -"'. @ k c.v.n.m.m.Z.Z.Z.A.S.S.S.S.D.D.D.D.D.D.D.D.D.D.S.D.S.S.Z.Z.Z.Z.N.m.n.n.v.v.c.l k h '.", -" @ b._.`._.`.`.`.).).).).(.^.(.^.).!.(.~.!.~.^.Q.Q.E.E.E.E.E.I.L.L.L.L.C.C.C.C.C.V.M.j ", +"'.'.'. X X @ @ # ; ; : : : > > > > , , h h h h h h h h h h h h , , > > > : ; # # @ @ . '.'.'.", +"'.'.@ k c.v.n.m.m.Z.Z.Z.A.S.S.S.S.D.D.D.D.D.D.D.D.D.D.S.D.S.S.Z.Z.Z.Z.N.m.n.n.v.v.c.l k h '.'.", +"'. @ b._.`._.`.`.`.).).).).(.^.(.^.).!.(.~.!.~.^.Q.Q.E.E.E.E.E.I.L.L.L.L.C.C.C.C.C.V.M.j '.", " o ././././.~./.!.~.~.~.~.~.W.W.W.Y.R.R.R.T.R.T.T.T.J.T.J.J.J.J.H.J.H.G.G.z.z.z.z.j.J o ", " 6 Y O.I.Y.Y.U.U.P.P.P.P.P.K.J.J.J.J.J.J.J.H.H.J.H.H.F.F.F.l.x.j.j.j.j.g.g.g.p.s.p.} K 6 ", " s K U O.G.G.G.G.z.F.z.x.x.x.x.x.l.l.k.h.h.h.h.h.i.i.i.i.i.i.u.u.u.t.t.w.q.q.O.o.] K P s ", @@ -227,7 +227,7 @@ static const char *wsiconcap48_xpm[] = { " s K K K K K K K K K K K K P P P I P T I I I I I I I I I T P I P P K P K K K K K K K K s ", " 6 K K K K K K K K K K K K K K P P P P P P I I I P I P P P P P P K K K K K K K K K K P 6 ", " o d K P P K P P P P K K K P P P P P P P P P P P P I P P P P P K K K K P K P P K P K d o ", -" . 6 s d d d d d d f f d d d d d d d d d f f f d f d d d d f f f f d d d d d d s 6 o ", -"'. . . . '.", -"'.'. '.'." +"'. . 6 s d d d d d d f f d d d d d d d d d f f f d f d d d d f f f f d d d d d d s 6 o '.", +"'.'. . . . '.'.", +"'.'.'. '.'.'." }; |