GNOME.org
 

gimp r25933 - in trunk: . libgimpwidgets plug-ins/help-browser themes/Default/images

Author: neo
Date: Thu Jun 12 12:59:30 2008
New Revision: 25933
URL: http://svn.gnome.org/viewvc/gimp?rev=25933&view=rev

Log:
2008-06-12  Sven Neumann  <sven gimp org>

	* plug-ins/help-browser/Makefile.am
	* plug-ins/help-browser/wilber-reading.svg
	* plug-ins/help-browser/wilber-reading.png: removed here...

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-user-manual.svg
	* themes/Default/images/stock-user-manual-16.png
	* themes/Default/images/stock-user-manual-24.png
	* themes/Default/images/stock-user-manual-32.png
	* themes/Default/images/stock-user-manual-64.png
	* libgimpwidgets/gimpstock.[ch]: ... and added as stock icon.

	* plug-ins/help-browser/dialog.c
	* plug-ins/help-browser/gimpthrobber.c: changed accordingly.
	Set the toolbar style to GTK_TOOLBAR_ICONS.


Added:
   trunk/themes/Default/images/stock-user-manual-16.png   (contents, props changed)
   trunk/themes/Default/images/stock-user-manual-24.png   (contents, props changed)
   trunk/themes/Default/images/stock-user-manual-32.png   (contents, props changed)
   trunk/themes/Default/images/stock-user-manual-64.png   (contents, props changed)
   trunk/themes/Default/images/stock-user-manual.svg
      - copied unchanged from r25932, /trunk/plug-ins/help-browser/wilber-reading.svg
Removed:
   trunk/plug-ins/help-browser/wilber-reading.png
   trunk/plug-ins/help-browser/wilber-reading.svg
Modified:
   trunk/ChangeLog
   trunk/libgimpwidgets/gimpstock.c
   trunk/libgimpwidgets/gimpstock.h
   trunk/plug-ins/help-browser/Makefile.am
   trunk/plug-ins/help-browser/dialog.c
   trunk/plug-ins/help-browser/gimpthrobber.c
   trunk/themes/Default/images/Makefile.am

Modified: trunk/libgimpwidgets/gimpstock.c
==============================================================================
--- trunk/libgimpwidgets/gimpstock.c	(original)
+++ trunk/libgimpwidgets/gimpstock.c	Thu Jun 12 12:59:30 2008
@@ -274,6 +274,7 @@
   { GIMP_STOCK_ERROR,                    NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_INFO,                     NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_QUESTION,                 NULL,        0, 0, LIBGIMP_DOMAIN },
+  { GIMP_STOCK_USER_MANUAL,              NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_WARNING,                  NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_WILBER,                   NULL,        0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_WILBER_EEK,               NULL,        0, 0, LIBGIMP_DOMAIN },
@@ -639,6 +640,7 @@
   { GIMP_STOCK_WARNING,                  stock_warning_16                  },
   { GIMP_STOCK_WILBER,                   stock_wilber_16                   },
   { GIMP_TOILET_PAPER,                   stock_toilet_paper_16             },
+  { GIMP_STOCK_USER_MANUAL,              stock_user_manual_16              },
   { GIMP_STOCK_WEB,                      stock_web_16                      },
   { GIMP_STOCK_VIDEO,                    stock_video_16                    },
   { GIMP_STOCK_GEGL,                     stock_gegl_16                     },
@@ -668,11 +670,12 @@
   { GIMP_STOCK_CHANNEL_GRAY,         stock_channel_gray_32         },
   { GIMP_STOCK_CHANNEL_INDEXED,      stock_channel_indexed_32      },
   { GIMP_STOCK_CHANNEL_ALPHA,        stock_channel_alpha_32        },
+  { GIMP_STOCK_FLOATING_SELECTION,   stock_floating_selection_32   },
   { GIMP_STOCK_LAYER_MASK,           stock_layer_mask_32           },
   { GIMP_STOCK_IMAGE,                stock_image_32                },
   { GIMP_STOCK_LAYER,                stock_layer_32                },
   { GIMP_STOCK_TEXT_LAYER,           stock_text_layer_32           },
-  { GIMP_STOCK_FLOATING_SELECTION,   stock_floating_selection_32   }
+  { GIMP_STOCK_USER_MANUAL,          stock_user_manual_32          }
 };
 
 static const struct
@@ -689,15 +692,16 @@
   { GIMP_STOCK_CHANNEL_GRAY,         stock_channel_gray_48         },
   { GIMP_STOCK_CHANNEL_INDEXED,      stock_channel_indexed_48      },
   { GIMP_STOCK_CHANNEL_ALPHA,        stock_channel_alpha_48        },
+  { GIMP_STOCK_FLOATING_SELECTION,   stock_floating_selection_48   },
   { GIMP_STOCK_LAYER_MASK,           stock_layer_mask_48           },
   { GIMP_STOCK_IMAGE,                stock_image_48                },
   { GIMP_STOCK_LAYER,                stock_layer_48                },
   { GIMP_STOCK_TEXT_LAYER,           stock_text_layer_48           },
