move stock icon code from toolbar.c into specific stock_icons file(s)

svn path=/trunk/; revision=24921
network-analytics · Apr 12, 2008 · 55c2be8 · 55c2be8
1 parent ca0cfac
commit 55c2be8
Show file tree

Hide file tree

Showing 30 changed files with 339 additions and 258 deletions.
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
@@ -117,6 +117,7 @@ noinst_HEADERS = \
 	sctp_stat.h	\
 	service_response_time_table.h	\
 	gui_stat_menu.h	\
+	stock_icons.h	\
 	stream_prefs.h	\
 	summary_dlg.h   \
 	supported_protos_dlg.h   \

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
@@ -110,6 +110,7 @@ WIRESHARK_GTK_SRC = \
 	sctp_error_dlg.c	\
 	service_response_time_table.c	\
 	simple_dialog.c	\
+	stock_icons.c	\
 	stream_prefs.c	\
 	summary_dlg.c	\
 	supported_protos_dlg.c	\

diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c
@@ -51,7 +51,7 @@
 #include "gui_utils.h"
 #include "simple_dialog.h"
 #include "dfilter_expr_dlg.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "gtkglobals.h"
 #include "help_dlg.h"
 

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
@@ -55,6 +55,7 @@
 #include "ringbuffer.h"
 #include <epan/filesystem.h>
 #include "compat_macros.h"
+#include "stock_icons.h"
 #include "capture_file_dlg.h"
 #include "help_dlg.h"
 #include "gtkglobals.h"

diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
@@ -42,7 +42,7 @@
 #include "capture-wpcap.h"
 #endif
 
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "simple_dialog.h"
 #include "capture.h"
 #include "capture_dlg.h"

diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
@@ -35,7 +35,7 @@
 #ifdef HAVE_LIBPCAP
 
 #include <gtk/gtk.h>
-#include "gtk/compat_macros.h"
+#include "gtk/stock_icons.h"
 
 #include <time.h>
 

diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
@@ -42,7 +42,7 @@
 #include "capture-pcap-util.h"
 #include "capture_ui_utils.h"
 #include "main.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "capture.h"
 #include <epan/strutil.h>
 

diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
@@ -43,6 +43,7 @@
 #include "gui_utils.h"
 #include "dfilter_expr_dlg.h"
 #include "compat_macros.h"
+#include "stock_icons.h"
 #include "filter_dlg.h"
 #include "capture_file_dlg.h"
 #include "gtkglobals.h"

diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
@@ -37,7 +37,7 @@
 
 #include "dlg_utils.h"
 #include "gui_utils.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "filter_dlg.h"
 #include "dfilter_expr_dlg.h"
 #include "simple_dialog.h"

diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
@@ -36,57 +36,6 @@
  *              gtk_widget_set_size_request, ...
  */
 
