diff options
author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2020-07-29 20:09:05 -0300 |
---|---|---|
committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2020-07-29 20:09:53 -0300 |
commit | b0dcd15387744803b2768a8631854007c032647b (patch) | |
tree | 1a8897253c60b39a77be57c9351c74f51ccade51 /gladeui | |
parent | 33fa9a707a2c33fdd65c96817755842d1547d378 (diff) | |
download | glade-b0dcd15387744803b2768a8631854007c032647b.tar.gz |
Use symbolic icon names.
Diffstat (limited to 'gladeui')
-rw-r--r-- | gladeui/glade-editor-property.c | 17 | ||||
-rw-r--r-- | gladeui/glade-editor.ui | 130 | ||||
-rw-r--r-- | gladeui/glade-inspector.c | 2 | ||||
-rw-r--r-- | gladeui/glade-property-label.ui | 18 | ||||
-rw-r--r-- | gladeui/glade-signal-editor.c | 4 | ||||
-rw-r--r-- | gladeui/glade-utils.h | 2 |
6 files changed, 84 insertions, 89 deletions
diff --git a/gladeui/glade-editor-property.c b/gladeui/glade-editor-property.c index efb7f9e9..29d55b8b 100644 --- a/gladeui/glade-editor-property.c +++ b/gladeui/glade-editor-property.c @@ -1424,7 +1424,7 @@ glade_eprop_flags_create_input (GladeEditorProperty *eprop) gtk_editable_set_editable (GTK_EDITABLE (eprop_flags->entry), FALSE); gtk_entry_set_icon_from_icon_name (GTK_ENTRY (eprop_flags->entry), GTK_ENTRY_ICON_SECONDARY, - "gtk-edit"); + "document-edit-symbolic"); g_signal_connect_swapped (eprop_flags->entry, "icon-release", G_CALLBACK (glade_eprop_flags_show_dialog), @@ -1808,7 +1808,7 @@ glade_eprop_named_icon_create_input (GladeEditorProperty *eprop) gtk_widget_set_valign (eprop_named_icon->entry, GTK_ALIGN_CENTER); gtk_entry_set_icon_from_icon_name (GTK_ENTRY (eprop_named_icon->entry), GTK_ENTRY_ICON_SECONDARY, - "gtk-edit"); + "document-edit-symbolic"); eprop_named_icon->current_context = NULL; @@ -2535,7 +2535,7 @@ glade_eprop_text_create_input (GladeEditorProperty *eprop) { gtk_entry_set_icon_from_icon_name (GTK_ENTRY (eprop_text->text_entry), GTK_ENTRY_ICON_SECONDARY, - "document-open"); + "document-open-symbolic"); g_signal_connect_swapped (eprop_text->text_entry, "icon-release", G_CALLBACK (glade_eprop_text_show_resource_dialog), @@ -2549,16 +2549,15 @@ glade_eprop_text_create_input (GladeEditorProperty *eprop) { gtk_entry_set_icon_from_icon_name (GTK_ENTRY (eprop_text->text_entry), GTK_ENTRY_ICON_SECONDARY, - "gtk-edit"); + "document-edit-symbolic"); g_signal_connect_swapped (eprop_text->text_entry, "icon-release", G_CALLBACK (glade_eprop_text_show_i18n_dialog), eprop); } else { - GtkWidget *button = gtk_button_new (); - gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_icon_name ("gtk-edit", GTK_ICON_SIZE_MENU)); + GtkWidget *button = gtk_button_new_from_icon_name ("document-edit-symbolic", + GTK_ICON_SIZE_MENU); gtk_widget_show (button); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); g_signal_connect_swapped (button, "clicked", @@ -3540,7 +3539,7 @@ glade_eprop_object_create_input (GladeEditorProperty *eprop) gtk_editable_set_editable (GTK_EDITABLE (eprop_object->entry), FALSE); gtk_entry_set_icon_from_icon_name (GTK_ENTRY (eprop_object->entry), GTK_ENTRY_ICON_SECONDARY, - "gtk-edit"); + "document-edit-symbolic"); g_signal_connect_swapped (eprop_object->entry, "icon-release", G_CALLBACK (glade_eprop_object_show_dialog), eprop); @@ -3758,7 +3757,7 @@ glade_eprop_objects_create_input (GladeEditorProperty *eprop) gtk_editable_set_editable (GTK_EDITABLE (eprop_objects->entry), FALSE); gtk_entry_set_icon_from_icon_name (GTK_ENTRY (eprop_objects->entry), GTK_ENTRY_ICON_SECONDARY, - "gtk-edit"); + "document-edit-symbolic"); g_signal_connect_swapped (eprop_objects->entry, "icon-release", G_CALLBACK (glade_eprop_objects_show_dialog), eprop); diff --git a/gladeui/glade-editor.ui b/gladeui/glade-editor.ui index 5cd26192..f48eb533 100644 --- a/gladeui/glade-editor.ui +++ b/gladeui/glade-editor.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 +<!-- Generated with glade 3.37.0 libgladeui - Glade UI Designer core library Copyright (C) 2013 Tristan Van Berkom <tvb@gnome.org> @@ -25,19 +25,19 @@ Author: Tristan Van Berkom <tvb@gnome.org> <requires lib="gtk+" version="3.10"/> <requires lib="gladeui" version="0.0"/> <template class="GladeEditor" parent="GtkBox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="class_field"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">4</property> <child> <object class="GtkImage" id="warning"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-dialog-warning</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">dialog-warning-symbolic</property> <property name="icon_size">1</property> </object> <packing> @@ -48,9 +48,9 @@ Author: Tristan Van Berkom <tvb@gnome.org> </child> <child> <object class="GtkImage" id="class_icon"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-missing-image</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">missing</property> </object> <packing> <property name="expand">False</property> @@ -61,10 +61,10 @@ Author: Tristan Van Berkom <tvb@gnome.org> <child> <object class="GtkLabel" id="class_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="can-focus">False</property> <property name="label">Class Title Label</property> <property name="ellipsize">end</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -82,27 +82,26 @@ Author: Tristan Van Berkom <tvb@gnome.org> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="scrollable">True</property> <signal name="switch-page" handler="glade_editor_switch_page" swapped="no"/> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">none</property> + <property name="can-focus">True</property> <child> <object class="GtkViewport" id="viewport1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="page_widget"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">4</property> - <property name="margin_top">4</property> - <property name="margin_bottom">2</property> + <property name="can-focus">False</property> + <property name="margin-left">6</property> + <property name="margin-right">4</property> + <property name="margin-top">4</property> + <property name="margin-bottom">2</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -122,32 +121,31 @@ Author: Tristan Van Berkom <tvb@gnome.org> <child type="tab"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_General</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">none</property> + <property name="can-focus">True</property> <child> <object class="GtkViewport" id="viewport2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="page_packing"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">4</property> - <property name="margin_top">4</property> - <property name="margin_bottom">2</property> + <property name="can-focus">False</property> + <property name="margin-left">6</property> + <property name="margin-right">4</property> + <property name="margin-top">4</property> + <property name="margin-bottom">2</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -170,33 +168,32 @@ Author: Tristan Van Berkom <tvb@gnome.org> <child type="tab"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_Packing</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">none</property> + <property name="can-focus">True</property> <child> <object class="GtkViewport" id="viewport3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="page_common"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">4</property> - <property name="margin_top">4</property> - <property name="margin_bottom">2</property> + <property name="can-focus">False</property> + <property name="margin-left">6</property> + <property name="margin-right">4</property> + <property name="margin-top">4</property> + <property name="margin-bottom">2</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -219,23 +216,23 @@ Author: Tristan Van Berkom <tvb@gnome.org> <child type="tab"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_Common</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkAlignment" id="page_signals"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GladeSignalEditor" id="signal_editor"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> </object> </child> @@ -247,33 +244,32 @@ Author: Tristan Van Berkom <tvb@gnome.org> <child type="tab"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">_Signals</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="position">3</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">none</property> + <property name="can-focus">True</property> <child> <object class="GtkViewport" id="viewport4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="page_atk"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">6</property> - <property name="margin_right">4</property> - <property name="margin_top">4</property> - <property name="margin_bottom">2</property> + <property name="can-focus">False</property> + <property name="margin-left">6</property> + <property name="margin-right">4</property> + <property name="margin-top">4</property> + <property name="margin-bottom">2</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -296,19 +292,19 @@ Author: Tristan Van Berkom <tvb@gnome.org> <child type="tab"> <object class="GtkEventBox" id="eventbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Accessibility</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Accessibility</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="resource">/org/gnome/gladeui/atk.png</property> </object> </child> </object> <packing> <property name="position">4</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> diff --git a/gladeui/glade-inspector.c b/gladeui/glade-inspector.c index a967da60..cf5f6c2b 100644 --- a/gladeui/glade-inspector.c +++ b/gladeui/glade-inspector.c @@ -936,7 +936,7 @@ add_columns (GtkTreeView *view) /* Warning cell */ renderer = gtk_cell_renderer_pixbuf_new (); g_object_set (renderer, - "stock-id", "gtk-dialog-warning", + "icon-name", "dialog-warning-symbolic", "xpad", 2, NULL); gtk_cell_area_box_pack_start (box, renderer, FALSE, FALSE, FALSE); diff --git a/gladeui/glade-property-label.ui b/gladeui/glade-property-label.ui index 311fc8b9..49084506 100644 --- a/gladeui/glade-property-label.ui +++ b/gladeui/glade-property-label.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 +<!-- Generated with glade 3.37.0 libgladeui - Glade UI Designer core library Copyright (C) 2013 Tristan Van Berkom <tvb@gnome.org> @@ -24,20 +24,20 @@ Author: Tristan Van Berkom <tvb@gnome.org> <interface domain="glade"> <requires lib="gtk+" version="3.10"/> <template class="GladePropertyLabel" parent="GtkEventBox"> - <property name="can_focus">False</property> - <property name="visible_window">False</property> + <property name="can-focus">False</property> + <property name="visible-window">False</property> <child> <object class="GtkBox" id="box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">4</property> <child> <object class="GtkLabel" id="label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="can-focus">False</property> <property name="label">property name</property> <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> @@ -47,9 +47,9 @@ Author: Tristan Van Berkom <tvb@gnome.org> </child> <child> <object class="GtkImage" id="warning"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="stock">gtk-dialog-warning</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="icon-name">dialog-warning-symbolic</property> <property name="icon_size">1</property> </object> <packing> diff --git a/gladeui/glade-signal-editor.c b/gladeui/glade-signal-editor.c index 6b84c6c1..e7b8f428 100644 --- a/gladeui/glade-signal-editor.c +++ b/gladeui/glade-signal-editor.c @@ -1359,7 +1359,7 @@ glade_signal_editor_init (GladeSignalEditor *self) NULL); renderer = glade_cell_renderer_icon_new (); - g_object_set (G_OBJECT (renderer), "icon-name", "gtk-edit", NULL); + g_object_set (G_OBJECT (renderer), "icon-name", "document-edit-symbolic", NULL); g_signal_connect (G_OBJECT (renderer), "activate", G_CALLBACK (glade_signal_editor_user_data_activate), @@ -1424,7 +1424,7 @@ glade_signal_editor_init (GladeSignalEditor *self) g_object_set (G_OBJECT (renderer), "icon-name", GLADE_DEVHELP_ICON_NAME, NULL); else - g_object_set (G_OBJECT (renderer), "icon-name", "dialog-information", NULL); + g_object_set (G_OBJECT (renderer), "icon-name", "dialog-information-symbolic", NULL); g_signal_connect (G_OBJECT (renderer), "activate", G_CALLBACK (glade_signal_editor_devhelp), self); diff --git a/gladeui/glade-utils.h b/gladeui/glade-utils.h index 54204b04..9e4d0e1a 100644 --- a/gladeui/glade-utils.h +++ b/gladeui/glade-utils.h @@ -6,7 +6,7 @@ G_BEGIN_DECLS -#define GLADE_DEVHELP_ICON_NAME "devhelp" +#define GLADE_DEVHELP_ICON_NAME "system-help-symbolic" #define GLADE_DEVHELP_FALLBACK_ICON_FILE "devhelp.png" typedef enum _GladeUtilFileDialogType |