[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/kleopatra
From:       Christoph Schleifenbaum <christoph () kdab ! net>
Date:       2010-10-21 17:47:03
Message-ID: 20101021174703.3972CAC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188212 by cschleifenbaum:

Show key id instead of fingerprint in the list view


 M  +4 -1      models/keylistmodel.cpp  
 M  +2 -2      models/keylistmodel.h  
 M  +1 -0      view/keytreeview.cpp  


--- branches/kdepim/enterprise4/kdepim/kleopatra/models/keylistmodel.cpp \
#1188211:1188212 @@ -250,6 +250,7 @@
             case ValidUntil:       return i18n( "Valid Until" );
             case TechnicalDetails: return i18n( "Details" );
             case Fingerprint:      return i18n( "Fingerprint" );
+            case ShortKeyID:       return i18n( "Key-ID" );
             case NumColumns:       ;
             }
     return QVariant();
@@ -304,13 +305,15 @@
             return Formatting::type( key );
         case Fingerprint:
             return QString::fromLatin1( key.primaryFingerprint() );
+        case ShortKeyID:
+            return QString::fromLatin1( key.keyID() );
         case NumColumns:
             break;
         }
     else if ( role == Qt::ToolTipRole )
         return Formatting::toolTip( key, toolTipOptions() );
     else if ( role == Qt::FontRole )
-        return KeyFilterManager::instance()->font( key, column == Fingerprint ? \
QFont( "courier" ) : QFont() ); +        return KeyFilterManager::instance()->font( \
key, ( column == Fingerprint || column == ShortKeyID ) ? QFont( "courier" ) : QFont() \
);  else if ( role == Qt::DecorationRole )
         return column == Icon ? returnIfValid( KeyFilterManager::instance()->icon( \
key ) ) : QVariant() ;  else if ( role == Qt::BackgroundRole )
--- branches/kdepim/enterprise4/kdepim/kleopatra/models/keylistmodel.h \
#1188211:1188212 @@ -62,10 +62,10 @@
             ValidUntil,
             TechnicalDetails,
             Fingerprint,
+            /* OpenPGP only, really */
+            ShortKeyID,
 #if 0
-            /* OpenPGP only, really */
             LongKeyID,
-            ShortKeyID,
             /* X509 only, really */
             Issuer,
             Subject,
--- branches/kdepim/enterprise4/kdepim/kleopatra/view/keytreeview.cpp \
#1188211:1188212 @@ -211,6 +211,7 @@
     if ( m_isHierarchical ) {
         find_last_proxy( m_proxy )->setSourceModel( model );
         m_view->expandAll();
+        m_view->setColumnHidden( AbstractKeyListModel::Fingerprint, true );
     }
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]