-  { GIMP_STOCK_FLOATING_SELECTION,   stock_floating_selection_48   },
 
   { GIMP_STOCK_ERROR,                stock_error_64                },
   { GIMP_STOCK_INFO,                 stock_info_64                 },
   { GIMP_STOCK_QUESTION,             stock_question_64             },
+  { GIMP_STOCK_USER_MANUAL,          stock_user_manual_64          },
   { GIMP_STOCK_WARNING,              stock_warning_64              },
   { GIMP_STOCK_WILBER,               stock_wilber_64               },
   { GIMP_STOCK_WILBER_EEK,           stock_wilber_eek_64           },

Modified: trunk/libgimpwidgets/gimpstock.h
==============================================================================
--- trunk/libgimpwidgets/gimpstock.h	(original)
+++ trunk/libgimpwidgets/gimpstock.h	Thu Jun 12 12:59:30 2008
@@ -263,6 +263,7 @@
 #define GIMP_STOCK_WILBER_EEK               "gimp-wilber-eek"
 #define GIMP_STOCK_FRAME                    "gimp-frame"
 #define GIMP_STOCK_TEXTURE                  "gimp-texture"
+#define GIMP_STOCK_USER_MANUAL              "gimp-user-manual"
 
 
 /*  missing icons:  */

Modified: trunk/plug-ins/help-browser/Makefile.am
==============================================================================
--- trunk/plug-ins/help-browser/Makefile.am	(original)
+++ trunk/plug-ins/help-browser/Makefile.am	Thu Jun 12 12:59:30 2008
@@ -39,7 +39,7 @@
 	$(RT_LIBS)		\
 	$(INTLLIBS)
 
-help_browser_sources = \
+help_browser_SOURCES = \
 	gimpthrobber.c		\
 	gimpthrobber.h		\
 	gimpthrobberaction.c	\
@@ -49,17 +49,3 @@
 	dialog.h		\
 	uri.c			\
 	uri.h
-
-help_browser_built_sources = logo-pixbuf.h
-dialog.c: $(help_browser_built_sources)
-
-help_browser_SOURCES = \
-	$(help_browser_built_sources) $(help_browser_sources)
-
-
-$(srcdir)/logo-pixbuf.h: wilber-reading.png
-	$(GDK_PIXBUF_CSOURCE) --raw --name=logo_data $< > $(@F)
-
-EXTRA_DIST = wilber-reading.png
-
-CLEANFILES = logo-pixbuf.h

Modified: trunk/plug-ins/help-browser/dialog.c
==============================================================================
--- trunk/plug-ins/help-browser/dialog.c	(original)
+++ trunk/plug-ins/help-browser/dialog.c	Thu Jun 12 12:59:30 2008
@@ -55,8 +55,6 @@
 #include "dialog.h"
 #include "uri.h"
 
-#include "logo-pixbuf.h"
-
 #include "libgimp/stdplugins-intl.h"
 
 #ifndef _O_BINARY
@@ -107,6 +105,8 @@
 
 static void       update_actions         (void);
 
+static void       window_set_icons       (GtkWidget         *window);
+
 static void       row_activated          (GtkTreeView       *tree_view,
                                           GtkTreePath       *path,
                                           GtkTreeViewColumn *column);
@@ -150,16 +150,15 @@
 void
 browser_dialog_open (void)
 {
-  GtkWidget       *window;
-  GtkWidget       *vbox;
-  GtkWidget       *toolbar;
-  GtkWidget       *paned;
-  GtkWidget       *scrolled;
-  GtkWidget       *button;
-  GtkToolItem     *item;
-  GtkAction       *action;
-  GdkPixbuf       *pixbuf;
-  DialogData       data = { 720, 560, 240, 1.0 };
+  GtkWidget   *window;
+  GtkWidget   *vbox;
+  GtkWidget   *toolbar;
+  GtkWidget   *paned;
+  GtkWidget   *scrolled;
+  GtkWidget   *button;
+  GtkToolItem *item;
+  GtkAction   *action;
+  DialogData   data = { 720, 560, 240, 1.0 };
 
   gimp_ui_init ("helpbrowser", TRUE);
 
@@ -176,9 +175,7 @@
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
-  pixbuf = gdk_pixbuf_new_from_inline (-1, logo_data, FALSE, NULL);
-  gtk_window_set_icon (GTK_WINDOW (window), pixbuf);
-  g_object_unref (pixbuf);
+  window_set_icons (window);
 
   vbox = gtk_vbox_new (FALSE, 2);
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -187,6 +184,7 @@
   ui_manager = ui_manager_new (window);
 
   toolbar = gtk_ui_manager_get_widget (ui_manager, "/help-browser-toolbar");
+  gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
   gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0);
   gtk_widget_show (toolbar);
 
@@ -218,8 +216,6 @@
 
   button = gtk_ui_manager_get_widget (ui_manager,
                                       "/help-browser-toolbar/website");
-  gimp_throbber_set_image (GIMP_THROBBER (button),
-                           gtk_image_new_from_pixbuf (pixbuf));
 
   /*  the horizontal paned  */
   paned = gtk_hpaned_new ();
@@ -314,6 +310,27 @@
 }
 
 static void
+window_set_icons (GtkWidget *window)
+{
+  const GtkIconSize sizes[] = { GTK_ICON_SIZE_MENU,
+                                GTK_ICON_SIZE_BUTTON,
+                                GTK_ICON_SIZE_DND,
+                                GTK_ICON_SIZE_DIALOG };
+  GList *list = NULL;
+  gint   i;
+
+  for (i = 0; i < G_N_ELEMENTS (sizes); i++)
+    list = g_list_prepend (list,
+                           gtk_widget_render_icon (window,
+                                                   GIMP_STOCK_USER_MANUAL,
+                                                   sizes[i], NULL));
+
+  gtk_window_set_icon_list (GTK_WINDOW (window), list);
+  g_list_foreach (list, (GFunc) g_object_unref, NULL);
+  g_list_free (list);
+}
+
+static void
 browser_dialog_make_index_foreach (const gchar    *help_id,
                                    GimpHelpItem   *item,
                                    GimpHelpLocale *locale)
@@ -507,12 +524,12 @@
     },
     {
       "reload", GTK_STOCK_REFRESH,
-       N_("Reload"), "<control>R", N_("Reload current page"),
+       N_("_Reload"), "<control>R", N_("Reload current page"),
       G_CALLBACK (reload_callback)
     },
     {
       "stop", GTK_STOCK_CANCEL,
-       N_("Stop"), "Escape", N_("Stop loading this page"),
+       N_("_Stop"), "Escape", N_("Stop loading this page"),
       G_CALLBACK (stop_callback)
     },
     {
@@ -522,7 +539,7 @@
     },
     {
       "copy-location", GTK_STOCK_COPY,
-      N_("Copy location"), "",
+      N_("C_opy location"), "",
       N_("Copy the location of this page to the clipboard"),
       G_CALLBACK (copy_location_callback)
     },
@@ -559,7 +576,7 @@
   action = gimp_throbber_action_new ("website",
                                      "docs.gimp.org",
                                      _("Visit the GIMP documentation website"),
-                                     GIMP_STOCK_WILBER);
+                                     GIMP_STOCK_USER_MANUAL);
   g_signal_connect_closure (action, "activate",
                             g_cclosure_new (G_CALLBACK (website_callback),
                                             NULL, NULL),

Modified: trunk/plug-ins/help-browser/gimpthrobber.c
==============================================================================
--- trunk/plug-ins/help-browser/gimpthrobber.c	(original)
+++ trunk/plug-ins/help-browser/gimpthrobber.c	Thu Jun 12 12:59:30 2008
@@ -199,7 +199,7 @@
   else
     {
       image = gtk_image_new_from_stock (button->priv->stock_id,
-                                        GTK_ICON_SIZE_BUTTON);
+                                        GTK_ICON_SIZE_DND);
     }
 
   gtk_container_add (GTK_CONTAINER (button->priv->button), image);

Modified: trunk/themes/Default/images/Makefile.am
==============================================================================
--- trunk/themes/Default/images/Makefile.am	(original)
+++ trunk/themes/Default/images/Makefile.am	Thu Jun 12 12:59:30 2008
@@ -117,6 +117,7 @@
 	stock-tools-16.png				\
 	stock-transparency-16.png			\
 	stock-undo-history-16.png			\
+	stock-user-manual-16.png			\
 	stock-video-16.png				\
 	stock-warning-16.png				\
 	stock-wilber-16.png				\
@@ -207,11 +208,12 @@
 	stock-tool-options-24.png		\
 	stock-tools-24.png			\
 	stock-transparency-24.png		\
+	stock-undo-history-24.png		\
+	stock-user-manual-24.png		\
 	stock-vcenter-24.png			\
 	stock-vchain-24.png			\
 	stock-vchain-broken-24.png		\
 	stock-video-24.png			\
-	stock-undo-history-24.png		\
 	stock-warning-24.png			\
 	stock-web-24.png			\
 	stock-wilber-22.png
@@ -228,7 +230,8 @@
 	stock-image-32.png			\
 	stock-layer-32.png			\
 	stock-layer-mask-32.png			\
-	stock-text-layer-32.png
+	stock-text-layer-32.png			\
+	stock-user-manual-32.png
 
 STOCK_DIALOG_IMAGES = \
 	stock-channel-48.png			\
@@ -248,6 +251,7 @@
 	stock-question-64.png			\
 	stock-text-layer-48.png			\
 	stock-texture-64.png			\
+	stock-user-manual-64.png		\
 	stock-warning-64.png			\
 	stock-wilber-64.png			\
 	stock-wilber-eek-64.png

Added: trunk/themes/Default/images/stock-user-manual-16.png
==============================================================================
Binary file. No diff available.

Added: trunk/themes/Default/images/stock-user-manual-24.png
==============================================================================
Binary file. No diff available.

Added: trunk/themes/Default/images/stock-user-manual-32.png
==============================================================================
Binary file. No diff available.

Added: trunk/themes/Default/images/stock-user-manual-64.png
==============================================================================
Binary file. No diff available.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]