osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More .. -> ../.. changes after gtk/ move 

svn path=/trunk/; revision=40523
This commit is contained in:
Jörg Mayer 2012-01-15 22:40:03 +00:00
parent ef356ef2ef
commit 89ac6f314f
9 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/gtk/Makefile.am
View File

@ -91,21 +91,21 @@ expert_indicators.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for elevel in chat error none note warn ; do \
gdk-pixbuf-csource --raw --name=expert_$${elevel}_pb_data ../image/expert_$${elevel}.png >> $@ ;\
gdk-pixbuf-csource --raw --name=expert_$${elevel}_pb_data ../../image/expert_$${elevel}.png >> $@ ;\
done
network_icons.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for icon in bluetooth usb wired wireless ; do \
gdk-pixbuf-csource --raw --name=network_$${icon}_pb_data ../image/toolbar/network_$${icon}_16.png >> $@ ;\
gdk-pixbuf-csource --raw --name=network_$${icon}_pb_data ../../image/toolbar/network_$${icon}_16.png >> $@ ;\
done
remote_icons.h:
echo "/* This file was automatically generated. DO NOT EDIT. */" > $@
echo >> $@
for icon in arrow globe sat ; do \
gdk-pixbuf-csource --raw --name=remote_$${icon}_pb_data ../image/toolbar/remote_$${icon}_16.png >> $@ ;\
gdk-pixbuf-csource --raw --name=remote_$${icon}_pb_data ../../image/toolbar/remote_$${icon}_16.png >> $@ ;\
done
EXTRA_DIST = \

2
ui/gtk/Makefile.common
View File

@ -152,7 +152,7 @@ WIRESHARK_GTK_SRC = \
webbrowser.c \
$(WIRESHARK_CUSTOM_GTK_SRC)
about_dlg.c main_welcome.c: ../image/wssplash.xpm ../image/wssplash-dev.xpm remote_icons.h
about_dlg.c main_welcome.c: ../../image/wssplash.xpm ../image/wssplash-dev.xpm remote_icons.h
main_statusbar.c: expert_indicators.h
capture_if_dlg.c: network_icons.h remote_icons.h

2
ui/gtk/about_dlg.c
View File

@ -52,7 +52,7 @@
#include "ui/gtk/main.h"
#include "ui/gtk/plugins_dlg.h"
#include "../image/wssplash-dev.xpm"
#include "../../image/wssplash-dev.xpm"
#include "webbrowser.h"
/*

14
ui/gtk/capture_if_dlg.c
View File

@ -70,7 +70,7 @@
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_AIRPCAP
#include "../image/toolbar/capture_airpcap_16.xpm"
#include "../../image/toolbar/capture_airpcap_16.xpm"
#endif
#if defined(HAVE_PCAP_REMOTE)
@ -78,16 +78,16 @@
#endif
#ifdef _WIN32
#include "../image/toolbar/capture_ethernet_16.xpm"
#include "../image/toolbar/modem_16.xpm"
#include "../../image/toolbar/capture_ethernet_16.xpm"
#include "../../image/toolbar/modem_16.xpm"
#endif
#include "../image/toolbar/network_virtual_16.xpm"
#include "../../image/toolbar/network_virtual_16.xpm"
/* new buttons to be used instead of labels for 'Capture','Prepare',' */
/*#include "../image/toolbar/capture_capture_16.xpm"*/
/*#include "../image/toolbar/capture_prepare_16.xpm"*/
/*#include "../image/toolbar/capture_details_16.xpm"*/
/*#include "../../image/toolbar/capture_capture_16.xpm"*/
/*#include "../../image/toolbar/capture_prepare_16.xpm"*/
/*#include "../../image/toolbar/capture_details_16.xpm"*/
#ifdef HAVE_AIRPCAP

2
ui/gtk/graph_analysis.c
View File

@ -66,7 +66,7 @@
#include "ui/gtk/old-gtk-compat.h"
#include "../image/voip_bg.xpm"
#include "../../image/voip_bg.xpm"
/****************************************************************************/

14
ui/gtk/main.c
View File

@ -167,13 +167,13 @@
#include "ui/gtk/old-gtk-compat.h"
#ifdef HAVE_LIBPCAP
#include "../image/wsicon16.xpm"
#include "../image/wsicon32.xpm"
#include "../image/wsicon48.xpm"
#include "../image/wsicon64.xpm"
#include "../image/wsiconcap16.xpm"
#include "../image/wsiconcap32.xpm"
#include "../image/wsiconcap48.xpm"
#include "../../image/wsicon16.xpm"
#include "../../image/wsicon32.xpm"
#include "../../image/wsicon48.xpm"
#include "../../image/wsicon64.xpm"
#include "../../image/wsiconcap16.xpm"
#include "../../image/wsiconcap32.xpm"
#include "../../image/wsiconcap48.xpm"
#endif
#ifdef HAVE_AIRPCAP

4
ui/gtk/main_welcome.c
View File

@ -63,7 +63,7 @@
#include "ui/gtk/webbrowser.h"
#endif
#endif /* HAVE_LIBPCAP */
#include "../image/wssplash-dev.xpm"
#include "../../image/wssplash-dev.xpm"
#include "../version_info.h"
#ifdef _WIN32
@ -77,7 +77,7 @@
#include "airpcap_gui_utils.h"
#endif
#if defined(HAVE_AIRPCAP)
#include "../image/toolbar/capture_airpcap_16.xpm"
#include "../../image/toolbar/capture_airpcap_16.xpm"
#endif
#if defined(HAVE_PCAP_REMOTE)
#include "ui/gtk/remote_icons.h"

12
ui/gtk/prefs_layout.c
View File

@ -39,12 +39,12 @@
#include "ui/gtk/main.h"
#include "ui/gtk/dlg_utils.h"
#include "../image/icon_layout_1.xpm"
#include "../image/icon_layout_2.xpm"
#include "../image/icon_layout_3.xpm"
#include "../image/icon_layout_4.xpm"
#include "../image/icon_layout_5.xpm"
#include "../image/icon_layout_6.xpm"
#include "../../image/icon_layout_1.xpm"
#include "../../image/icon_layout_2.xpm"
#include "../../image/icon_layout_3.xpm"
#include "../../image/icon_layout_4.xpm"
#include "../../image/icon_layout_5.xpm"
#include "../../image/icon_layout_6.xpm"
#define LAYOUT_QTY (layout_type_max - 1)

86
ui/gtk/stock_icons.c
View File