-
-#ifdef HAVE_LIBPCAP
-#define WIRESHARK_STOCK_CAPTURE_INTERFACES       "Wireshark_Stock_CaptureInterfaces"
-#define WIRESHARK_STOCK_CAPTURE_OPTIONS          "Wireshark_Stock_CaptureOptionss"
-#define WIRESHARK_STOCK_CAPTURE_START            "Wireshark_Stock_CaptureStart"
-#define WIRESHARK_STOCK_CAPTURE_STOP             "Wireshark_Stock_CaptureStop"
-#define WIRESHARK_STOCK_CAPTURE_RESTART          "Wireshark_Stock_CaptureRestart"
-#define WIRESHARK_STOCK_CAPTURE_FILTER           "Wireshark_Stock_CaptureFilter"
-#define WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY     "Wireshark_Stock_CaptureFilter_Entry"
-#define WIRESHARK_STOCK_CAPTURE_DETAILS          "Wireshark_Stock_CaptureDetails"
-#endif
-#define WIRESHARK_STOCK_DISPLAY_FILTER           "Wireshark_Stock_DisplayFilter"
-#define WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY     "Wireshark_Stock_DisplayFilter_Entry"
-#define WIRESHARK_STOCK_BROWSE                   "Wireshark_Stock_Browse"
-#define WIRESHARK_STOCK_CREATE_STAT              "Wireshark_Stock_CreateStat"
-#define WIRESHARK_STOCK_EXPORT                   "Wireshark_Stock_Export"
-#define WIRESHARK_STOCK_IMPORT                   "Wireshark_Stock_Import"
-#define WIRESHARK_STOCK_EDIT                     "Wireshark_Stock_Edit"
-#define WIRESHARK_STOCK_ADD_EXPRESSION           "Wireshark_Stock_Edit_Add_Expression"
-#define WIRESHARK_STOCK_DONT_SAVE                "Wireshark_Stock_Continue_without_Saving"
-#define WIRESHARK_STOCK_ABOUT                    "Wireshark_Stock_About"
-#define WIRESHARK_STOCK_COLORIZE                 "Wireshark_Stock_Colorize"
-#define WIRESHARK_STOCK_AUTOSCROLL               "Wireshark_Stock_Autoscroll"
-#define WIRESHARK_STOCK_RESIZE_COLUMNS           "Wireshark_Stock_Resize_Columns"
-#define WIRESHARK_STOCK_TIME                     "Wireshark_Stock_Time"
-#define WIRESHARK_STOCK_INTERNET                 "Wireshark_Stock_Internet"
-#define WIRESHARK_STOCK_WEB_SUPPORT              "Wireshark_Stock_Web_Support"
-#define WIRESHARK_STOCK_WIKI                     "Wireshark_Stock_Wiki"
-#define WIRESHARK_STOCK_CONVERSATIONS            "Wireshark_Stock_Conversations"
-#define WIRESHARK_STOCK_ENDPOINTS                "Wireshark_Stock_Endpoints"
-#define WIRESHARK_STOCK_GRAPHS                   "Wireshark_Stock_Graphs"
-#define WIRESHARK_STOCK_TELEPHONY                "Wireshark_Stock_Telephony"
-#define WIRESHARK_STOCK_DECODE_AS                "Wireshark_Stock_DecodeAs"
-#define WIRESHARK_STOCK_CHECKBOX                 "Wireshark_Stock_Checkbox"
-#define WIRESHARK_STOCK_FILE_SET_LIST            "Wireshark_Stock_File_Set_List"
-#define WIRESHARK_STOCK_FILE_SET_NEXT            "Wireshark_Stock_File_Set_Next"
-#define WIRESHARK_STOCK_FILE_SET_PREVIOUS        "Wireshark_Stock_File_Set_Previous"
-#define WIRESHARK_STOCK_FILTER_OUT_STREAM        "Wireshark_Stock_Filter_Out_This_Stream"
-#define WIRESHARK_STOCK_ENABLE                   "Wireshark_Stock_Enable"
-#define WIRESHARK_STOCK_DISABLE                  "Wireshark_Stock_Disable"
-#define WIRESHARK_STOCK_COLOR1                   "Wireshark_Stock_Color_1"
-#define WIRESHARK_STOCK_COLOR2                   "Wireshark_Stock_Color_2"
-#define WIRESHARK_STOCK_COLOR3                   "Wireshark_Stock_Color_3"
-#define WIRESHARK_STOCK_COLOR4                   "Wireshark_Stock_Color_4"
-#define WIRESHARK_STOCK_COLOR5                   "Wireshark_Stock_Color_5"
-#define WIRESHARK_STOCK_COLOR6                   "Wireshark_Stock_Color_6"
-#define WIRESHARK_STOCK_COLOR7                   "Wireshark_Stock_Color_7"
-#define WIRESHARK_STOCK_COLOR8                   "Wireshark_Stock_Color_8"
-#define WIRESHARK_STOCK_COLOR9                   "Wireshark_Stock_Color_9"
-#define WIRESHARK_STOCK_COLOR0                   "Wireshark_Stock_Color_10"
-
 /* for details, see "Pango Text Attribute Markup" */
 /* maybe it's a good idea to keep this macro beyond the ongoing GTK1 cleanup!
    If we want to change the look of the dialog boxes primary line the other day,

diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
@@ -52,7 +52,7 @@
 #include <epan/dissectors/packet-dcerpc.h>
 #include "../globals.h"
 #include "filter_dlg.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 

diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
@@ -32,7 +32,7 @@
 #include "gtkglobals.h"
 #include "gui_utils.h"
 #include "dlg_utils.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 
 #include <string.h>
 #include <stdarg.h>

diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
@@ -39,7 +39,7 @@
 #include "gui_utils.h"
 #include "simple_dialog.h"
 #include "dfilter_expr_dlg.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "gtkglobals.h"
 #include "help_dlg.h"
 #include <epan/prefs.h>

diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
@@ -42,7 +42,7 @@
 #include "alert_box.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include <epan/prefs.h>
 #include "prefs_dlg.h"
 #include "keys.h"

diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c
@@ -40,7 +40,7 @@
 #include <epan/filesystem.h>
 #include <epan/prefs.h>
 #include <gtk/colors.h>
-#include <gtk/compat_macros.h>
+#include <gtk/stock_icons.h>
 #include <gtk/dlg_utils.h>
 #include <gtk/follow_stream.h>
 #include <gtk/font_utils.h>

diff --git a/gtk/io_stat.c b/gtk/io_stat.c
@@ -51,7 +51,7 @@
 #include "simple_dialog.h"
 #include "../globals.h"
 #include "../color.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "dlg_utils.h"
 #include "filter_dlg.h"
 #include "help_dlg.h"

diff --git a/gtk/libui.vcproj b/gtk/libui.vcproj
@@ -627,6 +627,10 @@
 				RelativePath=".\stats_tree_stat.c"
 				>
 			</File>
+			<File
+				RelativePath=".\stock_icons.c"
+				>
+			</File>
 			<File
 				RelativePath=".\stream_prefs.c"
 				>
@@ -1009,6 +1013,10 @@
 				RelativePath=".\ssl-dlg.h"
 				>
 			</File>
+			<File
+				RelativePath=".\stock_icons.h"
+				>
+			</File>
 			<File
 				RelativePath=".\stream_prefs.h"
 				>

diff --git a/gtk/main.c b/gtk/main.c
@@ -137,6 +137,7 @@
 #include "proto_draw.h"
 #include "keys.h"
 #include "packet_win.h"
+#include "stock_icons.h"
 #include "toolbar.h"
 #include "find_dlg.h"
 #include "packet_list.h"
@@ -2931,6 +2932,8 @@ main(int argc, char *argv[])
 
   font_init();
 
+  stock_icons_init();
+
   /* close the splash screen, as we are going to open the main window now */
   splash_destroy(splash_win);
 

