PERFORCE change 125259 for review
dongmei
dongmei at FreeBSD.org
Fri Aug 17 00:34:44 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=125259
Change 125259 by dongmei at dongmei2007 on 2007/08/17 07:34:05
add the toolbar icons
Affected files ...
.. //depot/projects/soc2007/dongmei-auditanalyzer/Makefile#4 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/compat_macros.h#3 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/main.c#3 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/main.h#1 add
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.c#4 edit
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/toolbar.c#1 add
.. //depot/projects/soc2007/dongmei-auditanalyzer/gtk/toolbar.h#1 add
.. //depot/projects/soc2007/dongmei-auditanalyzer/image/toolbar/capture_start_24.xpm#1 add
.. //depot/projects/soc2007/dongmei-auditanalyzer/image/toolbar/capture_stop_24.xpm#1 add
Differences ...
==== //depot/projects/soc2007/dongmei-auditanalyzer/Makefile#4 (text+ko) ====
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/gtk
.PATH: ${.CURDIR}/image
-SOURCES = main.c menu.c list_view.c tree_view.c file_dlg.c gui_utils.c simple_dialog.c trail_file_dlg.c filesystem.c buffer.c except.c file_access.c strerror.c tfile.c tsess.c file_util.c capture.c
+SOURCES = main.c menu.c list_view.c tree_view.c file_dlg.c gui_utils.c simple_dialog.c trail_file_dlg.c filesystem.c buffer.c except.c file_access.c strerror.c tfile.c tsess.c file_util.c capture.c toolbar.c
OBJS = ${SOURCES:.c=.o}
CFLAGS = `pkg-config gtk+-2.0 --cflags` -D_U_=""
LDADD = `pkg-config gtk+-2.0 gthread-2.0 --libs` -lbsm
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/compat_macros.h#3 (text+ko) ====
@@ -22,10 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __COMPAT_MACROS_H__
-#define __COMPAT_MACROS_H__
-
/** @file
*
* Helper macros for gtk1.x / gtk2.x compatibility. Use these macros instead of the GTK deprecated functions,
@@ -36,7 +33,6 @@
* gtk_widget_set_size_request, ...
*/
-#if GTK_MAJOR_VERSION < 2
/** Connect a signal handler to a particular object.
*
@@ -146,79 +142,43 @@
#define ITEM_FACTORY_STOCK_ENTRY(path, accelerator, callback, action, data) \
{path, accelerator, GTK_MENU_FUNC(callback), action, NULL}
-#define GTK_STOCK_APPLY "Apply"
-#define GTK_STOCK_CANCEL "Cancel"
-#define GTK_STOCK_CLEAR "Clear"
-#define GTK_STOCK_CLOSE "Close"
-#define GTK_STOCK_COPY "Copy"
-#define GTK_STOCK_DELETE "Delete"
-#define GTK_STOCK_FIND "Find"
-#define GTK_STOCK_GO_BACK "Back"
-#define GTK_STOCK_GO_DOWN "Down"
-#define GTK_STOCK_GO_FORWARD "Next"
-#define GTK_STOCK_GO_UP "Up"
-#define GTK_STOCK_GOTO_BOTTOM "Bottom"
-#define GTK_STOCK_GOTO_TOP "Top"
-#define GTK_STOCK_HELP "Help"
-#define GTK_STOCK_HOME "Home"
-#define GTK_STOCK_JUMP_TO "GoTo"
-#define GTK_STOCK_NEW "New"
-#define GTK_STOCK_NO "No"
-#define GTK_STOCK_OK "OK"
-#define GTK_STOCK_OPEN "Open"
-#define GTK_STOCK_PRINT "Print"
-#define GTK_STOCK_PROPERTIES "Properties"
-#define GTK_STOCK_REFRESH "Reload"
-#define GTK_STOCK_REVERT_TO_SAVED "Revert"
-#define GTK_STOCK_SAVE "Save"
-#define GTK_STOCK_SAVE_AS "Save As"
-#define GTK_STOCK_SELECT_COLOR "Color"
-#define GTK_STOCK_SELECT_FONT "Font"
-#define GTK_STOCK_STOP "Stop"
-#define GTK_STOCK_YES "Yes"
-#define GTK_STOCK_ZOOM_IN "Zoom In"
-#define GTK_STOCK_ZOOM_OUT "Zoom Out"
-#define GTK_STOCK_ZOOM_100 "Zoom 100%"
-
-#ifdef HAVE_LIBPCAP
-#define WIRESHARK_STOCK_CAPTURE_INTERFACES "Interfaces"
-#define WIRESHARK_STOCK_CAPTURE_AIRPCAP "Airpcap"
-#define WIRESHARK_STOCK_CAPTURE_OPTIONS "Options"
-#define WIRESHARK_STOCK_CAPTURE_START "Start"
-#define WIRESHARK_STOCK_CAPTURE_STOP "Stop"
-#define WIRESHARK_STOCK_CAPTURE_RESTART "Restart"
-#define WIRESHARK_STOCK_CAPTURE_FILTER "CFilter"
-#define WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY "Capture Filter:"
-#define WIRESHARK_STOCK_CAPTURE_DETAILS "Details"
-#endif
-#define WIRESHARK_STOCK_DISPLAY_FILTER "Filter"
-#define WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY "Filter:"
-#define WIRESHARK_STOCK_PREFS "Prefs"
-#define WIRESHARK_STOCK_BROWSE "Browse"
-#define WIRESHARK_STOCK_CREATE_STAT "Create Stat"
-#define WIRESHARK_STOCK_EXPORT "Export..."
-#define WIRESHARK_STOCK_IMPORT "Import..."
-#define WIRESHARK_STOCK_EDIT "Edit..."
-#define WIRESHARK_STOCK_ADD_EXPRESSION "Add Expression..."
-#define WIRESHARK_STOCK_DONT_SAVE "Continue without Saving"
-#define WIRESHARK_STOCK_ABOUT "About"
-#define WIRESHARK_STOCK_COLORIZE "Colorize"
-#define WIRESHARK_STOCK_AUTOSCROLL "Auto Scroll"
-#define WIRESHARK_STOCK_RESIZE_COLUMNS "Resize Columns"
-#define WIRESHARK_STOCK_TIME "Time"
-#define WIRESHARK_STOCK_INTERNET "Internet"
-#define WIRESHARK_STOCK_WEB_SUPPORT "Web Support"
-#define WIRESHARK_STOCK_WIKI "Wiki"
-#define WIRESHARK_STOCK_CONVERSATIONS "Conversations"
-#define WIRESHARK_STOCK_ENDPOINTS "Endpoints"
-#define WIRESHARK_STOCK_GRAPHS "Graphs"
-#define WIRESHARK_STOCK_TELEPHONY "Telephony"
-#define WIRESHARK_STOCK_DECODE_AS "Decode As"
-#define WIRESHARK_STOCK_CHECKBOX "Checkbox"
-#define WIRESHARK_STOCK_FILE_SET_LIST "List Files"
-#define WIRESHARK_STOCK_FILE_SET_NEXT "Next File"
-#define WIRESHARK_STOCK_FILE_SET_PREVIOUS "Previous File"
-#define WIRESHARK_STOCK_FILTER_OUT_STREAM "Filter Out This Stream"
+#define AUANALYZER_STOCK_CAPTURE_INTERFACES "Interfaces"
+#define AUANALYZER_STOCK_CAPTURE_AIRPCAP "Airpcap"
+#define AUANALYZER_STOCK_CAPTURE_OPTIONS "Options"
+#define AUANALYZER_STOCK_CAPTURE_START "Start"
+#define AUANALYZER_STOCK_CAPTURE_STOP "Stop"
+#define AUANALYZER_STOCK_CAPTURE_RESTART "Restart"
+#define AUANALYZER_STOCK_CAPTURE_FILTER "CFilter"
+#define AUANALYZER_STOCK_CAPTURE_FILTER_ENTRY "Capture Filter:"
+#define AUANALYZER_STOCK_CAPTURE_DETAILS "Details"
+#define AUANALYZER_STOCK_DISPLAY_FILTER "Filter"
+#define AUANALYZER_STOCK_DISPLAY_FILTER_ENTRY "Filter:"
+#define AUANALYZER_STOCK_PREFS "Prefs"
+#define AUANALYZER_STOCK_BROWSE "Browse"
+#define AUANALYZER_STOCK_CREATE_STAT "Create Stat"
+#define AUANALYZER_STOCK_EXPORT "Export..."
+#define AUANALYZER_STOCK_IMPORT "Import..."
+#define AUANALYZER_STOCK_EDIT "Edit..."
+#define AUANALYZER_STOCK_ADD_EXPRESSION "Add Expression..."
+#define AUANALYZER_STOCK_DONT_SAVE "Continue without Saving"
+#define AUANALYZER_STOCK_ABOUT "About"
+#define AUANALYZER_STOCK_COLORIZE "Colorize"
+#define AUANALYZER_STOCK_AUTOSCROLL "Auto Scroll"
+#define AUANALYZER_STOCK_RESIZE_COLUMNS "Resize Columns"
+#define AUANALYZER_STOCK_TIME "Time"
+#define AUANALYZER_STOCK_INTERNET "Internet"
+#define AUANALYZER_STOCK_WEB_SUPPORT "Web Support"
+#define AUANALYZER_STOCK_WIKI "Wiki"
+#define AUANALYZER_STOCK_CONVERSATIONS "Conversations"
+#define AUANALYZER_STOCK_ENDPOINTS "Endpoints"
+#define AUANALYZER_STOCK_GRAPHS "Graphs"
+#define AUANALYZER_STOCK_TELEPHONY "Telephony"
+#define AUANALYZER_STOCK_DECODE_AS "Decode As"
+#define AUANALYZER_STOCK_CHECKBOX "Checkbox"
+#define AUANALYZER_STOCK_FILE_SET_LIST "List Files"
+#define AUANALYZER_STOCK_FILE_SET_NEXT "Next File"
+#define AUANALYZER_STOCK_FILE_SET_PREVIOUS "Previous File"
+#define AUANALYZER_STOCK_FILTER_OUT_STREAM "Filter Out This Stream"
/** Create a stock button. Will create a "normal" button for GTK1.
*
@@ -278,7 +238,6 @@
/*************************************************************************/
-#else /* GTK_MAJOR_VERSION >= 2 */
#define SIGNAL_CONNECT(widget, name, callback, arg) \
g_signal_connect(G_OBJECT(widget), name, G_CALLBACK(callback), \
@@ -314,85 +273,44 @@
#define ITEM_FACTORY_STOCK_ENTRY(path, accelerator, callback, action, data) \
{path, accelerator, GTK_MENU_FUNC(callback), action, "<StockItem>", data}
-#ifdef HAVE_LIBPCAP
-#define WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES "_Interfaces"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_AIRPCAP "_Wireless"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_OPTIONS "_Options"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_START "_Start"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_STOP "S_top"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_RESTART "_Restart"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_FILTER "_CFilter"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_FILTER_ENTRY "_Capture Filter:"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_DETAILS "_Details"
-#endif
-#define WIRESHARK_STOCK_LABEL_DISPLAY_FILTER "_Filter"
-#define WIRESHARK_STOCK_LABEL_DISPLAY_FILTER_ENTRY "_Filter:"
-#define WIRESHARK_STOCK_LABEL_PREFS "_Prefs"
-#define WIRESHARK_STOCK_LABEL_BROWSE "_Browse..."
-#define WIRESHARK_STOCK_LABEL_CREATE_STAT "Create _Stat"
-#define WIRESHARK_STOCK_LABEL_EXPORT "_Export..."
-#define WIRESHARK_STOCK_LABEL_IMPORT "_Import..."
-#define WIRESHARK_STOCK_LABEL_EDIT "_Edit..."
-#define WIRESHARK_STOCK_LABEL_ADD_EXPRESSION "_Expression..." /* plus sign coming from icon */
-#define WIRESHARK_STOCK_LABEL_DONT_SAVE "Continue _without Saving"
-#define WIRESHARK_STOCK_LABEL_ABOUT "_About"
-#define WIRESHARK_STOCK_LABEL_COLORIZE "_Colorize"
-#define WIRESHARK_STOCK_LABEL_AUTOSCROLL "_Auto Scroll in Live Capture"
-#define WIRESHARK_STOCK_LABEL_RESIZE_COLUMNS "Resize Columns"
-#define WIRESHARK_STOCK_LABEL_TIME "Time"
-#define WIRESHARK_STOCK_LABEL_INTERNET "Internet"
-#define WIRESHARK_STOCK_LABEL_WEB_SUPPORT "Web Support"
-#define WIRESHARK_STOCK_LABEL_WIKI "Wiki"
-#define WIRESHARK_STOCK_LABEL_CONVERSATIONS "Conversations"
-#define WIRESHARK_STOCK_LABEL_ENDPOINTS "Endpoints"
-#define WIRESHARK_STOCK_LABEL_GRAPHS "Graphs"
-#define WIRESHARK_STOCK_LABEL_TELEPHONY "Telephony"
-#define WIRESHARK_STOCK_LABEL_DECODE_AS "Decode As"
-#define WIRESHARK_STOCK_LABEL_CHECKBOX "Checkbox"
-#define WIRESHARK_STOCK_LABEL_FILE_SET_LIST "List Files"
-#define WIRESHARK_STOCK_LABEL_FILE_SET_NEXT "Next File"
-#define WIRESHARK_STOCK_LABEL_FILE_SET_PREVIOUS "Previous File"
-#define WIRESHARK_STOCK_LABEL_FILTER_OUT_STREAM "Filter Out This Stream"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_INTERFACES "_Interfaces"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_AIRPCAP "_Wireless"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_OPTIONS "_Options"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_START "_Start"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_STOP "S_top"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_RESTART "_Restart"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_FILTER "_CFilter"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_FILTER_ENTRY "_Capture Filter:"
+#define AUANALYZER_STOCK_LABEL_CAPTURE_DETAILS "_Details"
+#define AUANALYZER_STOCK_LABEL_DISPLAY_FILTER "_Filter"
+#define AUANALYZER_STOCK_LABEL_DISPLAY_FILTER_ENTRY "_Filter:"
+#define AUANALYZER_STOCK_LABEL_PREFS "_Prefs"
+#define AUANALYZER_STOCK_LABEL_BROWSE "_Browse..."
+#define AUANALYZER_STOCK_LABEL_CREATE_STAT "Create _Stat"
+#define AUANALYZER_STOCK_LABEL_EXPORT "_Export..."
+#define AUANALYZER_STOCK_LABEL_IMPORT "_Import..."
+#define AUANALYZER_STOCK_LABEL_EDIT "_Edit..."
+#define AUANALYZER_STOCK_LABEL_ADD_EXPRESSION "_Expression..." /* plus sign coming from icon */
+#define AUANALYZER_STOCK_LABEL_DONT_SAVE "Continue _without Saving"
+#define AUANALYZER_STOCK_LABEL_ABOUT "_About"
+#define AUANALYZER_STOCK_LABEL_COLORIZE "_Colorize"
+#define AUANALYZER_STOCK_LABEL_AUTOSCROLL "_Auto Scroll in Live Capture"
+#define AUANALYZER_STOCK_LABEL_RESIZE_COLUMNS "Resize Columns"
+#define AUANALYZER_STOCK_LABEL_TIME "Time"
+#define AUANALYZER_STOCK_LABEL_INTERNET "Internet"
+#define AUANALYZER_STOCK_LABEL_WEB_SUPPORT "Web Support"
+#define AUANALYZER_STOCK_LABEL_WIKI "Wiki"
+#define AUANALYZER_STOCK_LABEL_CONVERSATIONS "Conversations"
+#define AUANALYZER_STOCK_LABEL_ENDPOINTS "Endpoints"
+#define AUANALYZER_STOCK_LABEL_GRAPHS "Graphs"
+#define AUANALYZER_STOCK_LABEL_TELEPHONY "Telephony"
+#define AUANALYZER_STOCK_LABEL_DECODE_AS "Decode As"
+#define AUANALYZER_STOCK_LABEL_CHECKBOX "Checkbox"
+#define AUANALYZER_STOCK_LABEL_FILE_SET_LIST "List Files"
+#define AUANALYZER_STOCK_LABEL_FILE_SET_NEXT "Next File"
+#define AUANALYZER_STOCK_LABEL_FILE_SET_PREVIOUS "Previous File"
+#define AUANALYZER_STOCK_LABEL_FILTER_OUT_STREAM "Filter Out This Stream"
-#ifdef HAVE_LIBPCAP
-#define WIRESHARK_STOCK_CAPTURE_INTERFACES "Wireshark_Stock_CaptureInterfaces"
-#define WIRESHARK_STOCK_CAPTURE_AIRPCAP "Wireshark_Stock_CaptureAirpcap"
-#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_PREFS "Wireshark_Stock_Prefs"
-#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 BUTTON_NEW_FROM_STOCK(stock_id) \
gtk_button_new_from_stock(stock_id);
@@ -417,6 +335,3 @@
#define FONT_TYPE PangoFontDescription
-#endif /* GTK_MAJOR_VERSION */
-
-#endif /* __COMPAT_MACROS_H__ */
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/main.c#3 (text+ko) ====
@@ -9,9 +9,11 @@
#include "../tfile.h"
#include "list_view.h"
#include "tree_view.h"
+#include "stdbool.h"
+#include "toolbar.h"
trailer_file cfile;
-
+bool fstop=FALSE;
GtkWidget *top_level = NULL,*list_view,*tree_view,*list_sw,*tree_sw;
static GtkWidget *menubar, *main_vbox, *main_tb, *pkt_scrollw, *stat_hbox, *filter_tb;
static GtkWidget *main_pane_v1, *main_pane_v2, *main_pane_h1, *main_pane_h2,*vpaned;
@@ -19,12 +21,11 @@
/* This function is connected to the Close button or
* closing the window from the WM */
-gint delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
+gint file_quit_cmd_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
{
gtk_main_quit ();
return FALSE;
}
-
static GtkWidget *create_toolbar(void)
{
GtkWidget *toolbar;
@@ -47,11 +48,12 @@
"Closes this app", /* this button's tooltip */
"Private", /* tooltip private info */
iconw, /* icon widget */
- GTK_SIGNAL_FUNC (delete_event), /* a signal */
+ GTK_SIGNAL_FUNC (file_quit_cmd_cb), /* a signal */
NULL);
gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); /* space after item */
return toolbar;
}
+
gchar *
create_user_window_title(const gchar *caption)
{
@@ -104,7 +106,7 @@
gtk_window_add_accel_group(GTK_WINDOW(top_level), accel);
/*Create main toolbar*/
- main_tb=create_toolbar();
+ main_tb=toolbar_new();
/* Now create the contents of the two halves of the window */
@@ -179,12 +181,17 @@
main (int argc, char **argv)
{
GtkWidget *vpaned;
-
+
+ if (!g_thread_supported()) g_thread_init(NULL);
+ gdk_threads_init();
+
gtk_init (&argc, &argv);
init_trail_file(&cfile);
create_main_window();
show_main_window();
+ gdk_threads_enter();
gtk_main ();
+ gdk_threads_leave();
return 0;
}
==== //depot/projects/soc2007/dongmei-auditanalyzer/gtk/menu.c#4 (text+ko) ====
@@ -2,6 +2,7 @@
#include <string.h>
#include "compat_macros.h"
#include "trail_file_dlg.h"
+#include "main.h"
#include "../capture.h"
#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a))
@@ -11,9 +12,9 @@
ITEM_FACTORY_ENTRY("/_File", NULL, NULL, 0, "<Branch>", NULL),
ITEM_FACTORY_STOCK_ENTRY("/File/_Open...", "<control>O", file_open_cmd_cb,
0, GTK_STOCK_OPEN),
-/* ITEM_FACTORY_STOCK_ENTRY("/File/_Quit", "<control>Q", file_quit_cmd_cb,
+ ITEM_FACTORY_STOCK_ENTRY("/File/_Quit", "<control>Q", file_quit_cmd_cb,
0, GTK_STOCK_QUIT),
-*/
+
ITEM_FACTORY_ENTRY("/_Edit", NULL, NULL, 0, "<Branch>", NULL),
#if 0
/* Un-#if this when we actually implement Cut/Copy/Paste. */
@@ -34,9 +35,9 @@
// ITEM_FACTORY_ENTRY("/View/log _Bytes", NULL, byte_view_show_cb, 0, "<CheckItem>", NULL),
ITEM_FACTORY_ENTRY("/_Capture", NULL, NULL, 0, "<Branch>", NULL),
ITEM_FACTORY_STOCK_ENTRY("/Capture/_Start...", "<control>O", capture_start_cb,
- 0, GTK_STOCK_OPEN),
+ 0, AUANALYZER_STOCK_CAPTURE_START),
ITEM_FACTORY_STOCK_ENTRY("/Capture/_Stop...", "<control>O", capture_stop_cb,
- 0, GTK_STOCK_OPEN),
+ 0, AUANALYZER_STOCK_CAPTURE_STOP),
ITEM_FACTORY_ENTRY("/_Analyze", NULL, NULL, 0, "<Branch>", NULL),
ITEM_FACTORY_ENTRY("/_Statistics", NULL, NULL, 0, "<Branch>", NULL),
More information about the p4-projects
mailing list