diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-08-24 07:26:20 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-08-24 07:26:20 +0000 |
commit | 5a8e9365df6ebe2a6de7dd94b5b95ae2ef158478 (patch) | |
tree | 978f18f0404f93b65e558e5f4f10b39d0eb91a84 /gtk/main_menubar.c | |
parent | af2718e81c3b1988187dbc30c8e4747a1d6003f4 (diff) |
Several Time Shift menu improvements:
- Added shortcut Shift-Control-T
- Set inactive when no loaded packets
- Add stock time icon
- Moved below time reference functions
svn path=/trunk/; revision=38705
Diffstat (limited to 'gtk/main_menubar.c')
-rw-r--r-- | gtk/main_menubar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c index 91485f2d1b..1c78b25ea2 100644 --- a/gtk/main_menubar.c +++ b/gtk/main_menubar.c @@ -1014,9 +1014,9 @@ static const char *ui_desc_menubar = " <separator/>\n" " <menuitem name='SetTimeReference' action='/Edit/SetTimeReference'/>\n" " <menuitem name='Un-TimeReferenceAllPackets' action='/Edit/Un-TimeReferenceAllPackets'/>\n" -" <menuitem name='TimeShift' action='/Edit/TimeShift'/>\n" " <menuitem name='FindNextTimeReference' action='/Edit/FindNextTimeReference'/>\n" " <menuitem name='FindPreviousTimeReference' action='/Edit/FindPreviousTimeReference'/>\n" +" <menuitem name='TimeShift' action='/Edit/TimeShift'/>\n" " <separator/>\n" #ifdef WANT_PACKET_EDITOR " <menuitem name='EditPacket' action='/Edit/EditPacket'/>\n" @@ -1529,9 +1529,9 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Edit/Un-IgnoreAllPackets", NULL, "U_n-Ignore All Packets", "<shift><control>X", NULL, G_CALLBACK(new_packet_list_unignore_all_frames_cb) }, { "/Edit/SetTimeReference", WIRESHARK_STOCK_TIME, "Set Time Reference (toggle)", "<control>T", NULL, G_CALLBACK(set_reftime_cb) }, { "/Edit/Un-TimeReferenceAllPackets",NULL, "Un-Time Reference All Packets", "<alt><control>T", NULL, G_CALLBACK(new_packet_list_untime_reference_all_frames_cb) }, - { "/Edit/TimeShift", NULL, "Time Shift...", NULL, NULL, G_CALLBACK(time_shift_cb) }, { "/Edit/FindNextTimeReference", NULL, "Find Next Time Reference", "<alt><control>N", NULL, G_CALLBACK(find_next_ref_time_cb) }, { "/Edit/FindPreviousTimeReference", NULL, "Find Previous Time Reference", "<alt><control>B", NULL, G_CALLBACK(find_previous_ref_time_cb) }, + { "/Edit/TimeShift", WIRESHARK_STOCK_TIME, "Time Shift...", "<shift><control>T", NULL, G_CALLBACK(time_shift_cb) }, { "/Edit/ConfigurationProfiles", NULL, "_Configuration Profiles...", "<shift><control>A", NULL, G_CALLBACK(profile_dialog_cb) }, { "/Edit/Preferences", GTK_STOCK_PREFERENCES, "_Preferences...", "<shift><control>P", NULL, G_CALLBACK(menus_prefs_cb) }, @@ -4578,6 +4578,8 @@ set_menus_for_selected_packet(capture_file *cf) frame_selected); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/Un-TimeReferenceAllPackets", have_time_ref); + set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/TimeShift", + cf->count > 0); set_menu_sensitivity(ui_manager_packet_list_menu, "/PacketListMenuPopup/SetTimeReference", frame_selected); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/EditMenu/FindNextTimeReference", |