diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-18 00:52:08 +0900 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2018-11-18 02:16:34 +0100 |
commit | e8ed60163423efe3e956a7af93c8b8094d782113 (patch) | |
tree | 98e85247ec9afabee95858beca1021ed86a67c7f | |
parent | f199c3d632d866f3bb9e811c3969eb6f7c426e3b (diff) | |
download | tdepim-e8ed60163423efe3e956a7af93c8b8094d782113.tar.gz tdepim-e8ed60163423efe3e956a7af93c8b8094d782113.zip |
Add missing icons for Kleopatra's GpgME backends.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e07bf1c45ebf498c9c980aa9d2328fedeb005ac0)
-rw-r--r-- | certmanager/lib/pics/CMakeLists.txt | 2 | ||||
-rw-r--r-- | certmanager/lib/pics/Makefile.am | 2 | ||||
-rw-r--r-- | certmanager/lib/pics/cr16-app-dirmngr.png | bin | 0 -> 750 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr16-app-gpg_agent.png | bin | 0 -> 750 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr16-app-pinentry.png | bin | 0 -> 750 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr16-app-scdaemon.png | bin | 0 -> 750 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr22-app-dirmngr.png | bin | 0 -> 873 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr22-app-gpg_agent.png | bin | 0 -> 873 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr22-app-pinentry.png | bin | 0 -> 873 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr22-app-scdaemon.png | bin | 0 -> 873 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr32-app-dirmngr.png | bin | 0 -> 1391 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr32-app-gpg_agent.png | bin | 0 -> 1391 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr32-app-pinentry.png | bin | 0 -> 1391 bytes | |||
-rw-r--r-- | certmanager/lib/pics/cr32-app-scdaemon.png | bin | 0 -> 1391 bytes | |||
-rw-r--r-- | certmanager/lib/ui/cryptoconfigmodule.cpp | 6 |
15 files changed, 7 insertions, 3 deletions
diff --git a/certmanager/lib/pics/CMakeLists.txt b/certmanager/lib/pics/CMakeLists.txt index 751dcf023..fed74680a 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 33704d1b2..288b438e7 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 Binary files differnew file mode 100644 index 000000000..ccddf679f --- /dev/null +++ b/certmanager/lib/pics/cr16-app-dirmngr.png diff --git a/certmanager/lib/pics/cr16-app-gpg_agent.png b/certmanager/lib/pics/cr16-app-gpg_agent.png Binary files differnew file mode 100644 index 000000000..ccddf679f --- /dev/null +++ b/certmanager/lib/pics/cr16-app-gpg_agent.png diff --git a/certmanager/lib/pics/cr16-app-pinentry.png b/certmanager/lib/pics/cr16-app-pinentry.png Binary files differnew file mode 100644 index 000000000..ccddf679f --- /dev/null +++ b/certmanager/lib/pics/cr16-app-pinentry.png diff --git a/certmanager/lib/pics/cr16-app-scdaemon.png b/certmanager/lib/pics/cr16-app-scdaemon.png Binary files differnew file mode 100644 index 000000000..ccddf679f --- /dev/null +++ b/certmanager/lib/pics/cr16-app-scdaemon.png diff --git a/certmanager/lib/pics/cr22-app-dirmngr.png b/certmanager/lib/pics/cr22-app-dirmngr.png Binary files differnew file mode 100644 index 000000000..d325a8d42 --- /dev/null +++ b/certmanager/lib/pics/cr22-app-dirmngr.png diff --git a/certmanager/lib/pics/cr22-app-gpg_agent.png b/certmanager/lib/pics/cr22-app-gpg_agent.png Binary files differnew file mode 100644 index 000000000..d325a8d42 --- /dev/null +++ b/certmanager/lib/pics/cr22-app-gpg_agent.png diff --git a/certmanager/lib/pics/cr22-app-pinentry.png b/certmanager/lib/pics/cr22-app-pinentry.png Binary files differnew file mode 100644 index 000000000..d325a8d42 --- /dev/null +++ b/certmanager/lib/pics/cr22-app-pinentry.png diff --git a/certmanager/lib/pics/cr22-app-scdaemon.png b/certmanager/lib/pics/cr22-app-scdaemon.png Binary files differnew file mode 100644 index 000000000..d325a8d42 --- /dev/null +++ b/certmanager/lib/pics/cr22-app-scdaemon.png diff --git a/certmanager/lib/pics/cr32-app-dirmngr.png b/certmanager/lib/pics/cr32-app-dirmngr.png Binary files differnew file mode 100644 index 000000000..b45526c92 --- /dev/null +++ b/certmanager/lib/pics/cr32-app-dirmngr.png diff --git a/certmanager/lib/pics/cr32-app-gpg_agent.png b/certmanager/lib/pics/cr32-app-gpg_agent.png Binary files differnew file mode 100644 index 000000000..b45526c92 --- /dev/null +++ b/certmanager/lib/pics/cr32-app-gpg_agent.png diff --git a/certmanager/lib/pics/cr32-app-pinentry.png b/certmanager/lib/pics/cr32-app-pinentry.png Binary files differnew file mode 100644 index 000000000..b45526c92 --- /dev/null +++ b/certmanager/lib/pics/cr32-app-pinentry.png diff --git a/certmanager/lib/pics/cr32-app-scdaemon.png b/certmanager/lib/pics/cr32-app-scdaemon.png Binary files differnew file mode 100644 index 000000000..b45526c92 --- /dev/null +++ b/certmanager/lib/pics/cr32-app-scdaemon.png diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index 944f266b4..cfe154420 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 ); |