wok annotate xarchiver/stuff/xarchiver-0.5.3-icons.diff @ rev 20936

updated fpm2 again (0.76.1 -> 0.79)
author Hans-G?nter Theisgen
date Sat Mar 02 16:28:51 2019 +0100 (2019-03-02)
parents
children
rev   line source
al@16771 1 --- src/add_dialog.c.orig
al@16771 2 +++ src/add_dialog.c
al@16771 3 @@ -180,7 +180,7 @@
al@16771 4 GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT);
al@16771 5
al@16771 6 add_dialog->add_button = gtk_button_new();
al@16771 7 - add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR);
al@16771 8 + add_dialog->add_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_SMALL_TOOLBAR);
al@16771 9 add_dialog->add_hbox = gtk_hbox_new(FALSE, 4);
al@16771 10 add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add"));
al@16771 11
al@16771 12 --- src/extract_dialog.c.orig
al@16771 13 +++ src/extract_dialog.c
al@16771 14 @@ -167,7 +167,7 @@
al@16771 15 GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT);
al@16771 16
al@16771 17 extract_button = gtk_button_new();
al@16771 18 - extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR);
al@16771 19 + extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR);
al@16771 20 extract_hbox = gtk_hbox_new(FALSE,4);
al@16771 21 extract_label = gtk_label_new_with_mnemonic(_("_Extract"));
al@16771 22
al@16771 23 @@ -503,7 +503,7 @@
al@16771 24 GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT);
al@16771 25
al@16771 26 extract_button = gtk_button_new();
al@16771 27 - extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR);
al@16771 28 + extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR);
al@16771 29 extract_hbox = gtk_hbox_new(FALSE,4);
al@16771 30 extract_label = gtk_label_new_with_mnemonic(_("_Extract"));
al@16771 31
al@16771 32 --- src/interface.c.orig
al@16771 33 +++ src/interface.c
al@16771 34 @@ -110,7 +110,7 @@
al@16771 35 listing_html = gtk_image_menu_item_new_with_mnemonic (_("HTML file"));
al@16771 36 gtk_widget_show (listing_html);
al@16771 37 gtk_container_add (GTK_CONTAINER (listing_submenu),listing_html);
al@16771 38 - tmp_image = xa_main_window_find_image ("xarchiver-html.png",GTK_ICON_SIZE_MENU);
al@16771 39 + tmp_image = gtk_image_new_from_icon_name ("browser",GTK_ICON_SIZE_MENU);
al@16771 40 gtk_widget_show (tmp_image);
al@16771 41 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (listing_html),tmp_image);
al@16771 42
al@16771 43 @@ -171,7 +171,7 @@
al@16771 44 gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile);
al@16771 45 gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
al@16771 46
al@16771 47 - image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU);
al@16771 48 + image2 = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_MENU);
al@16771 49 gtk_widget_show (image2);
al@16771 50 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile),image2);
al@16771 51
al@16771 52 @@ -181,7 +181,7 @@
al@16771 53 gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu);
al@16771 54 gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
al@16771 55
al@16771 56 - image2 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU);
al@16771 57 + image2 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU);
al@16771 58 gtk_widget_show (image2);
al@16771 59 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu),image2);
al@16771 60
al@16771 61 @@ -387,7 +387,7 @@
al@16771 62 gtk_widget_show (separatortoolitem3);
al@16771 63 gtk_container_add (GTK_CONTAINER (toolbar1),separatortoolitem3);
al@16771 64
al@16771 65 - tmp_image = xa_main_window_find_image("xarchiver-add.png",GTK_ICON_SIZE_LARGE_TOOLBAR);
al@16771 66 + tmp_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_LARGE_TOOLBAR);
al@16771 67 gtk_widget_show (tmp_image);
al@16771 68 AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Add"));
al@16771 69 gtk_widget_set_sensitive (AddFile_button,FALSE);
al@16771 70 @@ -396,7 +396,7 @@
al@16771 71 gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button);
al@16771 72 gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL);
al@16771 73
al@16771 74 - tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR);
al@16771 75 + tmp_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_LARGE_TOOLBAR);
al@16771 76 gtk_widget_show (tmp_image);
al@16771 77 Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Extract"));
al@16771 78 gtk_widget_set_sensitive (Extract_button,FALSE);
al@16771 79 @@ -863,7 +863,7 @@
al@16771 80 gtk_widget_show (extract);
al@16771 81 gtk_container_add (GTK_CONTAINER (xa_popup_menu),extract);
al@16771 82
al@16771 83 - image9 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU);
al@16771 84 + image9 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU);
al@16771 85 gtk_widget_show (image9);
al@16771 86 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract),image9);
al@16771 87
al@16771 88 @@ -1527,7 +1527,7 @@
al@16771 89 hbox1 = gtk_hbox_new (FALSE,12);
al@16771 90 gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,0);
al@16771 91
al@16771 92 - pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL);
al@16771 93 + pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL);
al@16771 94 icon_pixbuf = gtk_image_new_from_pixbuf(pixbuf);
al@16771 95 g_object_unref(pixbuf);
al@16771 96
al@16771 97 --- src/mime.c.orig
al@16771 98 +++ src/mime.c
al@16771 99 @@ -41,9 +41,9 @@
al@16771 100 else if (strcmp(mime,"audio/mpeg") == 0 || strcmp(mime,"audio/midi") == 0 || strcmp (mime,"audio/mp2") == 0)
al@16771 101 icon_name = "sound";
al@16771 102 else if (strcmp(mime,"application/vnd.ms-excel") == 0 || strcmp(mime,"application/vnd.oasis.opendocument.spreadsheet") == 0)
al@16771 103 - icon_name = "gnome-mime-application-vnd.ms-excel";
al@16771 104 + icon_name = "application-vnd.ms-excel";
al@16771 105 else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0)
al@16771 106 - icon_name = "gnome-mime-application-vnd.ms-powerpoint";
al@16771 107 + icon_name = "application-vnd.ms-powerpoint";
al@16771 108 else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0
al@16771 109 || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0
al@16771 110 || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0
al@16771 111 @@ -57,11 +57,11 @@
al@16771 112 else if (strcmp(mime,"application/x-cd-image") == 0)
al@16771 113 icon_name = "application-x-cd-image";
al@16771 114 else if (strcmp(mime,"application/x-php") == 0)
al@16771 115 - icon_name = "gnome-mime-application-x-php";
al@16771 116 + icon_name = "application-x-php";
al@16771 117 else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0)
al@16771 118 - icon_name = "gnome-mime-application-x-perl";
al@16771 119 + icon_name = "text-x-script";
al@16771 120 else if (strcmp(mime,"application/x-font-ttf") == 0)
al@16771 121 - icon_name = "gnome-mime-application-x-font-ttf";
al@16771 122 + icon_name = "font";
al@16771 123 return icon_name;
al@16771 124 }
al@16771 125
al@16771 126 --- src/pref_dialog.c.orig
al@16771 127 +++ src/pref_dialog.c
al@16771 128 @@ -57,7 +57,7 @@
al@16771 129
al@16771 130 prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT);
al@16771 131 gtk_list_store_append (prefs_data->prefs_liststore,&iter);
al@16771 132 - icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL);
al@16771 133 + icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL);
al@16771 134 gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1);
al@16771 135 if(icon_pixbuf != NULL)
al@16771 136 g_object_unref (icon_pixbuf);