From 72779569e92be5ac6cd13da99f86fa8683d18b28 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 8 Feb 2007 23:57:19 +0100 Subject: [PATCH] remove debugging code fix spelling errors check certificate validity times add donators entry --- img/Makefile | 2 +- img/w32res.rc | 2 ++ lib/db_x509.cpp | 5 ----- misc/xca.nsi | 14 +++++++------- widgets/MW_help.cpp | 3 ++- widgets/NewX509.cpp | 20 ++++++++++++++------ 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/img/Makefile b/img/Makefile index 3c2735df..e95d1999 100644 --- a/img/Makefile +++ b/img/Makefile @@ -18,7 +18,7 @@ imgres.cpp: imgres.rcc $(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 -w32res.o: w32res.rc +w32res.o: w32res.rc key.ico xca.ico xdb.ico $(WINDRES) $< $@ include $(TOPDIR)/Rules.mak diff --git a/img/w32res.rc b/img/w32res.rc index f47b8267..52e18e94 100644 --- a/img/w32res.rc +++ b/img/w32res.rc @@ -1 +1,3 @@ IDI_ICON1 ICON DISCARDABLE "key.ico" +IDI_ICON2 ICON DISCARDABLE "xdb.ico" +IDI_ICON3 ICON DISCARDABLE "xca.ico" diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp index e11e0ce3..9b625be9 100644 --- a/lib/db_x509.cpp +++ b/lib/db_x509.cpp @@ -131,9 +131,7 @@ void db_x509::remFromCont(QModelIndex &idx) endRemoveRows(); while (pki->childCount()) { - printf("Insert dangling children: %d\n", pki->childCount()); child = (pki_x509*)pki->childItems.takeFirst(); - printf("Child: %s\n", CCHAR(child->getIntName())); child->delSigner((pki_x509*)pki); new_parent = findSigner(child); insertChild(new_parent, child); @@ -157,7 +155,6 @@ void db_x509::changeView() while(pki != rootItem && !pki->childCount()) { parent = pki->getParent(); temproot->append(pki); - //printf("Processing %s\n",CCHAR(pki->getIntName())); pki = parent; } } @@ -169,10 +166,8 @@ void db_x509::changeView() else mainwin->BNviewState->setText(tr("Tree View")); - //printf("ChildCount=%d\n", temproot->childCount()); while ((temproot->childCount())) { pki = temproot->takeFirst(); - //printf("Inserting %s\n", CCHAR(pki->getIntName())); inToCont(pki); } delete temproot; diff --git a/misc/xca.nsi b/misc/xca.nsi index de609fbd..3fa24eab 100755 --- a/misc/xca.nsi +++ b/misc/xca.nsi @@ -124,7 +124,7 @@ NoBackup1: StrCmp $0 "" 0 Skip1 WriteRegStr HKCR "xca_db" "" "XCA database" WriteRegStr HKCR "xca_db\shell" "" "open" - WriteRegStr HKCR "xca_db\DefaultIcon" "" "$INSTDIR\xca.exe,0" + WriteRegStr HKCR "xca_db\DefaultIcon" "" "$INSTDIR\xca.exe,1" WriteRegStr HKCR "xca_db\shell\open\command" "" '$INSTDIR\xca.exe -d "%1"' Skip1: @@ -138,7 +138,7 @@ NoBackup2: StrCmp $0 "" 0 Skip2 WriteRegStr HKCR "xca_template" "" "XCA Template" WriteRegStr HKCR "xca_template\shell" "" "open" - WriteRegStr HKCR "xca_template\DefaultIcon" "" "$INSTDIR\xca.exe,0" + WriteRegStr HKCR "xca_template\DefaultIcon" "" "$INSTDIR\xca.exe,2" WriteRegStr HKCR "xca_template\shell\open\command" "" '$INSTDIR\xca.exe -t "%1"' Skip2: @@ -280,11 +280,11 @@ SectionEnd LangString DESC_SecShortcut ${LANG_GERMAN} \ "Programmgruppe auf dem Desktop und im Menu." LangString DESC_SecUpdate ${LANG_GERMAN} \ - "Exportiert eine alte Datenbank < 0.5.1 in ein ASCII format, das mit dieser Version von XCA importiert werden kann." + "Exportiert eine alte Datenbank <= 0.5.1 in ein ASCII format, das mit dieser Version von XCA importiert werden kann." LangString DESC_SecUpdate ${LANG_ENGLISH} \ - "Dumps an old database < 0.5.1 into an ASCII format, that can be imported by the current Version of XCA." - LangString DESC_SecFiles ${LANG_ENGLISH} "File association for *.xdb" - LangString DESC_SecFiles ${LANG_GERMAN} "Registrierung der Dateiendung *.xdb." + "Dumps an old database <= 0.5.1 into an ASCII format, that can be imported by the current Version of XCA." + LangString DESC_SecFiles ${LANG_ENGLISH} "File association for *.xdb *.xca *.pem and 'open with' for *.crt *.crl *.pfx *.p7b *.cer" + LangString DESC_SecFiles ${LANG_GERMAN} "Registrierung der Dateiendung *.xdb *.xca *.pem und 'open with' für *.crt *.crl *.pfx *.p7b *.cer" ;Assign language strings to sections !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_SecMain) @@ -299,7 +299,7 @@ If this application saves you time and money, consider returning \ a small share back to me." LangString DESC_Donation ${LANG_GERMAN} \ -"Bitte ziehen sie eine Spende in Betracht.\r\n\r\n\ +"Bitte ziehen Sie eine Spende in Betracht.\r\n\r\n\ Wenn Ihnen dieses Programm Zeit und Geld spart, \ ziehen Sie bitte die Möglichkeit in Betracht mir einen kleinen \ Teil davon abzugeben." diff --git a/widgets/MW_help.cpp b/widgets/MW_help.cpp index 4495868d..bee94cc9 100644 --- a/widgets/MW_help.cpp +++ b/widgets/MW_help.cpp @@ -99,7 +99,8 @@ void MainWindow::about() "Wolfgang Glas<wolfgang.glas@ev-i.at>" "SPKAC support and Testing" "
General support
" - "

Mark Foster <mark@foster.cc>", + "

Mark Foster <mark@foster.cc>
" + "Thorsten Weiss <weiss2@gmx.de>", OPENSSL_VERSION_TEXT, QT_VERSION_STR ); about->setWindowTitle(tr(XCA_TITLE)); diff --git a/widgets/NewX509.cpp b/widgets/NewX509.cpp index fa382cd0..9a0fe7c5 100644 --- a/widgets/NewX509.cpp +++ b/widgets/NewX509.cpp @@ -652,14 +652,22 @@ void NewX509::on_okButton_clicked() if (notBefore->getDate().get_utc() == NULL || notAfter->getDate().get_utc() == NULL) { if (QMessageBox::warning(this, tr(XCA_TITLE), - tr("The Validity dates are out of range (1950 - 2049) to create " + tr("The validity dates are out of range (1950 - 2049) to create " "valid certificates. If you continue, your client may " - "reject the certificate"), tr("Change validity times"), - tr("Continue to issue"))) + "reject the certificate."), tr("Continue to issue"), + tr("Change validity times"))) { - accept(); + return; } - } else { - accept(); } + if (notBefore->getDate() > notAfter->getDate()) { + if (QMessageBox::warning(this, tr(XCA_TITLE), + tr("The certificate will be out of date before it becomes valid. " + "You most probably mixed up both dates."), + tr("Continue to issue"), tr("Change validity times"))) + { + return; + } + } + accept(); }