Commit 4aab3cf8 authored by Stefan Walter's avatar Stefan Walter

New icons for seahorse and seahorse-preferences Fixes Bug #336661

    * libseahorse/seahorse-gtkstock.c:
    * libseahorse/seahorse-gtkstock.h:
    * pixmaps/Makefile.am:
    * pixmaps/seahorse.png (removed):
    * pixmaps/22x22/Makefile.am:
    * pixmaps/22x22/seahorse-preferences.png (added):
    * pixmaps/22x22/seahorse-preferences.svg (added):
    * pixmaps/22x22/seahorse.png (added):
    * pixmaps/22x22/seahorse.svg (added):
    * pixmaps/48x48/Makefile.am:
    * pixmaps/48x48/seahorse-preferences.png (added):
    * pixmaps/48x48/seahorse-preferences.svg (added):
    * pixmaps/scaleable/Makefile.am:
    * pixmaps/scaleable/seahorse-preferences.png (added):
    * pixmaps/scaleable/seahorse.png:
    * plugins/applet/GNOME_SeahorseApplet.server.in.in:
    * plugins/nautilus/seahorse-pgp-preferences.desktop.in:
    * src/seahorse.desktop.in: New icons for seahorse and seahorse-preferences
    Fixes Bug #336661
parent 2ab58b02
2006-04-03 Nate Nielsen <nielsen@memberwebs.com>
* libseahorse/seahorse-gtkstock.c:
* libseahorse/seahorse-gtkstock.h:
* pixmaps/Makefile.am:
* pixmaps/seahorse.png (removed):
* pixmaps/22x22/Makefile.am:
* pixmaps/22x22/seahorse-preferences.png (added):
* pixmaps/22x22/seahorse-preferences.svg (added):
* pixmaps/22x22/seahorse.png (added):
* pixmaps/22x22/seahorse.svg (added):
* pixmaps/48x48/Makefile.am:
* pixmaps/48x48/seahorse-preferences.png (added):
* pixmaps/48x48/seahorse-preferences.svg (added):
* pixmaps/scaleable/Makefile.am:
* pixmaps/scaleable/seahorse-preferences.png (added):
* pixmaps/scaleable/seahorse.png:
* plugins/applet/GNOME_SeahorseApplet.server.in.in:
* plugins/nautilus/seahorse-pgp-preferences.desktop.in:
* src/seahorse.desktop.in: New icons for seahorse and seahorse-preferences
Fixes Bug #336661
2006-04-03 Nate Nielsen <nielsen@memberwebs.com>
* libseahorse/seahorse-gpgmex-op.c:
......
......@@ -30,6 +30,7 @@
#include "seahorse-gtkstock.h"
static const gchar *seahorse_icons[] = {
SEAHORSE_STOCK_SEAHORSE,
SEAHORSE_STOCK_KEY,
SEAHORSE_STOCK_SECRET,
SEAHORSE_STOCK_KEY_SSH,
......
......@@ -27,16 +27,14 @@
#define _SEAHORSE_GTKSTOCK_H_
/* The default stock icons */
#define SEAHORSE_STOCK_SEAHORSE "seahorse"
#define SEAHORSE_STOCK_KEY "seahorse-key"
#define SEAHORSE_STOCK_SECRET "seahorse-key-personal"
#define SEAHORSE_STOCK_KEY_SSH "seahorse-key-ssh"
#define SEAHORSE_STOCK_PERSON "seahorse-person"
#define SEAHORSE_STOCK_SIGN "seahorse-sign"
#define SEAHORSE_STOCK_SIGN_OK "seahorse-sign-ok"
#define SEAHORSE_STOCK_SIGN_BAD "seahorse-sign-bad"
/* TODO: For now this is the default icon */
#define SEAHORSE_STOCK_SEAHORSE SEAHORSE_STOCK_SECRET
#define SEAHORSE_STOCK_SIGN_BAD "seahorse-sign-bad"
void seahorse_gtkstock_init (void);
......
icon22dir = $(datadir)/pixmaps/seahorse/22x22/
icon22_DATA = seahorse-applet-encrypted.png \
icon22_DATA = seahorse.png \
seahorse-preferences.png \
seahorse-applet-encrypted.png \
seahorse-applet-key.png \
seahorse-applet-signed.png \
seahorse-applet-text.png \
......@@ -10,7 +12,9 @@ icon22_DATA = seahorse-applet-encrypted.png \
seahorse-key-ssh.png \
seahorse-share-keys.png
iconsrc = seahorse-applet-encrypted.svg \
iconsrc = seahorse.svg \
seahorse-preferences.svg \
seahorse-applet-encrypted.svg \
seahorse-applet-key.svg \
seahorse-applet-signed.svg \
seahorse-applet-text.svg \
......@@ -20,4 +24,8 @@ iconsrc = seahorse-applet-encrypted.svg \
seahorse-key-ssh.svg \
seahorse-share-keys.svg
desktop_iconsdir = $(datadir)/icons/hicolor/22x22/apps
desktop_icons_DATA = seahorse.svg \
seahorse-preferences.svg
EXTRA_DIST = $(iconsrc) $(icon22_DATA)
This diff is collapsed.
This diff is collapsed.
icon48dir = $(datadir)/pixmaps/seahorse/48x48/
icon48_DATA = seahorse-applet.png \
icon48_DATA = seahorse.png \
seahorse-preferences.png \
seahorse-applet.png \
seahorse-applet-encrypted.png \
seahorse-applet-key.png \
seahorse-applet-signed.png \
......@@ -16,4 +18,13 @@ icon48_DATA = seahorse-applet.png \
seahorse-sign-ok.png \
seahorse-sign-unknown.png
pixmapdir = $(datadir)/pixmaps/
pixmap_DATA = seahorse.png \
seahorse-preferences.png
desktop_iconsdir = $(datadir)/icons/hicolor/48x48/apps
desktop_icons_DATA = seahorse.png \
seahorse-preferences.png \
seahorse-applet.png
EXTRA_DIST = $(icon48_DATA)
SUBDIRS = 22x22 48x48 scaleable
pixmapdir = $(datadir)/pixmaps/
pixmap_DATA = seahorse.png
desktop_iconsdir = $(datadir)/icons/hicolor/48x48/apps
desktop_icons_DATA = seahorse.png
EXTRA_DIST = seahorse.png
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-hook:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi
......@@ -3,7 +3,9 @@ pixmapdir = $(datadir)/pixmaps/
pixmap_DATA = seahorse-applet.svg
iconsvgdir = $(datadir)/pixmaps/seahorse/scaleable/
iconsvg_DATA = seahorse-applet.svg \
iconsvg_DATA = seahorse.svg \
seahorse-preferences.svg \
seahorse-applet.svg \
seahorse-applet-encrypted.svg \
seahorse-applet-key.svg \
seahorse-applet-signed.svg \
......@@ -19,4 +21,10 @@ iconsvg_DATA = seahorse-applet.svg \
seahorse-sign-ok.svg \
seahorse-sign-unknown.svg
desktop_iconsdir = $(datadir)/icons/hicolor/scalable/apps
desktop_icons_DATA = seahorse.svg \
seahorse-preferences.svg \
seahorse-applet.svg
EXTRA_DIST = $(iconsvg_DATA)
This diff is collapsed.
This diff is collapsed.
......@@ -23,7 +23,7 @@
<oaf_attribute name="name" type="string" _value="Clipboard Text Encryption"/>
<oaf_attribute name="description" type="string" _value="Encrypt, decrypt or sign the clipboard (uses PGP type encryption)."/>
<oaf_attribute name="panel:icon" type="string" value="seahorse-applet.svg"/>
<oaf_attribute name="panel:icon" type="string" value="seahorse-applet"/>
<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
<oaf_attribute name="bugzilla:product" type="string" value="seahorse"/>
<oaf_attribute name="bugzilla:component" type="string" value="Applet"/>
......
......@@ -5,7 +5,7 @@ _Comment=Configure key servers and other encryption settings
Exec=seahorse-preferences
Terminal=false
Type=Application
Icon=gnome-mime-application-pgp-keys.png
Icon=seahorse-preferences
Categories=GNOME;GTK;Application;Settings;Advanced;
StartupNotify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
......
[Desktop Entry]
Encoding=UTF-8
_Name=Encryption Key Manager
_Name=Encryption Keys
_Comment=Manage your encryption keys
Exec=seahorse
Terminal=false
Type=Application
Icon=seahorse.png
Categories=GNOME;GTK;Application;Cryptography;
Icon=seahorse
Categories=GNOME;GTK;Application;Settings;Advanced;
StartupNotify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=seahorse
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment