diff options
Diffstat (limited to 'kgpg')
| -rw-r--r-- | kgpg/core/convert.cpp | 11 | ||||
| -rw-r--r-- | kgpg/kgpginterface.cpp | 3 |
2 files changed, 10 insertions, 4 deletions
diff --git a/kgpg/core/convert.cpp b/kgpg/core/convert.cpp index 934ec02..f23631f 100644 --- a/kgpg/core/convert.cpp +++ b/kgpg/core/convert.cpp @@ -23,7 +23,7 @@ //#include <KGlobal> //#include <KLocale> -#include <QTranslator> + //#include "kgpgsettings.h" #include "images.h" @@ -81,7 +81,7 @@ QColor Convert::toColor(const KgpgKeyTrust trust) switch (trust) { case TRUST_INVALID: - /*case TRUST_DISABLED: return KGpgSettings::colorBad(); +/* case TRUST_DISABLED: return KGpgSettings::colorBad(); case TRUST_EXPIRED: return KGpgSettings::colorExpired(); case TRUST_MARGINAL: return KGpgSettings::colorMarginal(); case TRUST_REVOKED: return KGpgSettings::colorRev(); @@ -90,14 +90,17 @@ QColor Convert::toColor(const KgpgKeyTrust trust) case TRUST_FULL: return KGpgSettings::colorGood(); case TRUST_ULTIMATE: return KGpgSettings::colorUltimate();*/ case TRUST_UNKNOWN: - default: return QColor(0,0,0); - //return KGpgSettings::colorUnknown(); +// default: return KGpgSettings::colorUnknown(); + default: + return QColor(); } } QString Convert::toString(const QDate &date) { + // TODO //return KGlobal::locale()->formatDate(date, KLocale::ShortDate); + return "TODO"; } KgpgKeyAlgo Convert::toAlgo(const uint v) diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 8632897..4785270 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -188,6 +188,7 @@ int KgpgInterface::sendPassphrase(const QString &text, KProcess *process, QWidge static KgpgCore::KgpgKeyList readPublicKeysProcess(GPGProc &p, KGpgKeyNode *readNode) { + qDebug() << "\n------\nread public keys process\n-----\n"; QStringList lsp; int items; KgpgCore::KgpgKeyList publiclistkeys; @@ -354,6 +355,7 @@ void KgpgInterface::readSignatures(KGpgKeyNode *node) static KgpgCore::KgpgKeyList readSecretKeysProcess(GPGProc &p) { + qDebug() << "\n------\nread secret keys process\n-----\n"; QStringList lsp; int items; bool hasuid = true; @@ -362,6 +364,7 @@ readSecretKeysProcess(GPGProc &p) while ( (items = p.readln(lsp)) >= 0 ) { if ((lsp.at(0) == QLatin1String( "sec" )) && (items >= 10)) { + result << KgpgKey(lsp.at(4), lsp.at(2).toUInt(), Convert::toTrust(lsp.at(1)), Convert::toAlgo(lsp.at(3).toInt()), QDateTime::fromTime_t(lsp.at(5).toUInt())); |