wok diff xarchiver/stuff/xarchiver-0.5.3-icons.diff @ rev 24924
Add as & asxxxx
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Apr 13 10:27:34 2022 +0000 (2022-04-13) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/xarchiver/stuff/xarchiver-0.5.3-icons.diff Wed Apr 13 10:27:34 2022 +0000 1.3 @@ -0,0 +1,136 @@ 1.4 +--- src/add_dialog.c.orig 1.5 ++++ src/add_dialog.c 1.6 +@@ -180,7 +180,7 @@ 1.7 + GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT); 1.8 + 1.9 + add_dialog->add_button = gtk_button_new(); 1.10 +- add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR); 1.11 ++ add_dialog->add_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 1.12 + add_dialog->add_hbox = gtk_hbox_new(FALSE, 4); 1.13 + add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add")); 1.14 + 1.15 +--- src/extract_dialog.c.orig 1.16 ++++ src/extract_dialog.c 1.17 +@@ -167,7 +167,7 @@ 1.18 + GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT); 1.19 + 1.20 + extract_button = gtk_button_new(); 1.21 +- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); 1.22 ++ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 1.23 + extract_hbox = gtk_hbox_new(FALSE,4); 1.24 + extract_label = gtk_label_new_with_mnemonic(_("_Extract")); 1.25 + 1.26 +@@ -503,7 +503,7 @@ 1.27 + GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT); 1.28 + 1.29 + extract_button = gtk_button_new(); 1.30 +- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); 1.31 ++ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 1.32 + extract_hbox = gtk_hbox_new(FALSE,4); 1.33 + extract_label = gtk_label_new_with_mnemonic(_("_Extract")); 1.34 + 1.35 +--- src/interface.c.orig 1.36 ++++ src/interface.c 1.37 +@@ -110,7 +110,7 @@ 1.38 + listing_html = gtk_image_menu_item_new_with_mnemonic (_("HTML file")); 1.39 + gtk_widget_show (listing_html); 1.40 + gtk_container_add (GTK_CONTAINER (listing_submenu),listing_html); 1.41 +- tmp_image = xa_main_window_find_image ("xarchiver-html.png",GTK_ICON_SIZE_MENU); 1.42 ++ tmp_image = gtk_image_new_from_icon_name ("browser",GTK_ICON_SIZE_MENU); 1.43 + gtk_widget_show (tmp_image); 1.44 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (listing_html),tmp_image); 1.45 + 1.46 +@@ -171,7 +171,7 @@ 1.47 + gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile); 1.48 + gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); 1.49 + 1.50 +- image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU); 1.51 ++ image2 = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_MENU); 1.52 + gtk_widget_show (image2); 1.53 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile),image2); 1.54 + 1.55 +@@ -181,7 +181,7 @@ 1.56 + gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu); 1.57 + gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); 1.58 + 1.59 +- image2 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); 1.60 ++ image2 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); 1.61 + gtk_widget_show (image2); 1.62 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu),image2); 1.63 + 1.64 +@@ -387,7 +387,7 @@ 1.65 + gtk_widget_show (separatortoolitem3); 1.66 + gtk_container_add (GTK_CONTAINER (toolbar1),separatortoolitem3); 1.67 + 1.68 +- tmp_image = xa_main_window_find_image("xarchiver-add.png",GTK_ICON_SIZE_LARGE_TOOLBAR); 1.69 ++ tmp_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); 1.70 + gtk_widget_show (tmp_image); 1.71 + AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Add")); 1.72 + gtk_widget_set_sensitive (AddFile_button,FALSE); 1.73 +@@ -396,7 +396,7 @@ 1.74 + gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button); 1.75 + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL); 1.76 + 1.77 +- tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR); 1.78 ++ tmp_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); 1.79 + gtk_widget_show (tmp_image); 1.80 + Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Extract")); 1.81 + gtk_widget_set_sensitive (Extract_button,FALSE); 1.82 +@@ -863,7 +863,7 @@ 1.83 + gtk_widget_show (extract); 1.84 + gtk_container_add (GTK_CONTAINER (xa_popup_menu),extract); 1.85 + 1.86 +- image9 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); 1.87 ++ image9 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); 1.88 + gtk_widget_show (image9); 1.89 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract),image9); 1.90 + 1.91 +@@ -1527,7 +1527,7 @@ 1.92 + hbox1 = gtk_hbox_new (FALSE,12); 1.93 + gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,0); 1.94 + 1.95 +- pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); 1.96 ++ pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); 1.97 + icon_pixbuf = gtk_image_new_from_pixbuf(pixbuf); 1.98 + g_object_unref(pixbuf); 1.99 + 1.100 +--- src/mime.c.orig 1.101 ++++ src/mime.c 1.102 +@@ -41,9 +41,9 @@ 1.103 + else if (strcmp(mime,"audio/mpeg") == 0 || strcmp(mime,"audio/midi") == 0 || strcmp (mime,"audio/mp2") == 0) 1.104 + icon_name = "sound"; 1.105 + else if (strcmp(mime,"application/vnd.ms-excel") == 0 || strcmp(mime,"application/vnd.oasis.opendocument.spreadsheet") == 0) 1.106 +- icon_name = "gnome-mime-application-vnd.ms-excel"; 1.107 ++ icon_name = "application-vnd.ms-excel"; 1.108 + else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) 1.109 +- icon_name = "gnome-mime-application-vnd.ms-powerpoint"; 1.110 ++ icon_name = "application-vnd.ms-powerpoint"; 1.111 + else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 1.112 + || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 1.113 + || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 1.114 +@@ -57,11 +57,11 @@ 1.115 + else if (strcmp(mime,"application/x-cd-image") == 0) 1.116 + icon_name = "application-x-cd-image"; 1.117 + else if (strcmp(mime,"application/x-php") == 0) 1.118 +- icon_name = "gnome-mime-application-x-php"; 1.119 ++ icon_name = "application-x-php"; 1.120 + else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0) 1.121 +- icon_name = "gnome-mime-application-x-perl"; 1.122 ++ icon_name = "text-x-script"; 1.123 + else if (strcmp(mime,"application/x-font-ttf") == 0) 1.124 +- icon_name = "gnome-mime-application-x-font-ttf"; 1.125 ++ icon_name = "font"; 1.126 + return icon_name; 1.127 + } 1.128 + 1.129 +--- src/pref_dialog.c.orig 1.130 ++++ src/pref_dialog.c 1.131 +@@ -57,7 +57,7 @@ 1.132 + 1.133 + prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT); 1.134 + gtk_list_store_append (prefs_data->prefs_liststore,&iter); 1.135 +- icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); 1.136 ++ icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); 1.137 + gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1); 1.138 + if(icon_pixbuf != NULL) 1.139 + g_object_unref (icon_pixbuf);