diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-17 13:47:17 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-12 07:14:32 +0000 |
| commit | 2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738 (patch) | |
| tree | 8b14d373b97ea9162a46e8b61f42919f2a6c5514 /ui/gtk/main.gresources.xml | |
| parent | 1ab019f409f2855d3b51717a237cc482242887e9 (diff) | |
[GTK] Replace deprecated gdk_pixbuf_new_from_inline()
Use GResource instead, if available. Add autotools and cmake compile time
checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26).
Merge all the various static pixbuf csource header files into
a single pixbuf-csource.h header with external linkage through use of the
tools/make-pixbuf-csource.pl script.
Fix inline pixbuf build target for some image paths (broken for GTK
in gb4a4de7).
Add missing 'expert_ok.png' file to distribution (GTK only).
Minor improvements to style/structure of ui/gtk/Makefile.am.
Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Reviewed-on: https://code.wireshark.org/review/10992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/main.gresources.xml')
| -rw-r--r-- | ui/gtk/main.gresources.xml | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/ui/gtk/main.gresources.xml b/ui/gtk/main.gresources.xml new file mode 100644 index 0000000000..54a4c6d8d9 --- /dev/null +++ b/ui/gtk/main.gresources.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gresources> + <gresource prefix="/org/wireshark"> + <file>image/wsicon16.png</file> + <file>image/wsicon24.png</file> + <file>image/wsicon32.png</file> + <file>image/wsicon48.png</file> + <file>image/wsicon64.png</file> + + <file>image/wsiconcap16.png</file> + <file>image/wsiconcap24.png</file> + <file>image/wsiconcap32.png</file> + <file>image/wsiconcap48.png</file> + <file>image/wsiconcap64.png</file> + + <file>image/wssplash.png</file> + <file>image/wssplash_dev.png</file> + + <file>image/layout_1.png</file> + <file>image/layout_2.png</file> + <file>image/layout_3.png</file> + <file>image/layout_4.png</file> + <file>image/layout_5.png</file> + <file>image/layout_6.png</file> + + <file>image/capture_comment_add.png</file> + <file>image/capture_comment_update.png</file> + <file>image/capture_comment_disabled.png</file> + + <file>image/toolbar/network_bluetooth_16.png</file> + <file>image/toolbar/network_usb_16.png</file> + <file>image/toolbar/network_wired_16.png</file> + <file>image/toolbar/network_wireless_16.png</file> + + <file>image/toolbar/remote_arrow_16.png</file> + <file>image/toolbar/remote_globe_16.png</file> + <file>image/toolbar/remote_sat_16.png</file> + + <file>image/toolbar/pipe_16.png</file> + + <file>image/toolbar/capture_interfaces_16.png</file> + <file>image/toolbar/gnome_emblem_web_16.png</file> + <file>image/toolbar/capture_interfaces_24.png</file> + <file>image/toolbar/gnome_emblem_web_24.png</file> + + <file>image/toolbar/14x14/x-expert-chat.png</file> + <file>image/toolbar/14x14/x-expert-error.png</file> + <file>image/toolbar/14x14/x-expert-none.png</file> + <file>image/toolbar/14x14/x-expert-note.png</file> + <file>image/toolbar/14x14/x-expert-warn.png</file> + <file>image/expert_ok.png</file> + + <file>image/toolbar/16x16/x-capture-file-save.png</file> + <file>image/toolbar/16x16/x-capture-options.png</file> + <file>image/toolbar/16x16/x-capture-restart.png</file> + <file>image/toolbar/16x16/x-capture-start.png</file> + <file>image/toolbar/16x16/x-capture-stop.png</file> + + <file>image/toolbar/24x24/x-capture-file-save.png</file> + <file>image/toolbar/24x24/x-capture-options.png</file> + <file>image/toolbar/24x24/x-capture-restart.png</file> + <file>image/toolbar/24x24/x-capture-start.png</file> + <file>image/toolbar/24x24/x-capture-stop.png</file> + </gresource> +</gresources> |