Added "Remove Ignored packets" to the win32 dialogs.

svn path=/trunk/; revision=31695

1 files changed, 48 insertions, 42 deletions

diff --git a/image/file_dlg_win32.rc b/image/file_dlg_win32.rc
index 433c700b3e..a2ec80c6cc 100644
--- a/image/file_dlg_win32.rc
+++ b/image/file_dlg_win32.rc
@@ -29,33 +29,36 @@ FONT 8, "MS Shell Dlg"
     LTEXT "-", EWFD_PTX_ELAPSED, 211, 79, 150, 8
 }
 
-WIRESHARK_SAVEFILENAME_TEMPLATE DIALOG 0, 0, 368, 116
+WIRESHARK_SAVEFILENAME_TEMPLATE DIALOG 0, 0, 368, 128
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Packet Range", -1, 5, 21, 210, 90
+    GROUPBOX "Packet Range", -1, 5, 21, 220, 102
 
-    CONTROL  "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 110, 32, 45, 10
-    CONTROL  "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 160,  32, 47, 10
+    CONTROL  "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 120, 32, 45, 10
+    CONTROL  "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 170,  32, 47, 10
 
     CONTROL  "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 16, 44, 51, 10
     CONTROL  "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON,  16, 56, 68, 10
     CONTROL  "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON,  16, 68, 67, 10
     CONTROL  "First to last marked", EWFD_FIRST_LAST_BTN, "Button",  BS_AUTORADIOBUTTON, 16, 80, 75, 10
     CONTROL  "Range:", EWFD_RANGE_BTN, "Button",  BS_AUTORADIOBUTTON, 16, 92, 35, 10
-    EDITTEXT EWFD_RANGE_EDIT, 53, 91, 30, 12, ES_AUTOHSCROLL
-
-    LTEXT "0", EWFD_ALL_PKTS_CAP, 110, 45, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_SEL_PKT_CAP, 110, 57, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_MARKED_CAP, 110, 69, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_FIRST_LAST_CAP, 110, 81, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_RANGE_CAP, 110, 93, 39, 8, SS_RIGHT
-
-    LTEXT "0", EWFD_ALL_PKTS_DISP, 160, 45, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_SEL_PKT_DISP, 160, 57, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_MARKED_DISP, 160, 69, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_FIRST_LAST_DISP, 160, 81, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_RANGE_DISP, 160, 93, 41, 8, SS_RIGHT
+    EDITTEXT EWFD_RANGE_EDIT, 53, 91, 50, 12, ES_AUTOHSCROLL
+    CONTROL  "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 16, 104, 100, 10
+
+    LTEXT "0", EWFD_ALL_PKTS_CAP, 120, 45, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_SEL_PKT_CAP, 120, 57, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_MARKED_CAP, 120, 69, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_FIRST_LAST_CAP, 120, 81, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_RANGE_CAP, 120, 93, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_IGNORED_CAP, 120, 105, 39, 8, SS_RIGHT
+
+    LTEXT "0", EWFD_ALL_PKTS_DISP, 170, 45, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_SEL_PKT_DISP, 170, 57, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_MARKED_DISP, 170, 69, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_FIRST_LAST_DISP, 170, 81, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_RANGE_DISP, 170, 93, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_IGNORED_DISP, 170, 105, 41, 8, SS_RIGHT
 }
 
 WIRESHARK_MERGEFILENAME_TEMPLATE DIALOG 0, 0, 368, 94
@@ -85,43 +88,46 @@ FONT 8, "MS Shell Dlg"
     LTEXT "-", EWFD_PTX_ELAPSED, 211, 79, 150, 8
 }
 
-WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOG 0, 0, 319, 97
+WIRESHARK_EXPORTFILENAME_TEMPLATE DIALOG 0, 0, 319, 109
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | DS_3DLOOK | DS_CONTROL
 FONT 8, "MS Shell Dlg"
 {
     // Provide hints for dialog layout and size
-    LTEXT    "", stc32, 1, 1, 250, 0
+    LTEXT    "", stc32, 1, 1, 260, 0
 
-    GROUPBOX "Packet Range", -1, 5, 2, 210, 90
+    GROUPBOX "Packet Range", -1, 5, 2, 220, 102
 
-    CONTROL  "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 110, 13, 45, 10
-    CONTROL  "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 160,  13, 47, 10
+    CONTROL  "Captured", EWFD_CAPTURED_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 120, 13, 45, 10
+    CONTROL  "Displayed", EWFD_DISPLAYED_BTN, "Button", BS_AUTORADIOBUTTON, 170,  13, 47, 10
 
     CONTROL  "All packets", EWFD_ALL_PKTS_BTN, "Button", BS_AUTORADIOBUTTON | WS_GROUP, 16, 25, 51, 10
     CONTROL  "Selected packet", EWFD_SEL_PKT_BTN, "Button", BS_AUTORADIOBUTTON,  16, 37, 68, 10
     CONTROL  "Marked packets", EWFD_MARKED_BTN, "Button", BS_AUTORADIOBUTTON,  16, 49, 67, 10
     CONTROL  "First to last marked", EWFD_FIRST_LAST_BTN, "Button",  BS_AUTORADIOBUTTON, 16, 61, 75, 10
     CONTROL  "Range:", EWFD_RANGE_BTN, "Button",  BS_AUTORADIOBUTTON, 16, 73, 35, 10
-    EDITTEXT EWFD_RANGE_EDIT, 53, 72, 30, 12, ES_AUTOHSCROLL
-
-    LTEXT "0", EWFD_ALL_PKTS_CAP,   110, 26, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_SEL_PKT_CAP,    110, 38, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_MARKED_CAP,     110, 50, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_FIRST_LAST_CAP, 110, 62, 39, 8, SS_RIGHT
-    LTEXT "0", EWFD_RANGE_CAP,      110, 74, 39, 8, SS_RIGHT
-
-    LTEXT "0", EWFD_ALL_PKTS_DISP,   160, 26, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_SEL_PKT_DISP,    160, 38, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_MARKED_DISP,     160, 50, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_FIRST_LAST_DISP, 160, 62, 41, 8, SS_RIGHT
-    LTEXT "0", EWFD_RANGE_DISP,      160, 74, 41, 8, SS_RIGHT
-
-    GROUPBOX "Packet Format", EWFD_PKT_FORMAT_GB, 224, 2, 119, 90
-    CONTROL  "Packet summary line", EWFD_PKT_SUMMARY_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 235, 15, 84, 10
-    CONTROL  "Packet details:", EWFD_PKT_DETAIL_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 235, 27, 95, 10
-    COMBOBOX EWFD_PKT_DETAIL_COMBO, 247, 39, 74, 45, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL  "Packet Bytes", EWFD_PKT_BYTES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 235, 56, 80, 10
-    CONTROL  "Each packet on a new page", EWFD_PKT_NEW_PAGE_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 235, 70, 106, 10
+    EDITTEXT EWFD_RANGE_EDIT, 53, 72, 50, 12, ES_AUTOHSCROLL
+    CONTROL  "Remove Ignored packets", EWFD_REMOVE_IGN_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 16, 85, 100, 10
+
+    LTEXT "0", EWFD_ALL_PKTS_CAP,   120, 26, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_SEL_PKT_CAP,    120, 38, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_MARKED_CAP,     120, 50, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_FIRST_LAST_CAP, 120, 62, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_RANGE_CAP,      120, 74, 39, 8, SS_RIGHT
+    LTEXT "0", EWFD_IGNORED_CAP,    120, 86, 39, 8, SS_RIGHT
+
+    LTEXT "0", EWFD_ALL_PKTS_DISP,   170, 26, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_SEL_PKT_DISP,    170, 38, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_MARKED_DISP,     170, 50, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_FIRST_LAST_DISP, 170, 62, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_RANGE_DISP,      170, 74, 41, 8, SS_RIGHT
+    LTEXT "0", EWFD_IGNORED_DISP,    170, 86, 41, 8, SS_RIGHT
+
+    GROUPBOX "Packet Format", EWFD_PKT_FORMAT_GB, 234, 2, 119, 102
+    CONTROL  "Packet summary line", EWFD_PKT_SUMMARY_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 245, 15, 84, 10
+    CONTROL  "Packet details:", EWFD_PKT_DETAIL_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 245, 27, 95, 10
+    COMBOBOX EWFD_PKT_DETAIL_COMBO, 257, 39, 74, 45, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL  "Packet Bytes", EWFD_PKT_BYTES_CB, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 245, 56, 80, 10
+    CONTROL  "Each packet on a new page", EWFD_PKT_NEW_PAGE_CB, "Button",  BS_AUTOCHECKBOX | WS_TABSTOP, 245, 70, 106, 10
 
 }