New key flags icons, subkey adapter redesign, support authanticate flag in database

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java

@@ -43,6 +43,7 @@ public class KeychainContract {
         String CAN_SIGN = "can_sign";
         String CAN_ENCRYPT = "can_encrypt";
         String CAN_CERTIFY = "can_certify";
+        String CAN_AUTHENTICATE = "can_authenticate";
         String IS_REVOKED = "is_revoked";
         String HAS_SECRET = "has_secret";
 
@@ -114,6 +115,7 @@ public class KeychainContract {
         public static final String HAS_ENCRYPT = "has_encrypt";
         public static final String HAS_SIGN = "has_sign";
         public static final String HAS_CERTIFY = "has_certify";
+        public static final String HAS_AUTHENTICATE = "has_authenticate";
         public static final String PUBKEY_DATA = "pubkey_data";
         public static final String PRIVKEY_DATA = "privkey_data";
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java

@@ -54,7 +54,7 @@ import java.io.IOException;
  */
 public class KeychainDatabase extends SQLiteOpenHelper {
     private static final String DATABASE_NAME = "openkeychain.db";
-    private static final int DATABASE_VERSION = 4;
+    private static final int DATABASE_VERSION = 5;
     static Boolean apgHack = false;
     private Context mContext;
 
@@ -96,6 +96,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
                 + KeysColumns.CAN_CERTIFY + " BOOLEAN, "
                 + KeysColumns.CAN_SIGN + " BOOLEAN, "
                 + KeysColumns.CAN_ENCRYPT + " BOOLEAN, "
+                + KeysColumns.CAN_AUTHENTICATE + " BOOLEAN, "
                 + KeysColumns.IS_REVOKED + " BOOLEAN, "
                 + KeysColumns.HAS_SECRET + " BOOLEAN, "
 
@@ -214,21 +215,28 @@ public class KeychainDatabase extends SQLiteOpenHelper {
                 // add has_secret for all who are upgrading from a beta version
                 try {
                     db.execSQL("ALTER TABLE keys ADD COLUMN has_secret BOOLEAN");
-                } catch(Exception e){
+                } catch (Exception e){
                     // never mind, the column probably already existed
                 }
                 // fall through
             case 2:
                 // ECC support
                 try {
-                    db.execSQL("ALTER TABLE keys ADD COLUMN " + KeysColumns.KEY_CURVE_OID + " TEXT");
+                    db.execSQL("ALTER TABLE keys ADD COLUMN key_curve_oid TEXT");
-                } catch(Exception e){
+                } catch (Exception e){
                     // never mind, the column probably already existed
                 }
                 // fall through
             case 3:
                 // better s2k detection, we need consolidate
                 // fall through
+            case 4:
+                try {
+                    db.execSQL("ALTER TABLE keys ADD COLUMN can_authenticate BOOLEAN");
+                } catch (Exception e){
+                    // never mind, the column probably already existed
+                }
+                // fall through
         }
 
         // always do consolidate after upgrade

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java

@@ -251,6 +251,7 @@ public class KeychainProvider extends ContentProvider {
                 projectionMap.put(KeyRings.CAN_CERTIFY, Tables.KEYS + "." + Keys.CAN_CERTIFY);
                 projectionMap.put(KeyRings.CAN_ENCRYPT, Tables.KEYS + "." + Keys.CAN_ENCRYPT);
                 projectionMap.put(KeyRings.CAN_SIGN, Tables.KEYS + "." + Keys.CAN_SIGN);
+                projectionMap.put(KeyRings.CAN_AUTHENTICATE, Tables.KEYS + "." + Keys.CAN_AUTHENTICATE);
                 projectionMap.put(KeyRings.CREATION, Tables.KEYS + "." + Keys.CREATION);
                 projectionMap.put(KeyRings.EXPIRY, Tables.KEYS + "." + Keys.EXPIRY);
                 projectionMap.put(KeyRings.ALGORITHM, Tables.KEYS + "." + Keys.ALGORITHM);
@@ -333,6 +334,16 @@ public class KeychainProvider extends ContentProvider {
                                 + " AND ( kS." + Keys.EXPIRY + " IS NULL OR kS." + Keys.EXPIRY
                                     + " >= " + new Date().getTime() / 1000 + " )"
                             + ")" : "")
+                        + (plist.contains(KeyRings.HAS_AUTHENTICATE) ?
+                            " LEFT JOIN " + Tables.KEYS + " AS kS ON ("
+                                    +"kS." + Keys.MASTER_KEY_ID
+                                    + " = " + Tables.KEYS + "." + Keys.MASTER_KEY_ID
+                                    + " AND kS." + Keys.IS_REVOKED + " = 0"
+                                    + " AND kS." + Keys.CAN_AUTHENTICATE + " = 1"
+                                    + " AND kS." + Keys.HAS_SECRET + " > 1"
+                                    + " AND ( kS." + Keys.EXPIRY + " IS NULL OR kS." + Keys.EXPIRY
+                                    + " >= " + new Date().getTime() / 1000 + " )"
+                                    + ")" : "")
                         + (plist.contains(KeyRings.HAS_CERTIFY) ?
                             " LEFT JOIN " + Tables.KEYS + " AS kC ON ("
                                 +"kC." + Keys.MASTER_KEY_ID
@@ -424,6 +435,7 @@ public class KeychainProvider extends ContentProvider {
                 projectionMap.put(Keys.CAN_CERTIFY, Keys.CAN_CERTIFY);
                 projectionMap.put(Keys.CAN_ENCRYPT, Keys.CAN_ENCRYPT);
                 projectionMap.put(Keys.CAN_SIGN, Keys.CAN_SIGN);
+                projectionMap.put(Keys.CAN_AUTHENTICATE, Keys.CAN_AUTHENTICATE);
                 projectionMap.put(Keys.HAS_SECRET, Keys.HAS_SECRET);
                 projectionMap.put(Keys.CREATION, Keys.CREATION);
                 projectionMap.put(Keys.EXPIRY, Keys.EXPIRY);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java

@@ -356,10 +356,11 @@ public class ProviderHelper {
                     values.put(Keys.ALGORITHM, key.getAlgorithm());
                     values.put(Keys.FINGERPRINT, key.getFingerprint());
 
-                    boolean c = key.canCertify(), e = key.canEncrypt(), s = key.canSign();
+                    boolean c = key.canCertify(), e = key.canEncrypt(), s = key.canSign(), a = key.canAuthenticate();
                     values.put(Keys.CAN_CERTIFY, c);
                     values.put(Keys.CAN_ENCRYPT, e);
                     values.put(Keys.CAN_SIGN, s);
+                    values.put(Keys.CAN_AUTHENTICATE, a);
                     values.put(Keys.IS_REVOKED, key.isRevoked());
                     if (masterKeyId == keyId) {
                         if (c) {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java

@@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.ui.adapter;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.database.Cursor;
+import android.graphics.PorterDuff;
 import android.graphics.Typeface;
 import android.support.v4.widget.CursorAdapter;
 import android.text.Spannable;
@@ -62,6 +63,7 @@ public class SubkeysAdapter extends CursorAdapter {
             Keys.CAN_CERTIFY,
             Keys.CAN_ENCRYPT,
             Keys.CAN_SIGN,
+            Keys.CAN_AUTHENTICATE,
             Keys.IS_REVOKED,
             Keys.CREATION,
             Keys.EXPIRY,
@@ -77,10 +79,11 @@ public class SubkeysAdapter extends CursorAdapter {
     private static final int INDEX_CAN_CERTIFY = 7;
     private static final int INDEX_CAN_ENCRYPT = 8;
     private static final int INDEX_CAN_SIGN = 9;
-    private static final int INDEX_IS_REVOKED = 10;
+    private static final int INDEX_CAN_AUTHENTICATE = 10;
-    private static final int INDEX_CREATION = 11;
+    private static final int INDEX_IS_REVOKED = 11;
-    private static final int INDEX_EXPIRY = 12;
+    private static final int INDEX_CREATION = 12;
-    private static final int INDEX_FINGERPRINT = 13;
+    private static final int INDEX_EXPIRY = 13;
+    private static final int INDEX_FINGERPRINT = 14;
 
     public SubkeysAdapter(Context context, Cursor c, int flags,
                           SaveKeyringParcel saveKeyringParcel) {
@@ -135,10 +138,11 @@ public class SubkeysAdapter extends CursorAdapter {
         TextView vKeyDetails = (TextView) view.findViewById(R.id.subkey_item_details);
         TextView vKeyExpiry = (TextView) view.findViewById(R.id.subkey_item_expiry);
         ImageView vCertifyIcon = (ImageView) view.findViewById(R.id.subkey_item_ic_certify);
-        ImageView vEncryptIcon = (ImageView) view.findViewById(R.id.subkey_item_ic_encrypt);
         ImageView vSignIcon = (ImageView) view.findViewById(R.id.subkey_item_ic_sign);
-        ImageView vRevokedIcon = (ImageView) view.findViewById(R.id.subkey_item_ic_revoked);
+        ImageView vEncryptIcon = (ImageView) view.findViewById(R.id.subkey_item_ic_encrypt);
+        ImageView vAuthenticateIcon = (ImageView) view.findViewById(R.id.subkey_item_ic_authenticate);
         ImageView vEditImage = (ImageView) view.findViewById(R.id.subkey_item_edit_image);
+        ImageView vStatus = (ImageView) view.findViewById(R.id.subkey_item_status);
 
         // not used:
         ImageView deleteImage = (ImageView) view.findViewById(R.id.subkey_item_delete_button);
@@ -196,7 +200,7 @@ public class SubkeysAdapter extends CursorAdapter {
         vCertifyIcon.setVisibility(cursor.getInt(INDEX_CAN_CERTIFY) != 0 ? View.VISIBLE : View.GONE);
         vEncryptIcon.setVisibility(cursor.getInt(INDEX_CAN_ENCRYPT) != 0 ? View.VISIBLE : View.GONE);
         vSignIcon.setVisibility(cursor.getInt(INDEX_CAN_SIGN) != 0 ? View.VISIBLE : View.GONE);
-        // TODO: missing icon for authenticate
+        vAuthenticateIcon.setVisibility(cursor.getInt(INDEX_CAN_AUTHENTICATE) != 0 ? View.VISIBLE : View.GONE);
 
         boolean isRevoked = cursor.getInt(INDEX_IS_REVOKED) > 0;
 
@@ -245,22 +249,50 @@ public class SubkeysAdapter extends CursorAdapter {
             vKeyExpiry.setText(context.getString(R.string.label_expiry) + ": " + context.getString(R.string.none));
         }
 
-        if (isRevoked) {
+        // if key is expired or revoked, strike through text
-            vRevokedIcon.setVisibility(View.VISIBLE);
+        boolean isInvalid = isRevoked || isExpired;
+        if (isInvalid) {
+            vStatus.setVisibility(View.VISIBLE);
+
+            vKeyId.setText(FormattingUtils.strikeOutText(vKeyId.getText()));
+            vKeyDetails.setText(FormattingUtils.strikeOutText(vKeyDetails.getText()));
+            vKeyExpiry.setText(FormattingUtils.strikeOutText(vKeyExpiry.getText()));
+
+            vCertifyIcon.setColorFilter(
+                    mContext.getResources().getColor(R.color.bg_gray),
+                    PorterDuff.Mode.SRC_IN);
+            vSignIcon.setColorFilter(
+                    mContext.getResources().getColor(R.color.bg_gray),
+                    PorterDuff.Mode.SRC_IN);
+            vEncryptIcon.setColorFilter(
+                    mContext.getResources().getColor(R.color.bg_gray),
+                    PorterDuff.Mode.SRC_IN);
+            vAuthenticateIcon.setColorFilter(
+                    mContext.getResources().getColor(R.color.bg_gray),
+                    PorterDuff.Mode.SRC_IN);
+
+            if (isRevoked) {
+                vStatus.setImageResource(R.drawable.status_signature_revoked_cutout);
+                vStatus.setColorFilter(
+                        mContext.getResources().getColor(R.color.bg_gray),
+                        PorterDuff.Mode.SRC_IN);
+            } else if (isExpired) {
+                vStatus.setImageResource(R.drawable.status_signature_expired_cutout);
+                vStatus.setColorFilter(
+                        mContext.getResources().getColor(R.color.bg_gray),
+                        PorterDuff.Mode.SRC_IN);
+            }
         } else {
+            vStatus.setVisibility(View.GONE);
+
             vKeyId.setTextColor(mDefaultTextColor);
             vKeyDetails.setTextColor(mDefaultTextColor);
             vKeyExpiry.setTextColor(mDefaultTextColor);
 
-            vRevokedIcon.setVisibility(View.GONE);
+            vCertifyIcon.clearColorFilter();
-        }
+            vSignIcon.clearColorFilter();
-
+            vEncryptIcon.clearColorFilter();
-        // if key is expired or revoked, strike through text
+            vAuthenticateIcon.clearColorFilter();
-        boolean isInvalid = isRevoked || isExpired;
-        if (isInvalid) {
-            vKeyId.setText(FormattingUtils.strikeOutText(vKeyId.getText()));
-            vKeyDetails.setText(FormattingUtils.strikeOutText(vKeyDetails.getText()));
-            vKeyExpiry.setText(FormattingUtils.strikeOutText(vKeyExpiry.getText()));
         }
         vKeyId.setEnabled(!isInvalid);
         vKeyDetails.setEnabled(!isInvalid);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAddedAdapter.java

@@ -53,8 +53,9 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd
         public TextView vKeyDetails;
         public TextView vKeyExpiry;
         public ImageView vCertifyIcon;
-        public ImageView vEncryptIcon;
         public ImageView vSignIcon;
+        public ImageView vEncryptIcon;
+        public ImageView vAuthenticateIcon;
         public ImageButton vDelete;
         // also hold a reference to the model item
         public SaveKeyringParcel.SubkeyAdd mModel;
@@ -69,16 +70,18 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd
             holder.vKeyDetails = (TextView) convertView.findViewById(R.id.subkey_item_details);
             holder.vKeyExpiry = (TextView) convertView.findViewById(R.id.subkey_item_expiry);
             holder.vCertifyIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_certify);
-            holder.vEncryptIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_encrypt);
             holder.vSignIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_sign);
+            holder.vEncryptIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_encrypt);
+            holder.vAuthenticateIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_authenticate);
+
             holder.vDelete = (ImageButton) convertView.findViewById(R.id.subkey_item_delete_button);
             holder.vDelete.setVisibility(View.VISIBLE); // always visible
 
             // not used:
-            ImageView editImage = (ImageView) convertView.findViewById(R.id.subkey_item_edit_image);
+            ImageView vEdit = (ImageView) convertView.findViewById(R.id.subkey_item_edit_image);
-            editImage.setVisibility(View.GONE);
+            vEdit.setVisibility(View.GONE);
-            ImageView revokedIcon = (ImageView) convertView.findViewById(R.id.subkey_item_ic_revoked);
+            ImageView vStatus = (ImageView) convertView.findViewById(R.id.subkey_item_status);
-            revokedIcon.setVisibility(View.GONE);
+            vStatus.setVisibility(View.GONE);
 
             convertView.setTag(holder);
 
@@ -136,7 +139,11 @@ public class SubkeysAddedAdapter extends ArrayAdapter<SaveKeyringParcel.SubkeyAd
         } else {
             holder.vEncryptIcon.setVisibility(View.GONE);
         }
-        // TODO: missing icon for authenticate
+        if ((flags & KeyFlags.AUTHENTICATION) > 0) {
+            holder.vAuthenticateIcon.setVisibility(View.VISIBLE);
+        } else {
+            holder.vAuthenticateIcon.setVisibility(View.GONE);
+        }
 
         return convertView;
     }

OpenKeychain/src/main/res/layout/view_key_subkey_item.xml

@@ -6,6 +6,16 @@
     android:orientation="horizontal"
     android:singleLine="true">
 
+    <ImageView
+        android:id="@+id/subkey_item_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/status_signature_revoked_cutout"
+        android:paddingLeft="8dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true" />
+
     <FrameLayout
         android:id="@+id/subkey_item_buttons"
         android:layout_width="wrap_content"
@@ -34,6 +44,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_toLeftOf="@id/subkey_item_buttons"
+        android:layout_toRightOf="@id/subkey_item_status"
         android:layout_centerVertical="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -60,15 +71,7 @@
                 android:id="@+id/subkey_item_ic_certify"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/certify_small"
+                android:src="@drawable/key_flag_certify"
-                android:layout_marginLeft="8dp"
-                android:layout_gravity="center_vertical" />
-
-            <ImageView
-                android:id="@+id/subkey_item_ic_encrypt"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/encrypted_small"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
@@ -76,15 +79,23 @@
                 android:id="@+id/subkey_item_ic_sign"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/signed_small"
+                android:src="@drawable/key_flag_sign"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:id="@+id/subkey_item_ic_revoked"
+                android:id="@+id/subkey_item_ic_encrypt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/revoked_key_small"
+                android:src="@drawable/key_flag_encrypt"
+                android:layout_marginLeft="8dp"
+                android:layout_gravity="center_vertical" />
+
+            <ImageView
+                android:id="@+id/subkey_item_ic_authenticate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/key_flag_authenticate"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 

Resources/graphics/key.svg

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="210mm" height="297mm" id="svg2" version="1.1" inkscape:version="0.48.0 r9654">
-  <defs id="defs4">
-    <linearGradient inkscape:collect="always" id="linearGradient3813">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop3815"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop3817"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3784">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop3786"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop3788"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3774">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3776"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3778"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3821">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3823"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3825"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3809">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop3811"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop3813"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3796">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop3798"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop3800"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3796" id="linearGradient3802" x1="491.42859" y1="533.79071" x2="397.14282" y2="612.36218" gradientUnits="userSpaceOnUse" gradientTransform="translate(-8.5714286,12.857143)"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3809" id="linearGradient3817" x1="451.4375" y1="387.35266" x2="70" y2="264.49554" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3821" id="linearGradient3827" x1="291.02759" y1="456.15002" x2="559.2226" y2="784.44958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.83333333,0,0,0.89559246,41.428572,48.08126)"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3774" id="linearGradient3780" x1="154.54454" y1="316.20752" x2="339.69678" y2="375.80652" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3784" id="linearGradient3790" x1="310.11683" y1="619.51182" x2="492.95444" y2="619.51182" gradientUnits="userSpaceOnUse"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3813" id="radialGradient3819" cx="162.63455" cy="473.54477" fx="162.63455" fy="473.54477" r="403.05087" gradientTransform="matrix(1,0,0,0.23308269,0,363.16968)" gradientUnits="userSpaceOnUse"/>
-    <filter inkscape:collect="always" id="filter3821" x="-0.041358053" width="1.0827161" y="-0.1774394" height="1.3548788">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="13.891166" id="feGaussianBlur3823"/>
-    </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3784" id="linearGradient5873" gradientUnits="userSpaceOnUse" x1="310.11683" y1="619.51182" x2="492.95444" y2="619.51182"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3774" id="linearGradient5876" gradientUnits="userSpaceOnUse" x1="154.54454" y1="316.20752" x2="339.69678" y2="375.80652"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3821" id="linearGradient5879" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.83333333,0,0,0.89559246,41.428572,48.08126)" x1="291.02759" y1="456.15002" x2="559.2226" y2="784.44958"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3809" id="linearGradient5882" gradientUnits="userSpaceOnUse" x1="451.4375" y1="387.35266" x2="70" y2="264.49554"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3796" id="linearGradient5885" gradientUnits="userSpaceOnUse" gradientTransform="translate(-8.5714286,12.857143)" x1="491.42859" y1="533.79071" x2="397.14282" y2="612.36218"/>
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="183.47351" inkscape:cy="630.2247" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:snap-global="false" inkscape:window-width="1271" inkscape:window-height="702" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0">
-    <sodipodi:guide orientation="0,1" position="-237.14286,948.57143" id="guide2987"/>
-    <sodipodi:guide orientation="0,1" position="-182.85714,234.28571" id="guide2989"/>
-    <sodipodi:guide orientation="1,0" position="11.428571,157.14286" id="guide2993"/>
-    <sodipodi:guide orientation="1,0" position="725.71429,345.71429" id="guide2995"/>
-  </sodipodi:namedview>
-  <metadata id="metadata7">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title>key</dc:title>
-        <dc:date>Mar 2011</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Franziska Sponsel</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>Franziska Sponsel</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>RRZE</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>key</rdf:li>
-            <rdf:li>lock</rdf:li>
-            <rdf:li>chain</rdf:li>
-            <rdf:li>secure</rdf:li>
-            <rdf:li>save</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Beate Kaspar, Hendrik Eggers</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"/>
-      </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
-        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
-        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
-        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1">
-    <g id="g6659">
-      <path transform="matrix(0.78703889,0,0,0.50001477,250.80749,512.53703)" d="m 565.68542,473.54477 a 403.05087,93.944183 0 1 1 -806.10174,0 403.05087,93.944183 0 1 1 806.10174,0 z" sodipodi:ry="93.944183" sodipodi:rx="403.05087" sodipodi:cy="473.54477" sodipodi:cx="162.63455" id="path3811" style="opacity:0.67295598;fill:url(#radialGradient3819);fill-opacity:1;stroke:none;filter:url(#filter3821)" sodipodi:type="arc"/>
-      <rect y="103.79076" x="11.428572" height="714.28571" width="714.28571" id="rect2985" style="fill:none;stroke:none"/>
-      <path sodipodi:nodetypes="ssscccccccccccccccccccccsssssss" inkscape:connector-curvature="0" id="path3765" d="m 240,189.5 c -88.36556,0 -160,71.63444 -160,160 0,74.01072 51.08528,133.42284 118.49765,154.56619 28.76063,9.02054 65.10031,3.78277 68.69777,4.48537 l -18.56502,21.66877 27.05314,3.51253 -10.31899,28.23625 44.73064,0.86845 -17.84433,26.01022 39.2217,-4.21803 -5.11585,27.44772 28.42454,-6.4704 17.77455,40.78089 37.64027,23.35189 -28.57265,31.19477 c 2.02311,1.37812 44.72926,6.83324 44.72926,6.83324 l -0.24554,28.95536 21.34376,14.22767 30.60714,3.37947 57.55357,-33.66518 0.25,-46.66072 -112.44643,-175.66964 -3.75893,-37.17411 -35.42857,-33.07589 C 387.0643,416.159 401.42857,396.57961 400,349.5 c -2.68011,-88.32491 -71.63444,-160 -160,-160 z m -24.28125,75.71875 c 23.66935,0 42.84375,19.1744 42.84375,42.84375 0,23.66935 -19.1744,42.875 -42.84375,42.875 -23.66935,0 -42.875,-19.20565 -42.875,-42.875 0,-23.66935 19.20565,-42.84375 42.875,-42.84375 z" style="fill:#c4a000;stroke:#000000;stroke-width:13;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
-      <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" id="path3792" d="M 351.42857,468.07647 368.57142,500.93361 490,685.21932 514.28571,713.79075 507.14285,682.36218 382.85714,488.07646 z" style="fill:#ffffff;fill-opacity:1;stroke:none;opacity:0.59433962"/>
-      <path style="opacity:0.66465411;fill:url(#linearGradient5885);fill-opacity:1;stroke:none" d="m 351.42858,468.07647 17.14285,32.85714 121.42858,184.28571 24.28571,28.57143 -15.22408,-29.91334 -121.76033,-187.21465 z" id="path3794" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc"/>
-      <path id="path3804" d="m 240.71875,209.5 c -76.92538,0 -139.28125,62.35587 -139.28125,139.28125 0,76.92538 62.35587,139.28125 139.28125,139.28125 C 317.64413,488.0625 380,425.70663 380,348.78125 380,271.85587 317.64413,209.5 240.71875,209.5 z m -26.4375,58.5625 c 21.30241,0 38.5625,17.29134 38.5625,38.59375 0,21.30241 -17.26009,38.5625 -38.5625,38.5625 -21.30241,0 -38.5625,-17.26009 -38.5625,-38.5625 0,-21.30241 17.26009,-38.59375 38.5625,-38.59375 z" style="opacity:0.61320759;fill:url(#linearGradient5882);fill-opacity:1;stroke:none" inkscape:connector-curvature="0"/>
-      <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="path3819" d="m 248.57143,495.43421 c 30.96868,0.78722 47.28356,9.8516 87.07517,-24.91902 l 162.92482,249.68882 -14.88154,11.71002 C 434.27974,660.85127 361.25763,568.58045 309.22589,502.82691 c -30.07132,13.01986 -37.53909,-0.11886 -60.65446,-7.3927 z" style="opacity:0.7295598;fill:url(#linearGradient5879);fill-opacity:1;stroke:none"/>
-      <path sodipodi:nodetypes="czczc" inkscape:connector-curvature="0" id="path3772" d="m 164.65486,306.86961 c 0,0 10.21318,55.82918 60.60915,48.48731 50.39597,-7.34186 37.37565,-70.71067 37.37565,-70.71067 0,0 23.33506,78.18103 -38.3858,84.85282 -61.72087,6.67179 -59.599,-62.62946 -59.599,-62.62946 z" style="opacity:0.59748427;fill:url(#linearGradient5876);fill-opacity:1;stroke:none"/>
-      <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="path3782" d="m 310.11683,504.8595 6.06092,36.36549 139.40105,174.7564 27.27412,18.18274 3.03045,-4.04061 z" style="opacity:0.5251572;fill:url(#linearGradient5873);fill-opacity:1;stroke:none"/>
-    </g>
-  </g>
-</svg>

Resources/graphics/key_flag_certify.svg

@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    id="svg5105"
+    xml:space="preserve"
+    sodipodi:version="0.32"
+    viewBox="0 0 48 48"
+    inkscape:output_extension="org.inkscape.output.svg.inkscape"
+    inkscape:version="0.46"
+    sodipodi:docname="application-certificate.svg"
+    sodipodi:docbase="/home/jimmac/gfx/ximian/tango-icon-theme/scalable/mimetypes"
+  >
+<defs
+      id="defs5187"
+    >
+<linearGradient
+        id="linearGradient6665"
+      >
+  <stop
+          id="stop6667"
+          style="stop-color:#000000"
+          offset="0"
+      />
+  <stop
+          id="stop6669"
+          style="stop-color:#000000;stop-opacity:0"
+          offset="1"
+      />
+</linearGradient
+    >
+<radialGradient
+        id="radialGradient5284"
+        gradientUnits="userSpaceOnUse"
+        cx="28.789"
+        cy="20.971"
+        r="13.281"
+        gradientTransform="matrix(1.3104 0 0 1.3104 -8.6427 -4.376)"
+        inkscape:collect="always"
+      ><stop
+          id="stop5115"
+          style="stop-color:#E41E08"
+          offset="0"
+      /><stop
+          id="stop5117"
+          style="stop-color:#901505"
+          offset="1"
+      /></radialGradient
+    >
+			<linearGradient
+        id="linearGradient6610"
+        y2="49.895"
+        gradientUnits="userSpaceOnUse"
+        y1="5.9245"
+        gradientTransform="matrix(.97573 0 0 .93103 -0.132 1.9784)"
+        x2="43.141"
+        x1="15.339"
+        inkscape:collect="always"
+      ><stop
+          id="stop6606"
+          style="stop-color:#ffa196"
+          offset="0"
+      /><stop
+          id="stop6608"
+          style="stop-color:#ff1f06;stop-opacity:0"
+          offset="1"
+      /></linearGradient
+    >
+<linearGradient
+        id="linearGradient6623"
+        y2="22.783"
+        gradientUnits="userSpaceOnUse"
+        y1="9.4437"
+        gradientTransform="matrix(1.0287 0 0 .97213 -1.2803 1.1893)"
+        x2="29.957"
+        x1="18.57"
+        inkscape:collect="always"
+      ><stop
+          id="stop6619"
+          style="stop-color:#ffffff;stop-opacity:.24742"
+          offset="0"
+      /><stop
+          id="stop6621"
+          style="stop-color:#ffffff;stop-opacity:0"
+          offset="1"
+      /></linearGradient
+    >
+<linearGradient
+        id="linearGradient6631"
+        y2="35.018"
+        gradientUnits="userSpaceOnUse"
+        y1="22.886"
+        gradientTransform="matrix(.84394 0 0 1.1849 -1.2803 1.6893)"
+        x2="38.251"
+        x1="38.506"
+        inkscape:collect="always"
+      ><stop
+          id="stop6627"
+          style="stop-color:#1d2349"
+          offset="0"
+      /><stop
+          id="stop6637"
+          style="stop-color:#4c5279"
+          offset=".35315"
+      /><stop
+          id="stop6633"
+          style="stop-color:#b3bdff"
+          offset=".46552"
+      /><stop
+          id="stop6635"
+          style="stop-color:#727cbe"
+          offset=".64982"
+      /><stop
+          id="stop6629"
+          style="stop-color:#323c7e"
+          offset="1"
+      /></linearGradient
+    >
+<radialGradient
+        id="radialGradient6663"
+        cx="24.452"
+        xlink:href="#linearGradient6665"
+        gradientUnits="userSpaceOnUse"
+        cy="19.819"
+        r="33.156"
+        gradientTransform="matrix(1.0245 0 0 .97611 .93934 -.53033)"
+        inkscape:collect="always"
+    />
+<radialGradient
+        id="radialGradient6675"
+        gradientUnits="userSpaceOnUse"
+        xlink:href="#linearGradient6665"
+        cx="24.452"
+        cy="19.819"
+        r="33.156"
+        gradientTransform="matrix(1.0245 0 0 .97611 1.6464 -.35355)"
+        inkscape:collect="always"
+    />
+<radialGradient
+        id="radialGradient6678"
+        gradientUnits="userSpaceOnUse"
+        cx="26.887"
+        cy="20.479"
+        r="14.694"
+        gradientTransform="matrix(1.1356 0 0 1.1356 -4.5403 -2.0774)"
+        inkscape:collect="always"
+      ><stop
+          id="stop5122"
+          style="stop-color:#E41E08"
+          offset="0"
+      /><stop
+          id="stop5124"
+          style="stop-color:#901505"
+          offset="1"
+      /></radialGradient
+    >
+<linearGradient
+        id="linearGradient6690"
+        y2="27.404"
+        gradientUnits="userSpaceOnUse"
+        y1="35.458"
+        gradientTransform="scale(.84394 1.1849)"
+        x2="36.499"
+        x1="37.503"
+        inkscape:collect="always"
+      ><stop
+          id="stop6686"
+          style="stop-color:#d5dbff"
+          offset="0"
+      /><stop
+          id="stop6688"
+          style="stop-color:#6579ff;stop-opacity:0"
+          offset="1"
+      /></linearGradient
+    >
+</defs
+  >
+<sodipodi:namedview
+      id="base"
+      bordercolor="#666666"
+      inkscape:window-x="203"
+      inkscape:window-y="30"
+      pagecolor="#ffffff"
+      inkscape:window-height="818"
+      inkscape:zoom="5.6568542"
+      inkscape:pageshadow="2"
+      showgrid="false"
+      borderopacity="0.16470588"
+      inkscape:current-layer="svg5105"
+      inkscape:cx="20.303269"
+      inkscape:cy="20.392013"
+      inkscape:showpageshadow="false"
+      inkscape:window-width="821"
+      inkscape:pageopacity="0.0"
+  />
+<path
+      id="path6671"
+      style="opacity:.48045;color:#000000;fill:url(#radialGradient6675)"
+      d="m25.389 19.305s-5.905 8.176-5.905 11.923c0 3.748 6.814 1.704 9.539 4.429s-6.359 9.766-6.359 9.766l9.084-2.499 3.634 3.861c0-4.655 5.337-8.403 2.612-11.242-2.839-2.838-10.902-2.498-11.356-6.245s-1.135-9.879-1.135-9.879l-0.114-0.114z"
+  />
+<path
+      id="path6639"
+      sodipodi:nodetypes="csssssssssssss"
+      style="opacity:.48045;fill:url(#radialGradient6663)"
+      d="m36.916 9.3947c1.322 3.0573 3.643 2.9013 3.701 6.9823 0.032 2.276 1.832 3.471 1.832 5.796 0 2.324-4.015 3.473-5.382 4.841-1.368 1.367 0.108 4.874-3.602 5.905-3.675 1.02-5.47-0.411-7.795-0.411s-7.888 4.483-9.939 2.432c-2.052-2.051-2.095-6.534-3.873-8.312-1.9146-1.914-4.9396-4.589-4.9396-8.008s1.9742-5.224 4.8026-8.402c2.918-3.2794 3.009-8.2052 6.427-8.2052 3.419 0 4.73 0.9378 7.639 0.8643 4.639-0.1172 5.207-2.3234 8.618-0.5935 3.008 1.5251 1.477 4.7177 2.511 7.1111z"
+  />
+<path
+      id="path5112"
+      style="stroke:#1f254f;stroke-miterlimit:6.6;fill:url(#linearGradient6631)"
+      d="m23.621 18.068s-5.905 8.176-5.905 11.923 6.814 1.703 9.539 4.429c2.725 2.725-6.359 9.765-6.359 9.765l9.084-2.498 3.634 3.861c0-4.656 5.337-8.403 2.612-11.242-2.839-2.839-10.901-2.498-11.356-6.246-0.454-3.747-1.135-9.879-1.135-9.879l-0.114-0.113z"
+  />
+<path
+      id="path6680"
+      sodipodi:nodetypes="cscccsss"
+      style="stroke:url(#linearGradient6690);stroke-width:.72113;stroke-miterlimit:6.6;fill:none"
+      d="m20.803 31.602c4.552 0.449 7.429 1.236 7.807 3.99 0.33 2.407-4.232 6.732-4.232 6.732l5.844-1.624 2.841 2.961c0.663-3.711 4.365-6.222 2.679-8.505-2.115-2.863-8.966-2.243-9.294-4.946-0.327-2.702-8.334 1.125-5.645 1.392z"
+  />
+<path
+      id="path5119"
+      sodipodi:nodetypes="csssssssssssss"
+      style="stroke-linejoin:round;stroke:#4c0901;stroke-linecap:round;fill:url(#radialGradient5284)"
+      d="m34.935 9.2468c1.267 2.9292 3.491 2.7802 3.546 6.6912 0.032 2.18 1.756 3.325 1.756 5.553s-3.847 3.328-5.157 4.639c-1.311 1.31 0.103 4.671-3.452 5.658-3.521 0.978-5.241-0.393-7.469-0.393s-7.558 4.295-9.524 2.33c-1.966-1.966-2.007-6.261-3.711-7.965-1.8345-1.834-4.7331-4.397-4.7331-7.673s1.8918-5.006 4.6021-8.051c2.796-3.1427 2.883-7.8627 6.159-7.8627s4.531 0.8987 7.32 0.8282c4.444-0.1123 4.989-2.2263 8.258-0.5687 2.882 1.4614 1.414 4.5206 2.405 6.814z"
+  />
+<path
+      id="path5126"
+      style="fill:url(#radialGradient6678)"
+      d="m34.977 17.568c0 6.245-5.11 11.355-11.356 11.355-6.245 0-11.355-5.11-11.355-11.355 0-6.246 5.11-11.356 11.355-11.356 6.246 0.0001 11.356 5.11 11.356 11.356z"
+  />
+<path
+      id="path6600"
+      sodipodi:nodetypes="csssssssssssss"
+      style="stroke-linejoin:round;stroke:url(#linearGradient6610);stroke-linecap:round;fill:none"
+      d="m33.889 10.03c1.153 2.668 3.179 2.532 3.229 6.094 0.029 1.986 1.599 3.028 1.599 5.057s-3.503 3.031-4.697 4.225c-1.193 1.193 0.094 4.254-3.143 5.153-3.207 0.891-4.774-0.358-6.802-0.358-2.029 0-6.884 3.912-8.674 2.122s-1.828-5.702-3.38-7.254c-1.67-1.671-4.3102-4.005-4.3102-6.988 0-2.984 1.7228-4.559 4.1912-7.332 2.547-2.8622 2.625-7.1608 5.609-7.1608 2.983 0 4.127 0.8184 6.666 0.7542 4.048-0.1023 4.544-2.0275 7.521-0.5179 2.625 1.3309 1.288 4.117 2.191 6.2055z"
+  />
+<path
+      id="path6612"
+      style="color:#000000;fill:url(#linearGradient6623)"
+      d="m23.663 7.0525c-5.868 0-10.646 4.7425-10.646 10.61 0 3.672 1.984 6.781 4.816 8.691 7.241-3.897 5.954-10.805 15.607-12.746-1.599-3.8493-5.351-6.5545-9.777-6.5545z"
+  />
+<metadata
+    ><rdf:RDF
+      ><cc:Work
+        ><dc:format
+          >image/svg+xml</dc:format
+        ><dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        /><cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        /><dc:publisher
+          ><cc:Agent
+              rdf:about="http://openclipart.org/"
+            ><dc:title
+              >Openclipart</dc:title
+            ></cc:Agent
+          ></dc:publisher
+        ><dc:title
+          >tango application certificate</dc:title
+        ><dc:date
+          >2010-04-02T18:54:10</dc:date
+        ><dc:description
+          >An icon from Tango Project. Since version 0.8.90 Tango Project icons are Public Domain: </dc:description
+        ><dc:source
+          >https://openclipart.org/detail/36067/tango-application-certificate-by-warszawianka</dc:source
+        ><dc:creator
+          ><cc:Agent
+            ><dc:title
+              >warszawianka</dc:title
+            ></cc:Agent
+          ></dc:creator
+        ><dc:subject
+          ><rdf:Bag
+            ><rdf:li
+              >externalsource</rdf:li
+            ><rdf:li
+              >icon</rdf:li
+            ><rdf:li
+              >ribbon</rdf:li
+            ><rdf:li
+              >seal</rdf:li
+            ><rdf:li
+              >tango</rdf:li
+            ></rdf:Bag
+          ></dc:subject
+        ></cc:Work
+      ><cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        ><cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        /><cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        /><cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        /></cc:License
+      ></rdf:RDF
+    ></metadata
+  ></svg
+>

Resources/graphics/key_flag_encrypt.svg

@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="48"
+   height="48"
+   id="svg2327"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="key_flag_encrypt.svg">
+  <metadata
+     id="metadata41">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1364"
+     inkscape:window-height="747"
+     id="namedview39"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="-172.47458"
+     inkscape:cy="64"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2327" />
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient9845">
+      <stop
+         id="stop9847"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop9849"
+         style="stop-color:#ffffff;stop-opacity:0.49484536"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11327">
+      <stop
+         id="stop11329"
+         style="stop-color:#7d6400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop11331"
+         style="stop-color:#be9700;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2092">
+      <stop
+         id="stop2094"
+         style="stop-color:#fff7b0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2098"
+         style="stop-color:#ffec41;stop-opacity:1"
+         offset="0.20999999" />
+      <stop
+         id="stop2293"
+         style="stop-color:#e2cc00;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop2100"
+         style="stop-color:#c3af00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11335">
+      <stop
+         id="stop11337"
+         style="stop-color:#6f716d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop11339"
+         style="stop-color:#9ea09c;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10591">
+      <stop
+         id="stop10593"
+         style="stop-color:#cad0c6;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10599"
+         style="stop-color:#eaece9;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop10595"
+         style="stop-color:#c5cbc0;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2454">
+      <stop
+         id="stop2456"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2458"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="12.57571"
+       cy="67.501709"
+       r="8.7662792"
+       fx="12.57571"
+       fy="67.501709"
+       id="radialGradient2433"
+       xlink:href="#linearGradient2454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6985148,0,0,1.1166655,-9.9357446,-40.845615)" />
+    <linearGradient
+       x1="10.907269"
+       y1="25.002281"
+       x2="30.875446"
+       y2="36.127281"
+       id="linearGradient3212"
+       xlink:href="#linearGradient9845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85380487,0,0,0.88502574,7.3712969,4.1902614)" />
+    <linearGradient
+       x1="6.72682"
+       y1="32.161697"
+       x2="40.938126"
+       y2="32.161697"
+       id="linearGradient3215"
+       xlink:href="#linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92307976,0,0,1.0060435,5.6957722,-0.91908571)" />
+    <linearGradient
+       x1="31.630468"
+       y1="41.791817"
+       x2="8.6713638"
+       y2="25.793524"
+       id="linearGradient3217"
+       xlink:href="#linearGradient11327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92307976,0,0,1.0060435,5.6957722,0.11742892)" />
+    <linearGradient
+       x1="12.88666"
+       y1="4.3602757"
+       x2="20.087339"
+       y2="18.414022"
+       id="linearGradient3220"
+       xlink:href="#linearGradient10591"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90426925,0,0,0.93642214,5.5912323,1.5958302)" />
+    <linearGradient
+       x1="19.250618"
+       y1="9.6635771"
+       x2="16.198252"
+       y2="6.0396547"
+       id="linearGradient3222"
+       xlink:href="#linearGradient11335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90426925,0,0,0.93642214,5.5912323,1.5958302)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10591"
+       id="linearGradient3025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90426925,0,0,0.93642214,5.5912323,1.5958302)"
+       x1="12.88666"
+       y1="4.3602757"
+       x2="20.087339"
+       y2="18.414022" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11335"
+       id="linearGradient3027"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90426925,0,0,0.93642214,5.5912323,1.5958302)"
+       x1="19.250618"
+       y1="9.6635771"
+       x2="16.198252"
+       y2="6.0396547" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2092"
+       id="linearGradient3029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92307976,0,0,1.0060435,5.6957722,-0.91908571)"
+       x1="6.72682"
+       y1="32.161697"
+       x2="40.938126"
+       y2="32.161697" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11327"
+       id="linearGradient3031"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92307976,0,0,1.0060435,5.6957722,0.11742892)"
+       x1="31.630468"
+       y1="41.791817"
+       x2="8.6713638"
+       y2="25.793524" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9845"
+       id="linearGradient3033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.85380487,0,0,0.88502574,7.3712969,4.1902614)"
+       x1="10.907269"
+       y1="25.002281"
+       x2="30.875446"
+       y2="36.127281" />
+  </defs>
+  <g
+     id="g3016"
+     transform="translate(-3.8458166,-0.83783159)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3027);stroke-width:2.23038054;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2086"
+       d="m 15.02735,22.627841 0,-7.195987 c 0,-7.3697718 4.939606,-10.7296476 12.28446,-10.6376105 7.384819,0.092033 12.260464,3.2984764 12.260464,10.7549495 l -0.01227,7.078648 -4.505654,0 0,-5.225442 c -0.120977,-1.813872 0.502741,-7.8896571 -7.690864,-7.8896571 -8.250124,0 -7.765189,6.0977401 -7.735627,7.9257701 l 0,5.189329 -4.600569,0 z" />
+    <rect
+       style="fill:url(#linearGradient3029);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3031);stroke-width:2.23038054;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect1314"
+       y="22.722927"
+       x="11.693803"
+       ry="4.3370967"
+       rx="4.9848475"
+       height="22.160332"
+       width="32.304028" />
+    <rect
+       style="fill:none;stroke:url(#linearGradient3033);stroke-width:2.23038244;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.60109289;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6903"
+       y="24.898569"
+       x="13.749024"
+       ry="2.7091224"
+       rx="2.7091198"
+       height="17.773537"
+       width="28.20174" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="rect11343"
+       d="m 15.849648,15.830751 c 0.244769,-5.456915 1.761879,-9.5663049 11.881668,-9.9146747 -6.552657,0.9234676 -10.116817,2.8366869 -10.116817,8.5417447 0,0 -0.163459,7.070953 -0.163459,7.070953 l -1.601392,0 0,-5.698023 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#fdca01;stroke-width:2.23038554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2478"
+       d="m 15.537169,29.940714 24.839114,0.192551" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#fdca01;stroke-width:2.23038554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2482"
+       d="m 15.489031,34.321256 24.839114,0.192551" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#fdca01;stroke-width:2.23038554px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path2486"
+       d="m 15.489029,38.942488 24.839115,0.19255" />
+  </g>
+</svg>

Resources/graphics/originals/tango or oxygen/1270234450.svg

@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    id="svg5105"
+    xml:space="preserve"
+    sodipodi:version="0.32"
+    viewBox="0 0 48 48"
+    inkscape:output_extension="org.inkscape.output.svg.inkscape"
+    inkscape:version="0.46"
+    sodipodi:docname="application-certificate.svg"
+    sodipodi:docbase="/home/jimmac/gfx/ximian/tango-icon-theme/scalable/mimetypes"
+  >
+<defs
+      id="defs5187"
+    >
+<linearGradient
+        id="linearGradient6665"
+      >
+  <stop
+          id="stop6667"
+          style="stop-color:#000000"
+          offset="0"
+      />
+  <stop
+          id="stop6669"
+          style="stop-color:#000000;stop-opacity:0"
+          offset="1"
+      />
+</linearGradient
+    >
+<radialGradient
+        id="radialGradient5284"
+        gradientUnits="userSpaceOnUse"
+        cx="28.789"
+        cy="20.971"
+        r="13.281"
+        gradientTransform="matrix(1.3104 0 0 1.3104 -8.6427 -4.376)"
+        inkscape:collect="always"
+      ><stop
+          id="stop5115"
+          style="stop-color:#E41E08"
+          offset="0"
+      /><stop
+          id="stop5117"
+          style="stop-color:#901505"
+          offset="1"
+      /></radialGradient
+    >
+			<linearGradient
+        id="linearGradient6610"
+        y2="49.895"
+        gradientUnits="userSpaceOnUse"
+        y1="5.9245"
+        gradientTransform="matrix(.97573 0 0 .93103 -0.132 1.9784)"
+        x2="43.141"
+        x1="15.339"
+        inkscape:collect="always"
+      ><stop
+          id="stop6606"
+          style="stop-color:#ffa196"
+          offset="0"
+      /><stop
+          id="stop6608"
+          style="stop-color:#ff1f06;stop-opacity:0"
+          offset="1"
+      /></linearGradient
+    >
+<linearGradient
+        id="linearGradient6623"
+        y2="22.783"
+        gradientUnits="userSpaceOnUse"
+        y1="9.4437"
+        gradientTransform="matrix(1.0287 0 0 .97213 -1.2803 1.1893)"
+        x2="29.957"
+        x1="18.57"
+        inkscape:collect="always"
+      ><stop
+          id="stop6619"
+          style="stop-color:#ffffff;stop-opacity:.24742"
+          offset="0"
+      /><stop
+          id="stop6621"
+          style="stop-color:#ffffff;stop-opacity:0"
+          offset="1"
+      /></linearGradient
+    >
+<linearGradient
+        id="linearGradient6631"
+        y2="35.018"
+        gradientUnits="userSpaceOnUse"
+        y1="22.886"
+        gradientTransform="matrix(.84394 0 0 1.1849 -1.2803 1.6893)"
+        x2="38.251"
+        x1="38.506"
+        inkscape:collect="always"
+      ><stop
+          id="stop6627"
+          style="stop-color:#1d2349"
+          offset="0"
+      /><stop
+          id="stop6637"
+          style="stop-color:#4c5279"
+          offset=".35315"
+      /><stop
+          id="stop6633"
+          style="stop-color:#b3bdff"
+          offset=".46552"
+      /><stop
+          id="stop6635"
+          style="stop-color:#727cbe"
+          offset=".64982"
+      /><stop
+          id="stop6629"
+          style="stop-color:#323c7e"
+          offset="1"
+      /></linearGradient
+    >
+<radialGradient
+        id="radialGradient6663"
+        cx="24.452"
+        xlink:href="#linearGradient6665"
+        gradientUnits="userSpaceOnUse"
+        cy="19.819"
+        r="33.156"
+        gradientTransform="matrix(1.0245 0 0 .97611 .93934 -.53033)"
+        inkscape:collect="always"
+    />
+<radialGradient
+        id="radialGradient6675"
+        gradientUnits="userSpaceOnUse"
+        xlink:href="#linearGradient6665"
+        cx="24.452"
+        cy="19.819"
+        r="33.156"
+        gradientTransform="matrix(1.0245 0 0 .97611 1.6464 -.35355)"
+        inkscape:collect="always"
+    />
+<radialGradient
+        id="radialGradient6678"
+        gradientUnits="userSpaceOnUse"
+        cx="26.887"
+        cy="20.479"
+        r="14.694"
+        gradientTransform="matrix(1.1356 0 0 1.1356 -4.5403 -2.0774)"
+        inkscape:collect="always"
+      ><stop
+          id="stop5122"
+          style="stop-color:#E41E08"
+          offset="0"
+      /><stop
+          id="stop5124"
+          style="stop-color:#901505"
+          offset="1"
+      /></radialGradient
+    >
+<linearGradient
+        id="linearGradient6690"
+        y2="27.404"
+        gradientUnits="userSpaceOnUse"
+        y1="35.458"
+        gradientTransform="scale(.84394 1.1849)"
+        x2="36.499"
+        x1="37.503"
+        inkscape:collect="always"
+      ><stop
+          id="stop6686"
+          style="stop-color:#d5dbff"
+          offset="0"
+      /><stop
+          id="stop6688"
+          style="stop-color:#6579ff;stop-opacity:0"
+          offset="1"
+      /></linearGradient
+    >
+</defs
+  >
+<sodipodi:namedview
+      id="base"
+      bordercolor="#666666"
+      inkscape:window-x="203"
+      inkscape:window-y="30"
+      pagecolor="#ffffff"
+      inkscape:window-height="818"
+      inkscape:zoom="5.6568542"
+      inkscape:pageshadow="2"
+      showgrid="false"
+      borderopacity="0.16470588"
+      inkscape:current-layer="svg5105"
+      inkscape:cx="20.303269"
+      inkscape:cy="20.392013"
+      inkscape:showpageshadow="false"
+      inkscape:window-width="821"
+      inkscape:pageopacity="0.0"
+  />
+<path
+      id="path6671"
+      style="opacity:.48045;color:#000000;fill:url(#radialGradient6675)"
+      d="m25.389 19.305s-5.905 8.176-5.905 11.923c0 3.748 6.814 1.704 9.539 4.429s-6.359 9.766-6.359 9.766l9.084-2.499 3.634 3.861c0-4.655 5.337-8.403 2.612-11.242-2.839-2.838-10.902-2.498-11.356-6.245s-1.135-9.879-1.135-9.879l-0.114-0.114z"
+  />
+<path
+      id="path6639"
+      sodipodi:nodetypes="csssssssssssss"
+      style="opacity:.48045;fill:url(#radialGradient6663)"
+      d="m36.916 9.3947c1.322 3.0573 3.643 2.9013 3.701 6.9823 0.032 2.276 1.832 3.471 1.832 5.796 0 2.324-4.015 3.473-5.382 4.841-1.368 1.367 0.108 4.874-3.602 5.905-3.675 1.02-5.47-0.411-7.795-0.411s-7.888 4.483-9.939 2.432c-2.052-2.051-2.095-6.534-3.873-8.312-1.9146-1.914-4.9396-4.589-4.9396-8.008s1.9742-5.224 4.8026-8.402c2.918-3.2794 3.009-8.2052 6.427-8.2052 3.419 0 4.73 0.9378 7.639 0.8643 4.639-0.1172 5.207-2.3234 8.618-0.5935 3.008 1.5251 1.477 4.7177 2.511 7.1111z"
+  />
+<path
+      id="path5112"
+      style="stroke:#1f254f;stroke-miterlimit:6.6;fill:url(#linearGradient6631)"
+      d="m23.621 18.068s-5.905 8.176-5.905 11.923 6.814 1.703 9.539 4.429c2.725 2.725-6.359 9.765-6.359 9.765l9.084-2.498 3.634 3.861c0-4.656 5.337-8.403 2.612-11.242-2.839-2.839-10.901-2.498-11.356-6.246-0.454-3.747-1.135-9.879-1.135-9.879l-0.114-0.113z"
+  />
+<path
+      id="path6680"
+      sodipodi:nodetypes="cscccsss"
+      style="stroke:url(#linearGradient6690);stroke-width:.72113;stroke-miterlimit:6.6;fill:none"
+      d="m20.803 31.602c4.552 0.449 7.429 1.236 7.807 3.99 0.33 2.407-4.232 6.732-4.232 6.732l5.844-1.624 2.841 2.961c0.663-3.711 4.365-6.222 2.679-8.505-2.115-2.863-8.966-2.243-9.294-4.946-0.327-2.702-8.334 1.125-5.645 1.392z"
+  />
+<path
+      id="path5119"
+      sodipodi:nodetypes="csssssssssssss"
+      style="stroke-linejoin:round;stroke:#4c0901;stroke-linecap:round;fill:url(#radialGradient5284)"
+      d="m34.935 9.2468c1.267 2.9292 3.491 2.7802 3.546 6.6912 0.032 2.18 1.756 3.325 1.756 5.553s-3.847 3.328-5.157 4.639c-1.311 1.31 0.103 4.671-3.452 5.658-3.521 0.978-5.241-0.393-7.469-0.393s-7.558 4.295-9.524 2.33c-1.966-1.966-2.007-6.261-3.711-7.965-1.8345-1.834-4.7331-4.397-4.7331-7.673s1.8918-5.006 4.6021-8.051c2.796-3.1427 2.883-7.8627 6.159-7.8627s4.531 0.8987 7.32 0.8282c4.444-0.1123 4.989-2.2263 8.258-0.5687 2.882 1.4614 1.414 4.5206 2.405 6.814z"
+  />
+<path
+      id="path5126"
+      style="fill:url(#radialGradient6678)"
+      d="m34.977 17.568c0 6.245-5.11 11.355-11.356 11.355-6.245 0-11.355-5.11-11.355-11.355 0-6.246 5.11-11.356 11.355-11.356 6.246 0.0001 11.356 5.11 11.356 11.356z"
+  />
+<path
+      id="path6600"
+      sodipodi:nodetypes="csssssssssssss"
+      style="stroke-linejoin:round;stroke:url(#linearGradient6610);stroke-linecap:round;fill:none"
+      d="m33.889 10.03c1.153 2.668 3.179 2.532 3.229 6.094 0.029 1.986 1.599 3.028 1.599 5.057s-3.503 3.031-4.697 4.225c-1.193 1.193 0.094 4.254-3.143 5.153-3.207 0.891-4.774-0.358-6.802-0.358-2.029 0-6.884 3.912-8.674 2.122s-1.828-5.702-3.38-7.254c-1.67-1.671-4.3102-4.005-4.3102-6.988 0-2.984 1.7228-4.559 4.1912-7.332 2.547-2.8622 2.625-7.1608 5.609-7.1608 2.983 0 4.127 0.8184 6.666 0.7542 4.048-0.1023 4.544-2.0275 7.521-0.5179 2.625 1.3309 1.288 4.117 2.191 6.2055z"
+  />
+<path
+      id="path6612"
+      style="color:#000000;fill:url(#linearGradient6623)"
+      d="m23.663 7.0525c-5.868 0-10.646 4.7425-10.646 10.61 0 3.672 1.984 6.781 4.816 8.691 7.241-3.897 5.954-10.805 15.607-12.746-1.599-3.8493-5.351-6.5545-9.777-6.5545z"
+  />
+<metadata
+    ><rdf:RDF
+      ><cc:Work
+        ><dc:format
+          >image/svg+xml</dc:format
+        ><dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        /><cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        /><dc:publisher
+          ><cc:Agent
+              rdf:about="http://openclipart.org/"
+            ><dc:title
+              >Openclipart</dc:title
+            ></cc:Agent
+          ></dc:publisher
+        ><dc:title
+          >tango application certificate</dc:title
+        ><dc:date
+          >2010-04-02T18:54:10</dc:date
+        ><dc:description
+          >An icon from Tango Project. Since version 0.8.90 Tango Project icons are Public Domain: </dc:description
+        ><dc:source
+          >https://openclipart.org/detail/36067/tango-application-certificate-by-warszawianka</dc:source
+        ><dc:creator
+          ><cc:Agent
+            ><dc:title
+              >warszawianka</dc:title
+            ></cc:Agent
+          ></dc:creator
+        ><dc:subject
+          ><rdf:Bag
+            ><rdf:li
+              >externalsource</rdf:li
+            ><rdf:li
+              >icon</rdf:li
+            ><rdf:li
+              >ribbon</rdf:li
+            ><rdf:li
+              >seal</rdf:li
+            ><rdf:li
+              >tango</rdf:li
+            ></rdf:Bag
+          ></dc:subject
+        ></cc:Work
+      ><cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        ><cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        /><cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        /><cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        /></cc:License
+      ></rdf:RDF
+    ></metadata
+  ></svg
+>

Resources/graphics/originals/tango or oxygen/osa_padlock.svg

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2327">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient9845">
+      <stop
+         id="stop9847"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop9849"
+         style="stop-color:#ffffff;stop-opacity:0.49484536"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11327">
+      <stop
+         id="stop11329"
+         style="stop-color:#7d6400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop11331"
+         style="stop-color:#be9700;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2092">
+      <stop
+         id="stop2094"
+         style="stop-color:#fff7b0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2098"
+         style="stop-color:#ffec41;stop-opacity:1"
+         offset="0.20999999" />
+      <stop
+         id="stop2293"
+         style="stop-color:#e2cc00;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop2100"
+         style="stop-color:#c3af00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11335">
+      <stop
+         id="stop11337"
+         style="stop-color:#6f716d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop11339"
+         style="stop-color:#9ea09c;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10591">
+      <stop
+         id="stop10593"
+         style="stop-color:#cad0c6;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10599"
+         style="stop-color:#eaece9;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop10595"
+         style="stop-color:#c5cbc0;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2454">
+      <stop
+         id="stop2456"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2458"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="12.57571"
+       cy="67.501709"
+       r="8.7662792"
+       fx="12.57571"
+       fy="67.501709"
+       id="radialGradient2433"
+       xlink:href="#linearGradient2454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5034684,0,0,2.2773761,-4.1239924,-63.744084)" />
+    <linearGradient
+       x1="10.907269"
+       y1="25.002281"
+       x2="30.875446"
+       y2="36.127281"
+       id="linearGradient3212"
+       xlink:href="#linearGradient9845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3619204,0,0,1.4117214,32.59783,27.876087)" />
+    <linearGradient
+       x1="6.72682"
+       y1="32.161697"
+       x2="40.938126"
+       y2="32.161697"
+       id="linearGradient3215"
+       xlink:href="#linearGradient2092"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4724221,0,0,1.6047591,29.925169,19.72607)" />
+    <linearGradient
+       x1="31.630468"
+       y1="41.791817"
+       x2="8.6713638"
+       y2="25.793524"
+       id="linearGradient3217"
+       xlink:href="#linearGradient11327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4724221,0,0,1.6047591,29.925169,21.379434)" />
+    <linearGradient
+       x1="12.88666"
+       y1="4.3602757"
+       x2="20.087339"
+       y2="18.414022"
+       id="linearGradient3220"
+       xlink:href="#linearGradient10591"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4424171,0,0,1.4937048,29.758415,23.73766)" />
+    <linearGradient
+       x1="19.250618"
+       y1="9.6635771"
+       x2="16.198252"
+       y2="6.0396547"
+       id="linearGradient3222"
+       xlink:href="#linearGradient11335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4424171,0,0,1.4937048,29.758415,23.73766)" />
+  </defs>
+  <path
+     d="m 113.33099,89.982835 c 0.007,11.027875 -21.595189,19.969225 -48.244948,19.969225 -26.649762,0 -48.251753,-8.94135 -48.24495,-19.969225 -0.0068,-11.027877 21.595188,-19.96923 48.24495,-19.96923 26.649759,0 48.251748,8.941353 48.244948,19.96923 z"
+     id="path2452"
+     style="opacity:0.50857143;fill:url(#radialGradient2433);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 44.810146,57.286219 0,-11.478453 c 0,-11.755664 7.879258,-17.115067 19.595176,-16.968256 11.779665,0.146808 19.556898,5.261462 19.556898,17.155424 l -0.01947,11.291285 -7.187054,0 0,-8.335201 c -0.19296,-2.893341 0.801933,-12.584942 -12.267844,-12.584942 -13.159928,0 -12.386402,9.726619 -12.339244,12.642546 l 0,8.277597 -7.338457,0 z"
+     id="path2086"
+     style="fill:url(#linearGradient3220);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3222);stroke-width:3.55772209;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <rect
+     width="51.52877"
+     height="35.348366"
+     rx="7.9514251"
+     ry="6.9181848"
+     x="39.492744"
+     y="57.437897"
+     id="rect1314"
+     style="fill:url(#linearGradient3215);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3217);stroke-width:3.55772233;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  <rect
+     width="44.985126"
+     height="28.350903"
+     rx="4.3213687"
+     ry="4.321372"
+     x="42.771069"
+     y="60.908306"
+     id="rect6903"
+     style="fill:none;stroke:url(#linearGradient3212);stroke-width:3.55772567;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.60109289;stroke-dasharray:none;stroke-dashoffset:0" />
+  <path
+     d="m 46.121811,46.444053 c 0.390434,-8.704427 2.810405,-15.259395 18.952672,-15.815087 -10.452266,1.473041 -16.137527,4.524854 -16.137527,13.6251 0,0 -0.260734,11.279012 -0.260734,11.279012 l -2.554411,0 0,-9.089025 z"
+     id="rect11343"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  <path
+     d="m 45.623365,68.951122 39.621343,0.307143"
+     id="path2478"
+     style="fill:none;stroke:#fdca01;stroke-width:3.5577302px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="m 45.546582,75.938607 39.621344,0.307144"
+     id="path2482"
+     style="fill:none;stroke:#fdca01;stroke-width:3.5577302px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="m 45.546578,83.310022 39.621344,0.307143"
+     id="path2486"
+     style="fill:none;stroke:#fdca01;stroke-width:3.5577302px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>

Resources/graphics/originals/tango or oxygen/tango-style-pen.svg

@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    id="svg9121"
+    sodipodi:docname="tango-style-pen.svg"
+    inkscape:export-filename="/home/andreas/projekt/bild/tango/scalable/draw-pencil3.png"
+    viewBox="0 0 48 48"
+    sodipodi:version="0.32"
+    inkscape:export-xdpi="90.000000"
+    inkscape:output_extension="org.inkscape.output.svg.inkscape"
+    inkscape:export-ydpi="90.000000"
+    inkscape:version="0.46"
+    sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/categories"
+  >
+  <defs
+      id="defs3"
+    >
+    <radialGradient
+        id="radialGradient6981"
+        gradientUnits="userSpaceOnUse"
+        cy="42.343"
+        cx="26.782"
+        gradientTransform="matrix(1 0 0 .28221 1.6792e-15 30.394)"
+        r="14.407"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop6977"
+          style="stop-color:#000000"
+          offset="0"
+      />
+      <stop
+          id="stop6979"
+          style="stop-color:#000000;stop-opacity:0"
+          offset="1"
+      />
+    </radialGradient
+    >
+    <linearGradient
+        id="linearGradient9910"
+      >
+      <stop
+          id="stop9912"
+          style="stop-color:#729fcf"
+          offset="0"
+      />
+      <stop
+          id="stop9918"
+          style="stop-color:#a5bfda"
+          offset=".31579"
+      />
+      <stop
+          id="stop9914"
+          style="stop-color:#376ca4"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <linearGradient
+        id="linearGradient3009"
+        y2="68.225"
+        xlink:href="#linearGradient9910"
+        gradientUnits="userSpaceOnUse"
+        x2="28.245"
+        gradientTransform="matrix(.49330 -.71665 -.71665 -.49330 94.393 72.494)"
+        y1="60.446"
+        x1="28.245"
+        inkscape:collect="always"
+    />
+    <linearGradient
+        id="linearGradient3011"
+        y2="68.225"
+        gradientUnits="userSpaceOnUse"
+        x2="28.245"
+        gradientTransform="matrix(.49330 -.71665 -.71665 -.49330 94.393 72.494)"
+        y1="60.446"
+        x1="28.245"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop9922"
+          style="stop-color:#5b90c8"
+          offset="0"
+      />
+      <stop
+          id="stop9924"
+          style="stop-color:#8fb0d1"
+          offset=".31579"
+      />
+      <stop
+          id="stop9926"
+          style="stop-color:#34679d"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <linearGradient
+        id="linearGradient3015"
+        y2="62.827"
+        gradientUnits="userSpaceOnUse"
+        x2="38.061"
+        gradientTransform="matrix(.49330 -.71665 -.71665 -.49330 94.393 72.494)"
+        y1="62.402"
+        x1="55.876"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop9954"
+          style="stop-color:#ffffff"
+          offset="0"
+      />
+      <stop
+          id="stop9956"
+          style="stop-color:#ffffff;stop-opacity:0"
+          offset="1"
+      />
+    </linearGradient
+    >
+  </defs
+  >
+  <sodipodi:namedview
+      id="base"
+      inkscape:showpageshadow="false"
+      inkscape:zoom="4"
+      borderopacity="0.17254902"
+      inkscape:current-layer="layer1"
+      stroke="#204a87"
+      inkscape:cy="25.863906"
+      fill="#3465a4"
+      inkscape:grid-bbox="true"
+      showgrid="false"
+      showguides="true"
+      bordercolor="#666666"
+      inkscape:window-x="0"
+      inkscape:guide-bbox="true"
+      inkscape:window-y="0"
+      inkscape:window-width="1280"
+      inkscape:pageopacity="0.0"
+      inkscape:pageshadow="2"
+      pagecolor="#ffffff"
+      inkscape:cx="61.036363"
+      inkscape:document-units="px"
+      inkscape:window-height="778"
+  />
+  <g
+      id="layer1"
+      inkscape:label="Layer 1"
+      inkscape:groupmode="layer"
+    >
+    <path
+        id="path6973"
+        sodipodi:rx="14.407301"
+        sodipodi:ry="4.0658641"
+        style="opacity:.3;color:#000000;fill:url(#radialGradient6981)"
+        sodipodi:type="arc"
+        d="m41.189 42.343a14.407 4.0659 0 1 1 -28.815 0 14.407 4.0659 0 1 1 28.815 0z"
+        transform="matrix(1.3384 0 0 1 -20.926 -3.409)"
+        sodipodi:cy="42.343147"
+        sodipodi:cx="26.78167"
+        inkscape:r_cy="true"
+        inkscape:r_cx="true"
+    />
+    <g
+        id="g2980"
+        transform="matrix(.98858 .15073 -.15073 .98858 -42.778 -3.1617)"
+      >
+      <path
+          id="path9903"
+          style="fill-rule:evenodd;stroke:#7d7d7d;fill:#e7e7e7"
+          inkscape:r_cy="true"
+          d="m61.249 22.577c-0.883-0.607-3.381 1.585-5.632 4.855-2.251 3.271-2.719 6.861-2.525 6.994 0.217 0.15 3.381-1.584 5.632-4.855 2.251-3.27 3.407-6.386 2.525-6.994z"
+          sodipodi:nodetypes="cszsc"
+          inkscape:r_cx="true"
+      />
+      <g
+          id="g9975"
+          inkscape:r_cy="true"
+          inkscape:r_cx="true"
+          transform="matrix(-.79601 .082581 .082581 .79601 83.595 -7.6556)"
+        >
+        <path
+            id="path9905"
+            sodipodi:rx="13.0625"
+            sodipodi:ry="5.5"
+            style="stroke:#3465a4;stroke-width:1.2535;fill:none"
+            sodipodi:start="4.0433671"
+            sodipodi:type="arc"
+            d="m32.086 57.686a13.062 5.5 0 0 1 20.86 3.135"
+            sodipodi:open="true"
+            transform="matrix(-.56251 -.81719 .82507 -.56793 -15.221 83.887)"
+            sodipodi:cy="62"
+            sodipodi:cx="40.1875"
+            inkscape:r_cy="true"
+            sodipodi:end="6.067175"
+            inkscape:r_cx="true"
+        />
+        <path
+            id="path9907"
+            sodipodi:rx="3"
+            sodipodi:ry="1.5625"
+            style="fill-rule:evenodd;stroke:#3465a4;stroke-width:1.2535;fill:#729fcf"
+            sodipodi:start="5.9815064"
+            sodipodi:type="arc"
+            d="m36.365 54.473a3 1.5625 0 0 1 -5.671 1.017l2.806-0.552z"
+            transform="matrix(-.56251 -.81719 .82507 -.56793 -14.286 81.453)"
+            sodipodi:cy="54.9375"
+            sodipodi:cx="33.5"
+            inkscape:r_cy="true"
+            sodipodi:end="9.0633414"
+            inkscape:r_cx="true"
+        />
+      </g
+      >
+      <path
+          id="path9898"
+          d="m66.816 20.12c-2.942 4.155-5.833 7.753-8.219 10.339l-3.867-2.662c1.761-3.551 4.504-8.145 7.83-12.977 6.004-8.7224 11.958-15.367 14.313-16.156 0.072-0.0225 0.169-0.0526 0.234-0.0641 0.046-0.007 0.114-0.0046 0.156-0.0056 0.066 0.0003 0.151 0.014 0.208 0.0299 0.013 0.0044 0.056 0.0045 0.069 0.0099 0.013 0.006 0.039 0.0286 0.051 0.0355 0.006 0.0038 0.02 0.0138 0.026 0.0178s0.02 0.0135 0.026 0.0177c0.011 0.0089 0.041 0.0257 0.051 0.0355 0.01 0.0104 0.025 0.0498 0.034 0.0611 0.035 0.0469 0.078 0.1213 0.102 0.1831 0.014 0.03966 0.041 0.10225 0.051 0.14756 0.012 0.06498 0.019 0.16627 0.023 0.24196 0.105 2.4812-3.977 10.415-9.981 19.137-0.373 0.543-0.735 1.084-1.107 1.609z"
+          style="fill-rule:evenodd;stroke:#3465a4;fill:url(#linearGradient3009)"
+          inkscape:r_cy="true"
+          inkscape:r_cx="true"
+      />
+      <path
+          id="path9893"
+          d="m71.382 13.929c-0.747 1.048-1.521 2.054-2.256 3.001l-5.415-3.727c0.885-1.457 1.868-2.99 2.93-4.532 5.066-7.3594 10.293-12.825 12.543-13.309 0.02-0.0036 0.067-0.0122 0.087-0.0153 0.019-0.0027 0.068-0.0136 0.086-0.0156 0.046-0.0038 0.113-0.0068 0.156-0.0056 0.017 0.0009 0.053 0.0083 0.069 0.01 0.049 0.0064 0.121 0.0238 0.164 0.0376 0.015 0.0051 0.056 0.0041 0.07 0.01 0.02 0.0095 0.058 0.0419 0.077 0.0532 0.006 0.004 0.02 0.0136 0.026 0.0178s0.019 0.0133 0.025 0.0177c0.018 0.0139 0.062 0.0377 0.078 0.0533 0.01 0.0108 0.024 0.0494 0.034 0.061 0.028 0.036 0.07 0.0969 0.094 0.1398 0.007 0.0147 0.027 0.0456 0.034 0.0611 0.016 0.0395 0.037 0.1034 0.05 0.1476 0.005 0.018 0.012 0.0678 0.016 0.0865 0.004 0.0192 0.013 0.0668 0.017 0.0866 0.351 2.2746-2.888 9.1084-7.954 16.468-0.315 0.457-0.616 0.91-0.931 1.353z"
+          style="fill-rule:evenodd;stroke:#3465a4;fill:url(#linearGradient3011)"
+          inkscape:r_cy="true"
+          inkscape:r_cx="true"
+      />
+      <path
+          id="path9888"
+          d="m78.925 1.0932l-3.816-2.6267c2.025-2.2648 3.853-3.6636 4.839-3.6072 0.006 0.0005 0.03 0.0015 0.037 0.0021 0.006 0.0008 0.03 0.0014 0.036 0.0022 0.006 0.001 0.031 0.0011 0.037 0.0022 0.035 0.0072 0.092 0.028 0.124 0.0398 0.006 0.0021 0.021 0.0155 0.026 0.0177 0.005 0.0024 0.031-0.0003 0.037 0.0022 0.005 0.0026 0.02 0.015 0.025 0.0177 0.005 0.0029 0.021 0.0148 0.026 0.0178 0.005 0.0031 0.021 0.0145 0.026 0.0177s0.021 0.0144 0.026 0.0178c0.004 0.0034 0.021 0.0142 0.025 0.0177 0.005 0.0037 0.022 0.014 0.026 0.0178 0.004 0.0039 0.011 0.0293 0.015 0.0333 0.004 0.0042 0.022 0.0135 0.026 0.0178 0.023 0.0262 0.062 0.0718 0.082 0.1021 0.003 0.0052 0.012 0.0281 0.015 0.0334s0.012 0.0278 0.015 0.0333c0.003 0.0056 0.012 0.0276 0.015 0.0333 0.405 0.9014-0.249 3.108-1.642 5.808z"
+          style="fill-rule:evenodd;stroke:#3465a4;fill:url(#linearGradient3009)"
+          inkscape:r_cy="true"
+          inkscape:r_cx="true"
+      />
+      <path
+          id="path9930"
+          style="opacity:.35714;stroke-linejoin:round;stroke:url(#linearGradient3015);stroke-linecap:round;fill:none"
+          inkscape:r_cy="true"
+          inkscape:r_cx="true"
+          sodipodi:nodetypes="cccszsc"
+          d="m69.708 14.318c-0.189 0.268-0.378 0.517-0.566 0.779l-3.75-2.584c0.513-0.779 1.237-2.048 1.777-2.8576 6.211-9.3166 12.3-13.972 12.553-13.798 0.28 0.1912-2.164 7.477-8.497 16.279-0.372 0.516-1.16 1.676-1.517 2.182z"
+      />
+    </g
+    >
+  </g
+  >
+  <metadata
+    >
+    <rdf:RDF
+      >
+      <cc:Work
+        >
+        <dc:format
+          >image/svg+xml</dc:format
+        >
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        />
+        <cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        />
+        <dc:publisher
+          >
+          <cc:Agent
+              rdf:about="http://openclipart.org/"
+            >
+            <dc:title
+              >Openclipart</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:publisher
+        >
+        <dc:title
+          >tango style pen</dc:title
+        >
+        <dc:date
+          >2010-03-29T09:24:52</dc:date
+        >
+        <dc:description
+          >This is a remix of &lt;a href="http://www.openclipart.org/detail/35401"&gt; tango applications office &lt;/a&gt; icon.</dc:description
+        >
+        <dc:source
+          >https://openclipart.org/detail/35443/tango-style-pen-by-warszawianka</dc:source
+        >
+        <dc:creator
+          >
+          <cc:Agent
+            >
+            <dc:title
+              >warszawianka</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:creator
+        >
+        <dc:subject
+          >
+          <rdf:Bag
+            >
+            <rdf:li
+              >icon</rdf:li
+            >
+            <rdf:li
+              >pen</rdf:li
+            >
+            <rdf:li
+              >remix</rdf:li
+            >
+            <rdf:li
+              >tango</rdf:li
+            >
+            <rdf:li
+              >writing</rdf:li
+            >
+          </rdf:Bag
+          >
+        </dc:subject
+        >
+      </cc:Work
+      >
+      <cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        >
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        />
+      </cc:License
+      >
+    </rdf:RDF
+    >
+  </metadata
+  >
+</svg
+>

Resources/graphics/update-drawables.sh

@@ -55,6 +55,15 @@ inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME%%.*}.png" $NAME
 inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME%%.*}.png" $NAME
 done
 
+for NAME in key_flag*.svg
+do
+echo $NAME
+inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME%%.*}.png" $NAME
+inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME%%.*}.png" $NAME
+inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME%%.*}.png" $NAME
+inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME%%.*}.png" $NAME
+done
+
 for NAME in "create_key_robot"
 do
 echo $NAME