Commit b6036a88 authored by Matthias Clasen's avatar Matthias Clasen

Use a better caps lock warning icon

svn path=/trunk/; revision=22070
parent 04fe64b1
2009-01-04 Matthias Clasen <mclasen@redhat.com>
* gtk/stock-icons/{16,24}/gtk-caps-lock-warning.png: New icons
* gtk/gtkstock.h: Add GTK_STOCK_CAPS_LOCK_WARNING.
* gtk/gtkiconfactory.c (get_default_icons): Register the stock icon.
* gtk/gtkentry.c (show_capslock_feedback): Use the new stock icon.
2009-01-05 Tor Lillqvist <tml@novell.com> 2009-01-05 Tor Lillqvist <tml@novell.com>
Bug 566628 - gdk_display_close always asserts on win32 Bug 566628 - gdk_display_close always asserts on win32
......
2009-01-05 Matthias Clasen <mclasen@redhat.com>
* gtk/tmpl/gtkstock.sgml: Add GTK_STOCK_CAPS_LOCK_WARNING
* gtk/Makefile.am: And copy the icon
2009-01-04 Matthias Clasen <mclasen@redhat.com> 2009-01-04 Matthias Clasen <mclasen@redhat.com>
Bug 566045 – GtkViewport is lacking a description Bug 566045 – GtkViewport is lacking a description
......
...@@ -181,6 +181,7 @@ HTML_IMAGES = \ ...@@ -181,6 +181,7 @@ HTML_IMAGES = \
$(top_srcdir)/gtk/stock-icons/20/gtk-apply.png \ $(top_srcdir)/gtk/stock-icons/20/gtk-apply.png \
$(top_srcdir)/gtk/stock-icons/24/gtk-bold.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-bold.png \
$(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png \ $(top_srcdir)/gtk/stock-icons/20/gtk-cancel.png \
$(top_srcdir)/gtk/stock-icons/24/gtk-caps-lock-warning.png \
$(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-cdrom.png \
$(top_srcdir)/gtk/stock-icons/24/gtk-clear.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-clear.png \
$(top_srcdir)/gtk/stock-icons/24/gtk-close.png \ $(top_srcdir)/gtk/stock-icons/24/gtk-close.png \
......
...@@ -151,6 +151,15 @@ The "Cancel" item. ...@@ -151,6 +151,15 @@ The "Cancel" item.
<!-- ##### MACRO GTK_STOCK_CAPS_LOCK_WARNING ##### -->
<para>
The "Caps Lock Warning" icon.
<inlinegraphic fileref="gtk-caps-lock-warning.png" format="PNG"></inlinegraphic>
</para>
@Since: 2.16
<!-- ##### MACRO GTK_STOCK_CDROM ##### --> <!-- ##### MACRO GTK_STOCK_CDROM ##### -->
<para> <para>
The "CD-Rom" item. The "CD-Rom" item.
......
...@@ -9339,7 +9339,7 @@ show_capslock_feedback (GtkEntry *entry, ...@@ -9339,7 +9339,7 @@ show_capslock_feedback (GtkEntry *entry,
if (gtk_entry_get_storage_type (entry, GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY) if (gtk_entry_get_storage_type (entry, GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
{ {
gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_INFO); gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CAPS_LOCK_WARNING);
gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE); gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE);
priv->caps_lock_warning_shown = TRUE; priv->caps_lock_warning_shown = TRUE;
} }
......
...@@ -509,6 +509,7 @@ get_default_icons (GtkIconFactory *factory) ...@@ -509,6 +509,7 @@ get_default_icons (GtkIconFactory *factory)
register_stock_icon (factory, GTK_STOCK_CONNECT); register_stock_icon (factory, GTK_STOCK_CONNECT);
register_stock_icon (factory, GTK_STOCK_DISCONNECT); register_stock_icon (factory, GTK_STOCK_DISCONNECT);
register_stock_icon (factory, GTK_STOCK_EDIT); register_stock_icon (factory, GTK_STOCK_EDIT);
register_stock_icon (factory, GTK_STOCK_CAPS_LOCK_WARNING);
register_bidi_stock_icon (factory, register_bidi_stock_icon (factory,
GTK_STOCK_MEDIA_FORWARD, GTK_STOCK_MEDIA_FORWARD,
GTK_STOCK_MEDIA_FORWARD "-ltr", GTK_STOCK_MEDIA_FORWARD "-ltr",
......
...@@ -84,6 +84,7 @@ void gtk_stock_set_translate_func (const gchar *domain, ...@@ -84,6 +84,7 @@ void gtk_stock_set_translate_func (const gchar *domain,
#define GTK_STOCK_APPLY "gtk-apply" #define GTK_STOCK_APPLY "gtk-apply"
#define GTK_STOCK_BOLD "gtk-bold" #define GTK_STOCK_BOLD "gtk-bold"
#define GTK_STOCK_CANCEL "gtk-cancel" #define GTK_STOCK_CANCEL "gtk-cancel"
#define GTK_STOCK_CAPS_LOCK_WARNING "gtk-caps-lock-warning"
#define GTK_STOCK_CDROM "gtk-cdrom" #define GTK_STOCK_CDROM "gtk-cdrom"
#define GTK_STOCK_CLEAR "gtk-clear" #define GTK_STOCK_CLEAR "gtk-clear"
#define GTK_STOCK_CLOSE "gtk-close" #define GTK_STOCK_CLOSE "gtk-close"
......
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