Merge branch 'included-icons' into 'master'

Included icons

See merge request GNOME/gtk!580

demos/gtk-demo/demo.gresource.xml

@@ -260,4 +260,24 @@
   <gresource prefix="/dnd">
     <file>dnd.css</file>
   </gresource>
+  <gresource prefix="/org/gtk/Demo">
+    <file>icons/16x16/actions/application-exit.png</file>
+    <file>icons/16x16/actions/document-new.png</file>
+    <file>icons/16x16/actions/document-open.png</file>
+    <file>icons/16x16/actions/document-save.png</file>
+    <file>icons/16x16/actions/edit-copy.png</file>
+    <file>icons/16x16/actions/edit-cut.png</file>
+    <file>icons/16x16/actions/edit-paste.png</file>
+    <file>icons/16x16/actions/process-stop.png</file>
+    <file>icons/16x16/actions/go-home.png</file>
+    <file>icons/16x16/actions/go-up.png</file>
+    <file>icons/16x16/actions/mail-send-receive-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/view-refresh-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/view-fullscreen-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/document-edit-symbolic.symbolic.png</file>
+    <file>icons/16x16/emotes/face-cool.png</file>
+    <file>icons/16x16/emotes/face-laugh-symbolic.symbolic.png</file>
+    <file>icons/16x16/status/battery-caution-charging-symbolic.symbolic.png</file>
+    <file>icons/16x16/categories/applications-other.png</file>
+  </gresource>
 </gresources>

demos/gtk-demo/sidebar.c

