osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

As I think Guy said a while back (quoting some HIG): anything you can do in a 

popup should also be available through a regular menu.  So, make the
"Manually resolve address" function availble in under View->Name Resolution .
(Yes, technically this is an "Edit"-like action, but it just fits so well
under Name Resolution.)

While there, move "Resolve Name" from main_menu_bar_toggle_action_entries[]
into main_menu_bar_entries[] so it doesn't get a (useless) toggle indicator.
(At least as I understand this function, it's supposed to allow you to tell
Wireshark to go off and try to resolve the names in the current frame;
unfortunately it doesn't seem to actually work.)

svn path=/trunk/; revision=41747
This commit is contained in:
Jeff Morriss 2012-03-23 02:37:25 +00:00
parent 26125e7f14
commit 48b1c7ae5c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/gtk/main_menubar.c
View File

@ -1091,6 +1091,7 @@ static const char *ui_desc_menubar =
" </menu>\n"
" <menu name= 'NameResolution' action='/View/NameResolution'>\n"
" <menuitem name='ResolveName' action='/View/NameResolution/ResolveName'/>\n"
" <menuitem name='ManuallyResolveName' action='/View/NameResolution/ManuallyResolveName'/>\n"
" <separator/>\n"
" <menuitem name='EnableforMACLayer' action='/View/NameResolution/EnableforMACLayer'/>\n"
" <menuitem name='EnableforNetworkLayer' action='/View/NameResolution/EnableforNetworkLayer'/>\n"
@ -1563,7 +1564,10 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/View/TimeDisplayFormat", NULL, "_Time Display Format", NULL, NULL, NULL },
{ "/View/NameResolution", NULL, "Name Resol_ution", NULL, NULL, NULL },
{ "/View/NameResolution", NULL, "Name Resol_ution", NULL, NULL, NULL },
{ "/View/NameResolution/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb) },
{ "/View/NameResolution/ManuallyResolveName",NULL, "Manually Resolve Name", NULL, NULL, G_CALLBACK(manual_addr_resolv_dlg) },
{ "/View/ZoomIn", GTK_STOCK_ZOOM_IN, "_Zoom In", "<control>plus", NULL, G_CALLBACK(view_zoom_in_cb) },
{ "/View/ZoomOut", GTK_STOCK_ZOOM_OUT, "Zoom _Out", "<control>minus", NULL, G_CALLBACK(view_zoom_out_cb) },
{ "/View/NormalSize", GTK_STOCK_ZOOM_100, "_Normal Size", "<control>equal", NULL, G_CALLBACK(view_zoom_100_cb) },
@ -1820,15 +1824,14 @@ static const GtkActionEntry main_menu_bar_entries[] = {
static const GtkToggleActionEntry main_menu_bar_toggle_action_entries[] =
{
/* name, stock id, label, accel, tooltip, callback, is_active */
{"/View/MainToolbar", NULL, "_Main Toolbar", NULL, NULL, G_CALLBACK(main_toolbar_show_hide_cb), TRUE},
{"/View/FilterToolbar", NULL, "_FilterToolbar", NULL, NULL, G_CALLBACK(filter_toolbar_show_hide_cb), TRUE},
{"/View/WirelessToolbar", NULL, "_WirelessToolbar", NULL, NULL, G_CALLBACK(wireless_toolbar_show_hide_cb), FALSE},
{"/View/Statusbar", NULL, "_Statusbar", NULL, NULL, G_CALLBACK(status_bar_show_hide_cb), TRUE},
{"/View/PacketList", NULL, "Packet _List", NULL, NULL, G_CALLBACK(packet_list_show_hide_cb), TRUE},
{"/View/PacketDetails", NULL, "Packet _Details", NULL, NULL, G_CALLBACK(packet_details_show_hide_cb), TRUE},
{"/View/PacketBytes", NULL, "Packet _Bytes", NULL, NULL, G_CALLBACK(packet_bytes_show_hide_cb), TRUE},
{"/View/MainToolbar", NULL, "_Main Toolbar", NULL, NULL, G_CALLBACK(main_toolbar_show_hide_cb), TRUE},
{"/View/FilterToolbar", NULL, "_FilterToolbar", NULL, NULL, G_CALLBACK(filter_toolbar_show_hide_cb), TRUE},
{"/View/WirelessToolbar", NULL, "_WirelessToolbar", NULL, NULL, G_CALLBACK(wireless_toolbar_show_hide_cb), FALSE},
{"/View/Statusbar", NULL, "_Statusbar", NULL, NULL, G_CALLBACK(status_bar_show_hide_cb), TRUE},
{"/View/PacketList", NULL, "Packet _List", NULL, NULL, G_CALLBACK(packet_list_show_hide_cb), TRUE},
{"/View/PacketDetails", NULL, "Packet _Details", NULL, NULL, G_CALLBACK(packet_details_show_hide_cb), TRUE},
{"/View/PacketBytes", NULL, "Packet _Bytes", NULL, NULL, G_CALLBACK(packet_bytes_show_hide_cb), TRUE},
{"/View/TimeDisplayFormat/DisplaySecondsWithHoursAndMinutes", NULL, "Display Seconds with hours and minutes", NULL, NULL, G_CALLBACK(timestamp_seconds_time_cb), FALSE},
{"/View/NameResolution/ResolveName", NULL, "_Resolve Name", NULL, NULL, G_CALLBACK(resolve_name_cb), FALSE},
{"/View/NameResolution/EnableforMACLayer", NULL, "Enable for _MAC Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_MAC_cb), TRUE},
{"/View/NameResolution/EnableforNetworkLayer", NULL, "Enable for _Network Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_network_cb), TRUE },
{"/View/NameResolution/EnableforTransportLayer", NULL, "Enable for _Transport Layer", NULL, NULL, G_CALLBACK(view_menu_en_for_transport_cb), TRUE },

1
ui/gtk/ui/main-menubar-ui.xml
View File

@ -110,6 +110,7 @@ xml description of Wireshark's main menubar, loaded from main_menubar.c in the g
</menu>
<menu name= 'NameResolution' action='/View/NameResolution'>
<menuitem name='ResolveName' action='/View/NameResolution/ResolveName'/>
<menuitem name='ManuallyResolveName' action='/View/NameResolution/ManuallyResolveName'/>
<separator/>
<menuitem name='EnableforMACLayer' action='/View/NameResolution/EnableforMACLayer'/>
<menuitem name='EnableforNetworkLayer' action='/View/NameResolution/EnableforNetworkLayer'/>