diff --git a/gtk/menu.c b/gtk/menu.c
@@ -69,6 +69,7 @@
 #include <epan/plugins.h>
 #include <epan/epan_dissect.h>
 #include "compat_macros.h"
+#include "stock_icons.h"
 #include "toolbar.h"
 #include "gtkglobals.h"
 #include "register.h"

diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
@@ -49,7 +49,7 @@
 #include "gui_utils.h"
 #include "dlg_utils.h"
 #include "simple_dialog.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "help_dlg.h"
 #include "keys.h"
 #include "uat_gui.h"

diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
@@ -47,7 +47,7 @@
 #ifdef _WIN32
 #include "print_mswin.h"
 #endif
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "range_utils.h"
 #include "help_dlg.h"
 #include "file_util.h"

diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
@@ -42,7 +42,7 @@
 #endif
 #include "file_dlg.h"
 #include "capture_file_dlg.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "gtkglobals.h"
 
 static void printer_browse_file_cb(GtkWidget *file_bt, GtkWidget *file_te);

diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
@@ -49,7 +49,7 @@
 #include "main.h"
 #include "globals.h"
 #include "filter_dlg.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 

diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
@@ -46,7 +46,7 @@
 #include "main.h"
 #include "globals.h"
 #include "filter_dlg.h"
-#include "compat_macros.h"
+#include "stock_icons.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 #include <epan/conversation.h>

diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c
@@ -35,6 +35,7 @@
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "compat_macros.h"
+#include "stock_icons.h"
 
 #include <epan/strutil.h>