diff --git a/img/Makefile b/img/Makefile index 0d116a10..98b5270e 100644 --- a/img/Makefile +++ b/img/Makefile @@ -19,7 +19,7 @@ imgres.cpp: imgres.rcc @$(PRINT) " RCC [$(BASENAME)] $@" $(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 @$(PRINT) " WINDRES $@" diff --git a/img/imgres.rcc b/img/imgres.rcc index 3e0af8dd..1e5cbaf5 100644 --- a/img/imgres.rcc +++ b/img/imgres.rcc @@ -16,7 +16,6 @@ netscape.png reqkey.png req.png - revoked.png spki.png template.png validcertkey.png diff --git a/img/revoked.png b/img/revoked.png deleted file mode 100644 index c4edd35c..00000000 Binary files a/img/revoked.png and /dev/null differ diff --git a/lib/pki_x509.cpp b/lib/pki_x509.cpp index ccf8c687..403713a1 100644 --- a/lib/pki_x509.cpp +++ b/lib/pki_x509.cpp @@ -23,7 +23,7 @@ bool pki_x509::dont_colorize_expiries = 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_x509super() @@ -949,7 +949,7 @@ QVariant pki_x509::getIcon(dbheader *hd) return QVariant(); if (!ca) return QVariant(); - pixnum = 5; + pixnum = 4; break; case HD_internal_name: k = getRefKey(); diff --git a/lib/pki_x509.h b/lib/pki_x509.h index eaa899a5..5ad0b050 100644 --- a/lib/pki_x509.h +++ b/lib/pki_x509.h @@ -42,7 +42,7 @@ class pki_x509 : public pki_x509super int sigAlg(); public: - static QPixmap *icon[6]; + static QPixmap *icon[5]; static bool dont_colorize_expiries; static bool disable_netscape; x509revList revList; diff --git a/widgets/MainWindow.cpp b/widgets/MainWindow.cpp index 89ba7103..c068c58b 100644 --- a/widgets/MainWindow.cpp +++ b/widgets/MainWindow.cpp @@ -264,8 +264,7 @@ void MainWindow::init_images() pki_x509::icon[1] = loadImg("validcertkey.png"); pki_x509::icon[2] = loadImg("invalidcert.png"); pki_x509::icon[3] = loadImg("invalidcertkey.png"); - pki_x509::icon[4] = loadImg("revoked.png"); - pki_x509::icon[5] = doneIco; + pki_x509::icon[4] = doneIco; pki_temp::icon = loadImg("template.png"); pki_crl::icon = loadImg("crl.png"); }