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