Midori Web Browser

Merge lp:~gero-bare/midori/midori-bug-1259705 into lp:midori

  1. midori-bug-1259705
  2. Merge into trunk
Proposed by Danielle Foré
Status: Work in progress
Proposed branch: lp:~gero-bare/midori/midori-bug-1259705
Merge into: lp:midori
Diff against target: 1375 lines (+209/-170)
29 files modified
extensions/adblock/widgets.vala (+1/-1)
extensions/addons.c (+12/-8)
extensions/apps.vala (+7/-7)
extensions/cookie-manager/cookie-manager-page.c (+22/-14)
extensions/cookie-permissions/cookie-permission-manager-preferences-window.c (+3/-3)
extensions/devpet.vala (+1/-1)
extensions/feed-panel/feed-panel.c (+4/-4)
extensions/nojs/nojs-preferences.c (+3/-3)
extensions/nojs/nojs-view.c (+10/-4)
extensions/notes.vala (+4/-5)
extensions/open-with.vala (+1/-1)
extensions/statusbar-features.c (+3/-3)
extensions/toolbar-editor.c (+2/-2)
extensions/transfers.vala (+6/-7)
katze/katze-http-auth.c (+1/-1)
katze/katze-preferences.c (+1/-1)
midori/midori-app.c (+4/-4)
midori/midori-browser.c (+35/-32)
midori/midori-dialog.vala (+8/-6)
midori/midori-panel.c (+3/-2)
midori/midori-preferences.c (+6/-6)
midori/midori-privatedata.c (+3/-3)
midori/midori-searchaction.c (+23/-11)
midori/midori-stock.h (+0/-3)
midori/midori-view.c (+6/-6)
midori/sokoke.c (+1/-1)
panels/midori-bookmarks.c (+14/-11)
panels/midori-history.c (+12/-9)
toolbars/midori-findbar.c (+13/-11)
To merge this branch: bzr merge lp:~gero-bare/midori/midori-bug-1259705
Reviewer Review Type Date Requested Status
Danielle Foré (community) Needs Fixing
Review via email: mp+245284@code.launchpad.net

Description of the change

This is a work to replace the "stock" facilities(icons/actions and others) inside the code of midori.

The work includes:
*A replacement of "from_stock" with appropriated functions: status (working on it)
*Remove midori-stock.h: status (starting)
*Add missing icons: status (discussing)
*Move Gtk.Action to GAction implementation: status (discussing/planned)

NOTICE To the reviewers.
Please check every FIXME added and if necessary comment, notify me about problems/solutions/thoughts, etc.

To post a comment you must log in.
lp:~gero-bare/midori/midori-bug-1259705 updated
6855. By Gero.Bare

Fix "edit-clear-all"

Revision history for this message
Danielle Foré (danrabbit) wrote :

* for the cookies extension, I don't think list-add/remove are appropriate for expanding items. It's pretty misleading, imo. In fact, I would use "list-remove-symbolic" and "list-remove-all-symbolic" for the delete icons. There aren't really icons for expanding/contracting all items. But I guess "view-sort-ascending" and "view-sort-descending" would make the most sense since we aren't trying to redesign components in this branch.

* Anything opposite "list-add" should be "list-remove" and not "edit-delete". This happens quite a lot in the side panel and extensions preferences.

* I don't think "edit-clear-all" is a thing. At least GNOME and elementary have only "edit-clear".

* "help-browser" should be "help-contents" for the same reason as above.

* Typo in diffline 1547 "go-uo" should be "go-up"

review: Needs Fixing
Reply
Revision history for this message
Danielle Foré (danrabbit) wrote :

Sorry I guess there is a "help-browser" app icon, but I think it should still use "help-contents" since it doesn't actually launch the help browser app (Which I believe is Yelp)

Reply
lp:~gero-bare/midori/midori-bug-1259705 updated
6856. By Gero.Bare

Fix edit-clear-all again.

6857. By Gero.Bare

Change icon name from help-browser to help-contents.

6858. By Gero.Bare

Fix edit-clear-all again.

6859. By Gero.Bare

Fix typo.

6860. By Gero.Bare

Replace preferences-system with preferences-desktop to ensure consistency. My bad.

6861. By Gero.Bare

Fix varoius mistakes.

6862. By Gero.Bare

Add some FIXME notices.
Start cleaning midori-stock.h file.

6863. By Gero.Bare

Merge current midori.

Unmerged revisions

6863. By Gero.Bare

Merge current midori.

6862. By Gero.Bare

Add some FIXME notices.
Start cleaning midori-stock.h file.

6861. By Gero.Bare

Fix varoius mistakes.

6860. By Gero.Bare

Replace preferences-system with preferences-desktop to ensure consistency. My bad.

6859. By Gero.Bare

Fix typo.

6858. By Gero.Bare

Fix edit-clear-all again.

6857. By Gero.Bare

Change icon name from help-browser to help-contents.

6856. By Gero.Bare

Fix edit-clear-all again.

6855. By Gero.Bare

Fix "edit-clear-all"

6854. By Gero.Bare

