Synchronize divergated icons on several platforms

The certificate has the greatest recognition value.
Even though it is not ideal on very small scale.
This commit is contained in:
Christian Hohnstädt 2021-04-29 20:44:32 +02:00 committed by Christian Hohnstaedt
parent 72ec14d738
commit d7cc443ce8
22 changed files with 263 additions and 179 deletions

View File

@ -153,7 +153,7 @@ xca$(SUFFIX).signed: xca$(SUFFIX)
mv "$<" "$@"; \
fi
msi-installer-dir-$(VERSION): misc/xca.wxs misc/xca.bat misc/variables.wxi img/banner.bmp img/dialog.bmp img/key.ico misc/copyright.rtf
msi-installer-dir-$(VERSION): misc/xca.wxs misc/xca.bat misc/variables.wxi img/banner.bmp img/dialog.bmp img/xca.ico misc/copyright.rtf
rm -f $@/* && mkdir -p $@ && cp -a $^ $@
xca-portable-$(VERSION): xca$(SUFFIX).signed do.doc do.lang do.misc

View File

@ -12,7 +12,7 @@ RST_FILES=arguments common-actions object-ids smartcard \
SPHINX_FILES=$(patsubst %,sphinx/%.rst,$(RST_FILES))
doc: xca.1.gz html/index.html qthelp/xca.qhc
.build-stamp doc: xca.1.gz html/index.html qthelp/xca.qhc
qthelpfiles=qthelp/*.html qthelp/xca.qhc qthelp/xca.qch
.install-stamp: doc

View File

@ -12,27 +12,22 @@ endif
include $(TOPDIR)/Rules.mak
sinclude .depend
ICONS = \
xca-16x16.png \
xca-32x32.png \
xca-64x64.png
PIXMAPS = \
xca-32x32.xpm
ICON_NAME = xca
ICON_SIZES = 16x16 32x32 64x64
ICONS = $(patsubst %,%/apps/xca.png, $(ICON_SIZES))
ICONS_SRC = $(patsubst %,xca-icons.iconset/icon_%.png, $(ICON_SIZES))
PIXMAPS = xca-32x32.xpm
ICONDIR = $(datadir)/icons/hicolor
install: install-pixmaps install-icons
.install-stamp: $(ICONS) $(PIXMAPS) $(ICON_NAME).png
install: install-pixmaps $(ICONS) $(ICONS_SRC)
.install-stamp: $(PIXMAPS) $(ICONS_SRC)
install-pixmaps: $(PIXMAPS)
install -D -m 644 $^ $(DESTDIR)$(datadir)/pixmaps/$(ICON_NAME).xpm
install -d $(DESTDIR)$(datadir)/pixmaps/
install -m 644 $^ $(DESTDIR)$(datadir)/pixmaps/
install-icons: $(ICONS)
for SZ in 16 32 64; do \
if [ -f xca-$${SZ}x$${SZ}.png ]; then \
install -D -m 0644 xca-$${SZ}x$${SZ}.png $(DESTDIR)$(ICONDIR)/$${SZ}x$${SZ}/apps/$(ICON_NAME).png ; \
fi ; \
done
%/apps/xca.png: xca-icons.iconset/icon_%.png
install -d $(DESTDIR)$(ICONDIR)/$*/apps
install -m 0644 $^ $(DESTDIR)$(ICONDIR)/$@
imgres.cpp: imgres.rcc
@$(PRINT) " RCC [$(BASENAME)] $@"
@ -40,11 +35,14 @@ imgres.cpp: imgres.rcc
imgres.rcc: bigcert.png bigcrl.png bigcsr.png bigkey.png bigtemp.png crl.png halfkey.png invalidcertkey.png invalidcert.png key.png netscape.png reqkey.png req.png template.png validcertkey.png validcert.png scard.png
w32res.o: w32res.rc key.ico xca.ico xdb.ico
w32res.o: w32res.rc xca.ico
@$(PRINT) " WINDRES $@"
$(WINDRES) $< $@
app: xca-mac-icon.icns
xca-icons.icns: xca-icons.iconset
iconutil --convert icns $^
app: xca-icons.icns
mkdir -p $(APPDIR)/Resources
install -m 644 $^ $(APPDIR)/Resources

