default-applications: Set icon-name in ui file

author: rbuj <[email protected]> 2020-08-06 14:22:06 +0200
committer: raveit65 <[email protected]> 2020-09-02 12:40:28 +0200
commit: 085164b567cd902e8e56f3f43aaa95dafe86c11d (patch)
tree: 75041c4cea9c73b53a5ca953ba312a9f00ccd799
parent: 6ffcc44a06cb86a417afe433c218a3b60c13531d (diff)
download: mate-control-center-085164b567cd902e8e56f3f43aaa95dafe86c11d.tar.bz2
mate-control-center-085164b567cd902e8e56f3f43aaa95dafe86c11d.tar.xz
2 files changed, 52 insertions, 52 deletions
diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c
index f70e0ee0..116c5d5a 100644
--- a/capplets/default-applications/mate-da-capplet.c
+++ b/capplets/default-applications/mate-da-capplet.c
@@ -340,54 +340,10 @@ refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_
 }
 }
 
-static struct {
- const char* name;
- const char* icon;
-} icons[] = {
- {"web_browser_image", "web-browser"},
- {"mail_reader_image", "emblem-mail"},
- {"media_player_image", "audio-x-generic"},
- {"visual_image", "zoom-best-fit"},
- {"mobility_image", "preferences-desktop-accessibility"},
- {"messenger_image", "instant-messaging"},
- {"filemanager_image", "file-manager"},
- {"imageviewer_image", "image-x-generic"},
- {"video_image", "video-x-generic"},
- {"text_image", "text-editor"},
- {"terminal_image", "terminal"},
- {"document_image", "application-pdf"},
- {"word_image", "x-office-document"},
- {"spreadsheet_image", "x-office-spreadsheet"},
- {"calculator_image", "accessories-calculator"},
-};
-
 /* Callback for icon theme change */
 static void
 theme_changed_cb(GtkIconTheme* theme, MateDACapplet* capplet)
 {
- GObject* icon;
- gint i;
- gint scale_factor;
- cairo_surface_t *surface;
-
- scale_factor = gtk_widget_get_scale_factor (capplet->window);
-
- for (i = 0; i < G_N_ELEMENTS(icons); i++)
- {
- icon = gtk_builder_get_object(capplet->builder, icons[i].name);
-
- surface = gtk_icon_theme_load_surface (theme, icons[i].icon,
- 32, scale_factor,
- NULL,
- GTK_ICON_LOOKUP_FORCE_SIZE,
- NULL);
-
- gtk_image_set_from_surface (GTK_IMAGE(icon), surface);
-
- if (surface)
- cairo_surface_destroy (surface);
- }
-
 refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers);
 refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->mail_combo_box), capplet->mail_readers);
 refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->media_combo_box), capplet->media_players);
diff --git a/capplets/default-applications/mate-default-applications-properties.ui b/capplets/default-applications/mate-default-applications-properties.ui
index 57c550e4..20c094fe 100644
--- a/capplets/default-applications/mate-default-applications-properties.ui
+++ b/capplets/default-applications/mate-default-applications-properties.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
 <interface>
 <requires lib="gtk+" version="3.14"/>
 <!-- interface-license-type gplv2 -->
@@ -7,15 +7,22 @@
 <!-- interface-description mate-default-applications-properties window -->
 <!-- interface-copyright MATE Developers -->
 <!-- interface-authors Wolfgang Ulbrich -->
+ <object class="GtkImage" id="close_img">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">window-close</property>
+ </object>
+ <object class="GtkImage" id="help_img">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">help-browser</property>
+ </object>
 <object class="GtkDialog" id="preferred_apps_dialog">
 <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="title" translatable="yes">Preferred Applications</property>
 <property name="resizable">False</property>
 <property name="type_hint">dialog</property>
- <child>
- <placeholder/>
- </child>
 <child internal-child="vbox">
 <object class="GtkBox" id="dialog-vbox">
 <property name="visible">True</property>
@@ -28,12 +35,14 @@
 <property name="layout_style">end</property>
 <child>
 <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
+ <property name="label" translatable="yes">_Help</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="can_default">True</property>
 <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="image">help_img</property>
+ <property name="use_underline">True</property>
+ <property name="always_show_image">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -43,12 +52,14 @@
 </child>
 <child>
 <object class="GtkButton" id="closebutton1">
- <property name="label">gtk-close</property>
+ <property name="label" translatable="yes">_Close</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="can_default">True</property>
 <property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="image">close_img</property>
+ <property name="use_underline">True</property>
+ <property name="always_show_image">True</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -93,6 +104,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">web-browser</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -161,6 +174,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">emblem-mail</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -229,6 +244,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">instant-messaging</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -316,6 +333,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">image-x-generic</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -384,6 +403,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">audio-x-generic</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -452,6 +473,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">video-x-generic</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -543,6 +566,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">text-editor</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -611,6 +636,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">terminal</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -679,6 +706,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">file-manager</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -747,6 +776,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">accessories-calculator</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -838,6 +869,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">application-pdf</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -906,6 +939,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">x-office-document</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -974,6 +1009,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">x-office-spreadsheet</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1065,6 +1102,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">zoom-best-fit</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1149,6 +1188,8 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="valign">start</property>
+ <property name="icon_name">preferences-desktop-accessibility</property>
+ <property name="icon_size">5</property>
 </object>
 <packing>
 <property name="expand">False</property>
@@ -1245,5 +1286,8 @@
 <action-widget response="-11">helpbutton1</action-widget>
 <action-widget response="-7">closebutton1</action-widget>
 </action-widgets>
+ <child type="titlebar">
+ <placeholder/>
+ </child>
 </object>
 </interface>
author	rbuj <[email protected]>	2020-08-06 14:22:06 +0200
committer	raveit65 <[email protected]>	2020-09-02 12:40:28 +0200
commit	085164b567cd902e8e56f3f43aaa95dafe86c11d (patch)
tree	75041c4cea9c73b53a5ca953ba312a9f00ccd799
parent	6ffcc44a06cb86a417afe433c218a3b60c13531d (diff)
download	mate-control-center-085164b567cd902e8e56f3f43aaa95dafe86c11d.tar.bz2 mate-control-center-085164b567cd902e8e56f3f43aaa95dafe86c11d.tar.xz