Fix the creation of gtk_tool_button_new in feed_panel extension.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/adblock/widgets.vala'
2--- extensions/adblock/widgets.vala 2014-04-03 17:07:04 +0000
3+++ extensions/adblock/widgets.vala 2015-02-08 05:58:50 +0000
4@@ -77,7 +77,7 @@
5 var menu = new Gtk.Menu ();
6
7 var menuitem = new Gtk.ImageMenuItem.with_label (_("Preferences"));
8- var image = new Gtk.Image.from_stock (Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU);
9+ var image = new Gtk.Image.from_icon_name ("preferences-desktop", Gtk.IconSize.MENU);
10 menuitem.always_show_image = true;
11 menuitem.set_image (image);
12 menuitem.activate.connect (() => {
13
14=== modified file 'extensions/addons.c'
15--- extensions/addons.c 2014-02-22 22:35:42 +0000
16+++ extensions/addons.c 2015-02-08 05:58:50 +0000
17@@ -623,39 +623,43 @@
18 gtk_widget_show (GTK_WIDGET (toolitem));
19
20 /* add button */
21- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
22+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("list-add",
23+GTK_ICON_SIZE_MENU), "Add");
24 gtk_tool_item_set_is_important (toolitem, TRUE);
25 g_signal_connect (toolitem, "clicked",
26 G_CALLBACK (addons_button_add_clicked_cb), viewable);
27 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
28 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new addon"));
29- gtk_widget_show (GTK_WIDGET (toolitem));
30+ gtk_widget_show_all (GTK_WIDGET (toolitem));
31
32 /* Text editor button */
33- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_EDIT);
34+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("accessories-text-editor",
35+GTK_ICON_SIZE_MENU), "Edit");
36 g_signal_connect (toolitem, "clicked",
37 G_CALLBACK (addons_open_in_editor_clicked_cb), viewable);
38 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
39 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
40 _("Open in Text Editor"));
41- gtk_widget_show (GTK_WIDGET (toolitem));
42+ gtk_widget_show_all (GTK_WIDGET (toolitem));
43
44 /* Target folder button */
45- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
46+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("folder",
47+GTK_ICON_SIZE_MENU), "Directory");
48 g_signal_connect (toolitem, "clicked",
49 G_CALLBACK (addons_open_target_folder_clicked_cb), viewable);
50 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
51 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
52 _("Open Target Folder"));
53- gtk_widget_show (GTK_WIDGET (toolitem));
54+ gtk_widget_show_all (GTK_WIDGET (toolitem));
55
56 /* Delete button */
57- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
58+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("list-remove",
59+GTK_ICON_SIZE_MENU), "Delete");
60 g_signal_connect (toolitem, "clicked",
61 G_CALLBACK (addons_button_delete_clicked_cb), viewable);
62 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
63 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Remove selected addon"));
64- gtk_widget_show (GTK_WIDGET (toolitem));
65+ gtk_widget_show_all (GTK_WIDGET (toolitem));
66 ADDONS (viewable)->toolbar = toolbar;
67
68 g_signal_connect (toolbar, "destroy",
69
70=== modified file 'extensions/apps.vala'
71--- extensions/apps.vala 2014-03-29 21:26:13 +0000
72+++ extensions/apps.vala 2015-02-08 05:58:50 +0000
73@@ -207,24 +207,24 @@
74
75 #if !HAVE_WIN32
76 /* FIXME: Profiles are broken on win32 because of no multi instance support */
77- var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
78+ var profile = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-add", Gtk.IconSize.SMALL_TOOLBAR), _("Add"));
79 profile.label = _("New _Profile");
80 profile.tooltip_text = _("Creates a new, independant profile and a launcher");
81 profile.use_underline = true;
82 profile.is_important = true;
83- profile.show ();
84+ profile.show_all ();
85 profile.clicked.connect (() => {
86 Launcher.create_profile.begin (this);
87 });
88 toolbar.insert (profile, -1);
89 #endif
90
91- var app = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
92+ var app = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-add", Gtk.IconSize.SMALL_TOOLBAR), _("Add"));
93 app.label = _("New _App");
94 app.tooltip_text = _("Creates a new app for a specific site");
95 app.use_underline = true;
96 app.is_important = true;
97- app.show ();
98+ app.show_all ();
99 app.clicked.connect (() => {
100 var view = (get_toplevel () as Midori.Browser).tab as Midori.View;
101 string checksum = Checksum.compute_for_string (ChecksumType.MD5, view.get_display_uri (), -1);
102@@ -365,7 +365,7 @@
103 catch (Error error) {
104 renderer.set ("icon-name", launcher.icon_name);
105 }
106- renderer.set ("stock-size", Gtk.IconSize.DIALOG,
107+ renderer.set ("icon-size", Gtk.IconSize.DIALOG,
108 "xpad", 4);
109 }
110
111@@ -383,8 +383,8 @@
112 void on_render_button (Gtk.CellLayout column, Gtk.CellRenderer renderer,
113 Gtk.TreeModel model, Gtk.TreeIter iter) {
114
115- renderer.set ("stock-id", Gtk.STOCK_DELETE,
116- "stock-size", Gtk.IconSize.MENU);
117+ renderer.set ("icon-name", "edit-delete",
118+ "icon-size", Gtk.IconSize.MENU);
119 }
120 }
121
122
123=== modified file 'extensions/cookie-manager/cookie-manager-page.c'
124--- extensions/cookie-manager/cookie-manager-page.c 2013-06-26 21:54:50 +0000
125+++ extensions/cookie-manager/cookie-manager-page.c 2015-02-08 05:58:50 +0000
126@@ -87,22 +87,24 @@
127 GtkToolItem *toolitem;
128
129 priv->toolbar = toolbar = gtk_toolbar_new();
130- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
131+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("edit-delete",
132+GTK_ICON_SIZE_MENU), "Delete");
133 gtk_tool_item_set_is_important(toolitem, TRUE);
134 g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_clicked_cb), cmp);
135- gtk_widget_show(GTK_WIDGET(toolitem));
136+ gtk_widget_show_all(GTK_WIDGET(toolitem));
137 gtk_widget_set_sensitive(GTK_WIDGET(toolitem), FALSE);
138 gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
139 priv->delete_button = GTK_WIDGET(toolitem);
140
141- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_DELETE);
142+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("edit-clear",
143+GTK_ICON_SIZE_MENU), "Delete All");
144 gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolitem), _("Delete All"));
145 gtk_tool_item_set_tooltip_text(toolitem,
146 _("Deletes all shown cookies. "
147 "If a filter is set, only those cookies are deleted which match the filter."));
148 gtk_tool_item_set_is_important(toolitem, TRUE);
149 g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_button_delete_all_clicked_cb), cmp);
150- gtk_widget_show(GTK_WIDGET(toolitem));
151+ gtk_widget_show_all(GTK_WIDGET(toolitem));
152 gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
153 priv->delete_all_button = GTK_WIDGET(toolitem);
154
155@@ -112,17 +114,21 @@
156 gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
157 gtk_widget_show(GTK_WIDGET(toolitem));
158
159- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_ADD);
160+ //FIXME Find a propper icon for Expand and Collapse actions
161+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("view-sort-ascending",
162+GTK_ICON_SIZE_MENU), "Expand");
163 gtk_tool_item_set_tooltip_text(toolitem, _("Expand All"));
164 g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_tree_popup_expand_activate_cb), cmp);
165- gtk_widget_show(GTK_WIDGET(toolitem));
166+ gtk_widget_show_all(GTK_WIDGET(toolitem));
167 gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
168 priv->expand_buttons[0] = GTK_WIDGET(toolitem);
169
170- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_REMOVE);
171+ //FIXME Find a propper icon for Expand and Collapse actions
172+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("view-sort-descending",
173+GTK_ICON_SIZE_MENU), "Collapse");
174 gtk_tool_item_set_tooltip_text(toolitem, _("Collapse All"));
175 g_signal_connect(toolitem, "clicked", G_CALLBACK(cm_tree_popup_collapse_activate_cb), cmp);
176- gtk_widget_show(GTK_WIDGET(toolitem));
177+ gtk_widget_show_all(GTK_WIDGET(toolitem));
178 gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
179 priv->expand_buttons[1] = GTK_WIDGET(toolitem);
180 }
181@@ -1055,8 +1061,10 @@
182 /* popup menu */
183 priv->popup_menu = menu = gtk_menu_new();
184
185- item = gtk_image_menu_item_new_from_stock(GTK_STOCK_DELETE, NULL);
186- gtk_widget_show(item);
187+ item = gtk_image_menu_item_new();
188+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
189+ gtk_image_new_from_icon_name ("edit-delete", GTK_ICON_SIZE_MENU));
190+ gtk_widget_show_all(item);
191 gtk_container_add(GTK_CONTAINER(menu), item);
192 g_signal_connect(item, "activate", G_CALLBACK(cm_button_delete_clicked_cb), cmp);
193 priv->delete_popup_button = item;
194@@ -1067,16 +1075,16 @@
195
196 item = gtk_image_menu_item_new_with_mnemonic(_("_Expand All"));
197 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
198- gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
199- gtk_widget_show(item);
200+ gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU));
201+ gtk_widget_show_all(item);
202 gtk_container_add(GTK_CONTAINER(menu), item);
203 g_signal_connect(item, "activate", G_CALLBACK(cm_tree_popup_expand_activate_cb), cmp);
204 priv->expand_buttons[2] = item;
205
206 item = gtk_image_menu_item_new_with_mnemonic(_("_Collapse All"));
207 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
208- gtk_image_new_from_icon_name(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
209- gtk_widget_show(item);
210+ gtk_image_new_from_icon_name("list-remove", GTK_ICON_SIZE_MENU));
211+ gtk_widget_show_all(item);
212 gtk_container_add(GTK_CONTAINER(menu), item);
213 g_signal_connect(item, "activate", G_CALLBACK(cm_tree_popup_collapse_activate_cb), cmp);
214 priv->expand_buttons[3] = item;
215
216=== modified file 'extensions/cookie-permissions/cookie-permission-manager-preferences-window.c'
217--- extensions/cookie-permissions/cookie-permission-manager-preferences-window.c 2014-01-01 22:39:30 +0000
218+++ extensions/cookie-permissions/cookie-permission-manager-preferences-window.c 2015-02-08 05:58:50 +0000
219@@ -814,7 +814,7 @@
220 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(priv->addDomainPolicyCombo), renderer, TRUE);
221 gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(priv->addDomainPolicyCombo), renderer, "text", 1);
222
223- priv->addDomainButton=gtk_button_new_from_stock(GTK_STOCK_ADD);
224+ priv->addDomainButton=gtk_button_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON);
225 gtk_widget_set_sensitive(priv->addDomainButton, FALSE);
226 gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainButton);
227 g_signal_connect_swapped(priv->addDomainButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_add_domain_clicked), self);
228@@ -869,13 +869,13 @@
229 hbox=gtk_hbox_new(FALSE, 0);
230 #endif
231
232- priv->deleteButton=gtk_button_new_from_stock(GTK_STOCK_DELETE);
233+ priv->deleteButton=gtk_button_new_from_icon_name ("list-remove", GTK_ICON_SIZE_BUTTON);
234 gtk_widget_set_sensitive(priv->deleteButton, FALSE);
235 gtk_container_add(GTK_CONTAINER(hbox), priv->deleteButton);
236 g_signal_connect_swapped(priv->deleteButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_delete_selection), self);
237
238 priv->deleteAllButton=gtk_button_new_with_mnemonic(_("Delete _all"));
239- gtk_button_set_image(GTK_BUTTON(priv->deleteAllButton), gtk_image_new_from_stock(GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON));
240+ gtk_button_set_image(GTK_BUTTON(priv->deleteAllButton), gtk_image_new_from_icon_name("edit-clear", GTK_ICON_SIZE_BUTTON));
241 gtk_widget_set_sensitive(priv->deleteAllButton, FALSE);
242 gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
243 g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_delete_all), self);
244
245=== modified file 'extensions/devpet.vala'
246--- extensions/devpet.vala 2013-11-17 22:47:25 +0000
247+++ extensions/devpet.vala 2015-02-08 05:58:50 +0000
248@@ -108,7 +108,7 @@
249 scroll_windows.set_shadow_type (Gtk.ShadowType.ETCHED_IN);
250
251
252- Gtk.Button clear = new Gtk.Button.from_stock ("gtk-clear");
253+ Gtk.Button clear = new Gtk.Button.from_icon_name ("edit-clear", Gtk.IconSize.MENU);
254 clear.clicked.connect (this.clear_list);
255
256 vbox.pack_start (scroll_windows, true, true, 0);
257
258=== modified file 'extensions/feed-panel/feed-panel.c'
259--- extensions/feed-panel/feed-panel.c 2013-10-25 21:49:56 +0000
260+++ extensions/feed-panel/feed-panel.c 2015-02-08 05:58:50 +0000
261@@ -499,9 +499,9 @@
262 {
263 feed_panel_popup_item (menu, GTK_STOCK_OPEN, NULL,
264 item, feed_panel_open_activate_cb, panel);
265- feed_panel_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"),
266+ feed_panel_popup_item (menu, "tab-new", _("Open in New _Tab"),
267 item, feed_panel_open_in_tab_activate_cb, panel);
268- feed_panel_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"),
269+ feed_panel_popup_item (menu, "window-new", _("Open in New _Window"),
270 item, feed_panel_open_in_window_activate_cb, panel);
271 }
272 else
273@@ -667,14 +667,14 @@
274
275 toolbar = gtk_toolbar_new ();
276 panel->toolbar = toolbar;
277- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
278+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU), NULL);
279 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Add new feed"));
280 gtk_tool_item_set_is_important (toolitem, TRUE);
281 g_signal_connect (toolitem, "clicked",
282 G_CALLBACK (feed_panel_add_clicked_cb), panel);
283 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
284 gtk_widget_show (GTK_WIDGET (toolitem));
285- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
286+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU), NULL);
287 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem), _("Delete feed"));
288 g_signal_connect (toolitem, "clicked",
289 G_CALLBACK (feed_panel_delete_clicked_cb), panel);
290
291=== modified file 'extensions/nojs/nojs-preferences.c'
292--- extensions/nojs/nojs-preferences.c 2013-08-16 22:02:25 +0000
293+++ extensions/nojs/nojs-preferences.c 2015-02-08 05:58:50 +0000
294@@ -915,7 +915,7 @@
295 gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(priv->addDomainPolicyCombo), renderer, TRUE);
296 gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(priv->addDomainPolicyCombo), renderer, "text", 1);
297
298- priv->addDomainButton=gtk_button_new_from_stock(GTK_STOCK_ADD);
299+ priv->addDomainButton=gtk_button_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON);
300 gtk_widget_set_sensitive(priv->addDomainButton, FALSE);
301 gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainButton);
302 g_signal_connect_swapped(priv->addDomainButton, "clicked", G_CALLBACK(_nojs_preferences_on_add_domain_clicked), self);
303@@ -970,13 +970,13 @@
304 hbox=gtk_hbox_new(FALSE, 0);
305 #endif
306
307- priv->deleteButton=gtk_button_new_from_stock(GTK_STOCK_DELETE);
308+ priv->deleteButton=gtk_button_new_from_icon_name("list-remove", GTK_ICON_SIZE_BUTTON);
309 gtk_widget_set_sensitive(priv->deleteButton, FALSE);
310 gtk_container_add(GTK_CONTAINER(hbox), priv->deleteButton);
311 g_signal_connect_swapped(priv->deleteButton, "clicked", G_CALLBACK(_nojs_preferences_on_delete_selection), self);
312
313 priv->deleteAllButton=gtk_button_new_with_mnemonic(_("Delete _all"));
314- gtk_button_set_image(GTK_BUTTON(priv->deleteAllButton), gtk_image_new_from_stock(GTK_STOCK_DELETE, GTK_ICON_SIZE_BUTTON));
315+ gtk_button_set_image(GTK_BUTTON(priv->deleteAllButton), gtk_image_new_from_icon_name("edit-clear", GTK_ICON_SIZE_BUTTON));
316 gtk_widget_set_sensitive(priv->deleteAllButton, FALSE);
317 gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
318 g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_nojs_preferences_on_delete_all), self);
319
320=== modified file 'extensions/nojs/nojs-view.c'
321--- extensions/nojs/nojs-view.c 2013-07-29 18:03:02 +0000
322+++ extensions/nojs/nojs-view.c 2015-02-08 05:58:50 +0000
323@@ -123,7 +123,9 @@
324 /* Create new menu and set up default items */
325 priv->menu=gtk_menu_new();
326
327- item=gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
328+ item = gtk_image_menu_item_new();
329+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
330+ gtk_image_new_from_icon_name ("preferences-desktop" , GTK_ICON_SIZE_MENU));
331 g_signal_connect_swapped(item, "activate", G_CALLBACK(_nojs_view_on_open_preferences), self);
332 gtk_menu_shell_prepend(GTK_MENU_SHELL(priv->menu), item);
333 gtk_widget_show_all(item);
334@@ -236,7 +238,7 @@
335 /* Add menu item(s) for domain */
336 itemLabel=g_strdup_printf(_("Deny %s"), inDomain);
337 item=gtk_image_menu_item_new_with_label(itemLabel);
338- itemImage=gtk_image_new_from_stock (GTK_STOCK_NO, GTK_ICON_SIZE_MENU);
339+ itemImage=gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_MENU);
340 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), itemImage);
341 gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE);
342 gtk_menu_shell_insert(GTK_MENU_SHELL(priv->menu), item, INSERT_POSITION);
343@@ -248,7 +250,9 @@
344
345 itemLabel=g_strdup_printf(_("Allow %s"), inDomain);
346 item=gtk_image_menu_item_new_with_label(itemLabel);
347- itemImage=gtk_image_new_from_stock (GTK_STOCK_YES, GTK_ICON_SIZE_MENU);
348+
349+//FIXME find a proper icon for an affirmative/accept/ok action
350+ itemImage=gtk_image_new_from_icon_name ("emblem-default", GTK_ICON_SIZE_MENU);
351 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), itemImage);
352 gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE);
353 gtk_menu_shell_insert(GTK_MENU_SHELL(priv->menu), item, INSERT_POSITION);
354@@ -260,7 +264,9 @@
355
356 itemLabel=g_strdup_printf(_("Allow %s this session"), inDomain);
357 item=gtk_image_menu_item_new_with_label(itemLabel);
358- itemImage=gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_MENU);
359+
360+//FIXME find a proper icon for an affirmative/accept/ok action
361+ itemImage=gtk_image_new_from_icon_name ("emblem-default", GTK_ICON_SIZE_MENU);
362 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), itemImage);
363 gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE);
364 gtk_menu_shell_insert(GTK_MENU_SHELL(priv->menu), item, INSERT_POSITION);
365
366=== modified file 'extensions/notes.vala'
367--- extensions/notes.vala 2014-04-12 15:50:27 +0000
368+++ extensions/notes.vala 2015-02-08 05:58:50 +0000
369@@ -146,8 +146,7 @@
370 public Gtk.Widget get_toolbar () {
371 if (toolbar == null) {
372 toolbar = new Gtk.Toolbar ();
373- var new_note_button = new Gtk.ToolButton.from_stock (Gtk.STOCK_EDIT);
374- new_note_button.label = _("New Note");
375+ var new_note_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("accessories-text-editor", Gtk.IconSize.MENU), _("New Note"));
376 new_note_button.tooltip_text = _("Creates a new empty note, unrelated to opened pages");
377 new_note_button.use_underline = true;
378 new_note_button.is_important = true;
379@@ -342,7 +341,7 @@
380 var menu = new Gtk.Menu ();
381
382 var menuitem = new Gtk.ImageMenuItem.with_label (_("Rename note"));
383- var image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
384+ var image = new Gtk.Image.from_icon_name ("accessories-text-editor", Gtk.IconSize.MENU);
385 menuitem.always_show_image = true;
386 menuitem.set_image (image);
387 menuitem.activate.connect (() => {
388@@ -353,7 +352,7 @@
389
390
391 menuitem = new Gtk.ImageMenuItem.with_label (_("Copy note to clipboard"));
392- image = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
393+ image = new Gtk.Image.from_icon_name ("edit-copy", Gtk.IconSize.MENU);
394 menuitem.always_show_image = true;
395 menuitem.set_image (image);
396 menuitem.activate.connect (() => {
397@@ -363,7 +362,7 @@
398
399
400 menuitem = new Gtk.ImageMenuItem.with_label (_("Remove note"));
401- image = new Gtk.Image.from_stock (Gtk.STOCK_DELETE, Gtk.IconSize.MENU);
402+ image = new Gtk.Image.from_icon_name ("edit-delete", Gtk.IconSize.MENU);
403 menuitem.always_show_image = true;
404 menuitem.set_image (image);
405 menuitem.activate.connect (() => {
406
407=== modified file 'extensions/open-with.vala'
408--- extensions/open-with.vala 2014-03-15 20:43:57 +0000
409+++ extensions/open-with.vala 2015-02-08 05:58:50 +0000
410@@ -266,7 +266,7 @@
411
412 var menu = new Gtk.Menu ();
413 var menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Custom…"));
414- menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
415+ menuitem.image = new Gtk.Image.from_icon_name ("accessories-text-editor", Gtk.IconSize.MENU);
416 menuitem.activate.connect (() => {
417 customize_app_info (app_info, content_type, uri);
418 });
419
420=== modified file 'extensions/statusbar-features.c'
421--- extensions/statusbar-features.c 2013-10-30 00:05:40 +0000
422+++ extensions/statusbar-features.c 2015-02-08 05:58:50 +0000
423@@ -150,7 +150,7 @@
424 if (!strcmp (property, "auto-load-images"))
425 {
426 g_object_set_data (G_OBJECT (button), "feature-label", _("Images"));
427- image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
428+ image = gtk_image_new_from_icon_name ("image-x-generic", GTK_ICON_SIZE_MENU);
429 gtk_button_set_image (GTK_BUTTON (button), image);
430 gtk_widget_set_tooltip_text (button, _("Load images automatically"));
431 statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
432@@ -160,7 +160,7 @@
433 if (!strcmp (property, "enable-javascript"))
434 {
435 g_object_set_data (G_OBJECT (button), "feature-label", _("Scripts"));
436- image = gtk_image_new_from_stock (STOCK_SCRIPT, GTK_ICON_SIZE_MENU);
437+ image = gtk_image_new_from_icon_name ("text-x-script", GTK_ICON_SIZE_MENU);
438 gtk_button_set_image (GTK_BUTTON (button), image);
439 gtk_widget_set_tooltip_text (button, _("Enable scripts"));
440 statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
441@@ -172,7 +172,7 @@
442 if (!midori_web_settings_has_plugin_support ())
443 gtk_widget_hide (button);
444 g_object_set_data (G_OBJECT (button), "feature-label", _("Netscape plugins"));
445- image = gtk_image_new_from_stock (MIDORI_STOCK_PLUGINS, GTK_ICON_SIZE_MENU);
446+ image = gtk_image_new_from_icon_name ("application-x-addon", GTK_ICON_SIZE_MENU);
447 gtk_button_set_image (GTK_BUTTON (button), image);
448 gtk_widget_set_tooltip_text (button, _("Enable Netscape plugins"));
449 statusbar_features_toolbar_notify_toolbar_style_cb (toolbar, NULL, button);
450
451=== modified file 'extensions/toolbar-editor.c'
452--- extensions/toolbar-editor.c 2014-03-15 18:07:53 +0000
453+++ extensions/toolbar-editor.c 2015-02-08 05:58:50 +0000
454@@ -477,11 +477,11 @@
455
456 button_add = gtk_button_new();
457 gtk_button_set_image(GTK_BUTTON(button_add),
458- gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON));
459+ gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON));
460 button_remove = gtk_button_new();
461 g_signal_connect(button_add, "clicked", G_CALLBACK(tb_editor_btn_add_clicked_cb), tbw);
462 gtk_button_set_image(GTK_BUTTON(button_remove),
463- gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON));
464+ gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON));
465 g_signal_connect(button_remove, "clicked", G_CALLBACK(tb_editor_btn_remove_clicked_cb), tbw);
466
467 vbox_buttons = gtk_vbox_new(FALSE, 6);
468
469=== modified file 'extensions/transfers.vala'
470--- extensions/transfers.vala 2014-02-22 22:35:42 +0000
471+++ extensions/transfers.vala 2015-02-08 05:58:50 +0000
472@@ -106,8 +106,7 @@
473 separator.draw = false;
474 separator.set_expand (true);
475 toolbar.insert (separator, -1);
476- clear = new Gtk.ToolButton.from_stock (Gtk.STOCK_CLEAR);
477- clear.label = _("Clear All");
478+ clear = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("edit-clear", Gtk.IconSize.BUTTON), _("Clear All"));
479 clear.is_important = true;
480 clear.clicked.connect (clear_clicked);
481 clear.sensitive = !array.is_empty ();
482@@ -200,7 +199,8 @@
483 store.get (iter, 0, out transfer);
484
485 var menu = new Gtk.Menu ();
486- var menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_OPEN, null);
487+ var menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("_Open"));
488+ menuitem.image = new Gtk.Image.from_icon_name ("document-open", Gtk.IconSize.MENU);
489 menuitem.activate.connect (() => {
490 try {
491 Midori.Download.open (transfer.download, treeview);
492@@ -211,19 +211,19 @@
493 menuitem.sensitive = transfer.succeeded;
494 menu.append (menuitem);
495 menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Open Destination _Folder"));
496- menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_DIRECTORY, Gtk.IconSize.MENU);
497+ menuitem.image = new Gtk.Image.from_icon_name ("folder", Gtk.IconSize.MENU);
498 menuitem.activate.connect (() => {
499 var folder = GLib.File.new_for_uri (transfer.destination);
500 (Midori.Browser.get_for_widget (this).tab as Midori.Tab).open_uri (folder.get_parent ().get_uri ());
501 });
502 menu.append (menuitem);
503 menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Copy Link Loc_ation"));
504+ menuitem.image = new Gtk.Image.from_icon_name ("edit-copy", Gtk.IconSize.MENU);
505 menuitem.activate.connect (() => {
506 string uri = transfer.destination;
507 get_clipboard (Gdk.SELECTION_PRIMARY).set_text (uri, -1);
508 get_clipboard (Gdk.SELECTION_CLIPBOARD).set_text (uri, -1);
509 });
510- menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
511 menu.append (menuitem);
512 menu.show_all ();
513 Katze.widget_popup (treeview, menu, null, Katze.MenuPos.CURSOR);
514@@ -382,8 +382,7 @@
515 set_style (Gtk.ToolbarStyle.BOTH_HORIZ);
516 show_arrow = false;
517
518- clear = new Gtk.ToolButton.from_stock (Gtk.STOCK_CLEAR);
519- clear.label = _("Clear All");
520+ clear = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("edit-clear",Gtk.IconSize.MENU), _("Clear All"));
521 clear.is_important = true;
522 clear.clicked.connect (clear_clicked);
523 clear.sensitive = !array.is_empty ();
524
525=== modified file 'katze/katze-http-auth.c'
526--- katze/katze-http-auth.c 2013-08-12 19:21:06 +0000
527+++ katze/katze-http-auth.c 2015-02-08 05:58:50 +0000
528@@ -220,7 +220,7 @@
529
530 gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 5);
531 hbox = gtk_hbox_new (FALSE, 6);
532- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION,
533+ image = gtk_image_new_from_icon_name ("dialog-password",
534 GTK_ICON_SIZE_DIALOG);
535 gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
536 label = gtk_label_new (_("A username and a password are required\n"
537
538=== modified file 'katze/katze-preferences.c'
539--- katze/katze-preferences.c 2014-05-20 02:15:05 +0000
540+++ katze/katze-preferences.c 2015-02-08 05:58:50 +0000
541@@ -189,7 +189,7 @@
542 GtkWidget* icon;
543 GtkWidget* hbox = gtk_hbox_new (FALSE, 0);
544 GtkWidget* button = gtk_button_new ();
545- icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON);
546+ icon = gtk_image_new_from_icon_name ("help-contents", GTK_ICON_SIZE_BUTTON);
547 gtk_button_set_image (GTK_BUTTON (button), icon);
548 g_signal_connect (button, "clicked",
549 G_CALLBACK (katze_preferences_help_clicked_cb), preferences);
550
551=== modified file 'midori/midori-app.c'
552--- midori/midori-app.c 2014-04-14 06:53:01 +0000
553+++ midori/midori-app.c 2015-02-08 05:58:50 +0000
554@@ -1179,12 +1179,12 @@
555 { STOCK_HISTORY, N_("_History"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_H },
556 { STOCK_SCRIPT, N_("_Userscripts") },
557 { STOCK_STYLE, N_("User_styles") },
558- { STOCK_TAB_NEW, N_("New _Tab") },
559+ { "tab-new", N_("New _Tab") },
560 { MIDORI_STOCK_TRANSFER, N_("_Transfers"), GDK_CONTROL_MASK | GDK_SHIFT_MASK, GDK_KEY_J },
561 { MIDORI_STOCK_PLUGINS, N_("Netscape p_lugins") },
562- { STOCK_USER_TRASH, N_("_Closed Tabs") },
563- { STOCK_WINDOW_NEW, N_("New _Window") },
564- { STOCK_FOLDER_NEW, N_("New _Folder") },
565+ { "user-trash", N_("_Closed Tabs") },
566+ { "window-new", N_("New _Window") },
567+ { "folder-new", N_("New _Folder") },
568 };
569
570 /* Print messages to stdout on Win32 console, cf. AbiWord
571
572=== modified file 'midori/midori-browser.c'
573--- midori/midori-browser.c 2014-11-22 17:20:43 +0000
574+++ midori/midori-browser.c 2015-02-08 05:58:50 +0000
575@@ -312,14 +312,14 @@
576 if (midori_tab_can_go_forward (MIDORI_TAB (view)))
577 {
578 g_object_set (action,
579- "stock-id", GTK_STOCK_GO_FORWARD,
580+ "icon-name", "go-next",
581 "tooltip", _("Go forward to the next page"),
582 "sensitive", TRUE, NULL);
583 }
584 else
585 {
586 g_object_set (action,
587- "stock-id", GTK_STOCK_MEDIA_NEXT,
588+ "icon-name", "media-skip-forward",
589 "tooltip", _("Go to the next sub-page"),
590 "sensitive", midori_view_get_next_page (view) != NULL, NULL);
591 }
592@@ -433,13 +433,13 @@
593 if (!loading)
594 {
595 g_object_set (action,
596- "stock-id", GTK_STOCK_REFRESH,
597+ "icon-name", "view-refresh",
598 "tooltip", _("Reload the current page"), NULL);
599 }
600 else
601 {
602 g_object_set (action,
603- "stock-id", GTK_STOCK_STOP,
604+ "icon-name", "process-stop",
605 "tooltip", _("Stop loading the current page"), NULL);
606 }
607
608@@ -903,7 +903,7 @@
609
610 renderer = gtk_cell_renderer_pixbuf_new ();
611 g_object_set (G_OBJECT (renderer),
612- "stock-id", GTK_STOCK_DIRECTORY,
613+ "icon-name", "folder",
614 "stock-size", GTK_ICON_SIZE_MENU,
615 NULL);
616 gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
617@@ -3518,11 +3518,11 @@
618 MidoriBrowser* browser)
619 {
620 GtkWidget* view = midori_browser_get_current_tab (browser);
621- gchar* stock_id;
622- g_object_get (action, "stock-id", &stock_id, NULL);
623+ gchar* icon_name;
624+ g_object_get (action, "stock-id", &icon_name, NULL);
625
626 /* Refresh or stop, depending on the stock id */
627- if (!strcmp (stock_id, GTK_STOCK_REFRESH))
628+ if (!strcmp (icon_name, "view-refresh"))
629 {
630 GdkModifierType state = (GdkModifierType)0;
631 gint x, y;
632@@ -3541,7 +3541,7 @@
633 }
634 else
635 midori_tab_stop_loading (MIDORI_TAB (view));
636- g_free (stock_id);
637+ g_free (icon_name);
638 }
639
640 static void
641@@ -3936,7 +3936,7 @@
642 MIDORI_LOCATION_ACTION (action), "go-jump-symbolic");
643 else
644 midori_location_action_set_secondary_icon (
645- MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
646+ MIDORI_LOCATION_ACTION (action), "go-jump");
647 }
648
649 static void
650@@ -4355,7 +4355,7 @@
651 gint child_bookmarks_count = midori_bookmarks_db_count_recursive (browser->bookmarks,
652 "uri <> ''", NULL, item, FALSE);
653
654- GtkAction* action = gtk_action_new ("BookmarkOpenAllTabs", _("Open all in _Tabs"), NULL, STOCK_TAB_NEW);
655+ GtkAction* action = gtk_action_new ("BookmarkOpenAllTabs", _("Open all in _Tabs"), NULL, "tab-new");
656 gtk_action_set_sensitive (action, child_bookmarks_count > 0);
657 g_object_set_data (G_OBJECT (action), "KatzeItem", item);
658 g_signal_connect (action, "activate",
659@@ -4364,19 +4364,19 @@
660 }
661 else
662 {
663- GtkAction* action = gtk_action_new ("BookmarkOpen", NULL, NULL, GTK_STOCK_OPEN);
664+ GtkAction* action = gtk_action_new ("BookmarkOpen", NULL, NULL, "document-open");
665 gtk_action_set_sensitive (action, katze_item_get_uri (item) != NULL);
666 g_object_set_data (G_OBJECT (action), "KatzeItem", item);
667 g_signal_connect (action, "activate",
668 G_CALLBACK (midori_browser_bookmark_open_activate_cb), browser);
669 midori_context_action_add (menu, action);
670- action = gtk_action_new ("BookmarkOpenTab", NULL, NULL, STOCK_TAB_NEW);
671+ action = gtk_action_new ("BookmarkOpenTab", NULL, NULL, "tab-new");
672 gtk_action_set_sensitive (action, katze_item_get_uri (item) != NULL);
673 g_object_set_data (G_OBJECT (action), "KatzeItem", item);
674 g_signal_connect (action, "activate",
675 G_CALLBACK (midori_browser_bookmark_open_in_tab_activate_cb), browser);
676 midori_context_action_add (menu, action);
677- action = gtk_action_new ("BookmarkOpenWindow", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW);
678+ action = gtk_action_new ("BookmarkOpenWindow", _("Open in New _Window"), NULL, "window-new");
679 gtk_action_set_sensitive (action, katze_item_get_uri (item) != NULL);
680 g_object_set_data (G_OBJECT (action), "KatzeItem", item);
681 g_signal_connect (action, "activate",
682@@ -4385,13 +4385,13 @@
683 }
684
685 midori_context_action_add (menu, NULL);
686- GtkAction* action = gtk_action_new ("BookmarkEdit", NULL, NULL, GTK_STOCK_EDIT);
687+ GtkAction* action = gtk_action_new ("BookmarkEdit", NULL, NULL, "accessories-text-editor");
688 gtk_action_set_sensitive (action, !KATZE_ITEM_IS_SEPARATOR (item));
689 g_object_set_data (G_OBJECT (action), "KatzeItem", item);
690 g_signal_connect (action, "activate",
691 G_CALLBACK (midori_browser_bookmark_edit_activate_cb), browser);
692 midori_context_action_add (menu, action);
693- action = gtk_action_new ("BookmarkDelete", NULL, NULL, GTK_STOCK_DELETE);
694+ action = gtk_action_new ("BookmarkDelete", NULL, NULL, "edit-delete");
695 g_object_set_data (G_OBJECT (action), "KatzeItem", item);
696 g_signal_connect (action, "activate",
697 G_CALLBACK (midori_browser_bookmark_delete_activate_cb), browser);
698@@ -5201,10 +5201,10 @@
699 static const GtkActionEntry entries[] =
700 {
701 { "File", NULL, N_("_File") },
702- { "WindowNew", STOCK_WINDOW_NEW,
703+ { "WindowNew", "window-new",
704 N_("New _Window"), "<Ctrl>n",
705 N_("Open a new window"), G_CALLBACK (_action_window_new_activate) },
706- { "TabNew", STOCK_TAB_NEW,
707+ { "TabNew", "tab-new",
708 NULL, "<Ctrl>t",
709 N_("Open a new tab"), G_CALLBACK (_action_tab_new_activate) },
710 { "PrivateBrowsing", NULL,
711@@ -5266,10 +5266,10 @@
712 { "Find", GTK_STOCK_FIND,
713 N_("_Find…"), "<Ctrl>f",
714 N_("Find a word or phrase in the page"), G_CALLBACK (_action_find_activate) },
715- { "FindNext", GTK_STOCK_GO_FORWARD,
716+ { "FindNext", "go-next",
717 N_("Find _Next"), "<Ctrl>g",
718 NULL, G_CALLBACK (_action_find_next_activate) },
719- { "FindPrevious", GTK_STOCK_GO_BACK,
720+ { "FindPrevious", "go-previous",
721 N_("Find _Previous"), "<Ctrl><Shift>g",
722 NULL, G_CALLBACK (_action_find_previous_activate) },
723 { "Preferences", GTK_STOCK_PREFERENCES,
724@@ -5381,7 +5381,7 @@
725 { "TabPrevious", GTK_STOCK_GO_BACK,
726 N_("_Previous Tab"), "<Ctrl>Page_Up",
727 NULL, G_CALLBACK (_action_tab_previous_activate) },
728- { "TabNext", GTK_STOCK_GO_FORWARD,
729+ { "TabNext", "go-next",
730 N_("_Next Tab"), "<Ctrl>Page_Down",
731 NULL, G_CALLBACK (_action_tab_next_activate) },
732 { "TabMoveFirst", NULL, N_("Move Tab to _first position"), NULL,
733@@ -5412,14 +5412,16 @@
734 NULL, NULL },
735
736 { "Help", NULL, N_("_Help") },
737- { "HelpFAQ", GTK_STOCK_HELP,
738+
739+//FIXME decide a propper icon for the faqs, "help-faqs" or "help-contents"
740+ { "HelpFAQ", "help-faqs",
741 N_("_Frequent Questions"), "F1",
742 NULL, G_CALLBACK (_action_help_link_activate) },
743 { "HelpBugs", NULL,
744 N_("_Report a Problem…"), NULL,
745 NULL, G_CALLBACK (_action_help_link_activate) },
746- { "About", GTK_STOCK_ABOUT,
747- NULL, "",
748+ { "About", "help-about",
749+ N_("_About"), "",
750 NULL, G_CALLBACK (_action_about_activate) },
751 { "Dummy", NULL, N_("_Tools") },
752 };
753@@ -5435,7 +5437,7 @@
754 N_("_Navigationbar"), "",
755 NULL, G_CALLBACK (_action_navigationbar_activate),
756 FALSE },
757- { "Panel", GTK_STOCK_INDENT,
758+ { "Panel", "format-indent-more",
759 N_("Side_panel"), "F9",
760 N_("Sidepanel"), G_CALLBACK (_action_panel_activate),
761 FALSE },
762@@ -5976,7 +5978,7 @@
763 action = g_object_new (MIDORI_TYPE_LOCATION_ACTION,
764 "name", "Location",
765 "label", _("_Location…"),
766- "stock-id", GTK_STOCK_JUMP_TO,
767+ "icon-name", "go-jump",
768 "tooltip", _("Open a particular location"),
769 "placeholder-text", _("Search or enter an address"),
770 NULL);
771@@ -6001,7 +6003,7 @@
772 action = g_object_new (MIDORI_TYPE_SEARCH_ACTION,
773 "name", "Search",
774 "label", _("_Web Search…"),
775- "stock-id", GTK_STOCK_FIND,
776+ "icon-name", "edit-find",
777 "tooltip", _("Run a web search"),
778 NULL);
779 g_object_connect (action,
780@@ -6028,7 +6030,7 @@
781
782 action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
783 "name", "Trash",
784- "stock-id", STOCK_USER_TRASH,
785+ "icon-name", "user-trash",
786 "tooltip", _("Reopen a previously closed tab or window"),
787 NULL);
788 g_object_connect (action,
789@@ -6045,7 +6047,7 @@
790 action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
791 "name", "Bookmarks",
792 "label", _("_Bookmarks"),
793- "stock-id", STOCK_BOOKMARKS,
794+ "icon-name", "user-bookmarks",
795 "tooltip", _("Show the saved bookmarks"),
796 "array", dummy_array /* updated, unique */,
797 NULL);
798@@ -6066,7 +6068,7 @@
799 action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
800 "name", "Tools",
801 "label", _("_Tools"),
802- "stock-id", GTK_STOCK_PREFERENCES,
803+ "icon-name", "preferences-desktop",
804 "array", dummy_array /* updated, unique */,
805 NULL);
806 g_object_connect (action,
807@@ -6077,10 +6079,11 @@
808 g_object_unref (action);
809 g_object_unref (dummy_array);
810
811+//FIXME Find a proper reeplacement for GTK_STOCK_INDEX
812 action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
813 "name", "Window",
814 "label", _("_Tabs"),
815- "stock-id", GTK_STOCK_INDEX,
816+ "icon-name", "text-x-generic",
817 "tooltip", _("Show a list of all open tabs"),
818 "array", browser->proxy_array,
819 NULL);
820@@ -6096,7 +6099,7 @@
821 action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
822 "name", "CompactMenu",
823 "label", _("_Menu"),
824- "stock-id", GTK_STOCK_PROPERTIES,
825+ "icon-name", "document-properties",
826 "tooltip", _("Menu"),
827 "array", katze_array_new (KATZE_TYPE_ITEM),
828 NULL);
829
830=== modified file 'midori/midori-dialog.vala'
831--- midori/midori-dialog.vala 2014-02-22 01:31:15 +0000
832+++ midori/midori-dialog.vala 2015-02-08 05:58:50 +0000
833@@ -121,15 +121,17 @@
834 public FileChooserDialog (string title, Gtk.Window? window, Gtk.FileChooserAction action) {
835 /* Creates a new file chooser dialog to Open or Save and Cancel.
836 The positive response is %Gtk.ResponseType.OK. */
837- unowned string stock_id = Gtk.Stock.OPEN;
838- if (action == Gtk.FileChooserAction.SAVE)
839- stock_id = Gtk.Stock.SAVE;
840+ unowned string button_option = _("Open");
841+ icon_name = "document-open";
842+ if (action == Gtk.FileChooserAction.SAVE) {
843+ icon_name = "document-save";
844+ button_option=_("Save");
845+ }
846 this.title = title;
847 transient_for = window;
848 this.action = action;
849- add_buttons (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
850- stock_id, Gtk.ResponseType.OK);
851- icon_name = stock_id;
852+ add_buttons (_("Cancel"), Gtk.ResponseType.CANCEL,
853+ button_option, Gtk.ResponseType.OK);
854 }
855 }
856
857
858=== modified file 'midori/midori-panel.c'
859--- midori/midori-panel.c 2013-10-28 19:54:21 +0000
860+++ midori/midori-panel.c 2015-02-08 05:58:50 +0000
861@@ -309,7 +309,7 @@
862 gtk_container_add (GTK_CONTAINER (toolitem), panel->toolbar_label);
863 gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6);
864 gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1);
865- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
866+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_MENU), "Next");
867 gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem),
868 _("Align sidepanel to the right"));
869 gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem),
870@@ -322,7 +322,8 @@
871 gtk_toolbar_insert (GTK_TOOLBAR (labelbar), toolitem, -1);
872 #endif
873 panel->button_align = toolitem;
874- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE);
875+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("window-close",
876+GTK_ICON_SIZE_MENU), "Close");
877 gtk_tool_button_set_label (GTK_TOOL_BUTTON (toolitem), _("Close panel"));
878 gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (toolitem), _("Close panel"));
879 g_signal_connect (toolitem, "clicked",
880
881=== modified file 'midori/midori-preferences.c'
882--- midori/midori-preferences.c 2014-11-05 21:10:18 +0000
883+++ midori/midori-preferences.c 2015-02-08 05:58:50 +0000
884@@ -284,7 +284,7 @@
885 /* Page "General" */
886 if (!midori_paths_is_readonly ())
887 {
888- PAGE_NEW (GTK_STOCK_HOME, _("Startup"));
889+ PAGE_NEW ("user-home", _("Startup"));
890 FRAME_NEW (NULL);
891 label = gtk_label_new (_("When Midori starts:"));
892 gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
893@@ -312,7 +312,7 @@
894 }
895
896 /* Page "Appearance" */
897- PAGE_NEW (GTK_STOCK_SELECT_FONT, _("Fonts"));
898+ PAGE_NEW ("preferences-desktop-font", _("Fonts"));
899 FRAME_NEW (NULL);
900 label = gtk_label_new (_("Proportional Font Family"));
901 gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
902@@ -347,7 +347,7 @@
903 SPANNED_ADD (button);
904
905 /* Page "Behavior" */
906- PAGE_NEW (GTK_STOCK_SELECT_COLOR, _("Behavior"));
907+ PAGE_NEW ("preferences-desktop-theme", _("Behavior"));
908 FRAME_NEW (NULL);
909 button = katze_property_proxy (settings, "auto-load-images", NULL);
910 gtk_button_set_label (GTK_BUTTON (button), _("Load images automatically"));
911@@ -414,7 +414,7 @@
912 SPANNED_ADD (button);
913
914 /* Page "Interface" */
915- PAGE_NEW (GTK_STOCK_CONVERT, _("Browsing"));
916+ PAGE_NEW ("preferences-other", _("Browsing"));
917 FRAME_NEW (NULL);
918 #ifdef G_OS_WIN32
919 INDENTED_ADD (gtk_label_new (_("Theme:")));
920@@ -473,7 +473,7 @@
921 SPANNED_ADD (button);
922
923 /* Page "Network" */
924- PAGE_NEW (GTK_STOCK_NETWORK, _("Network"));
925+ PAGE_NEW ("network-workgroup", _("Network"));
926 FRAME_NEW (NULL);
927 label = gtk_label_new (_("Proxy server"));
928 gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
929@@ -549,7 +549,7 @@
930 g_return_if_fail (KATZE_IS_PREFERENCES (preferences));
931 g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings));
932
933- katze_preferences_add_category (preferences, _("Privacy"), GTK_STOCK_INDEX);
934+ katze_preferences_add_category (preferences, _("Privacy"), "preferences-desktop-personal");
935 katze_preferences_add_group (preferences, NULL);
936 button = gtk_label_new (_("Delete old Cookies after:"));
937 gtk_misc_set_alignment (GTK_MISC (button), 0.0, 0.5);
938
939=== modified file 'midori/midori-privatedata.c'
940--- midori/midori-privatedata.c 2014-07-11 01:36:48 +0000
941+++ midori/midori-privatedata.c 2015-02-08 05:58:50 +0000
942@@ -118,7 +118,7 @@
943 dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"),
944 GTK_WINDOW (browser),
945 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
946- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
947+ _("_Cancel"), GTK_RESPONSE_CANCEL,
948 _("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL);
949 button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
950 content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
951@@ -129,7 +129,7 @@
952 katze_widget_add_class (button, "destructive-action");
953 screen = gtk_widget_get_screen (GTK_WIDGET (browser));
954 if (screen)
955- gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_CLEAR);
956+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "edit-clear");
957 sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
958 hbox = gtk_hbox_new (FALSE, 4);
959 icon = gtk_image_new_from_icon_name ("edit-clear", GTK_ICON_SIZE_DIALOG);
960@@ -382,4 +382,4 @@
961 item->clear = clear;
962 items = g_list_append (items, item);
963 return NULL;
964-}
965\ No newline at end of file
966+}
967
968=== modified file 'midori/midori-searchaction.c'
969--- midori/midori-searchaction.c 2014-07-16 02:14:19 +0000
970+++ midori/midori-searchaction.c 2015-02-08 05:58:50 +0000
971@@ -427,7 +427,7 @@
972 g_object_unref (icon);
973 }
974 else
975- gtk_image_set_from_icon_name (GTK_IMAGE (image), STOCK_EDIT_FIND,
976+ gtk_image_set_from_icon_name (GTK_IMAGE (image), "edit-find",
977 GTK_ICON_SIZE_MENU);
978 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
979 gtk_image_menu_item_set_always_show_image (
980@@ -451,7 +451,7 @@
981 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
982 gtk_widget_show (menuitem);
983 menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Manage Search Engines"));
984- image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
985+ image = gtk_image_new_from_icon_name ("preferences-desktop", GTK_ICON_SIZE_MENU);
986 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
987 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
988 g_signal_connect (menuitem, "activate",
989@@ -507,7 +507,7 @@
990 else if (gtk_icon_theme_has_icon (icon_theme, "edit-find-option"))
991 icon_name = "edit-find-option";
992 else
993- icon_name = STOCK_EDIT_FIND;
994+ icon_name = "edit-find";
995 gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
996 GTK_ENTRY_ICON_PRIMARY, icon_name);
997 }
998@@ -797,7 +797,7 @@
999 g_object_unref (icon);
1000 }
1001 else
1002- g_object_set (renderer, "icon-name", STOCK_EDIT_FIND, "yalign", 0.25, NULL);
1003+ g_object_set (renderer, "icon-name", "edit-find", "yalign", 0.25, NULL);
1004 g_object_unref (item);
1005 }
1006
1007@@ -1509,18 +1509,24 @@
1008 G_CALLBACK (midori_search_action_treeview_destroy_cb), search_action);
1009 vbox = gtk_vbox_new (FALSE, 4);
1010 gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4);
1011- button = gtk_button_new_from_stock (GTK_STOCK_ADD);
1012+ button = gtk_button_new_with_mnemonic (_("_Add"));
1013+ image = gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_MENU);
1014+ gtk_button_set_image (GTK_BUTTON(button), image);
1015 g_signal_connect (button, "clicked",
1016 G_CALLBACK (midori_search_action_dialog_add_cb), search_action);
1017 gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
1018- button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
1019+ button = gtk_button_new_with_mnemonic (_("_Edit"));
1020+ image = gtk_image_new_from_icon_name ("accessories-text-editor", GTK_ICON_SIZE_MENU);
1021+ gtk_button_set_image (GTK_BUTTON(button), image);
1022 search_action->edit_button = button;
1023 g_signal_connect (button, "clicked",
1024 G_CALLBACK (midori_search_action_dialog_edit_cb), search_action);
1025 gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
1026 if (!i)
1027 gtk_widget_set_sensitive (button, FALSE);
1028- button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
1029+ button = gtk_button_new_with_mnemonic (_("_Remove"));
1030+ image = gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU);
1031+ gtk_button_set_image (GTK_BUTTON(button), image);
1032 search_action->remove_button = button;
1033 g_signal_connect (button, "clicked",
1034 G_CALLBACK (midori_search_action_dialog_remove_cb), search_action);
1035@@ -1530,7 +1536,9 @@
1036 button = gtk_label_new (""); /* This is an invisible separator */
1037 gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 8);
1038 button = gtk_button_new_with_mnemonic (_("Use as _default"));
1039- image = gtk_image_new_from_stock (GTK_STOCK_YES, GTK_ICON_SIZE_BUTTON);
1040+
1041+//FIXME find a proper icon for an affirmative/accept/ok action
1042+ image = gtk_image_new_from_icon_name ("emblem-default", GTK_ICON_SIZE_MENU);
1043 gtk_button_set_image (GTK_BUTTON (button), image);
1044 search_action->default_button = button;
1045 g_signal_connect (button, "clicked",
1046@@ -1540,11 +1548,15 @@
1047 gtk_widget_set_sensitive (button, FALSE);
1048 button = gtk_label_new (""); /* This is an invisible separator */
1049 gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12);
1050- button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
1051+ button = gtk_button_new_with_mnemonic (_("D_own"));
1052+ image = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_MENU);
1053+ gtk_button_set_image (GTK_BUTTON (button), image);
1054 g_signal_connect (button, "clicked",
1055 G_CALLBACK (midori_search_action_dialog_move_down_cb), search_action);
1056 gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
1057- button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
1058+ button = gtk_button_new_with_mnemonic (_("_Up"));
1059+ image = gtk_image_new_from_icon_name ("go-up", GTK_ICON_SIZE_MENU);
1060+ gtk_button_set_image (GTK_BUTTON (button), image);
1061 g_signal_connect (button, "clicked",
1062 G_CALLBACK (midori_search_action_dialog_move_up_cb), search_action);
1063 gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
1064@@ -1553,7 +1565,7 @@
1065 GtkWidget* icon;
1066 hbox = gtk_hbox_new (FALSE, 0);
1067 button = gtk_button_new ();
1068- icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON);
1069+ icon = gtk_image_new_from_icon_name ("help-contents", GTK_ICON_SIZE_BUTTON);
1070 gtk_button_set_image (GTK_BUTTON (button), icon);
1071 /* TODO: Implement some kind of help function */
1072 gtk_widget_set_sensitive (button, FALSE);
1073
1074=== modified file 'midori/midori-stock.h'
1075--- midori/midori-stock.h 2013-04-22 23:01:10 +0000
1076+++ midori/midori-stock.h 2015-02-08 05:58:50 +0000
1077@@ -27,12 +27,9 @@
1078 #define STOCK_NETWORK_OFFLINE "network-offline"
1079 #define STOCK_SCRIPT "text-x-javascript"
1080 #define STOCK_SEND "mail-send"
1081-#define STOCK_TAB_NEW "tab-new"
1082 #define STOCK_USER_TRASH "user-trash"
1083-#define STOCK_WINDOW_NEW "window-new"
1084 #define STOCK_FOLDER_NEW "folder-new"
1085 #define STOCK_EDIT_CLEAR "edit-clear"
1086-#define STOCK_EDIT_FIND "edit-find"
1087 #define STOCK_STOP "stop"
1088 #define STOCK_URL "text-html"
1089
1090
1091=== modified file 'midori/midori-view.c'
1092--- midori/midori-view.c 2014-11-22 18:28:09 +0000
1093+++ midori/midori-view.c 2015-02-08 05:58:50 +0000
1094@@ -2335,14 +2335,14 @@
1095 {
1096 if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_APP)
1097 {
1098- GtkAction* action = gtk_action_new ("OpenLinkTab", _("Open _Link"), NULL, STOCK_TAB_NEW);
1099+ GtkAction* action = gtk_action_new ("OpenLinkTab", _("Open _Link"), NULL, "tab-new");
1100 g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->link_uri), (GDestroyNotify)g_free);
1101 g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_link_tab_activate_cb), view);
1102 midori_context_action_add (menu, action);
1103 }
1104 else if (!midori_view_always_same_tab (view->link_uri))
1105 {
1106- GtkAction* action = gtk_action_new ("OpenLinkTab", _("Open Link in New _Tab"), NULL, STOCK_TAB_NEW);
1107+ GtkAction* action = gtk_action_new ("OpenLinkTab", _("Open Link in New _Tab"), NULL, "tab-new");
1108 g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->link_uri), (GDestroyNotify)g_free);
1109 g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_link_tab_activate_cb), view);
1110 midori_context_action_add (menu, action);
1111@@ -2350,7 +2350,7 @@
1112 view->open_tabs_in_the_background
1113 ? _("Open Link in _Foreground Tab") : _("Open Link in _Background Tab"), NULL, NULL,
1114 midori_web_view_menu_background_tab_activate_cb, view);
1115- midori_context_action_add_simple (menu, "OpenLinkWindow", _("Open Link in New _Window"), NULL, STOCK_WINDOW_NEW,
1116+ midori_context_action_add_simple (menu, "OpenLinkWindow", _("Open Link in New _Window"), NULL, "window-new",
1117 midori_web_view_menu_new_window_activate_cb, view);
1118 }
1119
1120@@ -2373,7 +2373,7 @@
1121 midori_context_action_add_simple (menu, "OpenImageNewTab",
1122 view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW
1123 ? _("Open _Image in New Window") : _("Open _Image in New Tab")
1124- , NULL, STOCK_TAB_NEW,
1125+ , NULL, "tab-new",
1126 midori_web_view_menu_image_new_tab_activate_cb, view);
1127 midori_context_action_add_simple (menu, "CopyImage", _("Copy Im_age"), NULL, NULL,
1128 midori_web_view_menu_image_copy_activate_cb, view);
1129@@ -2432,7 +2432,7 @@
1130 {
1131 GdkPixbuf* pixbuf;
1132 gchar* search_option = g_strdup_printf ("SearchWith%u", i);
1133- GtkAction* action = (GtkAction*)midori_context_action_new_escaped (search_option, katze_item_get_name (item), NULL, STOCK_EDIT_FIND);
1134+ GtkAction* action = (GtkAction*)midori_context_action_new_escaped (search_option, katze_item_get_name (item), NULL, "edit-find");
1135 g_free (search_option);
1136 midori_context_action_add (searches, action);
1137 if ((pixbuf = katze_item_get_pixbuf (item, view->web_view)))
1138@@ -2482,7 +2482,7 @@
1139 midori_context_action_add_simple (menu, "OpenFrameInNewTab", _("Open _Frame in New Tab"), NULL, NULL,
1140 midori_web_view_open_frame_in_new_tab_cb, view);
1141 #endif
1142- midori_context_action_add_simple (menu, "OpenInNewWindow", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW,
1143+ midori_context_action_add_simple (menu, "OpenInNewWindow", _("Open in New _Window"), NULL, "window-new",
1144 midori_view_tab_label_menu_window_new_cb, view);
1145 midori_context_action_add_by_name (menu, "ZoomIn");
1146 midori_context_action_add_by_name (menu, "ZoomOut");
1147
1148=== modified file 'midori/sokoke.c'
1149--- midori/sokoke.c 2014-03-19 20:48:58 +0000
1150+++ midori/sokoke.c 2015-02-08 05:58:50 +0000
1151@@ -550,7 +550,7 @@
1152 if (icon)
1153 image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_DIALOG);
1154 else
1155- image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES,
1156+ image = gtk_image_new_from_icon_name ("preferences-desktop",
1157 GTK_ICON_SIZE_DIALOG);
1158 gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
1159 label = gtk_label_new (NULL);
1160
1161=== modified file 'panels/midori-bookmarks.c'
1162--- panels/midori-bookmarks.c 2014-07-24 06:01:27 +0000
1163+++ panels/midori-bookmarks.c 2015-02-08 05:58:50 +0000
1164@@ -757,7 +757,7 @@
1165
1166 toolbar = gtk_toolbar_new ();
1167 bookmarks->toolbar = toolbar;
1168- toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
1169+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("bookmark-new", GTK_ICON_SIZE_MENU), _("Add bookmark"));
1170 gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkAdd");
1171 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
1172 _("Add a new bookmark"));
1173@@ -765,22 +765,24 @@
1174 g_signal_connect (toolitem, "clicked",
1175 G_CALLBACK (midori_bookmarks_add_clicked_cb), bookmarks);
1176 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1177- gtk_widget_show (GTK_WIDGET (toolitem));
1178- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_EDIT);
1179+ gtk_widget_show_all (GTK_WIDGET (toolitem));
1180+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("accessories-text-editor",
1181+ GTK_ICON_SIZE_MENU), "Edit");
1182 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
1183 _("Edit the selected bookmark"));
1184 g_signal_connect (toolitem, "clicked",
1185 G_CALLBACK (midori_bookmarks_edit_clicked_cb), bookmarks);
1186 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1187- gtk_widget_show (GTK_WIDGET (toolitem));
1188+ gtk_widget_show_all (GTK_WIDGET (toolitem));
1189 bookmarks->edit = GTK_WIDGET (toolitem);
1190- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
1191+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("edit-delete",
1192+ GTK_ICON_SIZE_MENU), "Delete");
1193 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
1194 _("Delete the selected bookmark"));
1195 g_signal_connect (toolitem, "clicked",
1196 G_CALLBACK (midori_bookmarks_delete_clicked_cb), bookmarks);
1197 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1198- gtk_widget_show (GTK_WIDGET (toolitem));
1199+ gtk_widget_show_all (GTK_WIDGET (toolitem));
1200 bookmarks->delete = GTK_WIDGET (toolitem);
1201 midori_bookmarks_toolbar_update (bookmarks);
1202 midori_bookmarks_statusbar_update (bookmarks);
1203@@ -789,14 +791,15 @@
1204 gtk_tool_item_set_expand (toolitem, TRUE);
1205 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1206 gtk_widget_show (GTK_WIDGET (toolitem));
1207- toolitem = gtk_tool_button_new_from_stock (STOCK_FOLDER_NEW);
1208+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("folder-new",
1209+ GTK_ICON_SIZE_MENU), "New Folder");
1210 gtk_widget_set_name (GTK_WIDGET (toolitem), "BookmarkFolderAdd");
1211 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
1212 _("Add a new folder"));
1213 g_signal_connect (toolitem, "clicked",
1214 G_CALLBACK (midori_bookmarks_add_clicked_cb), bookmarks);
1215 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1216- gtk_widget_show (GTK_WIDGET (toolitem));
1217+ gtk_widget_show_all (GTK_WIDGET (toolitem));
1218
1219 g_signal_connect (bookmarks->edit, "destroy",
1220 G_CALLBACK (gtk_widget_destroyed), &bookmarks->edit);
1221@@ -1079,7 +1082,7 @@
1222 "uri <> ''", NULL, item, FALSE);
1223
1224 midori_bookmarks_popup_item (menu,
1225- STOCK_TAB_NEW, _("Open all in _Tabs"), item,
1226+ "tab-new", _("Open all in _Tabs"), item,
1227 (!child_bookmarks_count ? NULL : midori_bookmarks_open_in_tab_activate_cb),
1228 bookmarks);
1229 }
1230@@ -1087,9 +1090,9 @@
1231 {
1232 midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL,
1233 item, midori_bookmarks_open_activate_cb, bookmarks);
1234- midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"),
1235+ midori_bookmarks_popup_item (menu, "tab-new", _("Open in New _Tab"),
1236 item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
1237- midori_bookmarks_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"),
1238+ midori_bookmarks_popup_item (menu, "window-new", _("Open in New _Window"),
1239 item, midori_bookmarks_open_in_window_activate_cb, bookmarks);
1240 }
1241 menuitem = gtk_separator_menu_item_new ();
1242
1243=== modified file 'panels/midori-history.c'
1244--- panels/midori-history.c 2013-10-25 21:49:56 +0000
1245+++ panels/midori-history.c 2015-02-08 05:58:50 +0000
1246@@ -353,30 +353,33 @@
1247
1248 toolbar = gtk_toolbar_new ();
1249 history->toolbar = toolbar;
1250- toolitem = gtk_tool_button_new_from_stock (STOCK_BOOKMARK_ADD);
1251+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("bookmark-new",
1252+ GTK_ICON_SIZE_MENU), _("Add bookmark"));
1253 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
1254 _("Bookmark the selected history item"));
1255 gtk_tool_item_set_is_important (toolitem, TRUE);
1256 g_signal_connect (toolitem, "clicked",
1257 G_CALLBACK (midori_history_bookmark_add_cb), history);
1258 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1259- gtk_widget_show (GTK_WIDGET (toolitem));
1260+ gtk_widget_show_all (GTK_WIDGET (toolitem));
1261 history->bookmark = GTK_WIDGET (toolitem);
1262- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
1263+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("edit-delete",
1264+ GTK_ICON_SIZE_MENU), "Delete");
1265 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
1266 _("Delete the selected history item"));
1267 g_signal_connect (toolitem, "clicked",
1268 G_CALLBACK (midori_history_delete_clicked_cb), history);
1269 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1270- gtk_widget_show (GTK_WIDGET (toolitem));
1271+ gtk_widget_show_all (GTK_WIDGET (toolitem));
1272 history->delete = GTK_WIDGET (toolitem);
1273- toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR);
1274+ toolitem = gtk_tool_button_new (gtk_image_new_from_icon_name ("edit-clear",
1275+ GTK_ICON_SIZE_MENU), "Clear");
1276 gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
1277 _("Clear the entire history"));
1278 g_signal_connect (toolitem, "clicked",
1279 G_CALLBACK (midori_history_clear_clicked_cb), history);
1280 gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
1281- gtk_widget_show (GTK_WIDGET (toolitem));
1282+ gtk_widget_show_all (GTK_WIDGET (toolitem));
1283 history->clear = GTK_WIDGET (toolitem);
1284 midori_history_toolbar_update (history);
1285 g_signal_connect (history->bookmark, "destroy",
1286@@ -735,15 +738,15 @@
1287 menu = gtk_menu_new ();
1288 if (!katze_item_get_uri (item))
1289 midori_history_popup_item (menu,
1290- STOCK_TAB_NEW, _("Open all in _Tabs"),
1291+ "tab-new", _("Open all in _Tabs"),
1292 item, midori_history_open_in_tab_activate_cb, history);
1293 else
1294 {
1295 midori_history_popup_item (menu, GTK_STOCK_OPEN, NULL,
1296 item, midori_history_open_activate_cb, history);
1297- midori_history_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"),
1298+ midori_history_popup_item (menu, "tab-new", _("Open in New _Tab"),
1299 item, midori_history_open_in_tab_activate_cb, history);
1300- midori_history_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"),
1301+ midori_history_popup_item (menu, "window-new", _("Open in New _Window"),
1302 item, midori_history_open_in_window_activate_cb, history);
1303 midori_history_popup_item (menu, STOCK_BOOKMARK_ADD, NULL,
1304 item, midori_history_bookmark_add_cb, history);
1305
1306=== modified file 'toolbars/midori-findbar.c'
1307--- toolbars/midori-findbar.c 2013-06-21 20:49:53 +0000
1308+++ toolbars/midori-findbar.c 2015-02-08 05:58:50 +0000
1309@@ -146,7 +146,7 @@
1310 gtk_widget_grab_focus (GTK_WIDGET (findbar->find_text));
1311 else
1312 {
1313- midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, STOCK_EDIT_FIND);
1314+ midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, "edit-find");
1315 gtk_widget_show (GTK_WIDGET (findbar->find_case));
1316 gtk_widget_show (GTK_WIDGET (findbar->find_close));
1317 if (selected_text != NULL)
1318@@ -188,7 +188,7 @@
1319 if (g_utf8_strlen (preedit, -1) >= 1)
1320 {
1321 gboolean case_sensitive = midori_findbar_case_sensitive (findbar);
1322- midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, STOCK_EDIT_CLEAR);
1323+ midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_SECONDARY, "edit-clear");
1324 midori_tab_find (MIDORI_TAB (view), preedit, case_sensitive, TRUE);
1325 }
1326 else
1327@@ -245,29 +245,31 @@
1328 gtk_container_add (GTK_CONTAINER (toolitem), findbar->find_text);
1329 gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE);
1330 gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1);
1331- findbar->previous = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
1332+ findbar->previous = gtk_tool_button_new ( gtk_image_new_from_icon_name ("go-previous",
1333+ GTK_ICON_SIZE_SMALL_TOOLBAR), _("Previous"));
1334 g_signal_connect (findbar->previous, "clicked",
1335 G_CALLBACK (midori_findbar_previous_clicked_cb), findbar);
1336- gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->previous), _("Previous"));
1337 gtk_tool_item_set_is_important (findbar->previous, TRUE);
1338 gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->previous, -1);
1339- findbar->next = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
1340+ findbar->next = gtk_tool_button_new ( gtk_image_new_from_icon_name ("go-next",
1341+ GTK_ICON_SIZE_SMALL_TOOLBAR),_("Next"));
1342 g_signal_connect (findbar->next, "clicked",
1343 G_CALLBACK (midori_findbar_next_activate_cb), findbar);
1344- gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->next), _("Next"));
1345 gtk_tool_item_set_is_important (findbar->next, TRUE);
1346 gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->next, -1);
1347- findbar->find_case = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_SPELL_CHECK);
1348+ findbar->find_case = gtk_toggle_tool_button_new ();
1349 gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->find_case), _("Match Case"));
1350+ gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(findbar->find_case),
1351+ gtk_image_new_from_icon_name ("tools-check-spelling",GTK_ICON_SIZE_SMALL_TOOLBAR));
1352 gtk_tool_item_set_is_important (GTK_TOOL_ITEM (findbar->find_case), TRUE);
1353 gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_case, -1);
1354 toolitem = gtk_separator_tool_item_new ();
1355 gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE);
1356 gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE);
1357 gtk_toolbar_insert (GTK_TOOLBAR (findbar), toolitem, -1);
1358- findbar->find_close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE);
1359- gtk_tool_button_set_label (GTK_TOOL_BUTTON (findbar->find_close),
1360- _("Close Findbar"));
1361+ findbar->find_close = gtk_tool_button_new (gtk_image_new_from_icon_name("window-close",
1362+ GTK_ICON_SIZE_SMALL_TOOLBAR),_("Close Findbar"));
1363+
1364 g_signal_connect (findbar->find_close, "clicked",
1365 G_CALLBACK (midori_findbar_button_close_clicked_cb), findbar);
1366 gtk_toolbar_insert (GTK_TOOLBAR (findbar), findbar->find_close, -1);
1367@@ -292,7 +294,7 @@
1368 const gchar* text;
1369 gboolean case_sensitive;
1370
1371- midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, found ? STOCK_EDIT_FIND : STOCK_STOP);
1372+ midori_findbar_set_icon (findbar, GTK_ENTRY_ICON_PRIMARY, found ? "edit-find" : STOCK_STOP);
1373
1374 if (typing)
1375 {

Subscribers

People subscribed via source and target branches

to all changes: