The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

SF Bug #109 Revoked.png isn't a valid image

Browse Source 
It was unused and did not harm. No functional/optical impact.

Delete image and all ist references
This commit is contained in:
Christian Hohnstaedt 2018-01-06 14:49:09 +01:00
parent e3c9d7bff8
commit 0ba41583fb
6 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
img/Makefile
View File

@ -19,7 +19,7 @@ imgres.cpp: imgres.rcc
@$(PRINT) " RCC [$(BASENAME)] $@" @$(PRINT) " RCC [$(BASENAME)] $@"
$(RCC) -o $@ $< $(RCC) -o $@ $<
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 revoked.png spki.png template.png validcertkey.png validcert.png scard.png 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 spki.png template.png validcertkey.png validcert.png scard.png
w32res.o: w32res.rc key.ico xca.ico xdb.ico w32res.o: w32res.rc key.ico xca.ico xdb.ico
@$(PRINT) " WINDRES $@" @$(PRINT) " WINDRES $@"

1
img/imgres.rcc
View File

@ -16,7 +16,6 @@
<file>netscape.png</file> <file>netscape.png</file>
<file>reqkey.png</file> <file>reqkey.png</file>
<file>req.png</file> <file>req.png</file>
<file>revoked.png</file>
<file>spki.png</file> <file>spki.png</file>
<file>template.png</file> <file>template.png</file>
<file>validcertkey.png</file> <file>validcertkey.png</file>

BIN
img/revoked.png
View File

Binary file not shown.

4
lib/pki_x509.cpp
View File

@ -23,7 +23,7 @@
bool pki_x509::dont_colorize_expiries = false; bool pki_x509::dont_colorize_expiries = false;
bool pki_x509::disable_netscape = false; bool pki_x509::disable_netscape = false;
QPixmap *pki_x509::icon[6] = { NULL, NULL, NULL, NULL, NULL, NULL }; QPixmap *pki_x509::icon[5];
pki_x509::pki_x509(X509 *c) pki_x509::pki_x509(X509 *c)
:pki_x509super() :pki_x509super()
@ -949,7 +949,7 @@ QVariant pki_x509::getIcon(dbheader *hd)
return QVariant(); return QVariant();
if (!ca) if (!ca)
return QVariant(); return QVariant();
pixnum = 5; pixnum = 4;
break; break;
case HD_internal_name: case HD_internal_name:
k = getRefKey(); k = getRefKey();

2
lib/pki_x509.h
View File

@ -42,7 +42,7 @@ class pki_x509 : public pki_x509super
int sigAlg(); int sigAlg();
public: public:
static QPixmap *icon[6]; static QPixmap *icon[5];
static bool dont_colorize_expiries; static bool dont_colorize_expiries;
static bool disable_netscape; static bool disable_netscape;
x509revList revList; x509revList revList;

3
widgets/MainWindow.cpp
View File

@ -264,8 +264,7 @@ void MainWindow::init_images()
pki_x509::icon[1] = loadImg("validcertkey.png"); pki_x509::icon[1] = loadImg("validcertkey.png");
pki_x509::icon[2] = loadImg("invalidcert.png"); pki_x509::icon[2] = loadImg("invalidcert.png");
pki_x509::icon[3] = loadImg("invalidcertkey.png"); pki_x509::icon[3] = loadImg("invalidcertkey.png");
pki_x509::icon[4] = loadImg("revoked.png"); pki_x509::icon[4] = doneIco;
pki_x509::icon[5] = doneIco;
pki_temp::icon = loadImg("template.png"); pki_temp::icon = loadImg("template.png");
pki_crl::icon = loadImg("crl.png"); pki_crl::icon = loadImg("crl.png");
} }