@@ -65,7 +65,7 @@ do_sidebar (GtkWidget *do_widget)
         {
           if (i == 0)
             {
-              widget = gtk_image_new_from_icon_name ("help-about");
+              widget = gtk_image_new_from_icon_name ("org.gtk.Demo");
               gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
             }
           else

demos/gtk-demo/stack.ui

@@ -25,7 +25,7 @@
                   <object class="GtkImage">
                     <property name="margin-top">20</property>
                     <property name="margin-bottom">20</property>
-                    <property name="icon-name">gtk3-demo</property>
+                    <property name="icon-name">org.gtk.Demo</property>
                   </object>
                 </property>
               </object>

demos/widget-factory/icons/scalable/actions/star-new-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <path d="M8 .688c-1-.004-1.563 3.54-2.375 4.125-.812.584-4.344-.013-4.656.937-.313.95 2.882 2.578 3.187 3.531.305.953-1.338 4.128-.531 4.719.807.591 3.343-1.942 4.344-1.938 1 .005 3.5 2.585 4.312 2 .812-.584-.813-3.8-.5-4.75.313-.95 3.524-2.547 3.219-3.5-.305-.952-3.85-.377-4.656-.968C9.537 4.253 9 .69 8 .687zM7 5h2v2h2v2H9v2H7V9H5V7h2z" style="marker:none" color="#000" overflow="visible" fill="#474747"/>
+</svg>

demos/widget-factory/icons/scalable/actions/view-refresh-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+    <path d="M6.719 2c-.192.009-.372.035-.563.063a6.03 6.03 0 0 0-3.968 2.343C.206 7.048.764 10.831 3.405 12.813c2.642 1.98 6.425 1.422 8.406-1.22.123-.17.19-.382.188-.593v-1h-1a1.024 1.024 0 0 0-.813.406c-1.332 1.777-3.817 2.114-5.593.781-1.777-1.332-2.114-3.816-.782-5.593C5.146 3.817 7.63 3.48 9.407 4.812c.43.323.77.733 1.031 1.188H9a1 1 0 0 0-1 1v1h6V2h-1a1 1 0 0 0-1 1v1.688A5.966 5.966 0 0 0 6.719 2z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" color="#bebebe" font-weight="400" font-family="Sans" overflow="visible" fill="#474747"/>
+</svg>

demos/widget-factory/icons/scalable/actions/zoom-in-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15.982" height="16">
+    <path d="M3.188 2C2.524 2 2 2.549 2 3.219v9.562C2 13.451 2.525 14 3.188 14h9.624c.663 0 1.188-.549 1.188-1.219V3.22C14 2.549 13.475 2 12.812 2zM7 5h2v2h2v2H9v2H7V9H5V7h2z" style="marker:none" color="#bebebe" overflow="visible" fill="#474747"/>
+</svg>

demos/widget-factory/icons/scalable/actions/zoom-original-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15.982" height="16">
+    <path d="M3.188 2C2.524 2 2 2.549 2 3.219v9.562C2 13.451 2.525 14 3.188 14h9.624c.663 0 1.188-.549 1.188-1.219V3.22C14 2.549 13.475 2 12.812 2zM7 5h2v6H7V7H6V6c.694 0 1-.348 1-1z" style="marker:none" color="#bebebe" overflow="visible" fill="#474747"/>
+</svg>

demos/widget-factory/icons/scalable/actions/zoom-out-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15.982" height="16">
+    <path d="M3.188 2C2.524 2 2 2.549 2 3.219v9.562C2 13.451 2.525 14 3.188 14h9.624c.663 0 1.188-.549 1.188-1.219V3.22C14 2.549 13.475 2 12.812 2zM5 7h6v2H5z" style="marker:none" color="#bebebe" overflow="visible" fill="#474747"/>
+</svg>

demos/widget-factory/widget-factory.gresource.xml

@@ -9,4 +9,31 @@
   <gresource prefix="/org/gtk/WidgetFactory/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
   </gresource>
+  <gresource prefix="/org/gtk/WidgetFactory">
+    <file>icons/16x16/actions/document-new.png</file>
+    <file>icons/16x16/actions/document-save.png</file>
+    <file>icons/16x16/actions/edit-find.png</file>
+    <file>icons/16x16/actions/insert-image.png</file>
+    <file>icons/16x16/actions/send-to-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/view-fullscreen-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/document-send-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/star-new-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/view-grid-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/view-refresh-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/zoom-in.png</file>
+    <file>icons/16x16/actions/zoom-in-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/zoom-original.png</file>
+    <file>icons/16x16/actions/zoom-original-symbolic.symbolic.png</file>
+    <file>icons/16x16/actions/zoom-out.png</file>
+    <file>icons/16x16/actions/zoom-out-symbolic.symbolic.png</file>
+    <file>icons/16x16/emblems/emblem-default-symbolic.symbolic.png</file>
+    <file>icons/16x16/status/appointment-soon-symbolic.symbolic.png</file>
+    <file>icons/16x16/status/microphone-sensitivity-muted-symbolic.symbolic.png</file>
+    <file>icons/16x16/status/microphone-sensitivity-low-symbolic.symbolic.png</file>
+    <file>icons/16x16/status/microphone-sensitivity-medium-symbolic.symbolic.png</file>
+    <file>icons/16x16/status/microphone-sensitivity-high-symbolic.symbolic.png</file>
+    <file>icons/16x16/status/weather-clear-night-symbolic.symbolic.png</file>
+    <file>icons/16x16/emotes/face-monkey-symbolic.symbolic.png</file>
+    <file>icons/16x16/apps/preferences-desktop-locale-symbolic.symbolic.png</file>
+  </gresource>
 </gresources>

gtk/gen-gtk-gresources-xml.py

@@ -62,7 +62,7 @@ for f in get_files('ui', '.ui'):
 xml += '\n'
 
 for s in ['16x16', '24x24', '32x32', '48x48', 'scalable']:
-  for c in ['categories', 'status']:
+  for c in ['actions', 'categories', 'emblems', 'emotes', 'devices', 'mimetypes', 'places', 'status']:
     icons_dir = 'icons/{0}/{1}'.format(s,c)
     if os.path.exists(os.path.join(srcdir,icons_dir)):
       for f in get_files(icons_dir, '.png'):

gtk/gtkicontheme.c

@@ -1300,8 +1300,10 @@ load_themes (GtkIconTheme *icon_theme)
    * and gnome is a pragmatic solution to prevent missing icons in
    * GTK+ applications when run under, e.g. KDE.
    */
+#if 0
   insert_theme (icon_theme, DEFAULT_ICON_THEME);
   insert_theme (icon_theme, "gnome");
+#endif
   insert_theme (icon_theme, FALLBACK_ICON_THEME);
   priv->themes = g_list_reverse (priv->themes);
 

gtk/gtkspinbutton.c

@@ -840,9 +840,6 @@ static void
 gtk_spin_button_init (GtkSpinButton *spin_button)
 {
   GtkSpinButtonPrivate *priv = gtk_spin_button_get_instance_private (spin_button);
-  const char *up_icon_names[] = { "value-increase-symbolic", "list-add-symbolic" };
-  const char *down_icon_names[] = { "value-decrease-symbolic", "list-remove-symbolic" };
-  GIcon *icon;
   GtkEventController *controller;
   GtkGesture *gesture;
 
@@ -879,9 +876,7 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
 
 
   priv->down_button = gtk_button_new ();
-  icon = g_themed_icon_new_from_names ((char **)down_icon_names, 2);
-  gtk_container_add (GTK_CONTAINER (priv->down_button), gtk_image_new_from_gicon (icon));
-  g_object_unref (icon);
+  gtk_container_add (GTK_CONTAINER (priv->down_button), gtk_image_new_from_icon_name ("value-decrease-symbolic"));
   gtk_style_context_add_class (gtk_widget_get_style_context (priv->down_button), "image-button");
   gtk_widget_set_can_focus (priv->down_button, FALSE);
   gtk_style_context_add_class (gtk_widget_get_style_context (priv->down_button), "down");
@@ -897,9 +892,7 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
   gtk_widget_add_controller (GTK_WIDGET (priv->down_button), GTK_EVENT_CONTROLLER (gesture));
 
   priv->up_button = gtk_button_new ();
-  icon = g_themed_icon_new_from_names ((char **)up_icon_names, 2);
-  gtk_container_add (GTK_CONTAINER (priv->up_button), gtk_image_new_from_gicon (icon));
-  g_object_unref (icon);
+  gtk_container_add (GTK_CONTAINER (priv->up_button), gtk_image_new_from_icon_name ("value-increase-symbolic"));
   gtk_style_context_add_class (gtk_widget_get_style_context (priv->up_button), "image-button");
   gtk_widget_set_can_focus (priv->up_button, FALSE);
   gtk_style_context_add_class (gtk_widget_get_style_context (priv->up_button), "up");