From e8ed60163423efe3e956a7af93c8b8094d782113 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 18 Nov 2018 00:52:08 +0900
Subject: Add missing icons for Kleopatra's GpgME backends.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e07bf1c45ebf498c9c980aa9d2328fedeb005ac0)
---
 certmanager/lib/pics/CMakeLists.txt         |   2 +-
 certmanager/lib/pics/Makefile.am            |   2 +-
 certmanager/lib/pics/cr16-app-dirmngr.png   | Bin 0 -> 750 bytes
 certmanager/lib/pics/cr16-app-gpg_agent.png | Bin 0 -> 750 bytes
 certmanager/lib/pics/cr16-app-pinentry.png  | Bin 0 -> 750 bytes
 certmanager/lib/pics/cr16-app-scdaemon.png  | Bin 0 -> 750 bytes
 certmanager/lib/pics/cr22-app-dirmngr.png   | Bin 0 -> 873 bytes
 certmanager/lib/pics/cr22-app-gpg_agent.png | Bin 0 -> 873 bytes
 certmanager/lib/pics/cr22-app-pinentry.png  | Bin 0 -> 873 bytes
 certmanager/lib/pics/cr22-app-scdaemon.png  | Bin 0 -> 873 bytes
 certmanager/lib/pics/cr32-app-dirmngr.png   | Bin 0 -> 1391 bytes
 certmanager/lib/pics/cr32-app-gpg_agent.png | Bin 0 -> 1391 bytes
 certmanager/lib/pics/cr32-app-pinentry.png  | Bin 0 -> 1391 bytes
 certmanager/lib/pics/cr32-app-scdaemon.png  | Bin 0 -> 1391 bytes
 certmanager/lib/ui/cryptoconfigmodule.cpp   |   6 +++++-
 15 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 certmanager/lib/pics/cr16-app-dirmngr.png
 create mode 100644 certmanager/lib/pics/cr16-app-gpg_agent.png
 create mode 100644 certmanager/lib/pics/cr16-app-pinentry.png
 create mode 100644 certmanager/lib/pics/cr16-app-scdaemon.png
 create mode 100644 certmanager/lib/pics/cr22-app-dirmngr.png
 create mode 100644 certmanager/lib/pics/cr22-app-gpg_agent.png
 create mode 100644 certmanager/lib/pics/cr22-app-pinentry.png
 create mode 100644 certmanager/lib/pics/cr22-app-scdaemon.png
 create mode 100644 certmanager/lib/pics/cr32-app-dirmngr.png
 create mode 100644 certmanager/lib/pics/cr32-app-gpg_agent.png
 create mode 100644 certmanager/lib/pics/cr32-app-pinentry.png
 create mode 100644 certmanager/lib/pics/cr32-app-scdaemon.png

diff --git a/certmanager/lib/pics/CMakeLists.txt b/certmanager/lib/pics/CMakeLists.txt
index 751dcf02..fed74680 100644
--- a/certmanager/lib/pics/CMakeLists.txt
+++ b/certmanager/lib/pics/CMakeLists.txt
@@ -9,7 +9,7 @@
 #
 #################################################
 
-tde_install_icons( gpg gpgsm )
+tde_install_icons( gpg gpgsm gpg_agent dirmngr scdaemon pinentry )
 
 install( FILES
     key.png key_ok.png key_bad.png key_unknown.png chiasmus_chi.png
diff --git a/certmanager/lib/pics/Makefile.am b/certmanager/lib/pics/Makefile.am
index 33704d1b..288b438e 100644
--- a/certmanager/lib/pics/Makefile.am
+++ b/certmanager/lib/pics/Makefile.am
@@ -1,4 +1,4 @@
 picsdir = $(kde_datadir)/libkleopatra/pics
 pics_DATA = key.png key_ok.png key_bad.png key_unknown.png chiasmus_chi.png
 
-KDE_ICON = gpg gpgsm
+KDE_ICON = gpg gpgsm gpg_agent dirmngr scdaemon pinentry
diff --git a/certmanager/lib/pics/cr16-app-dirmngr.png b/certmanager/lib/pics/cr16-app-dirmngr.png
new file mode 100644
index 00000000..ccddf679
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-dirmngr.png differ
diff --git a/certmanager/lib/pics/cr16-app-gpg_agent.png b/certmanager/lib/pics/cr16-app-gpg_agent.png
new file mode 100644
index 00000000..ccddf679
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-gpg_agent.png differ
diff --git a/certmanager/lib/pics/cr16-app-pinentry.png b/certmanager/lib/pics/cr16-app-pinentry.png
new file mode 100644
index 00000000..ccddf679
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-pinentry.png differ
diff --git a/certmanager/lib/pics/cr16-app-scdaemon.png b/certmanager/lib/pics/cr16-app-scdaemon.png
new file mode 100644
index 00000000..ccddf679
Binary files /dev/null and b/certmanager/lib/pics/cr16-app-scdaemon.png differ
diff --git a/certmanager/lib/pics/cr22-app-dirmngr.png b/certmanager/lib/pics/cr22-app-dirmngr.png
new file mode 100644
index 00000000..d325a8d4
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-dirmngr.png differ
diff --git a/certmanager/lib/pics/cr22-app-gpg_agent.png b/certmanager/lib/pics/cr22-app-gpg_agent.png
new file mode 100644
index 00000000..d325a8d4
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-gpg_agent.png differ
diff --git a/certmanager/lib/pics/cr22-app-pinentry.png b/certmanager/lib/pics/cr22-app-pinentry.png
new file mode 100644
index 00000000..d325a8d4
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-pinentry.png differ
diff --git a/certmanager/lib/pics/cr22-app-scdaemon.png b/certmanager/lib/pics/cr22-app-scdaemon.png
new file mode 100644
index 00000000..d325a8d4
Binary files /dev/null and b/certmanager/lib/pics/cr22-app-scdaemon.png differ
diff --git a/certmanager/lib/pics/cr32-app-dirmngr.png b/certmanager/lib/pics/cr32-app-dirmngr.png
new file mode 100644
index 00000000..b45526c9
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-dirmngr.png differ
diff --git a/certmanager/lib/pics/cr32-app-gpg_agent.png b/certmanager/lib/pics/cr32-app-gpg_agent.png
new file mode 100644
index 00000000..b45526c9
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-gpg_agent.png differ
diff --git a/certmanager/lib/pics/cr32-app-pinentry.png b/certmanager/lib/pics/cr32-app-pinentry.png
new file mode 100644
index 00000000..b45526c9
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-pinentry.png differ
diff --git a/certmanager/lib/pics/cr32-app-scdaemon.png b/certmanager/lib/pics/cr32-app-scdaemon.png
new file mode 100644
index 00000000..b45526c9
Binary files /dev/null and b/certmanager/lib/pics/cr32-app-scdaemon.png differ
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index 944f266b..cfe15442 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -98,7 +98,11 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
     if ( comp->groupList().empty() )
       continue;
     if ( face() != Plain ) {
-      vbox = addVBoxPage( comp->description(), TQString(), loadIcon( comp->iconName() ) );
+      TQString iconName = comp->iconName();
+      if (iconName == TQString::null || iconName == "") {
+				iconName = "gpg";
+			}
+      vbox = addVBoxPage( comp->description(), TQString(), loadIcon(iconName) );
     }
 
     TQScrollView * scrollView = new TQScrollView( vbox );
-- 
cgit v1.2.3