@ -32,49 +32,49 @@
#include "ui/gtk/stock_icons.h"
/* these icons are derived from the original stock icons */
#include "../image/toolbar/capture_interfaces_24.xpm"
#include "../image/toolbar/capture_options_24.xpm"
#include "../image/toolbar/capture_start_24.xpm"
#include "../image/toolbar/capture_stop_24.xpm"
#include "../image/toolbar/capture_restart_24.xpm"
#include "../image/toolbar/capture_filter_24.xpm"
#include "../image/toolbar/capture_details_24.xpm"
#include "../image/toolbar/display_filter_24.xpm"
#include "../image/wsicon16.xpm"
#include "../image/toolbar/colorize_24.xpm"
#include "../image/toolbar/autoscroll_24.xpm"
#include "../image/toolbar/resize_columns_24.xpm"
#include "../image/toolbar/time_24.xpm"
#include "../image/toolbar/internet_24.xpm"
#include "../image/toolbar/web_support_24.xpm"
#include "../image/toolbar/wiki_24.xpm"
#include "../image/toolbar/conversations_16.xpm"
#include "../image/toolbar/endpoints_16.xpm"
#include "../image/toolbar/expert_info_16.xpm"
#include "../image/toolbar/flow_graph_16.xpm"
#include "../image/toolbar/graphs_16.xpm"
#include "../image/toolbar/telephony_16.xpm"
#include "../image/toolbar/decode_as_16.xpm"
#include "../image/toolbar/checkbox_16.xpm"
#include "../image/toolbar/file_set_list_16.xpm"
#include "../image/toolbar/file_set_next_16.xpm"
#include "../image/toolbar/file_set_previous_16.xpm"
#include "../image/toolbar/icon_color_1.xpm"
#include "../image/toolbar/icon_color_2.xpm"
#include "../image/toolbar/icon_color_3.xpm"
#include "../image/toolbar/icon_color_4.xpm"
#include "../image/toolbar/icon_color_5.xpm"
#include "../image/toolbar/icon_color_6.xpm"
#include "../image/toolbar/icon_color_7.xpm"
#include "../image/toolbar/icon_color_8.xpm"
#include "../image/toolbar/icon_color_9.xpm"
#include "../image/toolbar/icon_color_0.xpm"
#include "../image/toolbar/decode_24.xpm"
#include "../image/toolbar/audio_player_24.xpm"
#include "../image/toolbar/voip_flow_24.xpm"
#include "../image/toolbar/telephone_16.xpm"
#include "../image/toolbar/analyze_24.xpm"
#include "../image/WiresharkDoc_24.xpm"
#include "../../image/toolbar/capture_interfaces_24.xpm"
#include "../../image/toolbar/capture_options_24.xpm"
#include "../../image/toolbar/capture_start_24.xpm"
#include "../../image/toolbar/capture_stop_24.xpm"
#include "../../image/toolbar/capture_restart_24.xpm"
#include "../../image/toolbar/capture_filter_24.xpm"
#include "../../image/toolbar/capture_details_24.xpm"
#include "../../image/toolbar/display_filter_24.xpm"
#include "../../image/wsicon16.xpm"
#include "../../image/toolbar/colorize_24.xpm"
#include "../../image/toolbar/autoscroll_24.xpm"
#include "../../image/toolbar/resize_columns_24.xpm"
#include "../../image/toolbar/time_24.xpm"
#include "../../image/toolbar/internet_24.xpm"
#include "../../image/toolbar/web_support_24.xpm"
#include "../../image/toolbar/wiki_24.xpm"
#include "../../image/toolbar/conversations_16.xpm"
#include "../../image/toolbar/endpoints_16.xpm"
#include "../../image/toolbar/expert_info_16.xpm"
#include "../../image/toolbar/flow_graph_16.xpm"
#include "../../image/toolbar/graphs_16.xpm"
#include "../../image/toolbar/telephony_16.xpm"
#include "../../image/toolbar/decode_as_16.xpm"
#include "../../image/toolbar/checkbox_16.xpm"
#include "../../image/toolbar/file_set_list_16.xpm"
#include "../../image/toolbar/file_set_next_16.xpm"
#include "../../image/toolbar/file_set_previous_16.xpm"
#include "../../image/toolbar/icon_color_1.xpm"
#include "../../image/toolbar/icon_color_2.xpm"
#include "../../image/toolbar/icon_color_3.xpm"
#include "../../image/toolbar/icon_color_4.xpm"
#include "../../image/toolbar/icon_color_5.xpm"
#include "../../image/toolbar/icon_color_6.xpm"
#include "../../image/toolbar/icon_color_7.xpm"
#include "../../image/toolbar/icon_color_8.xpm"
#include "../../image/toolbar/icon_color_9.xpm"
#include "../../image/toolbar/icon_color_0.xpm"
#include "../../image/toolbar/decode_24.xpm"
#include "../../image/toolbar/audio_player_24.xpm"
#include "../../image/toolbar/voip_flow_24.xpm"
#include "../../image/toolbar/telephone_16.xpm"
#include "../../image/toolbar/analyze_24.xpm"
#include "../../image/WiresharkDoc_24.xpm"
typedef struct stock_pixmap_tag{
const char * name;