View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file alias="appIco">key.png</file>
<file alias="appIco">xca.png</file>
<file alias="doneIco">done.png</file>
<file alias="warnIco">warn.png</file>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,3 +1 @@
IDI_ICON1 ICON DISCARDABLE "key.ico"
IDI_ICON2 ICON DISCARDABLE "xdb.ico"
IDI_ICON3 ICON DISCARDABLE "xca.ico"
IDI_ICON1 ICON DISCARDABLE "xca.ico"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1021 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -1,153 +1,241 @@
/* XPM */
static char * xca_32x32_xpm[] = {
"32 32 118 2",
" c None",
". c #FFFFFF",
"+ c #D4D4D4",
"@ c #F4F4F4",
"# c #D1D2D1",
"$ c #EDEDED",
"% c #FBFBFB",
"& c #D6D6D6",
"* c #F5F5F5",
"= c #FEFEFE",
"- c #DBDBDB",
"; c #C9C9C9",
"> c #F6F6F6",
", c #FAFBFA",
"' c #D3D3D3",
") c #FAFAFA",
"! c #E2E2E2",
"~ c #E3E3E3",
"{ c #D0D0D0",
"] c #ECECEC",
"^ c #F7F7F7",
"/ c #D1D1D1",
"( c #F2F2F2",
"_ c #F7F8F7",
": c #DEDFDE",
"< c #EFEFEF",
"[ c #E8E8E8",
"} c #CACACA",
"| c #EBEBEB",
"1 c #CECECE",
"2 c #F1F1F1",
"3 c #DDDDDD",
"4 c #EEEEEE",
"5 c #E9E9E9",
"6 c #CBCBCB",
"7 c #F3F3F3",
"8 c #E1E2E1",
"9 c #EDEEED",
"0 c #D8D8D8",
"a c #CDCDCD",
"b c #EBECEB",
"c c #C7C8C7",
"d c #D6D7D6",
"e c #F0F0F0",
"f c #909090",
"g c #C7C7C7",
"h c #E7E8E7",
"i c #C4C4C4",
"j c #EAEAEA",
"k c #D4D5D4",
"l c #939393",
"m c #BBBCBB",
"n c #E4E5E4",
"o c #C2C2C2",
"p c #E7E7E7",
"q c #D2D2D2",
"r c #929292",
"s c #E0E1E0",
"t c #BFC0BF",
"u c #E4E4E4",
"v c #CFD0CF",
"w c #8F8F8F",
"x c #B5B6B5",
"y c #BCBDBC",
"z c #E1E1E1",
"A c #BDBDBD",
"B c #E5E5E5",
"C c #CDCECD",
"D c #E6E6E6",
"E c #DEDEDE",
"F c #DFDFDF",
"G c #E0E0E0",
"H c #888988",
"I c #D5D5D4",
"J c #BBBBBB",
"K c #CACBCA",
"L c #8E8E8E",
"M c #D5D5D5",
"N c #DADADA",
"O c #9F9F9E",
"P c #9C9C9C",
"Q c #A4A4A2",
"R c #BEBFBE",
"S c #6B6B6B",
"T c #C8C8C7",
"U c #696969",
"V c #CFCFCF",
"W c #D9D9D9",
"X c #D7D7D7",
"Y c #666666",
"Z c #989898",
"` c #6F6F6F",
" . c #DCDCDC",
".. c #636363",
"+. c #A7A7A7",
"@. c #656565",
"#. c #484848",
"$. c #828282",
"%. c #626262",
"&. c #AEAEAE",
"*. c #CCCCCC",
"=. c #818181",
"-. c #C8C8C8",
";. c #BABABA",
">. c #A6A6A6",
",. c #9D9D9D",
"'. c #C5C5C5",
"). c #9B9B9B",
"!. c #525252",
"~. c #767676",
"{. c #9E9E9E",
"]. c #A3A3A3",
"^. c #C3C3C3",
"/. c #919191",
"(. c #B8B8B8",
"_. c #ABABAB",
":. c #888888",
"<. c #2A2A2A",
" . + @ ",
" # $ % & * = - ",
" ; > , ' @ ) ! ~ ",
" { ] ^ / ( _ : < [ ",
" } | @ 1 2 * 3 4 @ 5 ",
" ( 6 < ( - $ 7 @ 5 ",
" 8 ] ; 9 < 0 ] 2 7 ( 0 ",
" a [ b c ] ] d | e ( ( ( f ",
" g $ h i j j k j < 2 2 ( l ",
" m h n o 5 p q [ 4 < < e r ",
" 1 s t p u v p $ 4 4 e w ",
" x y z A B 8 C D | $ $ < w ",
" $ ~ z E F G 3 H I d J u F K B j ] ] $ L ",
" ~ M M N G 3 3 0 E O P ~ 3 ; u 5 | | ] l ",
" - q 3 ! B ~ u ~ p ! G G Q R ~ p 5 | | S ",
" 0 / z ~ G ! ! ~ ~ D D 5 G T ! D [ | | U ",
" M V q W X W F z z B ~ 5 p p ~ + B 5 j Y ",
" ; V / Z ` f a X F u ! p D z j u .W j .. ",
" 6 +.@.#. $.+ z z B B E G u p p + %. ",
" &.*.$. / F ! u .F ! 5 j 5 =. ",
" &.-.6 M F u - 3 z j | j j ;. ",
" +.g { e F X & ~ - E F [ j $ j | >. ",
" ,.'.{ V F N M G N E E [ 5 ] $ j 4 ). ",
" J -.1 W .- G X 3 3 p [ | ] $ | @ S ",
" - -.X . .X 3 .D p j ] ] j $ *.!. ",
" J M V W F N - B D 5 | | | ] e ~. ",
" + - / 0 G ! D [ 5 [ 5 ] > {. ",
" & p 3 0 3 G ~ B p ( 5 ]. ",
" &.! 5 e 7 @ * ! ^.r ",
" L /.(.J ;._.:.f ",
" <. ",
" "};
static char *xca[] = {
/* columns rows colors chars-per-pixel */
"32 32 203 2 ",
" c #550504",
". c #5E0403",
"X c #590504",
"o c #590707",
"O c #5C0504",
"+ c #570C0C",
"@ c #5E0808",
"# c #5F0909",
"$ c #5A1616",
"% c #5D1C1B",
"& c #650504",
"* c #6A0101",
"= c #600909",
"- c #620808",
"; c #630C0C",
": c #600E0E",
"> c #730101",
", c #770101",
"< c #760504",
"1 c #7E0101",
"2 c #780605",
"3 c #7D0606",
"4 c #700907",
"5 c #760A09",
"6 c #700E0A",
"7 c #700E0E",
"8 c #641613",
"9 c #601818",
"0 c #6F1A1A",
"q c #701717",
"w c #711919",
"e c #7E1818",
"r c #602222",
"t c #612424",
"y c #632725",
"u c #622626",
"i c #672D29",
"p c #6C2E2E",
"a c #732E23",
"s c #7C3125",
"d c #71322B",
"f c #76362C",
"g c #793434",
"h c #7F574B",
"j c #686863",
"k c #6E6E61",
"l c #747466",
"z c #77776B",
"x c #79796B",
"c c #7A7A6C",
"v c #7C7C71",
"b c #7B7B75",
"n c #7E7C74",
"m c #7E7E77",
"M c #7E7E79",
"N c #840605",
"B c #8F0404",
"V c #8A0908",
"C c #99110F",
"Z c #811414",
"A c #9D1715",
"S c #A10404",
"D c #A0110E",
"F c #A3130F",
"G c #842626",
"H c #972722",
"J c #972C25",
"K c #813629",
"L c #A52E27",
"P c #B72A26",
"I c #AC322B",
"U c #A43733",
"Y c #8C4234",
"T c #884738",
"R c #A94034",
"E c #935742",
"W c #866259",
"Q c #AE7357",
"! c #866B62",
"~ c #8C7164",
"^ c #8C7B75",
"/ c #9E7974",
"( c #A97168",
") c #A07974",
"_ c #9D846D",
"` c #818173",
"' c #828274",
"] c #908F7C",
"[ c #AB827C",
"{ c #AF837C",
"} c #D3896E",
"| c #DD9F7E",
" . c #8E8E85",
".. c #8F8F85",
"X. c #8D8D88",
"o. c #989887",
"O. c #919188",
"+. c #929289",
"@. c #91918A",
"#. c #949489",
"$. c #94948D",
"%. c #96968C",
"&. c #96968E",
"*. c #9A9A89",
"=. c #99998C",
"-. c #98988E",
";. c #9A9A93",
":. c #9B9B95",
">. c #B5958A",
",. c #B39E92",
"<. c #AAA48B",
"1. c #B5A387",
"2. c #BCAA86",
"3. c #A0A099",
"4. c #A6A699",
"5. c #B2AB98",
"6. c #B3B39F",
"7. c #B8B8A2",
"8. c #B2B0A8",
"9. c #B4B3AB",
"0. c #BCBBAB",
"q. c #B9B9AE",
"w. c #D39E82",
"e. c #C4AE86",
"r. c #D8A885",
"t. c #D2A88B",
"y. c #D3C995",
"u. c #DCCE9F",
"i. c #E9C59D",
"p. c #E0D29E",
"a. c #E1D69F",
"s. c #C6C1A9",
"d. c #C6C5AE",
"f. c #CFC7AC",
"g. c #CBC9AD",
"h. c #C8C8AE",
"j. c #DCC8AF",
"k. c #C2C2B1",
"l. c #C5C5B0",
"z. c #C6C6B0",
"x. c #C5C5B4",
"c. c #CBCBB1",
"v. c #D1D1B4",
"b. c #D7D7B9",
"n. c #D7D7BC",
"m. c #DADABC",
"M. c #E6CFA3",
"N. c #EBD1A4",
"B. c #E6DBA4",
"V. c #E9DEA7",
"C. c #E4DEBE",
"Z. c #EFE2A8",
"A. c #EFE5AC",
"S. c #F0E3AE",
"D. c #EBE6B2",
"F. c #E0E0BB",
"G. c #E2E2BD",
"H. c #E9E8BE",
"J. c #F8EAB0",
"K. c #FAEEB3",
"L. c #FFF0B3",
"P. c #FCF0B9",
"I. c #F8F3BC",
"U. c #EDEDC5",
"Y. c #EEEDC4",
"T. c #ECECC8",
"R. c #F4F4C5",
"E. c #FEFDC3",
"W. c #F8F8C6",
"Q. c #FAFAC7",
"!. c #FFF9C6",
"~. c #FDFDC6",
"^. c #FFFEC6",
"/. c #F9F6C8",
"(. c #F8F8C8",
"). c #FDFACB",
"_. c #FFFFC9",
"`. c #FFFFCB",
"'. c #FFFFCF",
"]. c #FFFFD2",
"[. c #FFFFD7",
"{. c #F1F1D8",
"}. c #F0F0DA",
"|. c #F5F5DE",
" X c #FAFADB",
".X c #FFFFD8",
"XX c #FFFFDC",
"oX c #FFFFDD",
"OX c #FFFFDF",
"+X c #FFFFE1",
"@X c #FFFFE3",
"#X c #FFFFE4",
"$X c #FFFFE5",
"%X c #FFFFE6",
"&X c #FFFFE9",
"*X c #FFFFEA",
"=X c #FFFFEC",
"-X c #FFFFF2",
";X c #FFFFF8",
":X c #FFFFFA",
">X c #FFFFFC",
",X c white",
"<X c None",
/* pixels */
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X,XXX<X<X<X<X<X<X",
"<X<X<X<X,XoX[.Y J <X<X<X<X<X<X<X<X<X<X<X<X,X!.} r.N.*X<X<X<X<X<X",
"<X<X<X<X<XQ J.e.i d <X<X<X<X<X<X,X:XOX).H.t.I N V F | <X<X<X<X<X",
"<X<X<X<X1 C #XD.h y 1.g.d.n.m.b.v.h.7.6.5.P B O 2 R P.<X<X<X<X",
"<X<X<X<X* <X<XI._ r ~ *.x l k c ` ' z v 4.( A < X & D i.+X<X<X<X",
"<X<X<X<X6 L.K.A.2.% ! #.+...%.O.@.X.X.^ / 8.{ U H L w./._.<X<X<X",
"<X<X<X<XK p.y.V.u.8 W n j b :.M ;.3.$.) [ 9.q.0.s.f.G.(.^.,X<X<X",
"<X<X<X<Xs Z.a.B.S.a f <.] o.=.-.&.m .x.>.,.k.l.z.c.F.W.E.<X<X<X",
"<X<X<X7 4 <X%XXX'.E . T M.`.]..X X|.}.{.j.C.T.U.Y.R.Q.~.-X<X<X<X",
"<XG g 9 3 <X<X<X<X<X> o # 5 <X<X<X<X,X;X*X&X@X$X=X*X>X<X<X<X<X<X",
"<Xq p : <X<X<X<X<X<X<Xw $ + @ <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<XS - <X<X<X<X<X<X<X<X<X0 t u ; <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<XZ e = , <X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X",
"<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X<X"
};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 KiB

After

Width:  |  Height:  |  Size: 294 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -13,7 +13,7 @@
<key>CFBundleVersion</key>
<string>@XCA_VERSION@</string>
<key>CFBundleIconFile</key>
<string>xca-mac-icon.icns</string>
<string>xca-icons.icns</string>
<key>CFBundleIdentifier</key>
<string>de.hohnstaedt.xca</string>
<key>CFBundleName</key>

View File

@ -53,12 +53,12 @@
<File Id="xca.exe" Source="xca.exe" KeyPath="yes"/>
</Component>
<Component Id="Cextensions" Guid="97df41c4-624f-488b-84b8-7f1cf4018da3" KeyPath="yes">
<ProgId Id="XCA.Database" Description="XCA Database" Icon="xca.exe" IconIndex="1">
<ProgId Id="XCA.Database" Description="XCA Database" Icon="xca.exe">
<Extension Id="xdb" ContentType="application/x-xca-database">
<Verb Id="open" Command="Open" TargetFile="xca.exe" Argument="&quot;%1&quot;" />
</Extension>
</ProgId>
<ProgId Id="XCA.Template" Description="XCA Template" Icon="xca.exe" IconIndex="2">
<ProgId Id="XCA.Template" Description="XCA Template" Icon="xca.exe">
<Extension Id="xca" ContentType="application/x-xca-template">
<Verb Id="open" Command="Open" TargetFile="xca.exe" Argument="&quot;%1&quot;" />
</Extension>